mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/flask-wtf/default.nix pkgs/development/python-modules/unstructured-inference/default.nix pkgs/development/python-modules/unstructured/default.nix pkgs/development/python-modules/velbus-aio/default.nix
This commit is contained in:
Alyssa Ross
commit
acf111d42b
94 changed files with 3431 additions and 1251 deletions
|
|
@ -7206,6 +7206,12 @@
|
|||
fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5";
|
||||
}];
|
||||
};
|
||||
hubble = {
|
||||
name = "Hubble the Wolverine";
|
||||
matrix = "@hubofeverything:bark.lgbt";
|
||||
github = "the-furry-hubofeverything";
|
||||
githubId = 53921912;
|
||||
};
|
||||
hufman = {
|
||||
email = "hufman@gmail.com";
|
||||
github = "hufman";
|
||||
|
|
|
|||
|
|
@ -393,7 +393,7 @@ in
|
|||
)
|
||||
) // {
|
||||
# Miscellaneous options
|
||||
inherit (cfg) banaction maxretry;
|
||||
inherit (cfg) banaction maxretry bantime;
|
||||
ignoreip = ''127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}'';
|
||||
backend = "systemd";
|
||||
# Actions
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1246,6 +1246,10 @@ self: super: {
|
|||
meta.maintainers = with lib.maintainers; [enderger];
|
||||
};
|
||||
|
||||
typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
|
||||
dependencies = with self; [ nvim-lspconfig plenary-nvim ];
|
||||
};
|
||||
|
||||
unicode-vim =
|
||||
let
|
||||
unicode-data = fetchurl {
|
||||
|
|
|
|||
|
|
@ -864,6 +864,7 @@ https://github.com/Pocco81/true-zen.nvim/,,
|
|||
https://github.com/jgdavey/tslime.vim/,,
|
||||
https://github.com/Quramy/tsuquyomi/,,
|
||||
https://github.com/folke/twilight.nvim/,,
|
||||
https://github.com/pmizio/typescript-tools.nvim/,,
|
||||
https://github.com/leafgarland/typescript-vim/,,
|
||||
https://github.com/jose-elias-alvarez/typescript.nvim/,,
|
||||
https://github.com/kaarmu/typst.vim/,HEAD,
|
||||
|
|
|
|||
|
|
@ -3521,8 +3521,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "uiua-vscode";
|
||||
publisher = "uiua-lang";
|
||||
version = "0.0.15";
|
||||
sha256 = "sha256-q+hSssxOIfeRUw2z9nMiCmH8cAF+GPTvlmc1jl/L4uU=";
|
||||
version = "0.0.19";
|
||||
sha256 = "sha256-Tww1urq6CfLma254Sn5lwOYwbvxAeDZuBuFBQlzks1c=";
|
||||
};
|
||||
meta = {
|
||||
description = "VSCode language extension for Uiua";
|
||||
|
|
|
|||
|
|
@ -30,8 +30,10 @@ let
|
|||
});
|
||||
flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
|
||||
version = "0.15.1";
|
||||
format = "setuptools";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
pname = "Flask-WTF";
|
||||
hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw=";
|
||||
};
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ lib
|
||||
, writeShellScriptBin
|
||||
, buildGoPackage
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
, coreutils
|
||||
, nettools
|
||||
, busybox
|
||||
, util-linux
|
||||
, stdenv
|
||||
, dmidecode
|
||||
|
|
@ -29,22 +28,29 @@ let
|
|||
-r) echo "''${VERSION:-unknown}";;
|
||||
esac
|
||||
'';
|
||||
|
||||
binaries = {
|
||||
"core" = "amazon-ssm-agent";
|
||||
"agent" = "ssm-agent-worker";
|
||||
"cli-main" = "ssm-cli";
|
||||
"worker" = "ssm-document-worker";
|
||||
"logging" = "ssm-session-logger";
|
||||
"sessionworker" = "ssm-session-worker";
|
||||
};
|
||||
in
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ssm-agent";
|
||||
version = "3.2.1630.0";
|
||||
|
||||
goPackagePath = "github.com/aws/${pname}";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "refs/tags/${version}";
|
||||
owner = "aws";
|
||||
repo = "amazon-ssm-agent";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
patches = [
|
||||
# Some tests use networking, so we skip them.
|
||||
./0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch
|
||||
|
|
@ -54,6 +60,8 @@ buildGoPackage rec {
|
|||
./0002-version-gen-don-t-use-unnecessary-constants.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138
|
||||
# The updater is not built because it cannot work on NixOS
|
||||
subPackages = [
|
||||
|
|
@ -65,10 +73,7 @@ buildGoPackage rec {
|
|||
"agent/framework/processor/executer/outofproc/sessionworker"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postPatch = ''
|
||||
printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh
|
||||
|
|
@ -94,30 +99,22 @@ buildGoPackage rec {
|
|||
'';
|
||||
|
||||
preBuild = ''
|
||||
pushd go/src/${goPackagePath}
|
||||
|
||||
# Note: if this step fails, please patch the code to fix it! Please only skip
|
||||
# tests if it is not feasible for the test to pass in a sandbox.
|
||||
make quick-integtest
|
||||
|
||||
make pre-release
|
||||
make pre-build
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
pushd go/bin
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv core amazon-ssm-agent
|
||||
mv agent ssm-agent-worker
|
||||
mv cli-main ssm-cli
|
||||
mv worker ssm-document-worker
|
||||
mv logging ssm-session-logger
|
||||
mv sessionworker ssm-session-worker
|
||||
declare -A map=(${builtins.concatStringsSep " " (lib.mapAttrsToList (name: value: "[\"${name}\"]=\"${value}\"") binaries)})
|
||||
|
||||
popd
|
||||
'';
|
||||
for key in ''${!map[@]}; do
|
||||
install -D -m 0555 -T "$GOPATH/bin/''${key}" "$out/bin/''${map[''${key}]}"
|
||||
done
|
||||
|
||||
# These templates retain their `.template` extensions on installation. The
|
||||
# amazon-ssm-agent.json.template is required as default configuration when an
|
||||
|
|
@ -127,10 +124,11 @@ buildGoPackage rec {
|
|||
# seelog.xml isn't actually required to run, but it does ship as a template
|
||||
# with debian packages, so it's here for reference. Future work in the nixos
|
||||
# module could use this template and substitute a different log level.
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/amazon/ssm
|
||||
cp go/src/${goPackagePath}/amazon-ssm-agent.json.template $out/etc/amazon/ssm/amazon-ssm-agent.json.template
|
||||
cp go/src/${goPackagePath}/seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template
|
||||
|
||||
install -D -m 0444 -t $out/etc/amazon/ssm amazon-ssm-agent.json.template
|
||||
install -D -m 0444 -T seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-09-26
|
||||
# Last updated: 2023-10-16
|
||||
{
|
||||
version = "3.2.1-17153";
|
||||
urlhash = "b69de82d";
|
||||
arm64_hash = "sha256-BtmmVpKZF15aU7RRmXl9g5leg2jz5sT4vYXluq9aIYk=";
|
||||
amd64_hash = "sha256-+GjTjv0K2vnlkb46KhMvRRFWuIEBz23Lg3QhiA7QzkA=";
|
||||
version = "3.2.1-17412";
|
||||
urlhash = "423936b9";
|
||||
arm64_hash = "sha256-gvKBcfQafDtNioFg4Cyy92VMAX4uKL5H7wBkxQgDwjI=";
|
||||
amd64_hash = "sha256-cg2YXB1/pf5eDRHFgzydIb4GICjh9XRtCquPspgCL6c=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/";
|
||||
description = "Jabber/XMPP connection manager for the Telepathy framework";
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }:
|
||||
{ lib, stdenv, fetchurl, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-haze";
|
||||
|
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "A Telepathy connection manager based on libpurple";
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # Random choice
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-haze/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "IRC connection manager for the Telepathy framework";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-idle/";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config
|
||||
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus
|
||||
, fetchpatch
|
||||
, fetchpatch, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
dbus-glib libxml2 sqlite telepathy-glib
|
||||
dbus
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-call" ];
|
||||
|
|
@ -39,8 +42,8 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Logger service for Telepathy framework";
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/";
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
, python3
|
||||
, libxslt
|
||||
, makeWrapper
|
||||
, autoreconfHook
|
||||
, gtk-doc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -27,6 +29,9 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
libxslt
|
||||
makeWrapper
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
autoreconfHook
|
||||
gtk-doc
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -49,7 +54,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "5.12.158";
|
||||
version = "5.12.159";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
|
|
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vMrIkM8ShfaSrIEFiY6Jiwo8/6LMrjlqpD1B8DNtWcI=";
|
||||
hash = "sha256-6zifouzFYIMmdTySDFs9Q4MkZrDd1oaK479rEDk45r4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kdXnj1O9AWFwFWQwZ6QPe5ePlxjr/F68vJEpAZgph6I=";
|
||||
cargoHash = "sha256-GBQ0GyKLrrPlHKbZDG0ZuiCVEqkFIT5FrYbojvP/je0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, doctest
|
||||
, libdrm
|
||||
, libexecinfo
|
||||
, libevdev
|
||||
, libinput
|
||||
, libjpeg
|
||||
, libxkbcommon
|
||||
|
|
@ -18,19 +19,20 @@
|
|||
, wayland-scanner
|
||||
, wlroots
|
||||
, pango
|
||||
, nlohmann_json
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wayfire";
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wayfire";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is=";
|
||||
hash = "sha256-YI8N1rY71b2ulv7tAdah7sibG4qq3kY0/hyS0cls5to=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wf-config
|
||||
libdrm
|
||||
libexecinfo
|
||||
libevdev
|
||||
libinput
|
||||
libjpeg
|
||||
libxkbcommon
|
||||
|
|
@ -52,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wayland
|
||||
cairo
|
||||
pango
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -8,22 +9,32 @@
|
|||
, wf-config
|
||||
, gtkmm3
|
||||
, gtk-layer-shell
|
||||
, libevdev
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, xcbutilwm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wayfire-plugins-extra";
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wayfire-plugins-extra";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo=";
|
||||
hash = "sha256-OVyP1AgZ1d9DXFkbHnROwtSQIquEX5ccVIkcmCdDZtA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "check-dependency-libevdev.patch";
|
||||
url = "https://github.com/WayfireWM/wayfire-plugins-extra/commit/f3bbf1fcbafd28016e36be7a5043bd82574ac9e4.patch";
|
||||
hash = "sha256-8X1lpf8H8NuA845cIslahKDQKW/IA/KiMExU4Snk72o=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace metadata/meson.build \
|
||||
--replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')"
|
||||
|
|
@ -38,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
wayfire
|
||||
wf-config
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
xcbutilwm
|
||||
gtkmm3
|
||||
|
|
|
|||
|
|
@ -12,20 +12,22 @@
|
|||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
, gtk3
|
||||
, gtkmm3
|
||||
, libevdev
|
||||
, libxml2
|
||||
, libxkbcommon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wcm";
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wcm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU=";
|
||||
hash = "sha256-UwHJ4Wi83ATnA1CQKNSt8Qga7ooLnAY7QARz2FXvUIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,8 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wayland
|
||||
wayland-protocols
|
||||
gtk3
|
||||
gtkmm3
|
||||
libevdev
|
||||
libxml2
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wf-config";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wf-config";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA=";
|
||||
hash = "sha256-4QszCGlJqehnavTOdR2vZ95XuHKiNUIsA893sa9qph8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,18 +11,19 @@
|
|||
, gtkmm3
|
||||
, gtk-layer-shell
|
||||
, pulseaudio
|
||||
, libdbusmenu-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wf-shell";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wf-shell";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA=";
|
||||
hash = "sha256-K5g9DfFlqZyPHDUswx3vtzh0D9ogOQ1p87ZrqyH35vs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
gtkmm3
|
||||
gtk-layer-shell
|
||||
pulseaudio
|
||||
libdbusmenu-gtk3
|
||||
];
|
||||
|
||||
mesonFlags = [ "--sysconfdir /etc" ];
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ let
|
|||
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
|
||||
composer
|
||||
composer-local-repo-plugin
|
||||
phpDrv
|
||||
phpDrv.composerHooks.composerInstallHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ let
|
|||
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
|
||||
composer
|
||||
composer-local-repo-plugin
|
||||
phpDrv
|
||||
phpDrv.composerHooks.composerRepositoryHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, jq
|
||||
, moreutils
|
||||
, makeBinaryWrapper
|
||||
, php
|
||||
, cacert
|
||||
, buildPackages
|
||||
}:
|
||||
|
|
@ -12,14 +11,14 @@
|
|||
composerRepositoryHook = makeSetupHook
|
||||
{
|
||||
name = "composer-repository-hook.sh";
|
||||
propagatedBuildInputs = [ jq moreutils php cacert ];
|
||||
propagatedBuildInputs = [ jq moreutils cacert ];
|
||||
substitutions = { };
|
||||
} ./composer-repository-hook.sh;
|
||||
|
||||
composerInstallHook = makeSetupHook
|
||||
{
|
||||
name = "composer-install-hook.sh";
|
||||
propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php cacert ];
|
||||
propagatedBuildInputs = [ jq makeBinaryWrapper moreutils cacert ];
|
||||
substitutions = {
|
||||
# Specify the stdenv's `diff` by abspath to ensure that the user's build
|
||||
# inputs do not cause us to find the wrong `diff`.
|
||||
|
|
|
|||
1998
pkgs/by-name/ru/rustplayer/Cargo.lock
generated
Normal file
1998
pkgs/by-name/ru/rustplayer/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
13
pkgs/by-name/ru/rustplayer/dynamic-lib.patch
Normal file
13
pkgs/by-name/ru/rustplayer/dynamic-lib.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/thirdparty/ffmpeg-decoder-rs/Cargo.toml b/thirdparty/ffmpeg-decoder-rs/Cargo.toml
|
||||
index 9db9ac9..4546253 100644
|
||||
--- a/thirdparty/ffmpeg-decoder-rs/Cargo.toml
|
||||
+++ b/thirdparty/ffmpeg-decoder-rs/Cargo.toml
|
||||
@@ -20,7 +20,7 @@ default = []
|
||||
rodio_source = ['rodio']
|
||||
|
||||
[dependencies]
|
||||
-ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample", "static"] }
|
||||
+ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample"] }
|
||||
|
||||
thiserror = "1.0"
|
||||
log = "0.4"
|
||||
47
pkgs/by-name/ru/rustplayer/package.nix
Normal file
47
pkgs/by-name/ru/rustplayer/package.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, alsa-lib
|
||||
, ffmpeg_4
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "rustplayer";
|
||||
version = "unstable-2022-12-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kingtous";
|
||||
repo = "RustPlayer";
|
||||
rev = "a369bc19ab4a8c568c73be25c5e6117e1ee5d848";
|
||||
sha256 = "sha256-x82EdA7ezCzux1C85IcI2ZQ3M95sH6/k97Rv6lqc5eo=";
|
||||
};
|
||||
|
||||
# This patch is from the source
|
||||
patches = [
|
||||
./dynamic-lib.patch
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ffmpeg-sys-next-4.4.0" = "sha256-TBgf+J+ud7nnVjf0r98/rujFPEayjEaVi+vnSE6/5Ak=";
|
||||
};
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
buildInputs = [ alsa-lib openssl ffmpeg_4 ];
|
||||
|
||||
checkFlags = [
|
||||
# network required
|
||||
"--skip=fetch_and_play"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Kingtous/RustPlayer";
|
||||
description = "A local audio player and network m3u8 radio player using a terminal interface";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
576
pkgs/by-name/sy/symbolicator/Cargo.lock
generated
576
pkgs/by-name/sy/symbolicator/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "symbolicator";
|
||||
version = "23.9.1";
|
||||
version = "23.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "symbolicator";
|
||||
rev = version;
|
||||
hash = "sha256-QsU9hxBF7Te3vO6in/nWn6hYbovI1jOWYXB6PcqWGTA=";
|
||||
hash = "sha256-yD1uXqFN1T7bgbW20zu7VauELZTsTPpv4sdtVa/Xc3I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uiua";
|
||||
version = "0.0.19";
|
||||
version = "0.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uiua-lang";
|
||||
repo = "uiua";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2DopXsYhEyD6JHEJgtiCGCzpcl/6nOQCDp0uHDCSEcs=";
|
||||
hash = "sha256-fFsMN+4ORB//Ch+wrRRMeZKXvW8ta5m66Vy3I3uyHO8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WWIxXXuMbk7QqldJIxjWaaM946WGLuMl6mSw7Vc8LKo=";
|
||||
cargoHash = "sha256-old+U0sJWnp8wTiZBjcQ7+mv+6N15cpyyTDEjTUnghk=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20231011001633";
|
||||
version = "20231015073627";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-dU/y4rLjdzTOBvewPKRLBlq+DBc8i6oJGk8LDxTtaiM=";
|
||||
hash = "sha256-DffJ9d5ppTVLMTfITKd0zwCqBEKKMCwupLAFMr/o+dw=";
|
||||
};
|
||||
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@
|
|||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-desktop-view";
|
||||
version = "1.2.1";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-USsySJuDov2oe9UXyzACBAyYIRLKSXOMXdia8Ix/8TE=";
|
||||
repo = "budgie-desktop-view";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-k6VfAGWvUarhBFnREasOvWH3M9uuT5SFUpMFmKo1fmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,16 +38,12 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace ../scripts/mesonPostInstall.sh --replace "update-desktop-database -q" "update-desktop-database $out/share/applications"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "The official Budgie desktop icons application/implementation";
|
||||
homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view";
|
||||
mainProgram = "org.buddiesofbudgie.budgie-desktop-view";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
license = licenses.asl20;
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ federicoschonborn ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-terminal";
|
||||
version = "6.0.7";
|
||||
version = "6.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vXykC/x9F+cPTSqKTWimUhnr+IsfoeQncdj75sXG4/g=";
|
||||
hash = "sha256-7Yyw4aw+44JX9SKuwmJSrLz04WETvs3E3cnt0/O+Ls0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chez-scheme";
|
||||
version = "9.6.2";
|
||||
version = "9.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-cUaVeJ4brTUY5s1fvIroIE92ED1a0roFo/HAY+stXQI=";
|
||||
hash = "sha256-9YJ2gvolnEeXX/4Hh4X7Vh5KXFT3ZDMe9mwyEyhDaF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin cctools;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,10 @@ rustPlatform.buildRustPackage rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE=";
|
||||
|
||||
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
|
||||
cargoPatches = [
|
||||
# this patch is necessary until cargo-auditable is bumped on the rust platform
|
||||
./patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
From a59bb5f9deeff156bd7bc9d22bc199e0f902b7dc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
|
||||
<ereslibre@ereslibre.es>
|
||||
Date: Mon, 4 Sep 2023 15:25:15 +0200
|
||||
Subject: [PATCH] Use `dep:` dependency due to `cargo-auditable` limitation
|
||||
|
||||
`cargo-auditable` fails to process the current `Cargo.toml` as it
|
||||
is (cargo/rustc 1.72.0 is able to process this crate without any
|
||||
issues).
|
||||
---
|
||||
crates/c-api/Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml
|
||||
index a464c0dbd..1e793432c 100644
|
||||
--- a/crates/c-api/Cargo.toml
|
||||
+++ b/crates/c-api/Cargo.toml
|
||||
@@ -37,4 +37,4 @@ default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation']
|
||||
jitdump = ["wasmtime/jitdump"]
|
||||
cache = ["wasmtime/cache"]
|
||||
parallel-compilation = ['wasmtime/parallel-compilation']
|
||||
-wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std', 'wasi-common']
|
||||
+wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'dep:cap-std', 'wasi-common']
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
@ -3,21 +3,31 @@
|
|||
, boost
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, eigen
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcifpp";
|
||||
version = "5.1.2";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDB-REDO";
|
||||
repo = "libcifpp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-wx5D0kNKetgc/8LFAgNxTAwni+lJb2rajsxh0AASpeY=";
|
||||
hash = "sha256-9je4oj5XvclknD14Nh0LnBONHMeO40nY0+mZ9ACQYmY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/PDB-REDO/libcifpp/issues/51
|
||||
name = "fix-build-on-darwin.patch";
|
||||
url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch";
|
||||
hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
|
|
|||
35
pkgs/development/ocaml-modules/asai/default.nix
Normal file
35
pkgs/development/ocaml-modules/asai/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, algaeff
|
||||
, bwd
|
||||
, eio
|
||||
, eio_main
|
||||
, lsp
|
||||
, notty
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "asai";
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedPRL";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Jd90WhSjK4K2amFA5uyGF57NzsgHA8QiccX6qtxO1rQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
algaeff
|
||||
bwd
|
||||
lsp
|
||||
eio
|
||||
eio_main
|
||||
notty
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A library for constructing and printing compiler diagnostics";
|
||||
homepage = "https://redprl.org/asai/asai/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-protoc-plugin";
|
||||
version = "4.3.1";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "issuu";
|
||||
repo = "ocaml-protoc-plugin";
|
||||
rev = version;
|
||||
hash = "sha256-KFd43Ukz5gMeM3ik2VlfaIPwcZe9yaxk9VcQIrauUGU=";
|
||||
hash = "sha256-ZHeOi3y2X11MmkRuthmYFSjPLoGlGTO1pnRfk/XmgPU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
53
pkgs/development/python-modules/busypie/default.nix
Normal file
53
pkgs/development/python-modules/busypie/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "busypie";
|
||||
version = "0.5.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockem";
|
||||
repo = "busypie";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dw0Sc/a27/EYY7LVMQqDkYuxrUFYK+N6XLk6A7A/eS8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest-runner" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"busypie"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Expressive busy wait for Python";
|
||||
homepage = "https://github.com/rockem/busypie";
|
||||
changelog = "https://github.com/rockem/busypie/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "fastembed";
|
||||
version = "unstable-2023-09-07";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage {
|
|||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = "fastembed";
|
||||
rev = "9c5d32f271dfe9ae4730694727ff5df480983942";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d7Zb0IL0NOPEPsCHe/ZMNELnSCG4+y8JmGAXnCRUd50=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, hatchling
|
||||
, flask
|
||||
, itsdangerous
|
||||
, wtforms
|
||||
|
|
@ -11,16 +13,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-wtf";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-WTF";
|
||||
pname = "flask_wtf";
|
||||
inherit version;
|
||||
hash = "sha256-QcQkTprmJtY77UKuR4W5Bme4hbFTXVpAleH2MGDRKqk=";
|
||||
hash = "sha256-i7Jp65u0a4fnyCM9fn3r3x+LdL+QzBeJmIwps3qXtpU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
|
@ -47,5 +52,6 @@ buildPythonPackage rec {
|
|||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ mic92 anthonyroussel ];
|
||||
homepage = "https://github.com/lepture/flask-wtf/";
|
||||
changelog = "https://github.com/wtforms/flask-wtf/releases/tag/v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcal-sync";
|
||||
version = "4.2.1";
|
||||
version = "5.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = "gcal_sync";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+ysm3THUet2gKHyVq0QoOxDem7ik4BK7bxVos9thExM=";
|
||||
hash = "sha256-vlPAAGY6h/nV9bNOUXharm1aeKfaL7ImzbvAPlpMV5k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.36.5";
|
||||
version = "0.36.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-e70SirkWOQveyH6qMe+v2JSoNFvEc0EwJ9tLQA0jxZI=";
|
||||
hash = "sha256-SSFTB/fVMxlOqtyv72YssJLc1KCGluMG68OabyMWWQU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hap-python";
|
||||
version = "4.8.0";
|
||||
version = "4.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "ikalchev";
|
||||
repo = "HAP-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1NLLNE4LgV0r45nc21xCAAaKuH6bQm2YQWlxzhgajSI=";
|
||||
hash = "sha256-bFSqMAZWE3xTfnc7FSQMfAhxhKlYm65VFpm+q3yrqpE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lxmf";
|
||||
version = "0.3.4";
|
||||
version = "0.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "markqvist";
|
||||
repo = "lxmf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JQgeujIfVJrIQ5Z0znqYPiKFocEDgF2Fo89QwgS+gfw=";
|
||||
hash = "sha256-s5+hfn/NfuL7B5c1LElZ10B+O5xr98D0eBYfLhPt6uU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,34 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, nbformat
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbmerge";
|
||||
version = "unstable-2017-10-23";
|
||||
version = "0.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbn";
|
||||
repo = pname;
|
||||
rev = "fc0ba95e8422340317358ffec4404235defbc06a";
|
||||
sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ nbformat ];
|
||||
|
||||
nativeCheckInputs = [ nose ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
patchShebangs .
|
||||
nosetests -v
|
||||
PATH=$PATH:$out/bin ./cli_tests.sh
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nbmerge"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A tool to merge/concatenate Jupyter (IPython) notebooks";
|
||||
inherit (src.meta) homepage;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "nbmerge";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nomadnet";
|
||||
version = "0.3.9";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "markqvist";
|
||||
repo = "NomadNet";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dElqneeZ9S1n+q0VidprZV0M+sWNgdRcts7L1is8r/o=";
|
||||
hash = "sha256-xXVur2ibctRCfQ1zKnPeLrNoukTmFT8exTbm2ukByYY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, busypie
|
||||
, cbor2
|
||||
, fetchFromGitHub
|
||||
, pycryptodomex
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pubnub";
|
||||
version = "7.2.0";
|
||||
version = "7.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,8 +22,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AUB6pk3Gkrjc0RRFP0mql+up1baPjyPwuiRz8O6r/GM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KZC6a0ZrTPn033tQxn7HeCRhZUAgO2I5rGDzLJITtpI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -33,6 +34,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
busypie
|
||||
pytest-asyncio
|
||||
pytest-vcr
|
||||
pytestCheckHook
|
||||
|
|
@ -45,6 +47,11 @@ buildPythonPackage rec {
|
|||
"tests/functional/push"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_subscribe"
|
||||
"test_handshaking"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pubnub"
|
||||
];
|
||||
|
|
@ -52,7 +59,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python-based APIs for PubNub";
|
||||
homepage = "https://github.com/pubnub/python";
|
||||
changelog = "https://github.com/pubnub/python/releases/tag/${version}";
|
||||
changelog = "https://github.com/pubnub/python/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygitguardian";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "GitGuardian";
|
||||
repo = "py-gitguardian";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o5Hur51Dh4HWI7f4BpfEi40/inVAJgYF3xXZGPMyF8E=";
|
||||
hash = "sha256-Vr0+y3Zi7DsXzm2COOlMqUVjlZMRJkaVxT8QpSePhuA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, certifi
|
||||
, charset-normalizer
|
||||
, cvss
|
||||
, deepl
|
||||
, django
|
||||
, fetchFromGitHub
|
||||
|
|
@ -22,13 +23,14 @@
|
|||
, sqlparse
|
||||
, termcolor
|
||||
, toml
|
||||
, tomli-w
|
||||
, urllib3
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reptor";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -37,7 +39,7 @@ buildPythonPackage rec {
|
|||
owner = "Syslifters";
|
||||
repo = "reptor";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3FRMdiSKWlEUmggtSDea9w386uwAn/VUzXiD1xRNuxQ=";
|
||||
hash = "sha256-TN4ti860bMegxsCMhSxVQwiTLCB9nl+CJ+xDzJQcRuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,6 +50,7 @@ buildPythonPackage rec {
|
|||
asgiref
|
||||
certifi
|
||||
charset-normalizer
|
||||
cvss
|
||||
django
|
||||
idna
|
||||
markdown-it-py
|
||||
|
|
@ -59,6 +62,7 @@ buildPythonPackage rec {
|
|||
sqlparse
|
||||
termcolor
|
||||
toml
|
||||
tomli-w
|
||||
urllib3
|
||||
xmltodict
|
||||
];
|
||||
|
|
@ -66,7 +70,7 @@ buildPythonPackage rec {
|
|||
passthru.optional-dependencies = {
|
||||
ghostwriter = [
|
||||
gql
|
||||
];
|
||||
] ++ gql.optional-dependencies.aiohttp;
|
||||
translate = [
|
||||
deepl
|
||||
];
|
||||
|
|
@ -78,6 +82,7 @@ buildPythonPackage rec {
|
|||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export PATH="$PATH:$out/bin";
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -89,6 +94,13 @@ buildPythonPackage rec {
|
|||
"reptor/plugins/importers/GhostWriter/tests/test_ghostwriter.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests need network access
|
||||
"TestDummy"
|
||||
"TestIntegration"
|
||||
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to do automated pentest reporting with SysReptor";
|
||||
homepage = "https://github.com/Syslifters/reptor";
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "unstructured-inference";
|
||||
version = "0.5.28";
|
||||
version = "0.7.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Unstructured-IO";
|
||||
repo = "unstructured-inference";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-98TThX3mBInw/bnydWfgpKSANOt6OcxOdRq01nm13nA=";
|
||||
hash = "sha256-PorNIga1NgKgxkTfa5uBbVJbYoETuDrskDr2jSGwyYE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
, grpcio
|
||||
}:
|
||||
let
|
||||
version = "0.10.14";
|
||||
version = "0.10.23";
|
||||
optional-dependencies = {
|
||||
huggingflace = [
|
||||
langdetect
|
||||
|
|
@ -90,7 +90,7 @@ buildPythonPackage {
|
|||
owner = "Unstructured-IO";
|
||||
repo = "unstructured";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3oLnZp6DYR4odqwsVq5B7KVgdzKZrSoGQWnvNI0fKMs=";
|
||||
hash = "sha256-MfnMu7YW8G1G0sKNvum4k6hvNMRmpXp9YwaDHEj/mYE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "20212.6.2";
|
||||
version = "2023.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Cereal2nd";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MqSqwyfNICEU6h7+HAep3z1Uak30rlQ6noWEB3awVpA=";
|
||||
hash = "sha256-xVELkmucrw1QazSR2XN6ldmzdTya/rWsQd1mRsLTcbU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect-mqtt";
|
||||
version = "0.46.0";
|
||||
version = "0.47.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-mqtt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7TR6+woAV8f80t4epCnZj4jYYpTPKDkzwzNNsgofiwg=";
|
||||
hash = "sha256-pJtqKA04zooFDfxWGbTFZewS8N0Z2eB9iLFLYueu8oo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.58.3";
|
||||
version = "0.59.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fSrmprt3aiYa8gRXOWKHKXah3zSqhRvD32nVdMrihwA=";
|
||||
hash = "sha256-h2rMfpLsc2IPZN0Qp7vomoFMJxLXctkuiov3sntd5c0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,16 +27,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xml2rfc";
|
||||
version = "3.18.1";
|
||||
version = "3.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ietf-tools";
|
||||
repo = "xml2rfc";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+8L6qkJAMdjT+IDVtZt8/7VsOMdSxi/Jm7ORapJArbI=";
|
||||
hash = "sha256-IpCC5r9sOf4SFn0Bd6QgWqx3Sx0eRGcii7xyMpN5V/s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.15.4";
|
||||
version = "1.15.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-5fVFl9u1IR8FDo3dA9TXMam036VoTHaHkotlSo3cISo=";
|
||||
sha256 = "sha256-DrrIh2ThayFUqnUGGHkX0WmVkzitnVEOMXS8yWydD0A=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.19.4";
|
||||
version = "0.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-27CrfdZFz+HyIHiUJDpCP9JKJ4BneDQhU0zl1qSp4nc=";
|
||||
hash = "sha256-mIXsPj804jxDd8+jPH8tWnnUj7dXIRwfKTeT4WDWb5c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ let
|
|||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "fsautocomplete";
|
||||
version = "0.64.1";
|
||||
version = "0.66.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fsharp";
|
||||
repo = "FsAutoComplete";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/1XJ09NKOlTjBLe3PvAceIIhk1AiSXenBOFjERKDZko=";
|
||||
sha256 = "sha256-9kuGteoWbYoqgFA11qH+MEjhLMk/23bXXiGG8Lsr1MA=";
|
||||
};
|
||||
|
||||
nugetDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -5,12 +5,13 @@
|
|||
, pkg-config
|
||||
, nix-update-script
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, openssl
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "gptcommit";
|
||||
version = "0.5.13";
|
||||
version = "0.5.14";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -19,17 +20,18 @@ rustPlatform.buildRustPackage {
|
|||
owner = "zurawiki";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O0dqLN2wDXRIVcb9whlzK0BJOm/qhTH+nLpCwSUObng=";
|
||||
hash = "sha256-xjaFr1y2Fd7IWbJlegnIsfS5/oMJYd6QTnwp7IK17xM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-JwwQaThefWhJVRJ/a0WfdKJqr/NHgll6D6Y2QaeqWsc=";
|
||||
cargoHash = "sha256-VZrlEJi/UPQTGFiSpZs+Do+69CY3zdqGkAnUxMYvvaw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# 0.5.6 release has failing tests
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isLinux [ openssl ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]
|
||||
++ lib.optionals stdenv.isLinux [ openssl ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ko";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ko-build";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jBysfeoZ9W94c07xFODBASrWGJbZRHsUODfEul9f4Ug=";
|
||||
hash = "sha256-z0VemNdN35p5fA+cenXil7Vonl+ryu1ruKxzWFwMPfI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
|||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.0.5"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
|
||||
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "analysis"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
|
|
@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "chain-map"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
|
|
@ -127,11 +127,11 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "char-name"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
|
||||
[[package]]
|
||||
name = "cm-syntax"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
|
|
@ -143,7 +143,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "code-h2-md-map"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
]
|
||||
|
|
@ -160,7 +160,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"serde",
|
||||
|
|
@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
|
|||
|
||||
[[package]]
|
||||
name = "cov-mark"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
|
|
@ -225,7 +225,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "diagnostic"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
|
||||
[[package]]
|
||||
name = "diff"
|
||||
|
|
@ -248,7 +248,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
|
|||
[[package]]
|
||||
name = "elapsed"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"log",
|
||||
]
|
||||
|
|
@ -280,29 +280,18 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
|||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.3"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
|
||||
checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno-dragonfly"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-parse"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"drop_bomb",
|
||||
"rowan",
|
||||
|
|
@ -312,16 +301,16 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "fast-hash"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"rustc-hash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.0.0"
|
||||
version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
|
||||
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
|
|
@ -336,7 +325,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "fmt-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
|
|
@ -376,15 +365,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
|||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.0"
|
||||
version = "0.14.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
|
||||
checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
|
||||
checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
|
|
@ -395,7 +384,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
|||
[[package]]
|
||||
name = "identifier-case"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
|
|
@ -410,24 +399,24 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "idx"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"nohash-hasher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.0.0"
|
||||
version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
|
||||
checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown 0.14.0",
|
||||
"hashbrown 0.14.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "input"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"cm-syntax",
|
||||
"config",
|
||||
|
|
@ -475,7 +464,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
|
|||
|
||||
[[package]]
|
||||
name = "lang-srv"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"anyhow",
|
||||
|
|
@ -503,13 +492,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "lex-util"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.147"
|
||||
version = "0.2.149"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
|
||||
checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
|
||||
|
||||
[[package]]
|
||||
name = "line-index"
|
||||
|
|
@ -523,9 +512,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.5"
|
||||
version = "0.4.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
|
||||
checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
|
|
@ -560,22 +549,22 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.6.3"
|
||||
version = "2.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
|
||||
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.8.0"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
|
||||
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "millet-cli"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"codespan-reporting",
|
||||
|
|
@ -593,7 +582,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "millet-ls"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
|
|
@ -613,7 +602,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-hir"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"paths",
|
||||
|
|
@ -624,7 +613,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-statics"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
|
|
@ -648,7 +637,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-syntax"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
|
|
@ -687,9 +676,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.16"
|
||||
version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
|
||||
checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
|
@ -711,7 +700,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
|
|||
|
||||
[[package]]
|
||||
name = "panic-hook"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"better-panic",
|
||||
]
|
||||
|
|
@ -719,7 +708,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "paths"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"fast-hash",
|
||||
|
|
@ -732,7 +721,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "pattern-match"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
]
|
||||
|
|
@ -760,10 +749,20 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.66"
|
||||
name = "prettyplease"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
|
||||
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -800,9 +799,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.9.5"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
|
||||
checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
|
|
@ -812,9 +811,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.3.8"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
|
||||
checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
|
|
@ -823,15 +822,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.7.5"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
|
||||
checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
|
||||
|
||||
[[package]]
|
||||
name = "rowan"
|
||||
version = "0.15.11"
|
||||
version = "0.15.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf"
|
||||
checksum = "906057e449592587bf6724f00155bf82a6752c868d78a8fb3aa41f4e6357cfe8"
|
||||
dependencies = [
|
||||
"countme",
|
||||
"hashbrown 0.12.3",
|
||||
|
|
@ -854,9 +853,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
|||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.11"
|
||||
version = "0.38.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
|
||||
checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
|
||||
dependencies = [
|
||||
"bitflags 2.4.0",
|
||||
"errno",
|
||||
|
|
@ -893,9 +892,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.105"
|
||||
version = "1.0.107"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
|
||||
checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
|
@ -924,7 +923,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "slash-var-path"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
|
|
@ -932,14 +931,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-comment"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"sml-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"fmt-util",
|
||||
|
|
@ -950,7 +949,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-dynamics-tests"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"pretty_assertions",
|
||||
|
|
@ -966,7 +965,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-file-syntax"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"elapsed",
|
||||
|
|
@ -980,7 +979,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-fixity"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
|
|
@ -989,7 +988,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-hir"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"la-arena",
|
||||
"sml-lab",
|
||||
|
|
@ -1000,7 +999,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-hir-lower"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"cov-mark",
|
||||
|
|
@ -1015,14 +1014,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-lab"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-lex"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"cov-mark",
|
||||
"diagnostic",
|
||||
|
|
@ -1037,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7
|
|||
|
||||
[[package]]
|
||||
name = "sml-naive-fmt"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-comment",
|
||||
|
|
@ -1046,11 +1045,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-namespace"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
|
||||
[[package]]
|
||||
name = "sml-parse"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"event-parse",
|
||||
|
|
@ -1062,14 +1061,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-path"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-scon"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
|
|
@ -1078,7 +1077,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-statics"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"config",
|
||||
|
|
@ -1101,7 +1100,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-statics-types"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"code-h2-md-map",
|
||||
|
|
@ -1120,7 +1119,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-symbol-kind"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"sml-namespace",
|
||||
"sml-statics-types",
|
||||
|
|
@ -1128,7 +1127,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-syntax"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"code-h2-md-map",
|
||||
"fast-hash",
|
||||
|
|
@ -1139,7 +1138,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-ty-var-scope"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-hir",
|
||||
|
|
@ -1157,16 +1156,16 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "str-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"smol_str",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.31"
|
||||
version = "2.0.38"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
|
||||
checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1176,13 +1175,15 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "syntax-gen"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"char-name",
|
||||
"fast-hash",
|
||||
"identifier-case",
|
||||
"prettyplease",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"ungrammar",
|
||||
]
|
||||
|
||||
|
|
@ -1201,16 +1202,16 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "termcolor"
|
||||
version = "1.2.0"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
|
||||
checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"cm-syntax",
|
||||
|
|
@ -1236,7 +1237,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "text-pos"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"line-index",
|
||||
"text-size-util",
|
||||
|
|
@ -1251,7 +1252,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
|
|||
[[package]]
|
||||
name = "text-size-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
dependencies = [
|
||||
"text-size",
|
||||
]
|
||||
|
|
@ -1274,13 +1275,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||
[[package]]
|
||||
name = "token"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.7.6"
|
||||
version = "0.7.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
|
||||
checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
|
|
@ -1299,9 +1300,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.19.14"
|
||||
version = "0.19.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
|
||||
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde",
|
||||
|
|
@ -1313,7 +1314,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "topo-sort"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
|
||||
[[package]]
|
||||
name = "ungrammar"
|
||||
|
|
@ -1338,9 +1339,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
|
|||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.11"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
|
|
@ -1353,14 +1354,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.10"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
|
||||
|
||||
[[package]]
|
||||
name = "uniq"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416"
|
||||
source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
|
|
@ -1398,9 +1399,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
|||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.5"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
|
@ -1545,16 +1546,16 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
|||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.5.15"
|
||||
version = "0.5.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
|
||||
checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"flate2",
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.13.4";
|
||||
version = "0.13.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TLv2czZsZDOk8i8/0VxALflC/WV+MvRlbgbxB4kKsW0=";
|
||||
hash = "sha256-pgCsDbFYRN7QMAIzgdNn0vo/KLAZzMgjzil0AjxjKEc=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"char-name-0.1.0" = "sha256-txHvmD0ClTQqe6QhZ0DLgK5RON0UvZkxXCoZxC8U5+E=";
|
||||
"char-name-0.1.0" = "sha256-pLzkXx0twW4X3iHeiUT6KwEzXxYk0IhwISRqeaJVjvo=";
|
||||
"sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mask";
|
||||
version = "0.11.3";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jacobdeichert";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mPnykI3scTBzGjDa8nawWYRvZBkq74/t5WMbMbs3zVE=";
|
||||
rev = "mask/${version}";
|
||||
hash = "sha256-pi8dD4Fko39yn1maXNOqm+aDWYJhxE/b4kH7H18InbY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-h58MA3F4UA4gp64UPnK6Tvlvr4PFvrVKmjp48lZjH68=";
|
||||
cargoHash = "sha256-zbvYSTR0m7S4m0WFQrCqCrMXqMcDW2oIMznD5PDdeHE=";
|
||||
|
||||
# tests require mask to be installed
|
||||
doCheck = false;
|
||||
|
|
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A CLI task runner defined by a simple markdown file";
|
||||
homepage = "https://github.com/jacobdeichert/mask";
|
||||
changelog = "https://github.com/jacobdeichert/mask/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/jacobdeichert/mask/blob/mask/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spicy";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "zeek";
|
||||
repo = "spicy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-axeBD1wjMc5HZy+0Oi5wltr7M6zrQI/NzU6717vUpg0=";
|
||||
hash = "sha256-Cb+HYUObL3So3ZcG4Iy276rdO0TC9rholwEBIYA5BNU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "reindeer";
|
||||
version = "unstable-2023-09-20";
|
||||
version = "unstable-2023-10-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = pname;
|
||||
rev = "d2946997e49e9358d520f008085cfbe235855c12";
|
||||
sha256 = "sha256-2agiaRAis6wVGbY3wj+T5RumGlKF9YaHByLwU100dlc=";
|
||||
rev = "f8ffbf2362384e2311a8df458fcf39f44fc491bc";
|
||||
sha256 = "sha256-bGxh5bT7sDiIbSKghqlcx1ILPAiffL6lsbWSp5G1CSo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-rgXQYcqXckm1EL7OX/HtRfEdzTV09lM+YurcPYd/8FE=";
|
||||
cargoSha256 = "sha256-czzH0DgtK0sZmc670423hcdNQIc30tm+qtY+GA8WZbo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -11,23 +11,23 @@
|
|||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
pname = "tauri-mobile";
|
||||
version = "unstable-2023-06-06";
|
||||
pname = "cargo-mobile2";
|
||||
version = "0.7.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
rev = "43b2a3ba3a05b9ca3d3c9d8d7eafbeb4f24bf396";
|
||||
hash = "sha256-fVQmhtUn2Lwtr/id/qWtgnHQdXkf0jAOg4apOgnLD4Y=";
|
||||
rev = "cargo-mobile2-v${version}";
|
||||
hash = "sha256-aJPiPhDbu7Nwnd65kPMxeULrcjdSu0EF34ma3n/NTYI=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
# sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-MtLfcDJcLVhsIGD6pjpomuu9GYGqa7L8xnaQ++f+0H4=";
|
||||
cargoHash = "sha256-Inc+PWJO+PM99YYwQEG1J0/17RkLauraFVzO2CO15rQ=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/share/
|
||||
|
|
@ -17,20 +17,20 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tauri";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
rev = "tauri-v${version}";
|
||||
hash = "sha256-GjGaZJQ51vKlUWCCuIyyblYO0qMiQJ4n3ToGwUiRZw0=";
|
||||
hash = "sha256-HdA7c64ru21DvjhIswRW6r+EH3uYj4ipWzBcfVcc644=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-Uneg+d5xM1ez1PtHHdAwOfUQckds0ZY+12N9wKsKLw0=";
|
||||
cargoHash = "sha256-hmig/QKzdt/rIl4gggTygwZ6rEmekw0OlppN6pXvvmw=";
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
|
|
@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Build smaller, faster, and more secure desktop applications with a web frontend";
|
||||
homepage = "https://tauri.app/";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [ dit7ya happysalada ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,26 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
|
||||
, capstone
|
||||
, darwin
|
||||
, dbus
|
||||
, freetype
|
||||
, glfw
|
||||
, dbus
|
||||
, hicolor-icon-theme
|
||||
, pkg-config
|
||||
, tbb
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tracy";
|
||||
version = "0.9.1";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfpld";
|
||||
repo = "tracy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K1lQNRS8+ju9HyKNVXtHqslrPWcPgazzTitvwkIO3P4";
|
||||
sha256 = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (stdenv.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [
|
||||
|
|
@ -52,15 +50,18 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional stdenv.isDarwin "-Wno-format-security"
|
||||
++ lib.optional stdenv.isLinux "-ltbb"
|
||||
++ lib.optional stdenv.cc.isClang "-faligned-allocation"
|
||||
++ lib.optional disableLTO "-fno-lto");
|
||||
# workaround issue #19098
|
||||
++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto");
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
make -j $NIX_BUILD_CORES -C capture/build/unix release
|
||||
make -j $NIX_BUILD_CORES -C csvexport/build/unix release
|
||||
make -j $NIX_BUILD_CORES -C import-chrome/build/unix release
|
||||
make -j $NIX_BUILD_CORES -C library/unix release
|
||||
make -j $NIX_BUILD_CORES -C profiler/build/unix release LEGACY=1
|
||||
make -j $NIX_BUILD_CORES -C import-chrome/build/unix/ release
|
||||
make -j $NIX_BUILD_CORES -C capture/build/unix/ release
|
||||
make -j $NIX_BUILD_CORES -C update/build/unix/ release
|
||||
make -j $NIX_BUILD_CORES -C update/build/unix release
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -68,16 +69,35 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D ./profiler/build/unix/Tracy-release $out/bin/Tracy
|
||||
install -D ./import-chrome/build/unix/import-chrome-release $out/bin/import-chrome
|
||||
install -D ./capture/build/unix/capture-release $out/bin/capture
|
||||
install -D ./update/build/unix/update-release $out/bin/update
|
||||
install -D -m 0755 capture/build/unix/capture-release $out/bin/capture
|
||||
install -D -m 0755 csvexport/build/unix/csvexport-release $out/bin/tracy-csvexport
|
||||
install -D -m 0755 import-chrome/build/unix/import-chrome-release $out/bin/import-chrome
|
||||
install -D -m 0755 library/unix/libtracy-release.so $out/lib/libtracy.so
|
||||
install -D -m 0755 profiler/build/unix/Tracy-release $out/bin/tracy
|
||||
install -D -m 0755 update/build/unix/update-release $out/bin/update
|
||||
|
||||
mkdir -p $out/include/Tracy/client
|
||||
mkdir -p $out/include/Tracy/common
|
||||
mkdir -p $out/include/Tracy/tracy
|
||||
|
||||
cp -p public/client/*.{h,hpp} $out/include/Tracy/client
|
||||
cp -p public/common/*.{h,hpp} $out/include/Tracy/common
|
||||
cp -p public/tracy/*.{h,hpp} $out/include/Tracy/tracy
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace extra/desktop/tracy.desktop \
|
||||
--replace Exec=/usr/bin/tracy Exec=tracy
|
||||
|
||||
install -D -m 0644 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml
|
||||
install -D -m 0644 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop
|
||||
install -D -m 0644 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg
|
||||
install -D -m 0644 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png
|
||||
install -D -m 0644 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy
|
||||
install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/tracy
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -85,6 +105,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/wolfpld/tracy";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ mpickering nagisa ];
|
||||
mainProgram = "tracy";
|
||||
maintainers = with maintainers; [ mpickering nagisa paveloom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.16.19";
|
||||
version = "1.16.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R/144kHAP3npxrsBAskl1i1viARXZSdLKWFaWp/rkbs=";
|
||||
hash = "sha256-in9MCQEO3Bqzsjkz5FtV4sn3t9CXEKqukZkSSoA/CT4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tYqEFoemFM8fYq9LuNcr7b0XyQQbn8cDlgk3z4Uk36c=";
|
||||
cargoHash = "sha256-7fFhBsOpVYD/Z3EhGSYn64ebsYevowkCePCOlmbUpP8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.326-hardened1.patch",
|
||||
"sha256": "08jq0v7i5aghynscvhv3v3sgqbd2yyn6daqc9qg9cw02lxmvnjzz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.326-hardened1/linux-hardened-4.14.326-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.327-hardened1.patch",
|
||||
"sha256": "0183jgdvp20mk6vmmn62mdmy75xp816lm3gg5dlpvg4aw9n5hiz9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.327-hardened1/linux-hardened-4.14.327-hardened1.patch"
|
||||
},
|
||||
"sha256": "0y0lvzidw775mgx211wnc1c6223iqv8amz5y9jkz9h7l3l7y8p2m",
|
||||
"version": "4.14.326"
|
||||
"sha256": "0nharfyxlr17yan86zrhlbq7idm0g3zvvvmy2zbw7m9dhgc8bw5z",
|
||||
"version": "4.14.327"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"testing": {
|
||||
"version": "6.6-rc5",
|
||||
"hash": "sha256:19hnqly7ins0ycirjwrp3g0am43h2i62qfd1y81yhiy1dpyhbbc9"
|
||||
"version": "6.6-rc6",
|
||||
"hash": "sha256:1yzzf0bswqqarmbkw17vqcrkghivin7ca84x919aa2i8z7fyg2hw"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.7",
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
"hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.57",
|
||||
"hash": "sha256:1ccidrxswblxw9yaa45y6ds16pc7647f6fz36xxxhljivhyzxszr"
|
||||
"version": "6.1.58",
|
||||
"hash": "sha256:1b913ina3rcw4dx2s7n37kynv8rqsmrqa2ialsib6h7nsb9px66f"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.135",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.194-rt95"; # updated by ./update-rt.sh
|
||||
version = "5.10.197-rt96"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -17,14 +17,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394";
|
||||
sha256 = "1awkm7lln5gf6kld9z5h4mg39bd778jsdswwlwb7iv7bn03lafhq";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "02p01a9jpv92v0dfg6hj90wcrgy3sqjpaadrw44mnsqk4q5ndh70";
|
||||
sha256 = "0pd1yhr154zl5jfmchzdfv27cbnn8h23x7am0dmqwr1ylwg4bvbi";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ let
|
|||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.5.7"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1pg4r0k1xpc7x910rsammxsbly9pv52y54vj5rx2fljf8pnx20xy"; #zen
|
||||
suffix = "zen2"; #zen
|
||||
sha256 = "0qy3xn7kr16crm7iw1zhm3kpgxpmn66xc4g1yalvghwn6si0n81l"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mediamtx";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluenviron";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VIXrptVF5kjjz9vHqqjAM5gYk2o/wkUvudXixCloPgE=";
|
||||
hash = "sha256-7kEwP9ohDtFaA1J+IYEspwJ208tFN2es/ubCmBYlEuA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bUZU9I2lqjMOupkCQKSfdrWsBYmAVrLEXod0l+J3p6g=";
|
||||
vendorHash = "sha256-fcDyXWy/MzDIvJYfzZZyYLfYkl9tGpyeOsTT2zHxobI=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hfX1srlAd8huLViHlEyk3mcfMhY/LmeryQtAhB7rafw=";
|
||||
hash = "sha256-CYF0cse8NyHEnSZPRI9LNI09vr7kWPXHNibiEbW484E=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "23.1.13";
|
||||
version = "23.2.12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-32/mj1/PeeTrtN9COh/hTL4zFcpLnsS0R2uTGpyMUNk=";
|
||||
sha256 = "sha256-Sg41XXn/L1YglD2ryEC4AT70rv0hjZtTCf7O1Lwmqwo=";
|
||||
};
|
||||
server = callPackage ./server.nix { inherit src version; };
|
||||
in
|
||||
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
inherit doCheck src version;
|
||||
modRoot = "./src/go/rpk";
|
||||
runVend = false;
|
||||
vendorHash = "sha256-8HEJm7m5VgCanV+TY7g00uBUTaWsdv1mxpohmyicjlY=";
|
||||
vendorHash = "sha256-DNtkva6t3Arja6I20rgyw7Ty1OX32nkDMOABPwu2GIQ=";
|
||||
|
||||
ldflags = [
|
||||
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "static-web-server";
|
||||
version = "2.22.1";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "static-web-server";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RrwAT+la07A8PQhmUWmV4qrYha6GUFKMRx7jkVegPb8=";
|
||||
hash = "sha256-+2j/dSDuSl7bA35qOVlJFTi65aJZg2zQb3HcCxtynKI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YOBo2ey83QN26+9cUvoA1QWEPI3oTpwIJoqcPaWvovA=";
|
||||
cargoHash = "sha256-7ISSq0amoKbmHRsBEEm6MGkc4+SDgWBmicAiswzs+84=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ let
|
|||
safetensors
|
||||
uvicorn
|
||||
] ++ packages.unstructured.optional-dependencies.local-inference);
|
||||
version = "0.0.42";
|
||||
version = "0.0.53";
|
||||
unstructured_api_nltk_data = symlinkJoin {
|
||||
name = "unstructured_api_nltk_data";
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ in stdenvNoCC.mkDerivation {
|
|||
owner = "Unstructured-IO";
|
||||
repo = "unstructured-api";
|
||||
rev = version;
|
||||
hash = "sha256-Tn4o7gAIlvWUTbAmbTCF9LgMk0up16iWuNPTy6pxOuk=";
|
||||
hash = "sha256-lD3f6ws3xGFZsC1wHoWydIkWOgIwXuZencle+jJ8T3Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dysk";
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "dysk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iagh4BrcfQY8k2u1HlR50ht/KWOeEkoxYJ/Lg2cKWX8=";
|
||||
hash = "sha256-h/vdc7ltlXJQi1f013+fNyYB6fc0hTUcx4LN6UySIGM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mgEdDX+K71aT4ZMBDzxjOZhHqq8baXFFrwkfYzwIbUI=";
|
||||
cargoHash = "sha256-LC7A+fu4SqfsxT3K9gYJPx8G9h+7kXq0Nq70iSlfygE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "remote-touchpad";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unrud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uydt95mK0395dHvEno2SCnmKMJSkQ4TL7k7gnyoXlO0=";
|
||||
sha256 = "sha256-EfZ8h65jFVdy/U7I2YDoIMHgnnYpUcrOYUAMCPOmK6U=";
|
||||
};
|
||||
|
||||
buildInputs = [ libXi libXrandr libXt libXtst ];
|
||||
tags = [ "portal,x11" ];
|
||||
|
||||
vendorHash = "sha256-SYh1MhJUrJKguR12L3yyxHoBB6ux6a4TUJyPvoYx7iU=";
|
||||
vendorHash = "sha256-UX366UWROeorwYV4l1A3R03J10Gm7EajM+wEczIJEJM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Control mouse and keyboard from the webbrowser of a smartphone.";
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-I1Ej7VVhzerQowGIOmxE6pDdWbOU7x35Xmia+A2ba6s=";
|
||||
hash = "sha256-v/dFynTESqRWAxu5Wz0/EroXuwmNj3EEPJxzpfTGKtk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iperf";
|
||||
version = "3.14";
|
||||
version = "3.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
|
||||
hash = "sha256-cj/MQwoCe8aVJij6KjrHdYSh0L0ygnXlc/ybIGwVUAQ=";
|
||||
hash = "sha256-vbd8EfcrzpAhSIMVlXf6JEEgE+YrIIPPX1Q5HXmx2P8=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ];
|
||||
|
|
|
|||
|
|
@ -17,25 +17,6 @@ let
|
|||
hash = "sha256-yPGSKqjOz1EY5/V0oKz2EiZ90q2O4TINoXdxHuB7Gqk=";
|
||||
};
|
||||
});
|
||||
# mautrix>=0.19.8,<0.20
|
||||
mautrix = prev.mautrix.overridePythonAttrs (old: rec {
|
||||
version = "0.19.16";
|
||||
disabled = final.pythonOlder "3.8";
|
||||
checkInputs = old.checkInputs ++ [ final.sqlalchemy ];
|
||||
SQLALCHEMY_SILENCE_UBER_WARNING = true;
|
||||
src = old.src.override {
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk=";
|
||||
};
|
||||
});
|
||||
# mautrix has a runtime error with new ruamel-yaml since 0.17.22 changed the interface
|
||||
ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: rec {
|
||||
version = "0.17.21";
|
||||
src = prev.src.override {
|
||||
version = version;
|
||||
hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
|
||||
};
|
||||
});
|
||||
# SQLAlchemy>=1,<1.4
|
||||
# SQLAlchemy 2.0's derivation is very different, so don't override, just write it from scratch
|
||||
# (see https://github.com/NixOS/nixpkgs/blob/65dbed73949e4c0207e75dcc7271b29f9e457670/pkgs/development/python-modules/sqlalchemy/default.nix)
|
||||
|
|
@ -60,12 +41,12 @@ let
|
|||
|
||||
maubot = python.pkgs.buildPythonPackage rec {
|
||||
pname = "maubot";
|
||||
version = "0.4.1";
|
||||
disabled = python.pythonOlder "3.8";
|
||||
version = "0.4.2";
|
||||
disabled = python.pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ro2PPgF8818F8JewPZ3AlbfWFNNHKTZkQq+1zpm3kk4=";
|
||||
hash = "sha256-svdg7KpCy/+T9Hu+FbsgLNU8nVuIn0flPg7qyn7I+30=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -107,11 +88,14 @@ let
|
|||
rm $out/example-config.yaml
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
passthru = {
|
||||
inherit python;
|
||||
tests = {
|
||||
simple = runCommand "${pname}-tests" { } ''
|
||||
${maubot}/bin/mbc --help > $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# Setuptools is trying to do python -m maubot test
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rathole";
|
||||
version = "0.4.8";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapiz1";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yqZPs0rp3LD7n4+JGa55gZ4xMcumy+oazrxCqpDzIfQ=";
|
||||
hash = "sha256-YfLzR1lHk+0N3YU1XTNxz+KE1S3xaiKJk0zASm6cr1s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BZ6AgH/wnxrDLkyncR0pbayae9v5P7X7UnlJ48JR8sM=";
|
||||
cargoHash = "sha256-UyQXAUPnp32THZJAs/p3bIXZjcXTvjy207QBVLCfkr8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{ writeShellApplication
|
||||
, fetchFromGitHub
|
||||
, nix
|
||||
}:
|
||||
|
||||
let
|
||||
devour-flake = fetchFromGitHub {
|
||||
owner = "srid";
|
||||
repo = "devour-flake";
|
||||
rev = "v2";
|
||||
hash = "sha256-CZedJtbZlWAbv/b/aYgOEFd9vcTBn/oJNI3p29UitLk=";
|
||||
};
|
||||
in
|
||||
writeShellApplication {
|
||||
name = "devour-flake";
|
||||
runtimeInputs = [ nix ];
|
||||
text = ''
|
||||
FLAKE="$1"
|
||||
shift 1 || true
|
||||
|
||||
nix build ${devour-flake}#default \
|
||||
"$@" \
|
||||
-L --no-link --print-out-paths \
|
||||
--override-input flake "$FLAKE" \
|
||||
| xargs cat
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,32 +1,37 @@
|
|||
{ lib, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, fetchFromGitHub
|
||||
, libiconv
|
||||
, openssl
|
||||
, pkg-config
|
||||
, Security
|
||||
, devour-flake
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixci";
|
||||
version = "0.1.3";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "nixci";
|
||||
hash = "sha256-sM/1G1mf+msWbG4CX/pZNt4FmSKR2hWXdcq5h7W1AM0=";
|
||||
hash = "sha256-Q3V/JL64xkIj0X0NSMRTjRAP3PJC9ouj3CmEscVWdns=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PKBNQKuWV4PE7iSKr+LugayroFjDBT4/vyyjJiw/E+I=";
|
||||
cargoHash = "sha256-tjk91AaPsMLfXYB2o1HTTxb6Qr3l8BABPStrKEGvbtM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libiconv openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
# The rust program expects an environment (at build time) that points to the
|
||||
# devour-flake executable.
|
||||
DEVOUR_FLAKE = lib.getExe devour-flake;
|
||||
# devour-flake flake.
|
||||
env.DEVOUR_FLAKE = fetchFromGitHub {
|
||||
owner = "srid";
|
||||
repo = "devour-flake";
|
||||
rev = "v3";
|
||||
hash = "sha256-O51F4YFOzlaQAc9b6xjkAqpvrvCtw/Os2M7TU0y4SKQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Define and build CI for Nix projects anywhere";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ldeep";
|
||||
version = "1.0.38";
|
||||
version = "1.0.41";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franc-pentest";
|
||||
repo = "ldeep";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QoisQL7K4Xg4k7IGymvsMjNfTkjHtkVJpygHtX8lUqs=";
|
||||
hash = "sha256-jiOZAoZx5KK/jpW/Cui1WgPhjyf5gglcgWZbzMw65Lw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "openpgp-card-tools";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "openpgp-card";
|
||||
repo = "openpgp-card-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ISIABjuh0BC6OUFa5I9Wou+av7Dp4bZH8Aazi6x7cqY=";
|
||||
hash = "sha256-VD0eDq+lfeAu2gY9VZfz2ola3+CJCWerTEaGivpILyo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+EEpoI9OQvnJR6bVbEuLn3O7w6BchjBzr+oMGsWdP/k=";
|
||||
cargoHash = "sha256-tfawWfwsdWUOimd97b059HXt83ew6KBouI2MdGN8Knc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ];
|
||||
|
|
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "CLI tools for OpenPGP cards";
|
||||
homepage = "https://gitlab.com/openpgp-card/openpgp-card";
|
||||
license = licenses.asl20;
|
||||
license = with licenses ;[ asl20 /* OR */ mit ];
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
mainProgram = "opgpcard";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yara";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q+Q52W/MhurG3x0CIr0nv31qc4bdaLDk9AGGpMxKOcI=";
|
||||
hash = "sha256-axHFy7YwLhhww+lh+ORyW6YG+T385msysIHK5SMyhMk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,74 @@
|
|||
{ lib, stdenv, fetchurl, openssl, libcap, curl, which
|
||||
, eventlog, pkg-config, glib, python3, systemd, perl
|
||||
, riemann_c_client, protobufc, pcre, libnet
|
||||
, json_c, libuuid, libivykis, mongoc, rabbitmq-c
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoconf-archive
|
||||
, autoreconfHook
|
||||
, bison
|
||||
, flex
|
||||
, openssl
|
||||
, libcap
|
||||
, curl
|
||||
, which
|
||||
, eventlog
|
||||
, pkg-config
|
||||
, glib
|
||||
, hiredis
|
||||
, systemd
|
||||
, perl
|
||||
, python3
|
||||
, riemann_c_client
|
||||
, protobufc
|
||||
, pcre
|
||||
, paho-mqtt-c
|
||||
, libnet
|
||||
, json_c
|
||||
, libuuid
|
||||
, libivykis
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
, pcre2
|
||||
, mongoc
|
||||
, rabbitmq-c
|
||||
, libesmtp
|
||||
, rdkafka
|
||||
}:
|
||||
|
||||
let
|
||||
python-deps = ps: with ps; [
|
||||
pip
|
||||
boto3
|
||||
botocore
|
||||
cachetools
|
||||
certifi
|
||||
charset-normalizer
|
||||
google-auth
|
||||
idna
|
||||
kubernetes
|
||||
oauthlib
|
||||
pyasn1
|
||||
pyasn1-modules
|
||||
python-dateutil
|
||||
pyyaml
|
||||
requests
|
||||
requests-oauthlib
|
||||
rsa
|
||||
six
|
||||
urllib3
|
||||
websocket-client
|
||||
ply
|
||||
];
|
||||
myPy3 = (python3.withPackages python-deps);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "syslog-ng";
|
||||
version = "3.38.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-VJH2htC4KbabLg/A1mpi9RmRqvruAFR1v6OPqzmUQfc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "syslog-ng";
|
||||
repo = "syslog-ng";
|
||||
rev = "syslog-ng-${version}";
|
||||
hash = "sha256-NXwd4dyPfnHO3yjl3GPAMQYqenfpp7xFOil2G1e66w4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config which ];
|
||||
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl myPy3 ];
|
||||
|
||||
buildInputs = [
|
||||
libcap
|
||||
|
|
@ -22,8 +76,7 @@ stdenv.mkDerivation rec {
|
|||
openssl
|
||||
eventlog
|
||||
glib
|
||||
perl
|
||||
python3
|
||||
myPy3
|
||||
systemd
|
||||
riemann_c_client
|
||||
protobufc
|
||||
|
|
@ -35,13 +88,20 @@ stdenv.mkDerivation rec {
|
|||
mongoc
|
||||
rabbitmq-c
|
||||
libesmtp
|
||||
pcre2
|
||||
paho-mqtt-c
|
||||
hiredis
|
||||
rdkafka
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-manpages"
|
||||
"--with-docbook=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
|
||||
"--enable-dynamic-linking"
|
||||
"--enable-systemd"
|
||||
"--enable-smtp"
|
||||
"--with-python-packages=system"
|
||||
"--with-hiredis=system"
|
||||
"--with-ivykis=system"
|
||||
"--with-librabbitmq-client=system"
|
||||
"--with-mongoc=system"
|
||||
|
|
@ -59,7 +119,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.syslog-ng.com";
|
||||
description = "Next-generation syslogd with advanced networking and filtering capabilities";
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ vifino ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -597,8 +597,6 @@ with pkgs;
|
|||
|
||||
dec-decode = callPackage ../development/tools/dec-decode { };
|
||||
|
||||
devour-flake = callPackage ../tools/nix/devour-flake { };
|
||||
|
||||
dnf5 = callPackage ../tools/package-management/dnf5 { };
|
||||
|
||||
documenso = callPackage ../applications/office/documenso { };
|
||||
|
|
@ -8808,7 +8806,7 @@ with pkgs;
|
|||
gpt2tc = callPackage ../tools/text/gpt2tc { };
|
||||
|
||||
gptcommit = callPackage ../development/tools/gptcommit {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
|
||||
gptman = callPackage ../tools/system/gptman { };
|
||||
|
|
@ -17177,7 +17175,7 @@ with pkgs;
|
|||
cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { };
|
||||
|
||||
cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { };
|
||||
tauri-mobile = callPackage ../development/tools/rust/tauri-mobile { };
|
||||
cargo-mobile2 = callPackage ../development/tools/rust/cargo-mobile2 { };
|
||||
|
||||
cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { };
|
||||
cargo-vet = callPackage ../development/tools/rust/cargo-vet {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ let
|
|||
|
||||
arp = callPackage ../development/ocaml-modules/arp { };
|
||||
|
||||
asai = callPackage ../development/ocaml-modules/asai { };
|
||||
|
||||
asetmap = callPackage ../development/ocaml-modules/asetmap { };
|
||||
|
||||
asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
|
||||
|
|
|
|||
|
|
@ -1697,6 +1697,8 @@ self: super: with self; {
|
|||
|
||||
bundlewrap = callPackage ../development/python-modules/bundlewrap { };
|
||||
|
||||
busypie = callPackage ../development/python-modules/busypie { };
|
||||
|
||||
bx-py-utils = callPackage ../development/python-modules/bx-py-utils { };
|
||||
|
||||
bx-python = callPackage ../development/python-modules/bx-python { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue