From 447999e1ae0f6e9db4a8694a7105bdec49573e69 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 13 Nov 2024 19:35:50 -0800 Subject: [PATCH 001/484] widevine-cdm: move to by-name --- .../widevine-cdm.nix => by-name/wi/widevine-cdm/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/browsers/misc/widevine-cdm.nix => by-name/wi/widevine-cdm/package.nix} (100%) diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/by-name/wi/widevine-cdm/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/misc/widevine-cdm.nix rename to pkgs/by-name/wi/widevine-cdm/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27d706ce16a6..880a663c9496 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18781,8 +18781,6 @@ with pkgs; aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; - widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { }; - tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { }; tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { }; From 971457ce05d22325aa048b09f9a5e3bf929a4651 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:41:27 -0500 Subject: [PATCH 002/484] pysolfc: fix desktop entry --- pkgs/games/pysolfc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index dede95fe0c80..5e01a2eae9b9 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -69,10 +69,6 @@ python311Packages.buildPythonApplication rec { patches = [ ./pysolfc-datadir.patch ]; nativeBuildInputs = [ desktop-file-utils ]; - postPatch = '' - desktop-file-edit --set-key Icon --set-value ${placeholder "out"}/share/icons/pysol01.png data/pysol.desktop - desktop-file-edit --set-key Comment --set-value "${meta.description}" data/pysol.desktop - ''; postInstall = '' mkdir $out/share/PySolFC/cardsets From cedcbe01b570f007db5d9ea21d11f2848f3057ae Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 28 Dec 2024 15:40:48 -0500 Subject: [PATCH 003/484] xar: fix build on GCC14 --- pkgs/by-name/xa/xar/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 46eb43c0099b..801dcd2cc3da 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -68,11 +68,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; - # For some reason libxml2 package headers are in subdirectory and thus aren’t - # picked up by stdenv’s C compiler wrapper (see ccWrapper_addCVars). This - # doesn’t really belong here and either should be part of libxml2 package or - # libxml2 in Nixpkgs can just fix their header paths. - env.NIX_CFLAGS_COMPILE = "-isystem ${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = toString ( + [ + # For some reason libxml2 package headers are in subdirectory and thus aren’t + # picked up by stdenv’s C compiler wrapper (see ccWrapper_addCVars). This + # doesn’t really belong here and either should be part of libxml2 package or + # libxml2 in Nixpkgs can just fix their header paths. + "-isystem ${libxml2.dev}/include/libxml2" + ] + ++ lib.optionals stdenv.cc.isGNU [ + # fix build on GCC 14 + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-pointer-types" + ] + ); buildInputs = [ From 5042c058bdd3695795d532b5a965f22201eb5f0a Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 6 Jan 2025 14:52:09 -0300 Subject: [PATCH 004/484] plasmusic-toolbar: 2.1.1 -> 2.2.0 --- pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 1240632b805a..21d637e39e49 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-dQG6YOILsTsxbMfdrThodokixM2PrXPd5nB7+NWxFXg="; + hash = "sha256-yVhtn52wwBw+lGWbaynuF6Vv1rw5zslW/V1eZ71R140="; }; installPhase = '' From ff3c5a7172afb99d4294ed7bbe0e6abe3f3e22e8 Mon Sep 17 00:00:00 2001 From: Jorik Date: Wed, 30 Oct 2024 22:58:24 +0100 Subject: [PATCH 005/484] maintainers: add jorikvanveen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index edb71c74ff8d..b9596fe547ac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11174,6 +11174,12 @@ github = "jordanisaacs"; githubId = 19742638; }; + jorikvanveen = { + email = "vanveenjorik@protonmail.com"; + github = "jorikvanveen"; + githubId = 33939820; + name = "Jorik van Veen"; + }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; From 3244da6d13200f7a9bfbf744f9139dcfdc41994e Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 7 Jan 2025 19:09:18 +0900 Subject: [PATCH 006/484] nixos/tabby: fix invalid mkRemovedOptionModule import --- nixos/modules/services/misc/tabby.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/tabby.nix b/nixos/modules/services/misc/tabby.nix index 169d058d59b7..653bc9879288 100644 --- a/nixos/modules/services/misc/tabby.nix +++ b/nixos/modules/services/misc/tabby.nix @@ -16,7 +16,8 @@ in { imports = [ (mkRemovedOptionModule [ - "settings" + "services" + "tabby" "indexInterval" ] "These options are now managed within the tabby WebGUI") ]; From ea9594ba15fcbb787b9abe9d587e0e5c8fcafd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 11 Jan 2025 09:57:22 +0100 Subject: [PATCH 007/484] nixos/nix: restructure default for system-features Assign default for option system-features at the common place. It allows use to re-use the default value in cause of setting the option. --- nixos/modules/config/nix.nix | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix index 9505c60d4f63..e1c347242878 100644 --- a/nixos/modules/config/nix.nix +++ b/nixos/modules/config/nix.nix @@ -27,7 +27,6 @@ let literalExpression mapAttrsToList mkAfter - mkDefault mkIf mkOption mkRenamedOptionModuleWith @@ -316,15 +315,25 @@ in system-features = mkOption { type = types.listOf types.str; - example = [ "kvm" "big-parallel" "gccarch-skylake" ]; + default = + [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + ] + ++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) ( + # a builder can run code for `gcc.arch` and inferior architectures + [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] + ++ map (x: "gccarch-${x}") ( + systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ] + ) + ); + defaultText = literalExpression ''[ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-" ]''; description = '' The set of features supported by the machine. Derivations can express dependencies on system features through the `requiredSystemFeatures` attribute. - - By default, pseudo-features `nixos-test`, `benchmark`, - and `big-parallel` used in Nixpkgs are set, `kvm` - is also included if it is available. ''; }; @@ -350,7 +359,6 @@ in use-sandbox = true; show-trace = true; - system-features = [ "big-parallel" "kvm" "recursive-nix" ]; sandbox-paths = [ "/bin/sh=''${pkgs.busybox-sandbox-shell.out}/bin/busybox" ]; } ''; @@ -377,14 +385,6 @@ in trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; trusted-users = [ "root" ]; substituters = mkAfter [ "https://cache.nixos.org/" ]; - system-features = mkDefault ( - [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.stdenv.hostPlatform ? gcc.arch) ( - # a builder can run code for `gcc.arch` and inferior architectures - [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or []) - ) - ); }; }; } From 6ea4c4c1e84b163c1dbf828a53fd0b5d42a0ddfd Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 14 Jan 2025 13:25:58 +0100 Subject: [PATCH 008/484] pocket-casts: 0.8.0 -> 0.9.0 Diff: https://github.com/felicianotech/pocket-casts-desktop-app/compare/v0.8.0...v0.9.0 --- pkgs/by-name/po/pocket-casts/package.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix index b34c5eed3d01..7ff8546875e5 100644 --- a/pkgs/by-name/po/pocket-casts/package.nix +++ b/pkgs/by-name/po/pocket-casts/package.nix @@ -10,21 +10,23 @@ buildNpmPackage rec { pname = "pocket-casts"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - hash = "sha256-PwM9B2Qx4TxlcahQM/KEBTzWKc4cNrleDEYKg0m8bVE="; + hash = "sha256-5xn2uAjqIyWKQAruHLyho72HCYpbxyWlcTQ3LXXZy6M="; }; - npmDepsHash = "sha256-WPuXTcHCKrwepITGtZFCIwylVAdYlI3cNsuhqx1AEYI="; + npmDepsHash = "sha256-nfTn2rs0XGraebI0rKlTECccc7KpRXf/+qOjj/5GPAw="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; dontNpmBuild = true; + makeCacheWritable = true; + desktopItems = [ (makeDesktopItem { name = pname; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68b022b96e8f..18922e8f35f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2538,7 +2538,7 @@ with pkgs; patool = with python3Packages; toPythonApplication patool; pocket-casts = callPackage ../by-name/po/pocket-casts/package.nix { - electron = electron_32; + electron = electron_33; }; pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue { From e1cadf8259db663093e8efb9b1ce93f0d3f4f5ec Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 009/484] perlPackages.GraphicsTIFF: fix strictDeps build --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7162c0d4a942..636f2d8f81da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11127,6 +11127,7 @@ with self; { url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-20.tar.gz"; hash = "sha256-PlXMIJRl4GQBmiFaUvBf9RBAKX0CA5P+n7PeJ60CDjU="; }; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; propagatedBuildInputs = [ Readonly ]; nativeCheckInputs = [ TestRequires TestDeep pkgs.hexdump ]; From 879813b5ede6c54f281819e02f07e1e0aac94a37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 02:01:23 +0000 Subject: [PATCH 010/484] grafana-dash-n-grab: 0.7.1 -> 0.7.2 --- pkgs/by-name/gr/grafana-dash-n-grab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix index a7a2c108a56f..cd40c8407763 100644 --- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix +++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-oJ0wXBfanpYS95ET+7lpKzLdQG5g/uKFs5+Qd+hPjHo="; + sha256 = "sha256-0F4kdyQ4TXV2vb2IkPx7CisTmJAQjlSRtOAFhmZqaD8="; }; - vendorHash = "sha256-jnPnWcow5SiFHGfoAxBR8ncGHLyS7sFKNJT8YuUTg88="; + vendorHash = "sha256-Ufg4eeSLRHFkI577hPT5KWOf82o7//Y3n5GAlZl8IoQ="; ldflags = [ "-s" From aff75d6ae09c95b5e3f3e15b484e61ebdb1626f1 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 18 Jan 2025 12:04:52 +0100 Subject: [PATCH 011/484] pam_u2f: 1.3.1 -> 1.3.2 https://github.com/Yubico/pam-u2f/blob/pam_u2f-1.3.2/NEWS --- pkgs/by-name/pa/pam_u2f/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pam_u2f/package.nix b/pkgs/by-name/pa/pam_u2f/package.nix index a3606d871278..f3cf5168e67a 100644 --- a/pkgs/by-name/pa/pam_u2f/package.nix +++ b/pkgs/by-name/pa/pam_u2f/package.nix @@ -6,15 +6,16 @@ libfido2, pam, openssl, + nixosTests, }: stdenv.mkDerivation rec { pname = "pam_u2f"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-mhNUmUf4RPazq2kdca+09vAKRdFl/tJ7AcZsB3UKk4c="; + hash = "sha256-OL59GJcnHLP+45HSODs1r8EmrUMakanebpkQjBLMlJA="; }; nativeBuildInputs = [ pkg-config ]; @@ -36,6 +37,10 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests = { + pam_u2f = nixosTests.pam-u2f; + }; + meta = with lib; { homepage = "https://developers.yubico.com/pam-u2f/"; description = "PAM module for allowing authentication with a U2F device"; From de25b6a94bbb593763d7be3b1ded151720addf2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 18:09:33 +0000 Subject: [PATCH 012/484] juju: 3.6.1 -> 3.6.2 --- pkgs/by-name/ju/juju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix index e54327fee545..9394c7823218 100644 --- a/pkgs/by-name/ju/juju/package.nix +++ b/pkgs/by-name/ju/juju/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "juju"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-eq7C3F/OJWF/HWMO9I+yTlXeskO1xuTKGhmoNNGQcyM="; + hash = "sha256-qARy8c24VLE+Gmsszkvlwkh5Oo+sozoptjMIa4OiBfc="; }; - vendorHash = "sha256-+2MeUq+r0/2I8C/8IVZTxrKIZTS36P/9XHM2X41AZPE="; + vendorHash = "sha256-O7EGhy5bmTeUvlxpX0cv2kmeKDvPzilZxk0mTuyJCP8="; subPackages = [ "cmd/juju" From 07f172320af3bfcf6a574b0a1e3e80e0bce46c60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 02:57:15 +0000 Subject: [PATCH 013/484] rke: 1.7.1 -> 1.7.2 --- pkgs/by-name/rk/rke/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 3166db260785..d5d51e5315a2 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rke"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-BatjRfUosYD5e3TNzgREuMeGSA2lknZMG3/y+0V2NkU="; + hash = "sha256-9b42F9czbck5BY3CwpIhpxw2QdXRU3o9/bGvEMUTis8="; }; vendorHash = "sha256-Lp14xvhn4xzOurTa8sRk0A1X1c/sj1clw7niVTRgNeM="; From 9305c76f0611489e0fb894f0fd927ee8cd0e8c2e Mon Sep 17 00:00:00 2001 From: Jorik Date: Sat, 2 Nov 2024 15:11:57 +0100 Subject: [PATCH 014/484] python312Packages.textual-autocomplete: init at 3.0.0a13 --- .../textual-autocomplete/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/textual-autocomplete/default.nix diff --git a/pkgs/development/python-modules/textual-autocomplete/default.nix b/pkgs/development/python-modules/textual-autocomplete/default.nix new file mode 100644 index 000000000000..c609a33b77b0 --- /dev/null +++ b/pkgs/development/python-modules/textual-autocomplete/default.nix @@ -0,0 +1,45 @@ +{ + lib, + python3, + fetchFromGitHub, + poetry-core, + textual, + typing-extensions, + hatchling, +}: +python3.pkgs.buildPythonPackage rec { + pname = "textual_autocomplete"; + version = "3.0.0a13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "darrenburns"; + repo = "textual-autocomplete"; + rev = "2cb572bf5b1ea0554b396d0833dfb398cb45dc9b"; + hash = "sha256-jfGYC3xDspwEr+KGApGB05VFuzluDe5S9a/Sjg5HtdI="; + }; + + nativeBuildInputs = [ + poetry-core + hatchling + ]; + + pythonRelaxDeps = true; + + dependencies = [ + textual + typing-extensions + ]; + + pythonImportsCheck = [ + "textual" + "typing_extensions" + ]; + + meta = { + description = "Python library that provides autocomplete capabilities to textual"; + homepage = "https://pypi.org/project/textual-autocomplete"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jorikvanveen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 481a660c4f47..7c7142b4d791 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16005,6 +16005,8 @@ self: super: with self; { textual = callPackage ../development/python-modules/textual { }; + textual-autocomplete = callPackage ../development/python-modules/textual-autocomplete { }; + textual-dev = callPackage ../development/python-modules/textual-dev { }; textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { }; From 80ae1ba91339bbc4b260ddb8f0f57b1efd3e72f9 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 24 Jan 2025 15:44:20 +0100 Subject: [PATCH 015/484] yewtube: 2.12.0 -> 2.12.1 Diff: https://github.com/mps-youtube/yewtube/compare/refs/tags/v2.12.0...v2.12.1 --- pkgs/by-name/ye/yewtube/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ye/yewtube/package.nix b/pkgs/by-name/ye/yewtube/package.nix index 0509cdaec948..18b3746925ce 100644 --- a/pkgs/by-name/ye/yewtube/package.nix +++ b/pkgs/by-name/ye/yewtube/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; tag = "v${version}"; - hash = "sha256-66cGnEEISC+lZAYhFXuVdDtwh1TgwvCP6nBD84z2z0I="; + hash = "sha256-+V9t71Z8PKioM7HWlzTB6X7EokAWgqC3fQJr5tkPdq8="; }; postPatch = '' From b90a52b475aad5c7c46f2878623e462e68c6361c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 24 Jan 2025 16:50:06 +0100 Subject: [PATCH 016/484] passes: 0.9 -> 0.10 Diff: https://github.com/pablo-s/passes/compare/v0.9...v0.10 --- pkgs/by-name/pa/passes/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pa/passes/package.nix b/pkgs/by-name/pa/passes/package.nix index 102af396ff4b..c856dd3d6e71 100644 --- a/pkgs/by-name/pa/passes/package.nix +++ b/pkgs/by-name/pa/passes/package.nix @@ -18,23 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "passes"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "pablo-s"; repo = "passes"; rev = "v${finalAttrs.version}"; - hash = "sha256-RfoqIyqc9zwrWZ5RLhQl+6vTccbCTwtDcMlnWPCDOag="; + hash = "sha256-e6nHCOrb2PX47REr7sy80n1aTdMZ0c2QZlIIib4vll8="; }; postPatch = '' substituteInPlace src/model/meson.build \ - --replace /app/lib ${zint}/lib - substituteInPlace src/view/window.blp \ - --replace reveal_flap reveal-flap - substituteInPlace build-aux/meson/postinstall.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - patchShebangs build-aux/meson/postinstall.py + --replace-fail /app/lib ${zint}/lib ''; strictDeps = true; From b845aa355f4653624621529347d6d167e71f0178 Mon Sep 17 00:00:00 2001 From: normalc Date: Sat, 25 Jan 2025 18:41:01 -0500 Subject: [PATCH 017/484] ruffle: remove govanify from `meta.maintainers` --- pkgs/by-name/ru/ruffle/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index a05fbf8cbb02..65524055c617 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -114,7 +114,6 @@ rustPlatform.buildRustPackage { lib.licenses.asl20 ]; maintainers = [ - lib.maintainers.govanify lib.maintainers.jchw lib.maintainers.normalcea ]; From 9683835f04a0c1784ab2e7667ff8bedd5b084da6 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 8 Jan 2025 18:14:13 +0100 Subject: [PATCH 018/484] nixos/nextcloud: Update logreader warning description The error is only logged as an info since https://github.com/nextcloud/logreader/pull/1449. This was a bug in the app, since the error is not fixable by the admin due to the logging configuration. --- nixos/modules/services/web-apps/nextcloud.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index 8d9aa878c287..9d49af27f55c 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -245,7 +245,7 @@ that are managed by Nix. If you want automatic updates it is recommended that yo ## Known warnings {#module-services-nextcloud-known-warnings} -### Failed to get an iterator for log entries: Logreader application only supports "file" log_type {#module-services-nextcloud-warning-logreader} +### Logreader application only supports "file" log_type {#module-services-nextcloud-warning-logreader} This is because @@ -253,10 +253,10 @@ This is because * the Logreader application that allows reading logs in the admin panel is enabled by default and requires logs written to a file. -The logreader application doesn't work, as it was the case before. The only change is that -it complains loudly now. So nothing actionable here by default. Alternatively you can +The logreader application doesn't work, as it was the case before. +So nothing actionable here by default. Alternatively you can -* disable the logreader application to shut up the "error". +* disable the logreader application to shut up the "info". We can't really do that by default since whether apps are enabled/disabled is part of the application's state and tracked inside the database. From d1ed29454badb696c5133ecd7d4515f7ed6b17bf Mon Sep 17 00:00:00 2001 From: normalc Date: Sat, 25 Jan 2025 17:42:56 -0500 Subject: [PATCH 019/484] ruffle: nightly-2025-01-04 -> nightly-2025-01-25 Resolves #285887. --- pkgs/by-name/ru/ruffle/package.nix | 142 +++++++++++------- .../ruffle/remove-deterministic-feature.patch | 52 +++++++ 2 files changed, 143 insertions(+), 51 deletions(-) create mode 100644 pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 65524055c617..5bda1d81b3c6 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -6,7 +6,7 @@ pkg-config, python3, rustPlatform, - stdenv, + stdenvNoCC, lib, wayland, xorg, @@ -19,25 +19,46 @@ gsettings-desktop-schemas, glib, libxkbcommon, + openh264, darwin, }: let - version = "nightly-2025-01-04"; + pname = "ruffle"; + version = "nightly-2025-01-25"; + # TODO: Remove overridden derivation once ruffle accepts upstream openh264-2.5.0 + openh264-241 = + if stdenvNoCC.hostPlatform.isLinux then + openh264.overrideAttrs (_: rec { + version = "2.4.1"; + src = fetchFromGitHub { + owner = "cisco"; + repo = "openh264"; + tag = "v${version}"; + hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI="; + }; + postPatch = null; + }) + else + null; in rustPlatform.buildRustPackage { - pname = "ruffle"; - inherit version; + inherit pname version; src = fetchFromGitHub { owner = "ruffle-rs"; - repo = "ruffle"; - rev = version; - hash = "sha256-MxYl5fTTNerCwG3w34cltb6aasP6TvGRkvwf77lKIgs="; + repo = pname; + tag = version; + hash = "sha256-JLh0tatP70rYo2QXLKu6M9jJ1gFpY76sYaUJqW9U4E0="; }; + patches = [ ./remove-deterministic-feature.patch ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-PbNp/V+xmU6Lo24a6pd9XoT/LQmINztjOHKoikG9N4Y="; + nativeBuildInputs = [ jre_minimal ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ glib gsettings-desktop-schemas makeWrapper @@ -45,10 +66,10 @@ rustPlatform.buildRustPackage { python3 wrapGAppsHook3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ + lib.optionals stdenvNoCC.hostPlatform.isLinux [ alsa-lib cairo gtk3 @@ -62,53 +83,72 @@ rustPlatform.buildRustPackage { vulkan-loader udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - - dontWrapGApps = true; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -Dm644 -t $out/share/icons/hicolor/scalable/apps/ desktop/packages/linux/rs.ruffle.Ruffle.svg - - install -Dm644 -t $out/share/applications/ desktop/packages/linux/rs.ruffle.Ruffle.desktop - substituteInPlace $out/share/applications/rs.ruffle.Ruffle.desktop \ - --replace-fail "Exec=ruffle %u" "Exec=ruffle_desktop %u" - - install -Dm644 -t $out/share/metainfo/ desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml - ''; - - preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf $out/bin/ruffle_desktop \ - --add-needed libxkbcommon-x11.so \ - --add-needed libwayland-client.so \ - --add-rpath ${libxkbcommon}/lib:${wayland}/lib - ''; - - postFixup = - '' - # This name is too generic - mv $out/bin/exporter $out/bin/ruffle_exporter - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - vulkanWrapperArgs+=( - --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib - ) - - wrapProgram $out/bin/ruffle_exporter \ - "''${vulkanWrapperArgs[@]}" - - wrapProgram $out/bin/ruffle_desktop \ - "''${vulkanWrapperArgs[@]}" \ - "''${gappsWrapperArgs[@]}" - ''; + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; cargoBuildFlags = [ "--workspace" ]; - useFetchCargoVendor = true; - cargoHash = "sha256-q+9yhUjYolPlBt6W1xJPoyE7DgqDffEhkQqJmSX4y3Y="; + postInstall = + '' + # Namespace binaries with "ruffle_" + mv $out/bin/exporter $out/bin/ruffle_exporter + mv $out/bin/mocket $out/bin/ruffle_mocket + mv $out/bin/stub-report $out/bin/ruffle_stub-report + mv $out/bin/build_playerglobal $out/bin/ruffle_build_playerglobal + + # This name is too specific + mv $out/bin/ruffle_desktop $out/bin/ruffle + '' + + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop \ + -t $out/share/applications/ + + install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg \ + -t $out/share/icons/hicolor/scalable/apps/ + + install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml \ + -t $out/share/metainfo/ + + rm $out/bin/ruffle_web_safari + ''; + + preFixup = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + patchelf $out/bin/ruffle \ + --add-needed libxkbcommon-x11.so \ + --add-needed libwayland-client.so \ + --add-needed libopenh264.so \ + --add-rpath ${libxkbcommon}/lib:${wayland}/lib:${openh264-241}/lib + ''; + + dontWrapGApps = true; + + postFixup = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + vulkanWrapperArgs+=( + --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + ) + + wrapProgram $out/bin/ruffle_exporter \ + "''${vulkanWrapperArgs[@]}" + + wrapProgram $out/bin/ruffle \ + "''${vulkanWrapperArgs[@]}" \ + "''${gappsWrapperArgs[@]}" + ''; meta = { description = "Cross platform Adobe Flash Player emulator"; + longDescription = '' + Ruffle is a cross platform emulator for running and preserving + Adobe Flash content. It is capable of running ActionScript 1, 2 + and 3 programs with machine-native performance thanks to being + written in the Rust programming language. + + This package for ruffle also includes the `exporter` and + `scanner` utilities which allow for generating screenshots as + PNGs and parsing `.swf` files in bulk respectively. + ''; homepage = "https://ruffle.rs/"; + downloadPage = "https://ruffle.rs/downloads"; + changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${version}"; license = [ lib.licenses.mit lib.licenses.asl20 @@ -117,7 +157,7 @@ rustPlatform.buildRustPackage { lib.maintainers.jchw lib.maintainers.normalcea ]; + mainProgram = "ruffle"; platforms = lib.platforms.linux ++ lib.platforms.darwin; - mainProgram = "ruffle_desktop"; }; } diff --git a/pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch b/pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch new file mode 100644 index 000000000000..804bc46c22be --- /dev/null +++ b/pkgs/by-name/ru/ruffle/remove-deterministic-feature.patch @@ -0,0 +1,52 @@ +diff --git a/exporter/Cargo.toml b/exporter/Cargo.toml +index 93066a30d..0f8b71ae4 100644 +--- a/exporter/Cargo.toml ++++ b/exporter/Cargo.toml +@@ -13,7 +13,7 @@ workspace = true + [dependencies] + clap = { workspace = true } + futures = { workspace = true } +-ruffle_core = { path = "../core", features = ["deterministic", "default_font"] } ++ruffle_core = { path = "../core", features = ["default_font"] } + ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] } + image = { workspace = true, features = ["png"] } + walkdir = { workspace = true } +diff --git a/scanner/Cargo.toml b/scanner/Cargo.toml +index 59781ba79..40cf54c24 100644 +--- a/scanner/Cargo.toml ++++ b/scanner/Cargo.toml +@@ -12,7 +12,7 @@ workspace = true + + [dependencies] + clap = { workspace = true } +-ruffle_core = { path = "../core", features = ["deterministic"] } ++ruffle_core = { path = "../core" } + log = { workspace = true } + walkdir = { workspace = true } + serde = { workspace = true, features = ["derive"] } +diff --git a/tests/Cargo.toml b/tests/Cargo.toml +index 26bfc9a89..b7342b662 100644 +--- a/tests/Cargo.toml ++++ b/tests/Cargo.toml +@@ -27,7 +27,7 @@ ruffle_render_wgpu = { path = "../render/wgpu", optional = true } + regex = "1.11.1" + + [dev-dependencies] +-ruffle_core = { path = "../core", features = ["deterministic", "timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "test_only_as3"] } ++ruffle_core = { path = "../core", features = ["timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "test_only_as3"] } + ruffle_test_framework = { path = "framework" } + libtest-mimic = "0.8.1" + walkdir = { workspace = true } +diff --git a/tests/framework/Cargo.toml b/tests/framework/Cargo.toml +index ffc59e25b..639028578 100644 +--- a/tests/framework/Cargo.toml ++++ b/tests/framework/Cargo.toml +@@ -11,7 +11,7 @@ version.workspace = true + workspace = true + + [dependencies] +-ruffle_core = { path = "../../core", features = ["deterministic", "timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "serde"] } ++ruffle_core = { path = "../../core", features = ["timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "serde"] } + ruffle_render = { path = "../../render", features = ["serde"] } + ruffle_input_format = { path = "../input-format" } + ruffle_socket_format = { path = "../socket-format" } \ No newline at end of file From a3a1c578ed462e7c7e7d959059a82d5fff2cccde Mon Sep 17 00:00:00 2001 From: Jonathan del Strother Date: Mon, 27 Jan 2025 09:47:21 +0000 Subject: [PATCH 020/484] pngout: 20200115 -> 20230322 This bumps the nix `version` of the package to 20230322, although the linux binary remains unchanged. The 20230322 release just adds aarch64-darwin support to the mac binary. --- pkgs/by-name/pn/pngout/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix index c8a59c29033a..ffe2f663501f 100644 --- a/pkgs/by-name/pn/pngout/package.nix +++ b/pkgs/by-name/pn/pngout/package.nix @@ -7,6 +7,9 @@ let platforms = { + aarch64-darwin = { + folder = "."; + }; aarch64-linux = { folder = "aarch64"; ld-linux = "ld-linux-aarch64.so.1"; @@ -33,22 +36,22 @@ let download = if stdenv.hostPlatform.isDarwin then { - extension = "macos.zip"; - hash = "sha256-MnL6lH7q/BrACG4fFJNfnvoh0JClVeaJIlX+XIj2aG4="; + suffix = "20230322-mac.zip"; + hash = "sha256-Lj63k0UgYECuOg0NDs/prQHZL+UAK4oWdqZWMqVoQOE="; } else { - extension = "linux.tar.gz"; + suffix = "20200115-linux.tar.gz"; hash = "sha256-rDi7pvDeKQM96GZTjDr6ZDQTGbaVu+OI77xf2egw6Sg="; }; in stdenv.mkDerivation rec { pname = "pngout"; - version = "20200115"; + version = "20230322"; src = fetchurl { inherit (download) hash; - url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-${download.extension}"; + url = "https://www.jonof.id.au/files/kenutils/pngout-${download.suffix}"; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; From bc14c84db6907f2ca9339af9564c2e48ee708e93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 03:24:54 +0000 Subject: [PATCH 021/484] python312Packages.pulsar: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/pulsar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsar/default.nix b/pkgs/development/python-modules/pulsar/default.nix index 2ff2f2a7b4ac..b5699d971f02 100644 --- a/pkgs/development/python-modules/pulsar/default.nix +++ b/pkgs/development/python-modules/pulsar/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pulsar"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-python"; tag = "v${version}"; - hash = "sha256-2Ahv0lfeHuBhGIYhiTjKegEKsJqHkpK3Qu6xBnjsanI="; + hash = "sha256-/b3ha+FtZeLioRKGGjaW7x4jXu/cXxBX9GV2KyQpCkQ="; }; disabled = pythonOlder "3.7"; From 5f9e5f8a9876a92282e5e86cdc63f48c32b67536 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 04:48:40 +0000 Subject: [PATCH 022/484] soplex: 712 -> 713 --- pkgs/by-name/so/soplex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix index 2ee0976e6c9d..a9c44d88a836 100644 --- a/pkgs/by-name/so/soplex/package.nix +++ b/pkgs/by-name/so/soplex/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "soplex"; - version = "712"; + version = "713"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-8muN9wYDQX5CULifKBYO/t9whS2LsatrYB2khlV0akg="; + hash = "sha256-qI7VGPAm3ALzeiD/OgvlZ1w2GzHRYdBajTW5XdIN9pU="; }; nativeBuildInputs = [ cmake ]; From 75c4f247cd4100ba6fd1477734dd3adf01a81f63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 06:09:37 +0000 Subject: [PATCH 023/484] melange: 0.18.3 -> 0.19.3 --- pkgs/by-name/me/melange/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index e4853c99aa6a..c7bb965984ba 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.18.3"; + version = "0.19.3"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-bFlILwA8Vy7u8pJFx8PHvfYaeh8M2SRzrTpdDMYz6+M="; + hash = "sha256-90Ezv9PM1lFRq4b0ACrc34OteF6P/8DhZy+5kCnInSI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-xOsxzDIk2tuPXDtf1k0604B3AYgxEH5iQ/YdDs2Aezs="; + vendorHash = "sha256-V1BDcAD84W5n/IOAcO+eMd+LnSe0sgNgBeq95dOl/Us="; subPackages = [ "." ]; From c6919aa5616f9ac93fb9e7e848fc2d7097a76260 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 08:00:46 +0000 Subject: [PATCH 024/484] grizzly: 0.6.1 -> 0.7.1 --- pkgs/by-name/gr/grizzly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grizzly/package.nix b/pkgs/by-name/gr/grizzly/package.nix index dee241dd4c3f..3b353320f833 100644 --- a/pkgs/by-name/gr/grizzly/package.nix +++ b/pkgs/by-name/gr/grizzly/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "grizzly"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-9NtJHavlkuu8qSQI4FvXDOKfD1WjNzVqGDd8/8Fo3DE="; + hash = "sha256-1caG2QIBfbCgg9TLsW4XB0w+4dqUkQEsdWwRazbWeQA="; }; - vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs="; + vendorHash = "sha256-JxYafSralKqd/AB6fhTuQvt0q+/Zeu7dmZwVAAkolxY="; subPackages = [ "cmd/grr" ]; From 657c689842d9c57d9e3ce7a81d24cabf2e46445b Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 2 Feb 2025 21:04:08 +0100 Subject: [PATCH 025/484] ci/eval: make eval for non-native platforms less incorrect We commonly use platform-dependent conditional patterns like `lib.meta.availableOn stdenv.hostPlatform` and `stdenv.hostPlatform.isLinux` to enable different features in a given derivation or to evaluate completely different derivations based on the platform. For example, source builds of a given derivation may only be available on linux but not on darwin. The use of such conditionals allow us to fall back to patched binaries on darwin instead. In `chromedriver` (pkgs/development/tools/selenium/chromedriver/default.nix), we use ~~~nix if lib.meta.availableOn stdenv.hostPlatform chromium then callPackage ./source.nix { } else callPackage ./binary.nix { } ~~~ To provide some context, `chromedriver` source builds are based on `chromium.mkDerivation` and `chromium` is limited to `lib.platforms.linux`. Based on the same `chromium.mkDerivation`, we also do source builds for `electron` (pkgs/top-level/all-packages.nix): ~~~nix electron_33 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then electron-source.electron_33 else electron_33-bin; electron_34 = electron_34-bin; electron = electron_34; ~~~ And finally, the top-level `jdk` (Java) attribute has a lot of indirection, but eventually also boils down to `stdenv.hostPlatform.isLinux` for source builds and binaries for x86_64-darwin and aarch64-darwin. A surprising amount of electron and jdk consumers use variations of `meta.platforms = electron.meta.platforms` in their own meta block. Due to internal implementation details, the conditionals in those top-level attributes like `chromedriver`, `electron` and `jdk` are evaluated based on the value from `builtins.currentSystem` and not the system passed to `import { }`. This then causes `chromedriver`, `electron`, `jdk` and all dependents that inherit those `meta.platforms` to appear only available on linux despite also being available on darwin. Hydra is affected similarly, but it's a lot more nuanced and in practice not actually *that* bad. The addition of `--eval-system` ensures that `builtins.currentSystem` matches the requested platform. As a bonus, this also fixes the store paths of an impure test that should probably be made pure: ~~~diff @@ -885069,13 +886119,13 @@ "out": "/nix/store/lb2500hc69czy4sfga9mbh2k679cr1rp-test-compressDrv" }, "tests.config.allowPkgsInPermittedInsecurePackages.aarch64-darwin": { - "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" + "out": "/nix/store/v1zjb688mp4y2132b6chii43d5kkxnpa-hello-2.12.1" }, "tests.config.allowPkgsInPermittedInsecurePackages.aarch64-linux": { - "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" + "out": "/nix/store/hb21z2zdk03dwygsw5lvpa8zc3fbr500-hello-2.12.1" }, "tests.config.allowPkgsInPermittedInsecurePackages.x86_64-darwin": { - "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" + "out": "/nix/store/gljdqsf0mxv1j8zb04phx9ws09pp7z3l-hello-2.12.1" }, "tests.config.allowPkgsInPermittedInsecurePackages.x86_64-linux": { "out": "/nix/store/0l5h8svrpzwymq35mnpvx82gyc7nf8s4-hello-2.12.1" ~~~ Diff stats between two full evals based on 75c8548d8118c31509b89ffd7df6c322b94017dd with and without this fix on x86_64-linux: ~~~bash # git diff --no-index --stat /nix/store/659l3xp78255wx7abbahggsnrlj3a1la-combined-result/outpaths.json /nix/store/4fhlq4g5qa65cxbibskq9pma40zigrx7-combined-result/outpaths.json /nix/store/{659l3xp78255wx7abbahggsnrlj3a1la-combined-result => 4fhlq4g5qa65cxbibskq9pma40zigrx7-combined-result}/outpaths.json | 1416 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1405 insertions(+), 11 deletions(-) ~~~ The full diff is available as a gist at . When we added `electron_34` only as binary instead of the usual source on linux with binary fallback in cfed9a19cbc98d12c0167f69238673f4ed89f798 and made the unversioned `electron` top-level point to the newly added `electron_34` instead of `electron_33`, the GitHub workflow suddenly reported 20 new packages. Of those 20 reported packages, 17 where false-positives caused by dropping the wrongly evaluated conditional. --- ci/eval/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 927dec5a908d..d5f4419598b4 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -89,6 +89,7 @@ let set +e command time -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \ nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \ + --eval-system "$system" \ --option restrict-eval true \ --option allow-import-from-derivation false \ --query --available \ From bdd4e9d74045d35226e6b8efd02fd37a96595a80 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 2 Feb 2025 22:41:47 -0800 Subject: [PATCH 026/484] tezos-rust-libs: bump llvm --- pkgs/by-name/te/tezos-rust-libs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tezos-rust-libs/package.nix b/pkgs/by-name/te/tezos-rust-libs/package.nix index 2bbed03999a3..03e10ca9ed6b 100644 --- a/pkgs/by-name/te/tezos-rust-libs/package.nix +++ b/pkgs/by-name/te/tezos-rust-libs/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitLab, stdenv, - llvmPackages_12, + llvmPackages, cargo, libiconv, }: @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - llvmPackages_12.llvm + llvmPackages.llvm cargo ]; - propagatedBuildInputs = [ llvmPackages_12.libllvm ]; + propagatedBuildInputs = [ llvmPackages.libllvm ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' From 5da19e6cada34f2c7653769feb317adb15953b7e Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 3 Feb 2025 22:25:03 -0800 Subject: [PATCH 027/484] citrix-workspace: bump llvm --- .../networking/remote/citrix-workspace/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index f07ed6b3bf5a..e7772624061e 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -3,7 +3,7 @@ , heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, libgbm, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin -, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 +, libpulseaudio, pcsclite, glib-networking, llvmPackages, opencv4 , libfaketime , libinput, libcap, libjson, libsecret, libcanberra-gtk3 @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { libsoup_2_4 libvorbis libxml2 - llvmPackages_12.libunwind + llvmPackages.libunwind libgbm nspr nss From d4f5d01becc2af7f4e96e84ed3e20f302510f9b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 01:40:16 +0000 Subject: [PATCH 028/484] cargo-shuttle: 0.51.0 -> 0.52.0 --- pkgs/by-name/ca/cargo-shuttle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 5549e4789623..15444122fb5d 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-oKFL/tnMsXz/qic65DgLmnmeyBsrklacs+XeVM6RGSs="; + hash = "sha256-uAxNLoB8ExfHpGRl96OZWhzV8hSiDzt1E7T4OD21w74="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ocTkpIqXTf8k+onUroaCt/jMnslctzCt7g9wNtkI82g="; + cargoHash = "sha256-cHwF4+5HQmT2hICJjCF1zaivq6AtFhhLatxUWv+esCo="; nativeBuildInputs = [ pkg-config ]; From 9fc6a9ba5bf6fddf90489962b7c4c8822e85027d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:00:44 +0000 Subject: [PATCH 029/484] fanficfare: 4.41.0 -> 4.42.0 --- pkgs/by-name/fa/fanficfare/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix index 3f26f5f34409..a0b77ffa616b 100644 --- a/pkgs/by-name/fa/fanficfare/package.nix +++ b/pkgs/by-name/fa/fanficfare/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "fanficfare"; - version = "4.41.0"; + version = "4.42.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KZm3hhJzXZzHy11Ad6IdB5ixlLtIDFcx5X8ydqVpJKA="; + hash = "sha256-DfiZqndOh9XENU3MVubKydhdyeUdzhmRyHhLdxU+qDc="; }; nativeBuildInputs = with python3Packages; [ From 13d80f9a1d1cb20146a2718bc21f61f9a5de627d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 11:47:18 +0000 Subject: [PATCH 030/484] nim-unwrapped: 2.2.0 -> 2.2.2 --- pkgs/by-name/ni/nim-unwrapped-2_2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 41307f320271..0ecdbe92b511 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -85,12 +85,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.2.0"; + version = "2.2.2"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-zphChJyXYOSH7N0c2t98DyhEyvrmBUAcfHKuJXZEiTw="; + hash = "sha256-f8ybh6ycC6Wkif3Cbi2EgM6Wo8piIQDWJn75ITX9ih8="; }; buildInputs = [ From 3d86ed3ac6cf3d421d10522b77f09eb702515118 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:37:30 +0100 Subject: [PATCH 031/484] certificate-ripper: 2.3.0 -> 2.4.0 --- .../by-name/ce/certificate-ripper/package.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ce/certificate-ripper/package.nix b/pkgs/by-name/ce/certificate-ripper/package.nix index ea76132ab5b7..00b2bcfb7675 100644 --- a/pkgs/by-name/ce/certificate-ripper/package.nix +++ b/pkgs/by-name/ce/certificate-ripper/package.nix @@ -7,7 +7,7 @@ let pname = "certificate-ripper"; - version = "2.3.0"; + version = "2.4.0"; jar = maven.buildMavenPackage { pname = "${pname}-jar"; @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "Hakky54"; repo = "certificate-ripper"; - rev = version; - hash = "sha256-q/UhKLFAre3YUH2W7e+SH4kRM0GIZAUyNJFDm02eL+8="; + tag = version; + hash = "sha256-2EXALTGeGkHne335B1R42VrA5vMCMkFF5FBatAfO9Tc="; }; patches = [ @@ -25,12 +25,22 @@ let ./fix-test-temp-dir-path.patch ]; - mvnHash = "sha256-/iy7DXBAyq8TIpvrd2WAQh+9OApfxCWo1NoGwbzbq7s="; + mvnHash = "sha256-Nv/V2+QPSPMxkDcUh6gJrI6aSi+9O+brxpOZg/JPGxI="; - mvnParameters = lib.escapeShellArgs [ - "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic - "-Dtest=!PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # disable test using network - ]; + mvnParameters = + let + disabledTests = [ + "PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # uses network + "DerExportCommandShould#processSystemTrustedCertificates" + "JksExportCommandShould#processSystemTrustedCertificates" + "PemExportCommandShould#processSystemTrustedCertificates" + "Pkcs12ExportCommandShould#processSystemTrustedCertificates" + ]; + in + lib.escapeShellArgs [ + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic + "-Dtest=${lib.concatMapStringsSep "," (t: "!" + t) disabledTests}" + ]; installPhase = '' install -Dm644 target/crip.jar $out @@ -47,13 +57,12 @@ buildGraalvmNativeImage { # Copied from pom.xml extraNativeImageBuildArgs = [ "--no-fallback" - "-H:ReflectionConfigurationResources=graalvm_config.json" "-H:EnableURLProtocols=https" "-H:EnableURLProtocols=http" ]; meta = { - changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${version}"; + changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${jar.src.tag}"; description = "CLI tool to extract server certificates"; homepage = "https://github.com/Hakky54/certificate-ripper"; license = lib.licenses.asl20; From f05513f3af282cdbb7c79fbce78dfcd6a1b2334e Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:22:26 -0500 Subject: [PATCH 032/484] nixos/xonsh: support extra packages --- .../manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/programs/xonsh.nix | 21 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d5549ef98bee..b72db6032de2 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -348,6 +348,8 @@ - `borgmatic` has been updated from 1.8.14 to 1.9.5, please check the [upstream changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases) for more details, especially for a few possibly breaking changes noted in the [1.9.0 changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases/tag/1.9.0). +- `programs.xonsh.package` now gets overrided internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details. + - `nodePackages.ganache` has been removed, as the package has been deprecated by upstream. - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index 86bdb4088845..ed7f3593d79d 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -5,7 +5,7 @@ let cfg = config.programs.xonsh; - + package = cfg.package.override { inherit (cfg) extraPackages; }; in { @@ -32,6 +32,21 @@ in type = lib.types.lines; }; + extraPackages = lib.mkOption { + default = (ps: [ ]); + type = with lib.types; coercedTo (listOf lib.types.package) (v: (_: v)) (functionTo (listOf lib.types.package)); + description = '' + Add the specified extra packages to the xonsh package. + Preferred over using `programs.xonsh.package` as it composes with `programs.xonsh.xontribs`. + + Take care in using this option along with manually defining the package + option above, as the two can result in conflicting sets of build dependencies. + This option assumes that the package option has an overridable argument + called `extraPackages`, so if you override the package option but also + intend to use this option, be sure that your resulting package still honors + the necessary option. + ''; + }; }; }; @@ -64,11 +79,11 @@ in ${cfg.config} ''; - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ package ]; environment.shells = [ "/run/current-system/sw/bin/xonsh" - "${lib.getExe cfg.package}" + "${lib.getExe package}" ]; }; } From f6706283e81d05a907d5ca00539f8bd454a66a84 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:23:55 -0500 Subject: [PATCH 033/484] xonsh: format --- pkgs/by-name/xo/xonsh/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/package.nix b/pkgs/by-name/xo/xonsh/package.nix index 2cf2b9241ca4..63857655409c 100644 --- a/pkgs/by-name/xo/xonsh/package.nix +++ b/pkgs/by-name/xo/xonsh/package.nix @@ -7,14 +7,17 @@ }: let - pythonEnv = python3.withPackages - (ps: [ ps.xonsh ] ++ extraPackages ps); + pythonEnv = python3.withPackages (ps: [ ps.xonsh ] ++ extraPackages ps); xonsh = python3.pkgs.xonsh; in -runCommand - "xonsh-${xonsh.version}" +runCommand "xonsh-${xonsh.version}" { - inherit (xonsh) pname version meta passthru; + inherit (xonsh) + pname + version + meta + passthru + ; } '' mkdir -p $out/bin From a229520681acc90fd74805598fb64a698c1b2702 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Thu, 30 Jan 2025 13:22:03 -0500 Subject: [PATCH 034/484] xonsh: rewrite with callPackage and new buildPythonPackage --- pkgs/by-name/xo/xonsh/unwrapped.nix | 247 ++++++++++++++-------------- 1 file changed, 126 insertions(+), 121 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 3992262d873c..677b2f49b2d2 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -1,130 +1,135 @@ { lib, - coreutils, + buildPythonPackage, fetchFromGitHub, - gitMinimal, - glibcLocales, - nix-update-script, - pythonPackages, + + setuptools, + ply, + prompt-toolkit, + pygments, + addBinToPathHook, writableTmpDirAsHomeHook, + gitMinimal, + glibcLocales, + pip, + pyte, + pytest-mock, + pytest-subprocess, + pytestCheckHook, + requests, + + coreutils, + + nix-update-script, + python, }: -let +buildPythonPackage rec { + pname = "xonsh"; + version = "0.19.1"; + pyproject = true; - argset = { - pname = "xonsh"; - version = "0.19.1"; - pyproject = true; - - # PyPI package ships incomplete tests - src = fetchFromGitHub { - owner = "xonsh"; - repo = "xonsh"; - tag = argset.version; - hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs="; - }; - - nativeBuildInputs = with pythonPackages; [ - setuptools - wheel - ]; - - propagatedBuildInputs = ( - with pythonPackages; - [ - ply - prompt-toolkit - pygments - ] - ); - - nativeCheckInputs = - [ - addBinToPathHook - gitMinimal - glibcLocales - writableTmpDirAsHomeHook - ] - ++ (with pythonPackages; [ - pip - pyte - pytest-mock - pytest-subprocess - pytestCheckHook - requests - ]); - - disabledTests = [ - # fails on sandbox - "test_colorize_file" - "test_loading_correctly" - "test_no_command_path_completion" - "test_bsd_man_page_completions" - "test_xonsh_activator" - - # fails on non-interactive shells - "test_capture_always" - "test_casting" - "test_command_pipeline_capture" - "test_dirty_working_directory" - "test_man_completion" - "test_vc_get_branch" - "test_bash_and_is_alias_is_only_functional_alias" - - # flaky tests - "test_script" - "test_alias_stability" - "test_alias_stability_exception" - "test_complete_import" - "test_subproc_output_format" - - # https://github.com/xonsh/xonsh/issues/5569 - "test_spec_decorator_alias_output_format" - - # Broken test - "test_repath_backslash" - ]; - - disabledTestPaths = [ - # fails on sandbox - "tests/completers/test_command_completers.py" - "tests/shell/test_ptk_highlight.py" - # fails on non-interactive shells - "tests/prompt/test_gitstatus.py" - "tests/completers/test_bash_completer.py" - ]; - - # https://github.com/NixOS/nixpkgs/issues/248978 - dontWrapPythonPrograms = true; - - env.LC_ALL = "en_US.UTF-8"; - - postPatch = '' - sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py - sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py - - for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do - sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script - done - patchShebangs . - ''; - - passthru = { - shellPath = "/bin/xonsh"; - python = pythonPackages.python; # To the wrapper - wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; - updateScript = nix-update-script { }; - }; - - meta = { - homepage = "https://xon.sh/"; - description = "Python-ish, BASHwards-compatible shell"; - changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; - license = with lib.licenses; [ bsd3 ]; - mainProgram = "xonsh"; - maintainers = with lib.maintainers; [ samlukeyes123 ]; - }; + # PyPI package ships incomplete tests + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xonsh"; + tag = version; + hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs="; }; -in -pythonPackages.buildPythonPackage argset + + build-system = [ + setuptools + ]; + + dependencies = [ + ply + prompt-toolkit + pygments + ]; + + nativeCheckInputs = [ + addBinToPathHook + writableTmpDirAsHomeHook + gitMinimal + glibcLocales + pip + pyte + pytest-mock + pytest-subprocess + pytestCheckHook + requests + ]; + + disabledTests = [ + # fails on sandbox + "test_bsd_man_page_completions" + "test_colorize_file" + "test_loading_correctly" + "test_no_command_path_completion" + "test_xonsh_activator" + + # fails on non-interactive shells + "test_bash_and_is_alias_is_only_functional_alias" + "test_capture_always" + "test_casting" + "test_command_pipeline_capture" + "test_dirty_working_directory" + "test_man_completion" + "test_vc_get_branch" + + # flaky tests + "test_alias_stability" + "test_alias_stability_exception" + "test_complete_import" + "test_script" + "test_subproc_output_format" + + # broken tests + "test_repath_backslash" + + # https://github.com/xonsh/xonsh/issues/5569 + "test_spec_decorator_alias_output_format" + ]; + + disabledTestPaths = [ + # fails on sandbox + "tests/completers/test_command_completers.py" + "tests/shell/test_ptk_highlight.py" + + # fails on non-interactive shells + "tests/prompt/test_gitstatus.py" + "tests/completers/test_bash_completer.py" + ]; + + # https://github.com/NixOS/nixpkgs/issues/248978 + dontWrapPythonPrograms = true; + + env.LC_ALL = "en_US.UTF-8"; + + postPatch = '' + sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py + sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py + + for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do + sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script + done + patchShebangs . + ''; + + passthru = { + inherit python; + shellPath = "/bin/xonsh"; + wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://xon.sh/"; + description = "Python-ish, BASHwards-compatible shell"; + changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; + license = with lib.licenses; [ bsd3 ]; + mainProgram = "xonsh"; + maintainers = with lib.maintainers; [ samlukeyes123 ]; + }; +} From c922aecbc36187a48b82a57316c56c1f6e16f5f5 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:25:40 -0500 Subject: [PATCH 035/484] xonsh.xontribs: init empty package set --- pkgs/by-name/xo/xonsh/unwrapped.nix | 2 ++ pkgs/by-name/xo/xonsh/xontribs/default.nix | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/default.nix diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 677b2f49b2d2..3e7686d340c2 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -23,6 +23,7 @@ nix-update-script, python, + callPackage, }: buildPythonPackage rec { @@ -122,6 +123,7 @@ buildPythonPackage rec { shellPath = "/bin/xonsh"; wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; updateScript = nix-update-script { }; + xontribs = import ./xontribs { inherit callPackage; }; }; meta = { diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix new file mode 100644 index 000000000000..162a5bdf52f4 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -0,0 +1,5 @@ +{ + callPackage, +}: +{ +} From 92a755c010899f094f3140cae1bc5e3a5d0d17d8 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:28:29 -0500 Subject: [PATCH 036/484] xonsh.xontribs.xonsh-direnv: init at 1.6.5 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xonsh/xontribs/xonsh-direnv/default.nix | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 162a5bdf52f4..db2719a2b8b8 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -2,4 +2,5 @@ callPackage, }: { + xonsh-direnv = callPackage ./xonsh-direnv { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix new file mode 100644 index 000000000000..e4122feb09fe --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + direnv, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xonsh-direnv"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "74th"; + repo = "xonsh-direnv"; + tag = version; + hash = "sha256-huBJ7WknVCk+WgZaXHlL+Y1sqsn6TYqMP29/fsUPSyU="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + direnv + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Direnv support for Xonsh"; + homepage = "https://github.com/74th/xonsh-direnv/"; + changelog = "https://github.com/74th/xonsh-direnv/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From e23facf8739d9738c6904e0475b08ef735714bb5 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:30:32 -0500 Subject: [PATCH 037/484] xonsh.xontribs.xontrib-abbrevs: init at 0.1.0 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-abbrevs/default.nix | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index db2719a2b8b8..c40e2c67412c 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -3,4 +3,5 @@ }: { xonsh-direnv = callPackage ./xonsh-direnv { }; + xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix new file mode 100644 index 000000000000..d276a84fbf9c --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-abbrevs/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + setuptools-scm, + poetry-core, + prompt-toolkit, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-abbrevs"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-abbrevs"; + tag = "v${version}"; + hash = "sha256-JxH5b2ey99tvHXSUreU5r6fS8nko4RrS/1c8psNbJNc="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.17", ' "" + ''; + + build-system = [ + setuptools + setuptools-scm + poetry-core + ]; + + dependencies = [ + prompt-toolkit + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command abbreviations for Xonsh"; + homepage = "https://github.com/xonsh/xontrib-abbrevs"; + changelog = "https://github.com/xonsh/xontrib-apprevs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From 9c6b94bb313be8c4ce4c7ce7bb19cb916aa3e0f7 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:31:04 -0500 Subject: [PATCH 038/484] xonsh.xontribs.xontrib-bashisms: init at 0.0.5 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-bashisms/default.nix | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index c40e2c67412c..57b19bd769bd 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -4,4 +4,5 @@ { xonsh-direnv = callPackage ./xonsh-direnv { }; xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; + xontrib-bashisms = callPackage ./xontrib-bashisms { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix new file mode 100644 index 000000000000..9247a1f225a4 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-bashisms/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-bashisms"; + version = "0.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-bashisms"; + tag = version; + hash = "sha256-R1DCGMrRCJLnz/QMk6QB8ai4nx88vvyPdaCKg3od5/I="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Bash-like interactive mode extensions for the xonsh shell"; + homepage = "https://github.com/xonsh/xontrib-bashisms"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From bc10963f94090f17eaa1400d61087842dfd0fefb Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:31:40 -0500 Subject: [PATCH 039/484] xonsh.xontribs.xontrib-debug-tools: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-debug-tools/default.nix | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 57b19bd769bd..d2b54e0de446 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -5,4 +5,5 @@ xonsh-direnv = callPackage ./xonsh-direnv { }; xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; xontrib-bashisms = callPackage ./xontrib-bashisms { }; + xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix new file mode 100644 index 000000000000..dbe3e01a7961 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-debug-tools/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-debug-tools"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-debug-tools"; + tag = version; + hash = "sha256-Z8AXKk94NxmF5rO2OMZzNX0GIP/Vj+mOtYUaifRX1cw="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Debug tools for xonsh shell"; + homepage = "https://github.com/xonsh/xontrib-debug-tools"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From d508833e365603020eafd4265b90c6b8bf3b5b8e Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:32:08 -0500 Subject: [PATCH 040/484] xonsh.xontribs.xontrib-distributed: init at 0.0.4 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-distributed/default.nix | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index d2b54e0de446..64e84a357fa8 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -6,4 +6,5 @@ xontrib-abbrevs = callPackage ./xontrib-abbrevs { }; xontrib-bashisms = callPackage ./xontrib-bashisms { }; xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; + xontrib-distributed = callPackage ./xontrib-distributed { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix new file mode 100644 index 000000000000..7ae42069f366 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-distributed/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + poetry-core, + distributed, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-distributed"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-distributed"; + tag = "v${version}"; + hash = "sha256-Hb7S3PqHi0w6zb9ki8ADMtgdYVv8O5WQZMgJzKF74qE="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'xonsh = ">=0.12"' "" + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + distributed + ]; + + # As of v0.0.4 has no tests that get run by pytest + doCheck = false; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Dask Distributed integration for Xonsh"; + homepage = "https://github.com/xonsh/xontrib-distributed"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From cb78105719eabede7c07206e6c8ac8fca3539e88 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:32:43 -0500 Subject: [PATCH 041/484] xonsh.xontribs.xontrib-fish-completer: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontrib-fish-completer/default.nix | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 64e84a357fa8..4d06e9dd5039 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -7,4 +7,5 @@ xontrib-bashisms = callPackage ./xontrib-bashisms { }; xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; xontrib-distributed = callPackage ./xontrib-distributed { }; + xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix new file mode 100644 index 000000000000..71a9beacaf82 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-fish-completer/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + pytest-subprocess, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-fish-completer"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-fish-completer"; + tag = version; + hash = "sha256-PhhdZ3iLPDEIG9uDeR5ctJ9zz2+YORHBhbsiLrJckyA="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + pytest-subprocess + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Populate rich completions using fish and remove the default bash based completer"; + homepage = "https://github.com/xonsh/xontrib-fish-completer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From afeae08331f80ee83959223803bea28ae6bc0b72 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:06 -0500 Subject: [PATCH 042/484] xonsh.xontribs.xontrib-jedi: init at 0.1.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xonsh/xontribs/xontrib-jedi/default.nix | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 4d06e9dd5039..d8464131eee2 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -8,4 +8,5 @@ xontrib-debug-tools = callPackage ./xontrib-debug-tools { }; xontrib-distributed = callPackage ./xontrib-distributed { }; xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; + xontrib-jedi = callPackage ./xontrib-jedi { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix new file mode 100644 index 000000000000..a6ae8f5e23dd --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jedi/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + poetry-core, + jedi, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-jedi"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-jedi"; + tag = "v${version}"; + hash = "sha256-T4Yxr91emM2mjclQOjQsnnPO/JijAGNcqmZjxrz72Bs="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'xonsh = ">=0.17"' "" + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + jedi + ]; + + preCheck = '' + substituteInPlace tests/test_jedi.py \ + --replace-fail "/usr/bin" "${jedi}/bin" + ''; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Xonsh Python mode completions using jedi"; + homepage = "https://github.com/xonsh/xontrib-jedi"; + changelog = "https://github.com/xonsh/xontrib-jedi.releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From 6453547e820676c7eb0d3d7debdd4f2bb7093bd4 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:24 -0500 Subject: [PATCH 043/484] xonsh.xontribs.xontrib-jupyter: init at 0.3.2 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontribs/xontrib-jupyter/default.nix | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index d8464131eee2..0ad20b9cbab8 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -9,4 +9,5 @@ xontrib-distributed = callPackage ./xontrib-distributed { }; xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; xontrib-jedi = callPackage ./xontrib-jedi { }; + xontrib-jupyter = callPackage ./xontrib-jupyter { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix new file mode 100644 index 000000000000..a4ff04bba4e2 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-jupyter/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + poetry-core, + jupyter-client, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-jupyter"; + version = "0.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-jupyter"; + tag = "v${version}"; + hash = "sha256-gf+jyA2il7MD+Moez/zBYpf4EaPiNcgr5ZrJFK4uD2k="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'xonsh = ">=0.12"' "" + + substituteInPlace xonsh_jupyter/shell.py \ + --replace-fail 'xonsh.base_shell' 'xonsh.shells.base_shell' + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + jupyter-client + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Xonsh jupyter kernel allows to run Xonsh shell code in Jupyter, JupyterLab, Euporia, etc"; + homepage = "https://github.com/xonsh/xontrib-jupyter"; + changelog = "https://github.com/xonsh/xontrib-jupyter/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From a09d941ad719afe76c1924dcd95127d1dafc777b Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:39 -0500 Subject: [PATCH 044/484] xonsh.xontribs.xontrib-vox: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xo/xonsh/xontribs/xontrib-vox/default.nix | 60 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 0ad20b9cbab8..38e1a697f36f 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -10,4 +10,5 @@ xontrib-fish-completer = callPackage ./xontrib-fish-completer { }; xontrib-jedi = callPackage ./xontrib-jedi { }; xontrib-jupyter = callPackage ./xontrib-jupyter { }; + xontrib-vox = callPackage ./xontrib-vox { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix new file mode 100644 index 000000000000..9a191be8e5cf --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-vox/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + virtualenv, + writableTmpDirAsHomeHook, + pytestCheckHook, + pytest-subprocess, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-vox"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-vox"; + tag = version; + hash = "sha256-OB1O5GZYkg7Ucaqak3MncnQWXhMD4BM4wXsYCDD0mhk="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5"' "" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + virtualenv + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + pytest-subprocess + xonsh + ]; + + disabledTests = [ + # Monkeypatch in test fails, preventing test from running + "test_interpreter" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Python virtual environment manager for the xonsh shell"; + homepage = "https://github.com/xonsh/xontrib-vox"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From 65fa4335a0c93be788831b30cf0b161e3c46cc21 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 12 Nov 2024 09:33:54 -0500 Subject: [PATCH 045/484] xonsh.xontribs.xontrib-whole-word-jumping: init at 0.0.1 --- pkgs/by-name/xo/xonsh/xontribs/default.nix | 1 + .../xontrib-whole-word-jumping/default.nix | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix diff --git a/pkgs/by-name/xo/xonsh/xontribs/default.nix b/pkgs/by-name/xo/xonsh/xontribs/default.nix index 38e1a697f36f..fd0b211e6d7b 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/default.nix @@ -11,4 +11,5 @@ xontrib-jedi = callPackage ./xontrib-jedi { }; xontrib-jupyter = callPackage ./xontrib-jupyter { }; xontrib-vox = callPackage ./xontrib-vox { }; + xontrib-whole-word-jumping = callPackage ./xontrib-whole-word-jumping { }; } diff --git a/pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix new file mode 100644 index 000000000000..d842525e899f --- /dev/null +++ b/pkgs/by-name/xo/xonsh/xontribs/xontrib-whole-word-jumping/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + writableTmpDirAsHomeHook, + pytestCheckHook, + xonsh, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xontrib-whole-word-jumping"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xontrib-whole-word-jumping"; + tag = version; + hash = "sha256-zLAOGW9prjYDQBDITFNMggn4X1JTyAnVdjkBOH9gXPs="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"xonsh>=0.12.5", ' "" + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + xonsh + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Additional keyboard navigation for interactive xonsh shells"; + homepage = "https://github.com/xonsh/xontrib-whole-word-jumping"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; + }; +} From ab315b1b0cb329b14417acb5972c74d7056a978c Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Tue, 28 Jan 2025 11:54:48 +0100 Subject: [PATCH 046/484] spotify-player: 0.20.3 -> 0.20.4 --- pkgs/by-name/sp/spotify-player/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index 693b775bdf72..893cc5a22a11 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -21,7 +21,6 @@ withDaemon ? true, withAudioBackend ? "rodio", # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl withMediaControl ? true, - withLyrics ? true, withImage ? true, withNotify ? true, withSixel ? true, @@ -47,17 +46,17 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "aome510"; repo = pname; tag = "v${version}"; - hash = "sha256-9iXsZod1aLdCQYUKBjdRayQfRUz770Xw3/M85Rp/OCw="; + hash = "sha256-5N/zTkNgcIk/Ml11Oo+jyoO0r2Hh9SxFL+tdhD/1X/4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LX4DuIIL9jGQLEzECydIdPEdPGdRTYREwFbMCS8CoNo="; + cargoHash = "sha256-0vIhAJ3u+PfujUGI07fddDs33P35Q4CSDz1sMuQwVws="; nativeBuildInputs = [ @@ -100,13 +99,17 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ] ++ lib.optionals withMediaControl [ "media-control" ] ++ lib.optionals withImage [ "image" ] - ++ lib.optionals withLyrics [ "lyric-finder" ] ++ lib.optionals withDaemon [ "daemon" ] ++ lib.optionals withNotify [ "notify" ] ++ lib.optionals withStreaming [ "streaming" ] ++ lib.optionals withSixel [ "sixel" ] ++ lib.optionals withFuzzy [ "fzf" ]; + # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + export HOME=$TMPDIR + ''; + # sixel-sys is dynamically linked to libsixel postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) '' wrapProgram $out/bin/spotify_player \ From cc2fac109ffc5a0841cd7acc474caa22003e0261 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Wed, 22 Jan 2025 13:32:55 +0000 Subject: [PATCH 047/484] dioxus-cli: 0.6.0 -> 0.6.2 --- .../dioxus-cli/fix-wasm-opt-target-dir.patch | 11 +++++++++ pkgs/by-name/di/dioxus-cli/package.nix | 23 +++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch diff --git a/pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch b/pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch new file mode 100644 index 000000000000..1b1b9763235f --- /dev/null +++ b/pkgs/by-name/di/dioxus-cli/fix-wasm-opt-target-dir.patch @@ -0,0 +1,11 @@ +--- a/src/build/bundle.rs ++++ b/src/build/bundle.rs +@@ -334,7 +334,7 @@ impl AppBundle { + // Only run wasm-opt if the feature is enabled + // Wasm-opt has an expensive build script that makes it annoying to keep enabled for iterative dev + // We put it behind the "wasm-opt" feature flag so that it can be disabled when iterating on the cli +- self.run_wasm_opt(&self.build.exe_dir())?; ++ self.run_wasm_opt(&self.build.wasm_bindgen_out_dir())?; + + // Write the index.html file with the pre-configured contents we got from pre-rendering + std::fs::write( diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index a2b858cab97b..41d8e9437762 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -14,16 +14,24 @@ rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.6.0"; + version = "0.6.2"; src = fetchCrate { inherit pname version; - hash = "sha256-0Kg2/+S8EuMYZQaK4Ao+mbS7K48VhVWjPL+LnoVJMSw="; + hash = "sha256-jUS/it2N5o5D7Jon0fKHWEt3f0wdtVgNIkqSNc7u830="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uD3AHHY3edpqyQ8gnsTtxQsen8UzyVIbArSvpMa+B+8="; - buildFeatures = [ "optimizations" ]; + cargoHash = "sha256-izvo092FGZmci1cXLo+qhGlBh8W3A1TeBHrYXcjE6HU="; + cargoPatches = [ + # TODO: Remove once https://github.com/DioxusLabs/dioxus/issues/3659 is fixed upstream. + ./fix-wasm-opt-target-dir.patch + ]; + + buildFeatures = [ + "no-downloads" + "optimizations" + ]; nativeBuildInputs = [ pkg-config @@ -34,11 +42,18 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; + # wasm-opt-sys build.rs tries to verify C++17 support, but the check appears to be faulty. + postPatch = '' + substituteInPlace $cargoDepsCopy/wasm-opt-sys-*/build.rs \ + --replace-fail 'check_cxx17_support()?;' '// check_cxx17_support()?;' + ''; + nativeCheckInputs = [ rustfmt ]; checkFlags = [ # requires network access "--skip=serve::proxy::test" + "--skip=wasm_bindgen::test" ]; passthru = { From 4081b09e7af48f2c40af054fc4090e6c3100999e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 7 Feb 2025 00:28:37 -0500 Subject: [PATCH 048/484] resticprofile: 0.28.0 -> 0.29.1 --- pkgs/by-name/re/resticprofile/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix index 5897f00446b4..7ce002647106 100644 --- a/pkgs/by-name/re/resticprofile/package.nix +++ b/pkgs/by-name/re/resticprofile/package.nix @@ -11,13 +11,13 @@ buildGo123Module rec { pname = "resticprofile"; - version = "0.28.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "creativeprojects"; repo = "resticprofile"; tag = "v${version}"; - hash = "sha256-Ab+XesAw/GkNEGwAp1ERUlfDlI9Kxmd0UnS52v+nWIs="; + hash = "sha256-6s58rI+YMu6sCV8UsG9GOdF46Br3cMWIUqciVd2d4dY="; }; postPatch = '' @@ -32,9 +32,10 @@ buildGo123Module rec { ''; - vendorHash = "sha256-LLFdVB4n07Sq/QH1C7rutdpzfhkJvM9lvRg5exyYixM="; + vendorHash = "sha256-N39zPGos5EYRXGylsHFSjJ4EcQ9jahBOGV8xn7fF7gc="; ldflags = [ + "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" "-X main.builtBy=nixpkgs" From 745feb584b527d0df785a9509aee8858c28dc7d9 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Thu, 6 Feb 2025 16:59:02 -0500 Subject: [PATCH 049/484] ghidra: 11.2.1 -> 11.3 --- .../0001-Use-protobuf-gradle-plugin.patch | 63 ++--- .../0004-Fix-build-on-Gradle-8.12.patch | 13 - pkgs/tools/security/ghidra/build.nix | 10 +- pkgs/tools/security/ghidra/deps.json | 224 +++++++++++++----- 4 files changed, 185 insertions(+), 125 deletions(-) delete mode 100644 pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index 14065f3aa770..73d4dc6aef44 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -1,48 +1,26 @@ -From ffb6777d58f068db7e14372415154cd93f77766e Mon Sep 17 00:00:00 2001 +From be4c852769e260e3a9b516bb5626a6a6a68a2cd3 Mon Sep 17 00:00:00 2001 From: roblabla Date: Wed, 31 Jan 2024 13:19:55 +0100 Subject: [PATCH] Use com.google.protobuf:protobuf-gradle-plugin --- - Ghidra/Debug/Debugger-gadp/build.gradle | 7 +- Ghidra/Debug/Debugger-isf/build.gradle | 8 +- - Ghidra/Debug/Debugger-rmi-trace/build.gradle | 14 +-- + Ghidra/Debug/Debugger-rmi-trace/build.gradle | 16 ++-- build.gradle | 6 ++ - gradle/hasProtobuf.gradle | 94 -------------------- - 5 files changed, 26 insertions(+), 103 deletions(-) + gradle/hasProtobuf.gradle | 94 -------------------- + 4 files changed, 22 insertions(+), 102 deletions(-) + delete mode 100644 gradle/hasProtobuf.gradle -diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle -index 9e1c57faf..3a3242eb5 100644 ---- a/Ghidra/Debug/Debugger-gadp/build.gradle -+++ b/Ghidra/Debug/Debugger-gadp/build.gradle -@@ -18,11 +18,16 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" - apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" - apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" - apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" --apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" -+apply plugin: 'com.google.protobuf' - - apply plugin: 'eclipse' - eclipse.project.name = 'Debug Debugger-gadp' - -+buildscript { -+ dependencies { -+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' -+ } -+} - dependencies { - api project(':Framework-AsyncComm') - api project(':Framework-Debugging') diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle -index d135294a0..785681ca2 100644 +index f6c8464405..396b52d188 100644 --- a/Ghidra/Debug/Debugger-isf/build.gradle +++ b/Ghidra/Debug/Debugger-isf/build.gradle -@@ -18,11 +18,15 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" +@@ -18,11 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" -apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" -- + +apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-isf' @@ -52,21 +30,22 @@ index d135294a0..785681ca2 100644 + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + } +} ++ dependencies { api project(':Framework-AsyncComm') - api project(':Framework-Debugging') + api project(':ProposedUtils') diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle -index 40fbc17ab..7517ffe6e 100644 +index 8b6589f035..05da5a7a7e 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle +++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle -@@ -18,12 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" +@@ -19,12 +19,17 @@ apply from: "${rootProject.projectDir}/gradle/helpProject.gradle" apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" -apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" -+apply plugin: 'com.google.protobuf' apply from: "${rootProject.projectDir}/gradle/hasPythonPackage.gradle" - +- ++apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-rmi-trace' @@ -75,6 +54,7 @@ index 40fbc17ab..7517ffe6e 100644 + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + } +} ++ dependencies { api project(':Pty') api project(':Debugger') @@ -94,11 +74,11 @@ index 40fbc17ab..7517ffe6e 100644 commandLine exe, "--python_out=$outdir", "-I$srcdir" args src diff --git a/build.gradle b/build.gradle -index b0c717fb1..5f56506a5 100644 +index 2d75307a08..aa8f1d7604 100644 --- a/build.gradle +++ b/build.gradle -@@ -74,6 +74,12 @@ if (flatRepo.isDirectory()) { - jcenter() +@@ -80,6 +80,12 @@ if (flatRepo.isDirectory()) { + mavenCentral() flatDir name: "flat", dirs:["$flatRepo"] } + buildscript { @@ -111,9 +91,10 @@ index b0c717fb1..5f56506a5 100644 } else { diff --git a/gradle/hasProtobuf.gradle b/gradle/hasProtobuf.gradle -index 23b4ce74b..e69de29bb 100644 +deleted file mode 100644 +index 23b4ce74bb..0000000000 --- a/gradle/hasProtobuf.gradle -+++ b/gradle/hasProtobuf.gradle ++++ /dev/null @@ -1,94 +0,0 @@ -/* ### - * IP: GHIDRA @@ -210,5 +191,5 @@ index 23b4ce74b..e69de29bb 100644 -} -zipSourceSubproject.dependsOn generateProto -- -2.42.0 +2.47.0 diff --git a/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch b/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch deleted file mode 100644 index 2d1e9f77bf95..000000000000 --- a/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gradle/hasPythonPackage.gradle b/gradle/hasPythonPackage.gradle -index 2d83cf0cd3..8f3205f9ff 100644 ---- a/gradle/hasPythonPackage.gradle -+++ b/gradle/hasPythonPackage.gradle -@@ -44,7 +44,7 @@ task buildPyPackage { - doLast { - File setuptools = project(":Debugger-rmi-trace").findPyDep(".") - exec { -- workingDir { "build/pypkg" } -+ workingDir { file("build/pypkg") } - commandLine rootProject.PYTHON3, "-m", "pip" - args "wheel", "-w", "dist/", "--no-index", "--no-deps" - args "-f", setuptools diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index e079283c9162..37c55ae43bdf 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -20,7 +20,7 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.2.1"; + version = "11.3"; releaseName = "NIX"; distroPrefix = "ghidra_${version}_${releaseName}"; @@ -28,7 +28,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-UVX56yNZSAbUejiQ0AIn00r7R+fUW1DEjZmCr1iYwV4="; + hash = "sha256-N4uwAGs/dnnskuBX960BxrMv0Z8vlKt6EPor4qRqgJk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -52,10 +52,6 @@ let # Remove build dates from output filenames for easier reference ./0003-Remove-build-datestamp.patch - - # Fix build on Gradle 8.12 - # Upstream: https://github.com/NationalSecurityAgency/ghidra/commit/20285e267d110cfa585676dfd40804a59031598b - ./0004-Fix-build-on-Gradle-8.12.patch ]; postPatch = '' @@ -68,7 +64,7 @@ let echo "application.revision.ghidra=$(cat COMMIT)" >> Ghidra/application.properties # Tells ghidra to use our own protoc binary instead of the prebuilt one. - cat >>Ghidra/Debug/Debugger-gadp/build.gradle < Date: Fri, 7 Feb 2025 18:00:34 +0200 Subject: [PATCH 051/484] metals: 1.5.0 -> 1.5.1 --- pkgs/by-name/me/metals/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix index cd84a6449d9f..a9c9450d09f3 100644 --- a/pkgs/by-name/me/metals/package.nix +++ b/pkgs/by-name/me/metals/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.5.0"; + version = "1.5.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-JRuQ5R4EVDP2wVez3FnD4Vx8h200ShiXRhyRtKhs8V4="; + outputHash = "sha256-2FA2B/WzNGU4B785pn5zZ9Xj64huzbSbr2Or+CxUMlI="; }; nativeBuildInputs = [ From 53f87ad49044225133e30695fb2c3bdf08f68281 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 17:18:41 +0000 Subject: [PATCH 052/484] blackfire: 2.28.22 -> 2.28.23 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index fb45464155ce..adefdfa804fc 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.22"; + version = "2.28.23"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "vZemxC5Vg916imzecW2Wa88nBO9NH8zMY0RFfRjKoF4="; + sha256 = "rhcZZc77Y9zIYFbqDU9l+5vhQTSKs+tLzCEKLP6x/jo="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "hTqeL5xLyd6QWk4aFH3k5/GBc4fsc4EHZ5PMpT9j24g="; + sha256 = "Iqq7hBlO2XF2Sv0bdBXj93BQxHzayKJGAPDDB/peAW4="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "ARYJY5xDDzhatUWmyyjmewRV47hmNYgC5xlOdHBV0Po="; + sha256 = "lzTuEMEtLTFrMeRhYinEUrxZA3+uI+cykHHpslR19kU="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "gqA40eKuDneFKAC1oCby9aE6iLGwO2VNjazkf0U+uzU="; + sha256 = "rXSC16/bJfGATlhdN+DfhxDqBAUrtyHtM149if5fgxA="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "hgtQJtu3beRrcDuR8reX+82D/5n8XiRBOSmNtykf1RE="; + sha256 = "NW2zlaT5+NdXxBuyt5iBd3AmjaNbd1ktCi7HtXh5MmI="; }; }; From 7654daca5128adb49c067758d27fa131036f87e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 7 Feb 2025 19:18:29 +0100 Subject: [PATCH 053/484] yaml-language-server: fix strictDeps --- pkgs/by-name/ya/yaml-language-server/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 740c525f06b0..34f05c5deeef 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -29,11 +29,9 @@ stdenv.mkDerivation rec { makeWrapper fixup-yarn-lock yarn - ]; - - buildInputs = [ nodejs ]; + strictDeps = true; configurePhase = '' runHook preConfigure From 1012d54b3ae5acc1423d4e6da9a43750ffb0ca1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 19:04:27 +0000 Subject: [PATCH 054/484] factoriolab: 3.10.0 -> 3.11.4 --- pkgs/by-name/fa/factoriolab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 2c4ba6303308..049dd57fdf17 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.10.0"; + version = "3.11.4"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-MSiwtFd9u8IFrHDy++jO//P7Yn4Arip1DwBufR8KIRU="; + hash = "sha256-fn9qvUC14a37vQJJiu5jf+wOpeMFsUeR47TDmemNdEc="; }; buildInputs = [ vips ]; nativeBuildInputs = [ From 108d1379650bfca60d5d53715bac7a993c7a1518 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Feb 2025 21:08:38 +0100 Subject: [PATCH 055/484] chroma: 2.8.0 -> 2.15.0 --- pkgs/by-name/ch/chroma/package.nix | 4 ++-- pkgs/by-name/ch/chroma/src.json | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index 379fd6384bdc..20c100d07f31 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "chroma"; - version = "2.8.0"; + version = "2.15.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -21,7 +21,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorHash = "sha256-Bol5yMvNYuoVnSjEgf3h6X4CeUooy2Hpdy3SCaNXXOE="; + vendorHash = "sha256:14jg809xz647yv6sc8rnnksg2bpnn75panj8a2kdk2v87yrpq2zr"; modRoot = "./cmd/chroma"; diff --git a/pkgs/by-name/ch/chroma/src.json b/pkgs/by-name/ch/chroma/src.json index 8bba14faf188..e9cee45b9f29 100644 --- a/pkgs/by-name/ch/chroma/src.json +++ b/pkgs/by-name/ch/chroma/src.json @@ -1,9 +1,10 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "e8acfc274c22a76fd38030d2977a2246cd4322b3", - "date": "2023-06-30T08:43:39+10:00", - "path": "/nix/store/57y15g11dmdy2s6vxrjzl03s03j509gy-chroma", - "sha256": "0fdgpi5r0k42qzdn4lxh81ww1zcn9mwfildwrqf1s7crsqmr9dc5", + "rev": "009385f9487ee14c8a54e49aaf4331fea0830310", + "date": "2024-12-30T09:27:18+11:00", + "path": "/nix/store/rr2cj4bmlfw803diwyfpbrpai35gifaw-chroma", + "sha256": "088w3aixwfk8s04iyb2mjn3kx5dl3gb9q14jzawabcdy2ar7iijn", + "hash": "sha256-VsZ4shK+saW4+pIEnNYbtJU+h5VVLB8J0Gg63qMaHCE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 7539f8d17e3ae1b967503dcbd3f418ff9cf7d6e0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Feb 2025 20:49:34 +0100 Subject: [PATCH 056/484] licensee: 9.16.1 -> 9.18.0 --- .../package-management/licensee/Gemfile.lock | 50 ++++---- .../package-management/licensee/gemset.nix | 118 +++++++++++------- 2 files changed, 97 insertions(+), 71 deletions(-) diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock index 6bfe70664bd1..85997a8d96a9 100644 --- a/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/pkgs/tools/package-management/licensee/Gemfile.lock @@ -1,38 +1,42 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - base64 (0.2.0) - dotenv (2.8.1) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - licensee (9.16.1) - dotenv (~> 2.0) - octokit (>= 4.20, < 9.0) - reverse_markdown (>= 1, < 3) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + dotenv (3.1.7) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + json (2.9.1) + licensee (9.18.0) + dotenv (>= 2, < 4) + octokit (>= 4.20, < 10.0) + reverse_markdown (>= 1, < 4) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.8.5) - nokogiri (1.16.0) + logger (1.6.5) + mini_portile2 (2.8.8) + net-http (0.6.0) + uri + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - octokit (8.0.0) + octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) - public_suffix (5.0.4) - racc (1.7.3) - reverse_markdown (2.1.1) + public_suffix (6.0.1) + racc (1.8.1) + reverse_markdown (3.0.0) nokogiri - ruby2_keywords (0.0.5) - rugged (1.7.1) + rugged (1.9.0) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - thor (1.3.0) + thor (1.3.2) + uri (1.0.2) PLATFORMS ruby @@ -41,4 +45,4 @@ DEPENDENCIES licensee BUNDLED WITH - 2.4.22 + 2.5.22 diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index 032f6c9433a7..abc4f2ced445 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -5,55 +5,56 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; - }; - base64 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; - type = "gem"; - }; - version = "0.2.0"; + version = "2.8.7"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; + sha256 = "1wrw6fm0s38cd6h55w79bkvjhcj2zfkargjpws4kilkmhr3xyw66"; type = "gem"; }; - version = "2.8.1"; + version = "3.1.7"; }; faraday = { dependencies = [ - "base64" "faraday-net_http" - "ruby2_keywords" + "json" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; + sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; type = "gem"; }; - version = "2.8.1"; + version = "2.12.2"; }; faraday-net_http = { + dependencies = [ "net-http" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; type = "gem"; }; - version = "3.0.2"; + version = "3.4.0"; + }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj"; + type = "gem"; + }; + version = "2.9.1"; }; licensee = { dependencies = [ @@ -67,20 +68,41 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05g5w9c4jlfhwn0hfz117s1c7hfdm5yn7cywr4mah7xr41yvbh04"; + sha256 = "0xyzk7gzi91l6xlwfvf2z0963jwd2csf987yk0ffbr5p9ycdp0ry"; type = "gem"; }; - version = "9.16.1"; + version = "9.18.0"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3"; + type = "gem"; + }; + version = "1.6.5"; }; mini_portile2 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.8"; + }; + net-http = { + dependencies = [ "uri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; }; nokogiri = { dependencies = [ @@ -91,10 +113,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; + sha256 = "1gzqcs1kkykj8lrnbxc1iwr1wqmmaml8l6wyxdvy0vqq6gxiqyck"; type = "gem"; }; - version = "1.16.0"; + version = "1.18.2"; }; octokit = { dependencies = [ @@ -105,30 +127,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3"; + sha256 = "05j3gz79gxkid3lc2balyllqik4v4swnm0rcvxz14m76bkrpz92g"; type = "gem"; }; - version = "8.0.0"; + version = "9.2.0"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.1"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; reverse_markdown = { dependencies = [ "nokogiri" ]; @@ -136,30 +158,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j"; + sha256 = "195c7yra7amggqj7rir0yr09r4v29c2hgkbkb21mj0jsfs3868mb"; type = "gem"; }; - version = "2.1.1"; - }; - ruby2_keywords = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; + version = "3.0.0"; }; rugged = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02m9zksfy3dwzhbv56xq2wwmlghca5209hdg895pi2x2d2sbkahi"; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; }; sawyer = { dependencies = [ @@ -180,9 +192,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk"; + type = "gem"; + }; + version = "1.0.2"; }; } From 3dea7372a434c93bb6eab3e51ca9fd1bb4db0a86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 23:31:20 +0000 Subject: [PATCH 057/484] python312Packages.langsmith: 0.3.4 -> 0.3.6 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 1a39a1734206..e4a9c71cd8f0 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.3.4"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-mJS9Sdt4ESh9YRyjiUdVHC6R400SKhTeSdTjnbtY61I="; + hash = "sha256-V52sBGC4acQHfgsK5uCKQIWoeiaUnyEObVrt5TBRukU="; }; sourceRoot = "${src.name}/python"; From ff1741e20dc77f83e5f2ad0f5564fd271a01965e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Feb 2025 00:32:14 +0000 Subject: [PATCH 058/484] argo: 3.6.2 -> 3.6.3 --- pkgs/by-name/ar/argo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argo/package.nix b/pkgs/by-name/ar/argo/package.nix index 6947234dc673..f4a8825b9554 100644 --- a/pkgs/by-name/ar/argo/package.nix +++ b/pkgs/by-name/ar/argo/package.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; tag = "v${version}"; - hash = "sha256-GRs6xF9/vZi5LdkDA4RkBR6ElvWi0uji/05h0Y7P2eU="; + hash = "sha256-FbhF/oPWtcDqukeQf+NjfSCieQmrSTKBn3vbRr9IQIE="; }; - vendorHash = "sha256-8+0iBtXNHyLwE6+AeDDQRERt0930kPIjhQ5abqEqey0="; + vendorHash = "sha256-uCIdZkoPgppJtrFf7nOVIyEXo1bVILYXNs5LtLLLmsY="; doCheck = false; From 974db0c4f84c1e94e71689ca135a3896714fdf44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:37:09 +0100 Subject: [PATCH 059/484] python312Packages.certbot-dns-cloudflare: refactor --- .../python-modules/certbot-dns-cloudflare/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 2a115f7590c8..1b9e10ae7113 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -5,18 +5,21 @@ cloudflare, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "certbot-dns-cloudflare"; - format = "setuptools"; + pyproject = true; inherit (certbot) src version; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; sourceRoot = "${src.name}/certbot-dns-cloudflare"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ acme certbot cloudflare From 7e4759039d1ad13c45ebbfefb56dbee203e8a4ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Feb 2025 12:37:35 +0100 Subject: [PATCH 060/484] python312Packages.certbot-dns-cloudflare: mark as broken See https://github.com/certbot/certbot/pull/10182 --- .../python-modules/certbot-dns-cloudflare/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 1b9e10ae7113..257ed1daa9a6 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -37,5 +37,7 @@ buildPythonPackage rec { meta = certbot.meta // { description = "Cloudflare DNS Authenticator plugin for Certbot"; + # https://github.com/certbot/certbot/pull/10182 + broken = true; }; } From 33e8007dc1f2a3ba5c8340965bc8543414aac665 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 9 Feb 2025 01:08:48 +0400 Subject: [PATCH 061/484] =?UTF-8?q?python312Packages.stravalib:=202.1=20?= =?UTF-8?q?=E2=86=92=202.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/stravalib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index d7939a45b415..abcf77d21f14 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "stravalib"; - version = "2.1"; + version = "2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "stravalib"; repo = "stravalib"; tag = "v${version}"; - hash = "sha256-VEVy9BAAoLsBCwMNFpsCjhacFbsgNswYoJ5tTcOQccw="; + hash = "sha256-4T5/Sqni9DCE/sIyNCZA8FzFo7lRAsrF+2JP8ydSGqw="; }; build-system = [ @@ -46,11 +46,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "stravalib" ]; - meta = with lib; { + meta = { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sikmir ]; }; } From c10ad6ec5a2f706ce64274742f7802a76f038f34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:17:26 +0000 Subject: [PATCH 062/484] python312Packages.plyara: 2.2.7 -> 2.2.8 --- pkgs/development/python-modules/plyara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyara/default.nix b/pkgs/development/python-modules/plyara/default.nix index f6e6e62c20c4..3b03163a52dd 100644 --- a/pkgs/development/python-modules/plyara/default.nix +++ b/pkgs/development/python-modules/plyara/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plyara"; - version = "2.2.7"; + version = "2.2.8"; pyproject = true; disabled = pythonOlder "3.10"; # https://github.com/plyara/plyara: "Plyara requires Python 3.10+" src = fetchPypi { inherit pname version; - hash = "sha256-6gYD9BePlxGvSUg9ENa7a9uzU0pOl+IJs8ZVRekDVHY="; + hash = "sha256-zmpb5r3BcveLsQ0uIgQJx2vUaz2p/0PlO76E0e7elwA="; }; build-system = [ From 21e5c1788795f3367db161ad5151d0d4dfb5c267 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 00:56:59 +0000 Subject: [PATCH 063/484] fq: 0.13.0 -> 0.14.0 --- pkgs/by-name/fq/fq/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index b870fe1f41d4..b388edd34a3f 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fq"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-bHyLEJiSM42arZiM1VVKga6wp3Q3EAMgUrFnh3hbk9M="; + hash = "sha256-I3mVAPNWjRHG0td1ulzGOthiNybfWLx1HgwPjFfBHCo="; }; - vendorHash = "sha256-in+c8Wl7ffXAqMvs+3K6dzAd5ePqBpRaxU2iM81moQM="; + vendorHash = "sha256-p2cvv983gYTvyLPYIGVsk6N7yUzBpiPzgJ3sMRNWPTo="; ldflags = [ "-s" From 65f3e6c9b368ea1754fdcb925b9bb102e90639a7 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 9 Feb 2025 03:37:18 +0100 Subject: [PATCH 064/484] sdl2-compat: init at 2.30.52 --- pkgs/by-name/sd/sdl2-compat/package.nix | 98 +++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 pkgs/by-name/sd/sdl2-compat/package.nix diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix new file mode 100644 index 000000000000..d64f5435a65d --- /dev/null +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -0,0 +1,98 @@ +{ + cmake, + lib, + fetchFromGitHub, + monado, + ninja, + nix-update-script, + SDL2_ttf, + SDL2_net, + SDL2_gfx, + SDL2_sound, + SDL2_mixer, + SDL2_image, + sdl3, + stdenv, + testers, + testSupport ? true, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sdl2-compat"; + version = "2.30.52"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "sdl2-compat"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-pdY+yrLWIjMTjmKdYvX4DjzXy2cKaw6P90BPu8K163k"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + sdl3 + ]; + + outputs = [ + "out" + "dev" + ]; + + outputBin = "dev"; + + cmakeFlags = [ + (lib.cmakeBool "SDL2COMPAT_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = testSupport && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postFixup = + if stdenv.hostPlatform.isDarwin then + '' + install_name_tool -add_rpath ${lib.makeLibraryPath [ sdl3 ]} $out/lib/libSDL2.dylib + '' + else + '' + patchelf --add-rpath ${lib.makeLibraryPath [ sdl3 ]} $out/lib/libSDL2.so + ''; + + passthru = { + tests = + let + replaceSDL2 = drv: drv.override { SDL2 = finalAttrs.finalPackage; }; + in + { + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + SDL2_ttf = replaceSDL2 SDL2_ttf; + SDL2_net = replaceSDL2 SDL2_net; + SDL2_gfx = replaceSDL2 SDL2_gfx; + SDL2_sound = replaceSDL2 SDL2_sound; + SDL2_mixer = replaceSDL2 SDL2_mixer; + SDL2_image = replaceSDL2 SDL2_image; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + monado = replaceSDL2 monado; + }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(.*)" + ]; + }; + }; + + meta = { + description = "SDL2 compatibility layer that uses SDL3 behind the scenes"; + homepage = "https://libsdl.org"; + changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ nadiaholmquist ]; + platforms = lib.platforms.unix; + pkgConfigModules = [ "sdl2_compat" ]; + }; +}) From 2aa1904f346a66d9047bb624c0be96be0c6328d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 08:05:28 +0000 Subject: [PATCH 065/484] python312Packages.neo: 0.13.4 -> 0.14.0 --- pkgs/development/python-modules/neo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index f47bb14bf457..27e9c1b5e8d4 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "neo"; - version = "0.13.4"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NeuralEnsemble"; repo = "python-neo"; tag = version; - hash = "sha256-iBrZXJ4I0PWMwkLBSbtfImNPqupr4GyXNvGqwqEp6Qs="; + hash = "sha256-lLs70BsbFxTmd/qR0EqsceG+fAKI1P+em5Ix2kM9w/w="; }; build-system = [ setuptools ]; From 2ae7bba20eecaf7d14a49a8d5c172ec02e24cc20 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 9 Feb 2025 14:34:34 +0100 Subject: [PATCH 066/484] python313Packages.pygame-ce: 2.5.2 -> 2.5.3 Changelog: https://github.com/pygame-community/pygame-ce/releases/tag/2.5.3 --- .../python-modules/pygame-ce/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 470ece383353..aee76f73983c 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "pygame-ce"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,8 +39,8 @@ buildPythonPackage rec { owner = "pygame-community"; repo = "pygame-ce"; tag = version; - hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY="; - # Unicode file cause different checksums on HFS+ vs. other filesystems + hash = "sha256-Vl9UwCknbMHdsB1wwo/JqybWz3UbAMegIcO0GpiCxig="; + # Unicode files cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; @@ -69,11 +69,12 @@ buildPythonPackage rec { '' # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015) substituteInPlace pyproject.toml \ - --replace-fail '"meson<=1.5.1",' '"meson",' \ - --replace-fail '"meson-python<=0.16.0",' '"meson-python",' \ - --replace-fail '"ninja<=1.11.1.1",' "" \ + --replace-fail '"meson<=1.7.0",' '"meson",' \ + --replace-fail '"meson-python<=0.17.1",' '"meson-python",' \ + --replace-fail '"ninja<=1.12.1",' "" \ --replace-fail '"cython<=3.0.11",' '"cython",' \ - --replace-fail '"sphinx<=7.2.6",' "" + --replace-fail '"sphinx<=8.1.3",' "" \ + --replace-fail '"sphinx-autoapi<=3.3.2",' "" substituteInPlace buildconfig/config_{unix,darwin}.py \ --replace-fail 'from distutils' 'from setuptools._distutils' substituteInPlace src_py/sysfont.py \ @@ -160,7 +161,7 @@ buildPythonPackage rec { meta = { description = "Pygame Community Edition (CE) - library for multimedia application built on SDL"; homepage = "https://pyga.me/"; - changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${version}"; + changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${src.tag}"; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.unix; From cee2c1b02fe28f9af52cc03daf7889b12b3e6fc8 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sun, 9 Feb 2025 12:53:13 -0300 Subject: [PATCH 067/484] plasmusic-toolbar: 2.2.0 -> 2.3.0 --- pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 21d637e39e49..1de7bdefae6b 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-yVhtn52wwBw+lGWbaynuF6Vv1rw5zslW/V1eZ71R140="; + hash = "sha256-YxhZ4XhHCbEPVrc+qqO+phGnEf0nnKiDVRB5K4wjR/Q="; }; installPhase = '' From 495a1f2b6af38c564fba6a82bca2cabd585f2762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 16:21:49 +0000 Subject: [PATCH 068/484] python312Packages.types-s3transfer: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/types-s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index 51f5a2d24e74..66871ab7aaf5 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-aridTXa8v21JRYKUmWO0ZyNH6Nqjl9l5DzaEtPz4c8Q="; + hash = "sha256-PMuLkLFENK8vsNbAhQBZbZPzqD+4BKK7hD2b9PfCymA="; }; build-system = [ setuptools ]; From 105b640ae11406c5b6b01552d531e9c64ec8867e Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 10 Feb 2025 01:58:47 +0900 Subject: [PATCH 069/484] wleave: 0.4.1 -> 0.5.1 Full Changelog: https://github.com/AMNatty/wleave/compare/0.4.1...0.5.1 Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index d83e8b399757..9ba22db2ae39 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -5,25 +5,25 @@ at-spi2-atk, pkg-config, glib, - gtk3, - gtk-layer-shell, + gtk4, + gtk4-layer-shell, installShellFiles, scdoc, }: rustPlatform.buildRustPackage rec { pname = "wleave"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "AMNatty"; repo = "wleave"; rev = version; - hash = "sha256-PkEj0RlSxhxG9qOJkuMTVj6r0lxsm7V8b1AIaCVaXCQ="; + hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HDlL/tRc60kLW2qoa/TYKe11RbpX0CCmkPiKa7BRK80="; + cargoHash = "sha256-csnArsVk/Ifhi3aO3bSG0mkSA81KACxR/xC1L8JJfmc="; nativeBuildInputs = [ pkg-config @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ at-spi2-atk - gtk3 - gtk-layer-shell + gtk4 + gtk4-layer-shell glib ]; @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Wayland-native logout script written in GTK3"; + description = "Wayland-native logout script written in GTK4"; homepage = "https://github.com/AMNatty/wleave"; license = licenses.mit; mainProgram = "wleave"; From 4bfefba805262cfb2517764de5106865fb3bc3fa Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 10 Feb 2025 02:00:37 +0900 Subject: [PATCH 070/484] wleave: format with nixfmt Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index 9ba22db2ae39..f29345c0afca 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -10,7 +10,6 @@ installShellFiles, scdoc, }: - rustPlatform.buildRustPackage rec { pname = "wleave"; version = "0.5.1"; From 00594b6f98c0b24bb641bc9115451ef1db5a8b70 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 9 Feb 2025 18:33:44 +0100 Subject: [PATCH 071/484] bakelite: clean up and provide update script --- pkgs/by-name/ba/bakelite/package.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ba/bakelite/package.nix b/pkgs/by-name/ba/bakelite/package.nix index 7eb87f2b5a33..ab9e57dcd74b 100644 --- a/pkgs/by-name/ba/bakelite/package.nix +++ b/pkgs/by-name/ba/bakelite/package.nix @@ -2,15 +2,16 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bakelite"; - version = "unstable-2023-03-30"; + version = "0.4.2-unstable-2023-05-30"; src = fetchFromGitHub { owner = "richfelker"; - repo = pname; + repo = "bakelite"; rev = "65d69e88e0972d1493ebbd9bf9d1bfde36272636"; hash = "sha256-OjBw9aYD2h7BWYgQzZp03hGCyQcRgmm2AjrcT/QrQAo="; }; @@ -27,13 +28,19 @@ stdenv.mkDerivation rec { cp bakelite $out/bin ''; - meta = with lib; { + passthru = { + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + }; + + meta = { homepage = "https://github.com/richfelker/bakelite"; description = "Incremental backup with strong cryptographic confidentality"; mainProgram = "bakelite"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ mvs ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mvs ]; # no support for Darwin (yet: https://github.com/richfelker/bakelite/pull/5) - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 0677547a9fe7bbf886fb277738b527a15cc1d498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 18:45:05 +0000 Subject: [PATCH 072/484] python312Packages.jianpu-ly: 1.826 -> 1.832 --- pkgs/development/python-modules/jianpu-ly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix index 2469f6569f35..8fc533bbb692 100644 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ b/pkgs/development/python-modules/jianpu-ly/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jianpu-ly"; - version = "1.826"; + version = "1.832"; pyproject = true; src = fetchPypi { inherit version; pname = "jianpu_ly"; - hash = "sha256-9vNCwXCOEHG2WNu8nDqCKJ3Z4vrsfX1lwKvkVGRrPPA="; + hash = "sha256-7+PM8wHzC5O8o12VjA1aeYIAdv/17TM7RymHyxkq5vs="; }; dependencies = [ lilypond ]; From 9aefcbba8900e376fa2dab2951d83a2790ea02df Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 9 Feb 2025 20:22:20 +0100 Subject: [PATCH 073/484] truecrack: fix build on gcc-14 --- .../tr/truecrack/fix-empty-return.patch | 11 ++++ pkgs/by-name/tr/truecrack/package.nix | 63 ++++++++++++++----- 2 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/tr/truecrack/fix-empty-return.patch diff --git a/pkgs/by-name/tr/truecrack/fix-empty-return.patch b/pkgs/by-name/tr/truecrack/fix-empty-return.patch new file mode 100644 index 000000000000..691d708ee53e --- /dev/null +++ b/pkgs/by-name/tr/truecrack/fix-empty-return.patch @@ -0,0 +1,11 @@ +--- a/src/Common/CpuCore.c ++++ b/src/Common/CpuCore.c +@@ -96,7 +96,7 @@ + derive_key_whirlpool ( word, wordlength+1, salt, PKCS5_SALT_SIZE, 1000, headerKey, cpu_GetMaxPkcs5OutSize ()); + else{ + perror("Key derivation function not supported"); +- return; ++ return 0; + } + + value=cpu_Xts(encryptionAlgorithm,encryptedHeader,headerKey,cpu_GetMaxPkcs5OutSize(), masterKey, &length); diff --git a/pkgs/by-name/tr/truecrack/package.nix b/pkgs/by-name/tr/truecrack/package.nix index c8fee97c8e1b..5c952f5ed409 100644 --- a/pkgs/by-name/tr/truecrack/package.nix +++ b/pkgs/by-name/tr/truecrack/package.nix @@ -6,6 +6,7 @@ config, cudaSupport ? config.cudaSupport, pkg-config, + versionCheckHook, }: gccStdenv.mkDerivation rec { @@ -15,10 +16,14 @@ gccStdenv.mkDerivation rec { src = fetchFromGitLab { owner = "kalilinux"; repo = "packages/truecrack"; - rev = "debian/${version}+git20150326-0kali1"; - sha256 = "+Rw9SfaQtO1AJO6UVVDMCo8DT0dYEbv7zX8SI+pHCRQ="; + tag = "kali/${version}+git20150326-0kali4"; + hash = "sha256-d6ld6KHSqYM4RymHf5qcm2AWK6FHWC0rFaLRfIQ2m5Q="; }; + patches = [ + ./fix-empty-return.patch + ]; + configureFlags = ( if cudaSupport then [ @@ -38,24 +43,54 @@ gccStdenv.mkDerivation rec { cudatoolkit ]; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: CpuAes.o:/build/source/src/Crypto/CpuAes.h:1233: multiple definition of - # `t_rc'; CpuCore.o:/build/source/src/Crypto/CpuAes.h:1237: first defined here - # TODO: remove on upstream fixes it: - # https://gitlab.com/kalilinux/packages/truecrack/-/issues/1 - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ([ + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: CpuAes.o:/build/source/src/Crypto/CpuAes.h:1233: multiple definition of + # `t_rc'; CpuCore.o:/build/source/src/Crypto/CpuAes.h:1237: first defined here + # TODO: remove on upstream fixes it: + # https://gitlab.com/kalilinux/packages/truecrack/-/issues/1 + "-fcommon" + # Function are declared after they are used in the file, this is error since gcc-14. + # Common/Crypto.c:42:13: error: implicit declaration of function 'cpu_CipherInit'; did you mean 'CipherInit'? [] + # https://gitlab.com/kalilinux/packages/truecrack/-/commit/5b0e3a96b747013bded7b33f65bb42be2dbafc86 + "-Wno-error=implicit-function-declaration" + ]); - installFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; - meta = with lib; { + installFlags = [ "prefix=$(out)" ]; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + echo "Cracking test volumes" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -c test/tes -m 4 | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/whirlpool_aes.test.tc -w test/passwords.txt -k whirlpool | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/sha512_aes.test.tc -w test/passwords.txt -k sha512 | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_serpent.test.tc -w test/passwords.txt -e serpent | grep -aF "Found password" + $out/bin/${meta.mainProgram} -t test/ripemd160_twofish.test.tc -w test/passwords.txt -e twofish | grep -aF "Found password" + echo "Finished cracking test volumes" + + runHook postInstallCheck + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { description = "Brute-force password cracker for TrueCrypt volumes, optimized for Nvidia Cuda technology"; mainProgram = "truecrack"; homepage = "https://gitlab.com/kalilinux/packages/truecrack"; broken = cudaSupport; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ethancedwards8 ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ethancedwards8 ]; }; } From fe6ba0d17756a43098d8926611dd27fc1b4298d4 Mon Sep 17 00:00:00 2001 From: XBagon Date: Sun, 9 Feb 2025 20:55:30 +0100 Subject: [PATCH 074/484] egglog: 0-unstable-2024-01-26 -> 0.4.0 Diff: https://github.com/egraphs-good/egglog/compare/b78f69ca1f7187c363bb31271c8e8958f477f15d...v0.4.0 remove git dependency (d913a539f7c0d35c84c2cc3fb8785abc0a28daea) --- pkgs/by-name/eg/egglog/Cargo.lock | 1415 ---------------------------- pkgs/by-name/eg/egglog/package.nix | 23 +- 2 files changed, 11 insertions(+), 1427 deletions(-) delete mode 100644 pkgs/by-name/eg/egglog/Cargo.lock diff --git a/pkgs/by-name/eg/egglog/Cargo.lock b/pkgs/by-name/eg/egglog/Cargo.lock deleted file mode 100644 index 0d2fbadc10bc..000000000000 --- a/pkgs/by-name/eg/egglog/Cargo.lock +++ /dev/null @@ -1,1415 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen", -] - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dot-generator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aaac7ada45f71873ebce336491d1c1bc4a7c8042c7cea978168ad59e805b871" -dependencies = [ - "dot-structures", -] - -[[package]] -name = "dot-structures" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675e35c02a51bb4d4618cb4885b3839ce6d1787c97b664474d9208d074742e20" - -[[package]] -name = "egglog" -version = "0.1.0" -dependencies = [ - "clap", - "egraph-serialize", - "env_logger", - "generic_symbolic_expressions", - "getrandom", - "glob", - "hashbrown 0.14.2", - "indexmap", - "instant", - "lalrpop", - "lalrpop-util", - "lazy_static", - "libtest-mimic", - "log", - "num-integer", - "num-rational", - "num-traits", - "ordered-float", - "regex", - "rustc-hash", - "serde_json", - "smallvec", - "symbol_table", - "thiserror", -] - -[[package]] -name = "egraph-serialize" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41150f383849cfc16ae6230f592112b3c0a2c0e3ec43eb0b09db037bfcce703" -dependencies = [ - "graphviz-rust", - "indexmap", - "once_cell", - "ordered-float", - "serde", - "serde_json", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "ena" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" -dependencies = [ - "log", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "generic_symbolic_expressions" -version = "5.0.3" -source = "git+https://github.com/oflatt/symbolic-expressions?rev=655b6a4c06b4b3d3b2300e17779860b4abe440f0#655b6a4c06b4b3d3b2300e17779860b4abe440f0" - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "graphviz-rust" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27dafd1ac303e0dfb347a3861d9ac440859bab26ec2f534bbceb262ea492a1e0" -dependencies = [ - "dot-generator", - "dot-structures", - "into-attr", - "into-attr-derive", - "pest", - "pest_derive", - "rand", - "tempfile", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -dependencies = [ - "ahash 0.8.6", - "allocator-api2", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", - "serde", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "into-attr" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b48c537e49a709e678caec3753a7dba6854661a1eaa27675024283b3f8b376" -dependencies = [ - "dot-structures", -] - -[[package]] -name = "into-attr-derive" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecac7c1ae6cd2c6a3a64d1061a8bdc7f52ff62c26a831a2301e54c1b5d70d5b1" -dependencies = [ - "dot-generator", - "dot-structures", - "into-attr", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lalrpop" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" -dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax 0.7.5", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" -dependencies = [ - "regex", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libtest-mimic" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d8de370f98a6cb8a4606618e53e802f93b094ddec0f96988eaec2c27e6e9ce7" -dependencies = [ - "clap", - "termcolor", - "threadpool", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "ordered-float" -version = "3.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" -dependencies = [ - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets", -] - -[[package]] -name = "pest" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "pest_meta" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "serde", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "symbol_table" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828f672b631c220bf6ea8a1d3b82c7d0fc998e5ba8373383d8604bc1e2a6245a" -dependencies = [ - "ahash 0.7.7", - "hashbrown 0.12.3", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.4.1", - "rustix", - "windows-sys", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "wasm-logger" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718" -dependencies = [ - "log", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "web-demo" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "egglog", - "js-sys", - "log", - "wasm-bindgen", - "wasm-logger", - "web-sys", - "wee_alloc", -] - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wee_alloc" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "memory_units", - "winapi", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "zerocopy" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] diff --git a/pkgs/by-name/eg/egglog/package.nix b/pkgs/by-name/eg/egglog/package.nix index 1e947e1cfcb3..1a46064ac5bd 100644 --- a/pkgs/by-name/eg/egglog/package.nix +++ b/pkgs/by-name/eg/egglog/package.nix @@ -4,31 +4,30 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "egglog"; - version = "0-unstable-2024-01-26"; + version = "0.4.0"; src = fetchFromGitHub { owner = "egraphs-good"; repo = "egglog"; - rev = "b78f69ca1f7187c363bb31271c8e8958f477f15d"; - hash = "sha256-/1ktyz8wU1yLTdAFPnupK6jUFjiK6nQfotGRNOWiOsA="; + rev = "v${version}"; + hash = "sha256-j+3qknmezKqHVxvfmG9oPFtWOzJsimGXYe5PWX694mI="; }; + useFetchCargoVendor = true; + cargoHash = "sha256-gWccsWZCOucNP6M6cJqCMF8emwzqLXkaRm/huK4ARTs="; + useNextest = true; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "generic_symbolic_expressions-5.0.3" = "sha256-UX6fS470YJMdNnn0GR3earMGQK3p/YvaFia7IEvGGKg="; - }; - }; - meta = with lib; { description = "Fixpoint reasoning system that unifies Datalog and equality saturation"; mainProgram = "egglog"; homepage = "https://github.com/egraphs-good/egglog"; license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ + figsoda + XBagon + ]; }; } From 7ca7bb9dee684b31f440d9ad4f49678a6b6a63f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:31:14 +0000 Subject: [PATCH 075/484] anilibria-winmaclinux: 2.2.24 -> 2.2.25 --- pkgs/applications/video/anilibria-winmaclinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 38e4c25b7b19..c1a1114fe3df 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "2.2.24"; + version = "2.2.25"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-FAnVgrH6ZXfIp8FaacSpcHIwF6DCFt4K5e+UMAUb6qI="; + hash = "sha256-9jlGENJVgzQi5oEspM6JHIgYt9np8WNKPJzoW2kSgQs="; }; sourceRoot = "${src.name}/src"; From 310e3e7aea0df740ff5d7bf28ffdd84350290f04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 03:02:39 +0000 Subject: [PATCH 076/484] prometheus-snmp-exporter: 0.26.0 -> 0.28.0 --- pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index b4f395c18361..7c2ad7f12dd6 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "snmp_exporter"; - version = "0.26.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "sha256-6UTvzcN0BB4uLfyZxr8CkmlMAjggYRV/EmQPRD7ZqmY="; + sha256 = "sha256-/uNmY4xON9VFXEi4njAC5nD1RVWn+nUr1oQnt9w8pmQ="; }; - vendorHash = "sha256-0WGiVM4HTgcVkCxfjW1c+z1wlf/ay5BXZXuGRPS4guc="; + vendorHash = "sha256-WSqkuRzeSctO+modNHBGBD3HvhrSXFlmsdfB/3lS5sw="; buildInputs = [ net-snmp ]; From 4d20fd65f1c02fc40ec62b5527f26c9406191e37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 03:30:18 +0000 Subject: [PATCH 077/484] ytdownloader: 3.18.5 -> 3.19.0 --- pkgs/by-name/yt/ytdownloader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index 0d831a9b011a..9b9d0e34ca8c 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.18.5"; + version = "3.19.0"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; tag = "v${version}"; - hash = "sha256-914sEFUVwiHMXwnwZjdeSQmeSPRREeoihLKYYTTKAcs="; + hash = "sha256-Oj462x1oyhaLFbVNr90hKmg0S+BZXUv1DyNdxsc2L7Y="; }; - npmDepsHash = "sha256-zBFRzVBmKAncZFTFa0hhv5BaE0rsAv9IdezZBNd5J2E="; + npmDepsHash = "sha256-ZJdPfNndYOWzvJpgra16/tCuWTvPLd4ZhSFualJB00E="; nativeBuildInputs = [ copyDesktopItems From cb8300fbae92c8fe802f979b66bcb341e33c6f56 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 30 Jan 2025 23:27:49 +0900 Subject: [PATCH 078/484] bfg-repo-cleaner: prefer versionCheckHook rather than testers.testVersion https://github.com/NixOS/nixpkgs/blob/bd352cd67834c983d69adf4080d225dbe28f99ba/doc/stdenv/passthru.chapter.md?plain=1#L84 --- pkgs/by-name/bf/bfg-repo-cleaner/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index d2044dd34c78..f7b73362d43e 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -4,8 +4,7 @@ fetchurl, jre, makeWrapper, - testers, - bfg-repo-cleaner, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -31,9 +30,12 @@ stdenv.mkDerivation rec { makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" ''; - passthru.tests.version = testers.testVersion { - package = bfg-repo-cleaner; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; meta = with lib; { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; From 82d95f18fdcbde3640402db949125c0ba1a430a6 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 30 Jan 2025 23:31:26 +0900 Subject: [PATCH 079/484] bfg-repo-cleaner: 1.14.0 -> 1.15.0 Diff: https://github.com/rtyley/bfg-repo-cleaner/compare/v1.14.0...v1.15.0 --- pkgs/by-name/bf/bfg-repo-cleaner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index f7b73362d43e..bf6c2ce7eafc 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bfg-repo-cleaner"; - version = "1.14.0"; + version = "1.15.0"; jarName = "bfg-${version}.jar"; src = fetchurl { url = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; - hash = "sha256-GnXpOQVB9LVdnAElazYbgVweCiY+L7PQcrVcKRHq0Lc="; + hash = "sha256-3+KIWtwpFjeQk/AqgBgSAFNoVsmph78hxJLkUq3v73o="; }; nativeBuildInputs = [ makeWrapper ]; From 4391342df7be4c4d738611dd86a6b5d385651854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20St=C3=A4ding?= Date: Mon, 10 Feb 2025 14:40:35 +0100 Subject: [PATCH 080/484] dafny: 4.9.1 -> 4.10.0 --- pkgs/by-name/da/dafny/deps.json | 39 +++++++++++++++++++++++++++++-- pkgs/by-name/da/dafny/package.nix | 13 +++-------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/da/dafny/deps.json b/pkgs/by-name/da/dafny/deps.json index fe629403b62f..ce1545664768 100644 --- a/pkgs/by-name/da/dafny/deps.json +++ b/pkgs/by-name/da/dafny/deps.json @@ -244,6 +244,16 @@ "version": "1.1.0", "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies", + "version": "1.0.3", + "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net452", + "version": "1.0.3", + "hash": "sha256-RTPuFG8D7gnwINEoEtAqmVm4oTW8K4Z87v1o4DDeLMI=" + }, { "pname": "Microsoft.TestPlatform.Extensions.TrxLogger", "version": "17.9.0", @@ -294,6 +304,11 @@ "version": "2.6.81", "hash": "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs=" }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, { "pname": "Newtonsoft.Json", "version": "11.0.2", @@ -529,6 +544,11 @@ "version": "4.3.0", "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, + { + "pname": "System.Buffers", + "version": "4.4.0", + "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA=" + }, { "pname": "System.Collections", "version": "4.3.0", @@ -624,11 +644,21 @@ "version": "4.1.0", "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" }, + { + "pname": "System.Memory", + "version": "4.5.3", + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" + }, { "pname": "System.Net.WebSockets", "version": "4.3.0", "hash": "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0=" }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -724,6 +754,11 @@ "version": "4.4.0", "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.2", + "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" + }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.7.1", @@ -841,7 +876,7 @@ }, { "pname": "Tomlyn", - "version": "0.16.2", - "hash": "sha256-ULW4n8s2lvTMG3I18rpsVfXtKXN7C8nPrMXQowxGIsU=" + "version": "0.17.0", + "hash": "sha256-pJHF7w8RJhV23wiI3qzm5el4qPlPlgYTmTKA8yGhzXY=" } ] diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 1b5cdecb3404..9484b7aadf7f 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -38,18 +38,18 @@ let in buildDotnetModule rec { pname = "Dafny"; - version = "4.9.1"; + version = "4.10.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; tag = "v${version}"; - hash = "sha256-fCBaOF1mDrqJaUiATZAhzLjlK3NGVFnxdOwgHbOkkgY="; + hash = "sha256-aPOjt4bwalhJUTJm4+pGqN88LwDP5zrVtakF26b3K4s="; }; postPatch = let - runtimeJarVersion = "4.9.1"; + runtimeJarVersion = "4.10.0"; in '' cp ${writeScript "fake-gradlew-for-dafny" '' @@ -66,13 +66,6 @@ buildDotnetModule rec { substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ --replace-fail TargetFrameworks TargetFramework \ --replace-fail "netstandard2.0;net452" net8.0 - - for f in Source/**/*.csproj ; do - [[ "$f" == "Source/DafnyRuntime/DafnyRuntime.csproj" ]] && continue; - - substituteInPlace $f \ - --replace-fail net6.0 net8.0 - done ''; dotnet-sdk = dotnetCorePackages.sdk_8_0; From 7df3b3244756a6ee6b67411aa00cd22a90461058 Mon Sep 17 00:00:00 2001 From: Marco Desiderati Date: Mon, 10 Feb 2025 16:56:42 +0100 Subject: [PATCH 081/484] snx-rs: 2.9.0 -> 3.0.3 Changelog: https://github.com/ancwrd1/snx-rs/blob/v3.0.3/CHANGELOG.md --- pkgs/by-name/sn/snx-rs/Cargo.lock | 624 ++++++++++++++++++----------- pkgs/by-name/sn/snx-rs/package.nix | 8 +- 2 files changed, 402 insertions(+), 230 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/Cargo.lock b/pkgs/by-name/sn/snx-rs/Cargo.lock index 93695da0b1ec..ec3aa403b691 100644 --- a/pkgs/by-name/sn/snx-rs/Cargo.lock +++ b/pkgs/by-name/sn/snx-rs/Cargo.lock @@ -37,7 +37,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -111,11 +111,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -206,7 +207,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -235,13 +236,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -308,9 +309,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" dependencies = [ "serde", ] @@ -368,9 +369,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -380,9 +381,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" dependencies = [ "serde", ] @@ -434,7 +435,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -449,7 +450,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cairo-sys-rs", "glib", "libc", @@ -479,9 +480,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.7" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2" dependencies = [ "shlex", ] @@ -535,9 +536,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff" dependencies = [ "clap_builder", "clap_derive", @@ -545,9 +546,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" dependencies = [ "anstream", "anstyle", @@ -557,14 +558,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -620,7 +621,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.10.0", "core-graphics-types", "foreign-types 0.5.0", @@ -633,16 +634,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.10.0", "libc", ] [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -725,7 +726,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -736,7 +737,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -811,7 +812,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -850,14 +851,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "enumflags2" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147" dependencies = [ "enumflags2_derive", "serde", @@ -865,13 +866,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -892,9 +893,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -979,7 +980,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1053,9 +1054,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" dependencies = [ "fastrand", "futures-core", @@ -1072,7 +1073,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1181,7 +1182,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", ] [[package]] @@ -1228,7 +1241,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "futures-channel", "futures-core", "futures-executor", @@ -1256,7 +1269,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1269,6 +1282,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" + [[package]] name = "gobject-sys" version = "0.18.0" @@ -1329,7 +1348,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1445,15 +1464,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -1659,7 +1678,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1691,9 +1710,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -1711,9 +1730,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" dependencies = [ "serde", ] @@ -1727,22 +1746,27 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "isakmp" version = "0.1.0" -source = "git+https://github.com/ancwrd1/isakmp.git#c6360f5ac959fa386871b43ea49d92856deb0c73" +source = "git+https://github.com/ancwrd1/isakmp.git#d5f33e5605031429c474e61dfb8009953738bf01" dependencies = [ "anyhow", "async-trait", - "bitflags 2.6.0", + "bitflags 2.8.0", "byteorder", "bytes", "cryptoki", + "futures", "hex", "itertools", "openssl", "parking_lot", - "rand", + "pnet_macros", + "pnet_macros_support", + "pnet_packet", + "rand 0.9.0", "rmp-serde", "serde", "tokio", + "tokio-util", "tracing", ] @@ -1763,9 +1787,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -1777,7 +1801,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "serde", "unicode-segmentation", ] @@ -1854,15 +1878,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "libc", ] [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1882,9 +1906,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "memchr" @@ -1909,9 +1933,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", "simd-adler32", @@ -1924,7 +1948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -1949,9 +1973,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" dependencies = [ "libc", "log", @@ -1970,13 +1994,19 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "cfg_aliases", "libc", "memoffset", ] +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + [[package]] name = "normpath" version = "1.3.0" @@ -2091,7 +2121,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "libc", "objc2", @@ -2107,7 +2137,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -2127,9 +2157,9 @@ dependencies = [ [[package]] name = "objc2-encode" -version = "4.0.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" [[package]] name = "objc2-foundation" @@ -2137,7 +2167,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "libc", "objc2", @@ -2149,7 +2179,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -2161,7 +2191,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "block2", "objc2", "objc2-foundation", @@ -2197,11 +2227,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2218,23 +2248,33 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -2352,7 +2392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.11", "ucd-trie", ] @@ -2376,7 +2416,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -2419,6 +2459,48 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "pnet_base" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7" +dependencies = [ + "no-std-net", +] + +[[package]] +name = "pnet_macros" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.98", +] + +[[package]] +name = "pnet_macros_support" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed67a952585d509dd0003049b1fc56b982ac665c8299b124b90ea2bdb3134ab" +dependencies = [ + "pnet_base", +] + +[[package]] +name = "pnet_packet" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c96ebadfab635fcc23036ba30a7d33a80c39e8461b8bd7dc7bb186acb96560f" +dependencies = [ + "glob", + "pnet_base", + "pnet_macros", + "pnet_macros_support", +] + [[package]] name = "png" version = "0.17.16" @@ -2453,7 +2535,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -2481,7 +2563,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.22", + "toml_edit 0.22.23", ] [[package]] @@ -2510,9 +2592,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -2533,8 +2615,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.0", + "zerocopy 0.8.16", ] [[package]] @@ -2544,7 +2637,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.0", ] [[package]] @@ -2553,7 +2656,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +dependencies = [ + "getrandom 0.3.1", + "zerocopy 0.8.16", ] [[package]] @@ -2562,7 +2675,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] @@ -2571,7 +2684,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 1.0.69", ] @@ -2657,7 +2770,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -2703,11 +2816,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", @@ -2716,9 +2829,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.20" +version = "0.23.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" dependencies = [ "once_cell", "rustls-pki-types", @@ -2738,9 +2851,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" @@ -2754,10 +2867,16 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.18" +name = "rustversion" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + +[[package]] +name = "ryu" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "schannel" @@ -2796,7 +2915,7 @@ dependencies = [ "hkdf", "num", "once_cell", - "rand", + "rand 0.8.5", "serde", "sha2", "zbus 4.4.0", @@ -2808,7 +2927,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -2817,9 +2936,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2827,9 +2946,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" @@ -2848,14 +2967,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -2871,7 +2990,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -2970,7 +3089,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snx-rs" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "clap", @@ -2985,7 +3104,7 @@ dependencies = [ [[package]] name = "snx-rs-gui" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "async-channel", @@ -3001,12 +3120,12 @@ dependencies = [ "tracing", "tracing-subscriber", "tray-icon", - "zbus 5.2.0", + "zbus 5.3.1", ] [[package]] name = "snxcore" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "async-recursion", @@ -3027,11 +3146,13 @@ dependencies = [ "num-traits", "once_cell", "opener", + "openssl", + "openssl-sys", "parse_int", "passterm", "pest", "pest_derive", - "rand", + "rand 0.9.0", "regex", "reqwest", "secret-service", @@ -3044,12 +3165,12 @@ dependencies = [ "tracing", "tun", "uuid", - "zbus 5.2.0", + "zbus 5.3.1", ] [[package]] name = "snxctl" -version = "2.9.0" +version = "3.0.3" dependencies = [ "anyhow", "clap", @@ -3112,9 +3233,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.95" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -3138,7 +3259,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3147,7 +3268,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -3183,13 +3304,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", - "getrandom", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -3206,11 +3327,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.11", ] [[package]] @@ -3221,18 +3342,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3257,9 +3378,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -3276,13 +3397,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3327,7 +3448,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.22", + "toml_edit 0.22.23", ] [[package]] @@ -3363,15 +3484,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.22", + "winnow 0.7.1", ] [[package]] @@ -3420,7 +3541,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3486,9 +3607,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5ea2466ffcdd0be0831f7d3981daa0b953586c0062f6d33398cb374689b090" +checksum = "0df2e279123d6a96b1611b1d2bc126323900f970819fea3c5c2ed0c657fa2132" dependencies = [ "bytes", "cfg-if", @@ -3498,7 +3619,7 @@ dependencies = [ "libc", "log", "nix", - "thiserror 2.0.9", + "thiserror 2.0.11", "tokio", "tokio-util", "windows-sys 0.59.0", @@ -3530,9 +3651,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-segmentation" @@ -3577,19 +3698,19 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ - "getrandom", + "getrandom 0.2.15", "sha1_smol", ] [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -3625,35 +3746,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.99" +name = "wasi" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -3664,9 +3795,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3674,28 +3805,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -3931,18 +4065,27 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.22" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" +checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" dependencies = [ "memchr", ] [[package]] -name = "winreg2" -version = "0.53.1" +name = "winnow" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25225e44ce2ac6b72befed6416b0857cf8663f9963dba572c39473062f0e625" +checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" dependencies = [ "cfg-if", "windows-sys 0.59.0", @@ -3950,18 +4093,27 @@ dependencies = [ [[package]] name = "wintun-bindings" -version = "0.7.27" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e35d3911efde5ee25586385204127ff6a3f251477dcdd3b222775aaa4d95977" +checksum = "67a02981bed4592bcd271f9bfe154228ddbd2fd69e37a7d358da5d3a1251d696" dependencies = [ "blocking", "c2rust-bitfields", "futures", "libloading 0.8.6", "log", - "thiserror 2.0.9", + "thiserror 2.0.11", "windows-sys 0.59.0", - "winreg2", + "winreg", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", ] [[package]] @@ -4006,7 +4158,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "synstructure", ] @@ -4028,7 +4180,7 @@ dependencies = [ "hex", "nix", "ordered-stream", - "rand", + "rand 0.8.5", "serde", "serde_repr", "sha1", @@ -4045,9 +4197,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1" +checksum = "2494e4b3f44d8363eef79a8a75fc0649efb710eef65a66b5e688a5eb4afe678a" dependencies = [ "async-broadcast", "async-recursion", @@ -4066,11 +4218,11 @@ dependencies = [ "tracing", "uds_windows", "windows-sys 0.59.0", - "winnow 0.6.22", + "winnow 0.6.26", "xdg-home", - "zbus_macros 5.2.0", - "zbus_names 4.1.0", - "zvariant 5.1.0", + "zbus_macros 5.3.1", + "zbus_names 4.1.1", + "zvariant 5.2.0", ] [[package]] @@ -4082,23 +4234,23 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "zvariant_utils 2.1.0", ] [[package]] name = "zbus_macros" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57" +checksum = "445efc01929302aee95e2b25bbb62a301ea8a6369466e4278e58e7d1dfb23631" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", - "zbus_names 4.1.0", - "zvariant 5.1.0", - "zvariant_utils 3.0.2", + "syn 2.0.98", + "zbus_names 4.1.1", + "zvariant 5.2.0", + "zvariant_utils 3.1.0", ] [[package]] @@ -4114,14 +4266,14 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b" +checksum = "519629a3f80976d89c575895b05677cbc45eaf9f70d62a364d819ba646409cc8" dependencies = [ "serde", "static_assertions", - "winnow 0.6.22", - "zvariant 5.1.0", + "winnow 0.6.26", + "zvariant 5.2.0", ] [[package]] @@ -4131,7 +4283,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b8c07a70861ce02bad1607b5753ecb2501f67847b9f9ada7c160fff0ec6300c" +dependencies = [ + "zerocopy-derive 0.8.16", ] [[package]] @@ -4142,7 +4303,18 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5226bc9a9a9836e7428936cde76bb6b22feea1a8bfdbc0d241136e4d13417e25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", ] [[package]] @@ -4162,7 +4334,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "synstructure", ] @@ -4191,7 +4363,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -4209,17 +4381,17 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f" +checksum = "55e6b9b5f1361de2d5e7d9fd1ee5f6f7fcb6060618a1f82f3472f58f2b8d4be9" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", - "winnow 0.6.22", - "zvariant_derive 5.1.0", - "zvariant_utils 3.0.2", + "winnow 0.6.26", + "zvariant_derive 5.2.0", + "zvariant_utils 3.1.0", ] [[package]] @@ -4231,21 +4403,21 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "zvariant_utils 2.1.0", ] [[package]] name = "zvariant_derive" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916" +checksum = "573a8dd76961957108b10f7a45bac6ab1ea3e9b7fe01aff88325dc57bb8f5c8b" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.95", - "zvariant_utils 3.0.2", + "syn 2.0.98", + "zvariant_utils 3.1.0", ] [[package]] @@ -4256,19 +4428,19 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "zvariant_utils" -version = "3.0.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6" +checksum = "ddd46446ea2a1f353bfda53e35f17633afa79f4fe290a611c94645c69fe96a50" dependencies = [ "proc-macro2", "quote", "serde", "static_assertions", - "syn 2.0.95", - "winnow 0.6.22", + "syn 2.0.98", + "winnow 0.6.26", ] diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 73a5539193fc..dc36f8bd2c13 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -18,13 +18,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "2.9.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; - rev = "v2.9.0"; - hash = "sha256-9uTawt9Lk3YJbw8hzrP91bEaPGT1wZehrmCWDKYrw5w="; + tag = "v${version}"; + hash = "sha256-TrA0uwzBhITCQ0ql8z1og1iNbH4eJlmzXFPbOpnN5do="; }; passthru.updateScript = nix-update-script { }; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "isakmp-0.1.0" = "sha256-H8yLwIUzlaPA0kJEfdGn8jvSjs27zWeIFdHlF3HitRk="; + "isakmp-0.1.0" = "sha256-S34NN57l5MzyGXso01GSMCGPiYYEJc1mDluXoWQ0Y1k="; }; }; From 88ca6d28302146ab36cd0854c6e11176a0728265 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 17:21:34 +0000 Subject: [PATCH 082/484] lldap-cli: 0-unstable-2024-11-11 -> 0-unstable-2025-01-19 --- pkgs/by-name/ll/lldap-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ll/lldap-cli/package.nix b/pkgs/by-name/ll/lldap-cli/package.nix index 71872a916407..2679e08eb4bf 100644 --- a/pkgs/by-name/ll/lldap-cli/package.nix +++ b/pkgs/by-name/ll/lldap-cli/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation { pname = "lldap-cli"; - version = "0-unstable-2024-11-11"; + version = "0-unstable-2025-01-19"; src = fetchFromGitHub { owner = "Zepmann"; repo = "lldap-cli"; - rev = "2a80dc47c334c88faf3000b45c631bc2cea09906"; - hash = "sha256-uk7SOiQmUYtoJnihSnPsu/7Er4wXX4xvPboJaNSMjkM="; + rev = "e383494b4dd89ae4e028958b268e200fd85a7a64"; + hash = "sha256-k6UDLOyP+EvKmC1TmbMObgAw2IIs7ekIZxJOWbwc+jg="; }; nativeBuildInputs = [ makeWrapper ]; From db5ba327e1a49b98ae2e347246b23b8a8452dfda Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 18:39:43 +0200 Subject: [PATCH 083/484] python312Packages.tensordict: 0.6.2 -> 0.7.0 Diff: https://github.com/pytorch/tensordict/compare/refs/tags/v0.6.2...v0.7.0 Changelog: https://github.com/pytorch/tensordict/releases/tag/v0.7.0 --- .../python-modules/tensordict/default.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 2f68c637ede6..391142bc00f5 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -1,18 +1,17 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system setuptools, torch, - which, # dependencies cloudpickle, numpy, orjson, + packaging, # checks h5py, @@ -23,28 +22,26 @@ buildPythonPackage rec { pname = "tensordict"; - version = "0.6.2"; + version = "0.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pytorch"; repo = "tensordict"; tag = "v${version}"; - hash = "sha256-dsbpk0O5Gs5WUfi3ENqHdpy4rWoBjm1i44+ycp0jDJ0="; + hash = "sha256-KbCNBFewMx4kaWMoV+zREj6XTZiwmR4/I3zpf55wuOQ="; }; build-system = [ setuptools torch - which ]; dependencies = [ cloudpickle numpy orjson + packaging torch ]; @@ -62,6 +59,10 @@ buildPythonPackage rec { disabledTests = [ + # FileNotFoundError: [Errno 2] No such file or directory: '/build/source/tensordict/tensorclass.pyi + "test_tensorclass_instance_methods" + "test_tensorclass_stub_methods" + # Hangs forever "test_copy_onto" @@ -86,14 +87,15 @@ buildPythonPackage rec { "test_isend" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: - # OpenMP support not found. - "test/test_compile.py" - - # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - "test/test_distributed.py" - ]; + disabledTestPaths = + [ + # torch._dynamo.exc.Unsupported: Graph break due to unsupported builtin None.ReferenceType.__new__. + "test/test_compile.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + "test/test_distributed.py" + ]; meta = { description = "Pytorch dedicated tensor container"; From 31474e87774831a7975d2e345d94468f7812c9d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 21:38:53 +0000 Subject: [PATCH 084/484] python312Packages.pyxnat: 1.6.2 -> 1.6.3 --- pkgs/development/python-modules/pyxnat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 1668987bb258..3c7a50805264 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyxnat"; - version = "1.6.2"; + version = "1.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyxnat"; repo = "pyxnat"; tag = version; - hash = "sha256-21nTIYbIYlFWNJTxqsuijamqRunpdc7/VBawvrWadWI="; + hash = "sha256-peyQQ1fc+0O1I9LztYSgk2VBC17Y3UlOZGR2WSYKVTk="; }; build-system = [ setuptools ]; @@ -77,7 +77,7 @@ buildPythonPackage rec { homepage = "https://pyxnat.github.io/pyxnat"; description = "Python API to XNAT"; mainProgram = "sessionmirror.py"; - changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${version}"; + changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; From eeb8d6421ec4eeb8ff7c44cd7a923a563b3e1002 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:18:36 +0100 Subject: [PATCH 085/484] sourcegit: 2025.03 -> 2025.04 --- pkgs/by-name/so/sourcegit/deps.json | 82 +++++++++++++++++++++++++-- pkgs/by-name/so/sourcegit/package.nix | 4 +- 2 files changed, 78 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json index f5d19193563b..81ebf7f068aa 100644 --- a/pkgs/by-name/so/sourcegit/deps.json +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -99,6 +99,16 @@ "version": "11.1.0", "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM=" }, + { + "pname": "Azure.AI.OpenAI", + "version": "2.2.0-beta.1", + "hash": "sha256-H173lh1HdNB2x7SjrvLPcQKUmxn8PKOJ8aa2HM07w/w=" + }, + { + "pname": "Azure.Core", + "version": "1.44.1", + "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" + }, { "pname": "CommunityToolkit.Mvvm", "version": "8.3.2", @@ -131,29 +141,39 @@ }, { "pname": "LiveChartsCore", - "version": "2.0.0-rc5", - "hash": "sha256-NHgYbeIdAoZlrC6QgVb1oLo3dlo17R8yTbPgiHMmJZc=" + "version": "2.0.0-rc5.1", + "hash": "sha256-B0cMspfPvhDTbzyZhL9Ntn9/wTYjP/JcWAlM8MxfcEQ=" }, { "pname": "LiveChartsCore.SkiaSharpView", - "version": "2.0.0-rc5", - "hash": "sha256-zppOFKHGn2HJMP8AAuk6mxJXqvgjfN7o8f0sInUWZGc=" + "version": "2.0.0-rc5.1", + "hash": "sha256-lgePmk/Fqk7c4eq5z9JhmrfQhCUBYPxga1NcKmSE9nc=" }, { "pname": "LiveChartsCore.SkiaSharpView.Avalonia", - "version": "2.0.0-rc5", - "hash": "sha256-xyFEZWWkRlBi8GNCDpyOUzt6aEe+9sR1+VN2yY59mhg=" + "version": "2.0.0-rc5.1", + "hash": "sha256-IMJ09v5dsN5wvlhjsPKOfOG0vTDCwJ9QuZEMWyvoxH8=" }, { "pname": "MicroCom.Runtime", "version": "0.11.0", "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0", + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + }, { "pname": "Onigwrap", "version": "1.0.6", "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" }, + { + "pname": "OpenAI", + "version": "2.2.0-beta.1", + "hash": "sha256-XtzTi7K+wIOvqzhN5qdHj+M5tcIASJpYtd5cpx/M3Gw=" + }, { "pname": "SkiaSharp", "version": "2.88.9", @@ -184,16 +204,66 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, + { + "pname": "System.ClientModel", + "version": "1.1.0", + "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" + }, + { + "pname": "System.ClientModel", + "version": "1.2.1", + "hash": "sha256-MNFNrCAhD+vj97gVXdJIm3QmY++y25zBZtiIXrGdQ2c=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "6.0.1", + "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" + }, { "pname": "System.IO.Pipelines", "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, + { + "pname": "System.Memory.Data", + "version": "6.0.0", + "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "6.0.0", + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.0", + "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.10", + "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" + }, { "pname": "System.Text.Json", "version": "8.0.5", "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, { "pname": "TextMateSharp", "version": "1.0.59", diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index 7fda0cafd624..a6beac1464b5 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -19,13 +19,13 @@ buildDotnetModule (finalAttrs: { pname = "sourcegit"; - version = "2025.03"; + version = "2025.04"; src = fetchFromGitHub { owner = "sourcegit-scm"; repo = "sourcegit"; tag = "v${finalAttrs.version}"; - hash = "sha256-l1M3ix0HY87y2ES/iwT2Ju/Mwb8CCmnz95amHlYKFS4="; + hash = "sha256-PyJvmWTZPOJcejD23zGJ28RCEnpXqWcqxuHBlAkRTcQ="; }; patches = [ ./fix-darwin-git-path.patch ]; From 05afb9a3af4b3c698b59529e9db614d2aace0afa Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:19:44 +0100 Subject: [PATCH 086/484] gale: 1.2.2 -> 1.3.1 --- pkgs/by-name/ga/gale/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index af74f730976a..bdfb42a3605d 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gale"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-bpeRbsbC1x1AXSyEPs1pUqwMouHQqJ/OtXXlNOVYcEA="; + hash = "sha256-cIholTqWxDb3CkKCY8qRhevxd7CQxBlBGmhJ/91K1g4="; }; postPatch = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-xKg/ABUdtylFpT3EisXVvyv38++KjucrZ+s3/fFjzmM="; + hash = "sha256-qhH8jeRQZgx6DELzxczt6AmoILxZHUkVpVkYZoDQPRQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-OocLkYAdmnAwvojzywNlg6BirkItoopX36aDYfqeeTA="; + hash = "sha256-RtTqdbMZlsLNEoxdwjUd0B/3TkdbDpcjOMhH8BlshfE="; }; cargoRoot = "src-tauri"; From aa82fd9491a5ae509c9cc0224e5ac0ec26ce3e58 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 25 Oct 2024 23:13:07 +0200 Subject: [PATCH 087/484] python312Packages.torchrl: 0.6.0 -> 0.7.0; mark as broken Diff: https://github.com/pytorch/rl/compare/refs/tags/v0.6.0...v0.7.0 Changelog: https://github.com/pytorch/rl/releases/tag/v0.7.0 --- pkgs/development/python-modules/torchrl/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index d06fa6db8884..1e249d4d255d 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "torchrl"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "rl"; tag = "v${version}"; - hash = "sha256-2jxvxhhKZQVy1aU0G9PE8nPlg8yp+/+EUACkLNLRpMQ="; + hash = "sha256-SMVm1XfHHqSkWTDVSqqO3kIxMBgV9A+XrEpJ56AyaBE="; }; build-system = [ @@ -186,5 +186,8 @@ buildPythonPackage rec { changelog = "https://github.com/pytorch/rl/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + # torhcrl is not compatible with our current version of gymnasium (>=1.0) + # https://github.com/pytorch/rl/pull/2473 + broken = true; }; } From 5b56834dc5a52c2e81a4e2559db530a3c231bf1f Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Mon, 10 Feb 2025 23:53:56 +0100 Subject: [PATCH 088/484] cloudflare-warp: include desktop-file-util to allow browser to open --- pkgs/by-name/cl/cloudflare-warp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index b476cbd63f49..d340ca8061c2 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -4,6 +4,7 @@ autoPatchelfHook, versionCheckHook, copyDesktopItems, + desktop-file-utils, dbus, dpkg, fetchurl, @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { versionCheckHook makeWrapper copyDesktopItems + desktop-file-utils ]; buildInputs = [ From 789dfdd6ef444ff08047b1e86a343da7416998e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 00:37:03 +0000 Subject: [PATCH 089/484] aardvark-dns: 1.13.1 -> 1.14.0 --- pkgs/by-name/aa/aardvark-dns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix index efb858752c7f..fca5e9106500 100644 --- a/pkgs/by-name/aa/aardvark-dns/package.nix +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-VXuTHc/t+5QidTqMptoQqircHTtYzeEXfFFII8jeOrI="; + hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ydvvV3w8VmfdSTXeJvMuN0oqkkZdWs6/9KocalRGWpg="; + cargoHash = "sha256-t9qfPz4Jy1RueiDEY2fB3Y1uty0i/Wf0ElsR+nSVF5g="; passthru.tests = { inherit (nixosTests) podman; }; From d6bbb2a12af01fbf41e1ad5ffc81a17de1923984 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 11 Feb 2025 08:49:52 +0530 Subject: [PATCH 090/484] opengist: 1.8.4 -> 1.9.1 Signed-off-by: phanirithvij --- pkgs/by-name/op/opengist/package.nix | 8 ++++---- pkgs/by-name/op/opengist/update.sh | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 459b7b2d29d6..000823c3d3ba 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -12,12 +12,12 @@ let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; tag = "v${version}"; - hash = "sha256-vpl3ztLHeVZndAwDgobfiI+3Xu3CFU38qgXy83p06As="; + hash = "sha256-Zjn38OGnDtgD2OfIhgUxWo0Cx+ZmNv6UjJanASbjiYU="; }; frontend = buildNpmPackage { @@ -40,13 +40,13 @@ let cp -R public $out ''; - npmDepsHash = "sha256-l09TPGBGhWcsl3x14ovilDd1zZWv4XzFCAmAfapKtAE="; + npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-mLFjRL4spAWuPLVOtt88KH+p2g9lGCYzaHokVxdrLOw="; + vendorHash = "sha256-aqfr3yGyTXDtZDU8d1lbWWvFfY4fo6/PsSDwpiDtM90="; tags = [ "fs_embed" ]; ldflags = [ "-s" diff --git a/pkgs/by-name/op/opengist/update.sh b/pkgs/by-name/op/opengist/update.sh index ad3ac9ca639a..219894eb27ef 100755 --- a/pkgs/by-name/op/opengist/update.sh +++ b/pkgs/by-name/op/opengist/update.sh @@ -1,11 +1,12 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts common-updater-scripts +#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts # shellcheck shell=bash set -eou pipefail +set -x -NIXPKGS_DIR="$PWD" +NIXPKGS_DIR="$(git rev-parse --show-toplevel)" SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" # Get latest release @@ -27,7 +28,9 @@ fi echo "Updating opengist $oldVersion -> $latestVersion" +pushd "$NIXPKGS_DIR" >/dev/null || exit 1 update-source-version opengist "${latestVersion}" +popd >/dev/null pushd "$SCRIPT_DIR" >/dev/null || exit 1 @@ -43,7 +46,7 @@ popd >/dev/null # nix-prefetch broken due to ninja finalAttrs.src.rev # nix-update with goModules broken for this package -setKV () { +setKV() { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${SCRIPT_DIR}/package.nix" } From 2d028149d9fd13a53cf556fcf9f48868ef249011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:12:29 +0000 Subject: [PATCH 091/484] cadical: 2.1.2 -> 2.1.3 --- pkgs/by-name/ca/cadical/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index fde53b371fb5..dfc2727379cc 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "2.1.2", + version ? "2.1.3", }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "rel-${version}"; hash = { - "2.1.2" = "sha256-fhvQd/f8eaw7OA2/XoOTVOnQxSSxUvugu6VWo2nmpQ0="; + "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4="; "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; } .${version}; From b364d449332dc6b41a240c4a51f199754cbc61e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:29:40 +0000 Subject: [PATCH 092/484] vscode-extensions.timonwong.shellcheck: 0.37.6 -> 0.37.7 --- .../vscode/extensions/timonwong.shellcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index 4b3fae6e9d53..5b77d76e9168 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.37.6"; - sha256 = "sha256-xfVKI+xxA/8YUcCWpskxZLbBLPsYCF46iKJkrV2zODs="; + version = "0.37.7"; + sha256 = "sha256-i8cVY8EcKSxnmWmRWDiARF79pOEcYMc+y+7i4d8EDTo="; }; nativeBuildInputs = [ jq From 21c6a520d1f14f547b95662c36bcef236d06133c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 04:40:45 +0000 Subject: [PATCH 093/484] victoriametrics: 1.110.0 -> 1.111.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index bcdbaa465213..1dbce435d37c 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.110.0"; + version = "1.111.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - hash = "sha256-TrM2YyxZZZw+wGMIFACJExtQb6aJwDe1xe63OQqCjDo="; + hash = "sha256-KLRaAGLh7SYPQERZvuj5Jlu1oIrvQPFCQJRlHedLezk="; }; vendorHash = null; From ed3db9c9a7c818c00ab2827dfc9573b7ad44c2c1 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:56:07 +0000 Subject: [PATCH 094/484] badkeys: 0.0.12 -> 0.0.13 Diff: https://github.com/badkeys/badkeys/compare/v0.0.12...v0.0.13 Changelog: https://github.com/badkeys/badkeys/releases/tag/v0.0.13 --- pkgs/by-name/ba/badkeys/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 584d5e57b1f3..7b9ef6cb21f9 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "badkeys"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; tag = "v${version}"; - hash = "sha256-LFoB/ZHIMRpN/eHg3x8HCxNbMKclf2SJSDPk33OIil8="; + hash = "sha256-xukdaqyQKEnwPmAN4WZqeLo5g2tJxPehabTyDgCv8q4="; }; build-system = with python3Packages; [ @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tool to find common vulnerabilities in cryptographic public keys"; homepage = "https://badkeys.info/"; - changelog = "https://github.com/badkeys/badkeys/releases/tag/v${version}"; + changelog = "https://github.com/badkeys/badkeys/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "badkeys"; From c6f6d0bdaa35185f16199fb6996e9250b825bb0f Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 02:13:16 -0500 Subject: [PATCH 095/484] badkeys: add version test --- pkgs/by-name/ba/badkeys/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 7b9ef6cb21f9..4035dc26541a 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -1,7 +1,9 @@ { lib, + badkeys, fetchFromGitHub, python3Packages, + testers, }: python3Packages.buildPythonApplication rec { @@ -35,6 +37,10 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "badkeys" ]; + passthru = { + tests.version = testers.testVersion { package = badkeys; }; + }; + meta = { description = "Tool to find common vulnerabilities in cryptographic public keys"; homepage = "https://badkeys.info/"; From cdf52f25bea501046b7d140cd4e207c73cccf59e Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:56:28 +0000 Subject: [PATCH 096/484] dosage-tracker: 1.8.0 -> 1.8.3 Diff: https://github.com/diegopvlk/Dosage/compare/v1.8.0...v1.8.3 --- pkgs/by-name/do/dosage-tracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index db912ceca71f..c7d9721bb1fa 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-u/HnlnitLJjYxt+LqbhS2DYUDVVBamZCakBym2eNK1c="; + hash = "sha256-BEKhIIM0/uaqFD56W+fgsE78KVgqj6HqpS7KRp9Lt3c="; }; # https://github.com/NixOS/nixpkgs/issues/318830 From cc5ad5c14933208b1d0ed8800c1b55f07c14186e Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:56:38 +0000 Subject: [PATCH 097/484] garnet: 1.0.54 -> 1.0.55 Diff: https://github.com/microsoft/garnet/compare/v1.0.54...v1.0.55 Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.55 --- pkgs/by-name/ga/garnet/deps.json | 5 ----- pkgs/by-name/ga/garnet/package.nix | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index 56c17f432cc2..46004d44a882 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -144,11 +144,6 @@ "version": "8.0.0", "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" }, - { - "pname": "NLua", - "version": "1.7.3", - "hash": "sha256-2+eOxal0BDwAc6nJTNsFvf5E0KdfksIie7C7hEKeQos=" - }, { "pname": "System.ClientModel", "version": "1.0.0", diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 740b45574e61..30ded66f519e 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.54"; + version = "1.0.55"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-tTJz4LilzrSDDmsTwRRK3Svif3ewUWuU3nbUN8GyyPY="; + hash = "sha256-yeaSSQXsTw6JsF2ugCRSIWCSwuOYuWLErb77/CBraQE="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; From c42dcff29920de2355fb5bce58a14cd4935fba08 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:58:52 +0000 Subject: [PATCH 098/484] shortwave: 4.0.1 -> 5.0.0 --- pkgs/by-name/sh/shortwave/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index fbab3ca14b4b..83a925941a98 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -28,20 +28,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "4.0.1"; + version = "5.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps="; + sha256 = "sha256-MbkfbpX2av/o+wC1pORHfaLXnchEIFmhQ5mqPuMElak="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-vtQRt8/eWwMA1+tKULpStLR7E1+R7LkNutS2Joz7zeI="; + hash = "sha256-DBWg9Xss1ChbPyI3MiN7eTXhSUG37ZaYS/HFxou9d/w="; }; nativeBuildInputs = [ From c9974b78fe3fcc54d61b8e318e7c49ceb1779a65 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 03:02:14 -0500 Subject: [PATCH 099/484] sydbox: 3.30.0 -> 3.30.1 Diff: https://gitlab.exherbo.org/Sydbox/sydbox/-/compare/refs/tags/v3.30.0...3.30.1 Changelog: https://gitlab.exherbo.org/sydbox/sydbox/-/blob/v3.30.1/ChangeLog.md --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index b455322bee9f..0f247a1c50b8 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "sydbox"; - version = "3.30.0"; + version = "3.30.1"; outputs = [ "out" @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { owner = "Sydbox"; repo = "sydbox"; tag = "v${version}"; - hash = "sha256-EbdJuJefFQaL6e+2AcsPF4eXin3ky+jlt4s68mSusoc="; + hash = "sha256-Vby+2uSosp5yHc99lB2nMozMfsLowPunXuS30evKiZk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+tyUKX0hzVt2CkbbNYuonWfh1sJBaqmbaeYdctHbPVw="; + cargoHash = "sha256-1Em6ibjYXWnCIF1r7qS2uKvBAhb1klGjwrv9E6PTQCU="; nativeBuildInputs = [ mandoc From 2dae2e9540d9a41981dedb0de0f670a09012b587 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 08:04:34 +0000 Subject: [PATCH 100/484] inputplumber: 0.42.2 -> 0.45.1 --- pkgs/by-name/in/inputplumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index d0fbd3fdd3e3..abfcb30c3dff 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.42.2"; + version = "0.45.1"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-wIncdLGQUpAxldKg4rp8KK6qhOBlzo4AqHQk4Q+rMnU="; + hash = "sha256-mapuj/9VCrzux5yS3+NeMw1xG70+xglshOs9O+RIHKM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-C0zRUNQQ/Gw8InmX+SmQV/oj8T2IxtwQPyBKga7Ju2Y="; + cargoHash = "sha256-QUTMzHAdB4GJMO+LZP5VFTJRvRHUa6XIcP+1bRSaGdg="; nativeBuildInputs = [ pkg-config From a3207b2be20fd337cb16ee578ebea89cf02ff679 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 10:42:58 +0000 Subject: [PATCH 101/484] python312Packages.reflex-hosting-cli: 0.1.32 -> 0.1.35 --- .../development/python-modules/reflex-hosting-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index c64f5c81cabd..fc597ada7650 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.32"; + version = "0.1.35"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-C45LSzDZJhv21yAmXxxCiyhAu2MIluYKGi+qCVkB7Vk="; + hash = "sha256-ml0Cl4uQAEVGShpVgfOtxiYNqqCeis+V/QUCTNqSauc="; }; pythonRelaxDeps = [ "pipdeptree" ]; From 62359ce7943f42d96202dbf55bfd09d592f68c79 Mon Sep 17 00:00:00 2001 From: Rolf Verschuuren Date: Tue, 11 Feb 2025 11:50:17 +0100 Subject: [PATCH 102/484] unison-ucm: 0.5.29 -> 0.5.33 --- pkgs/by-name/un/unison-ucm/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index 088da6370333..159d4419ed9e 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -14,21 +14,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.29"; + version = "0.5.33"; src = { aarch64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; - hash = "sha256-iSyhPCn8+u/kKW1NVorUaRXaP0Q771m6G1ICsHp1/Rs="; + hash = "sha256-DXqQMv1pEEFSHDsY8BICFfKAD4zaishRIDo1hwCVj54="; }; x86_64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-Rukx1I67jq78xvDB7eYP6TvZZBZtWisOv2WZe6/KlHE="; + hash = "sha256-ffHbkujs3UMChPM2uL3tBcxInKEOHwRUMrIeh+k5ghY="; }; x86_64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz"; - hash = "sha256-fVsKPTi9j+LVWDPhuHYb7NKD2JXJz7nRE6yuE7rQ3e0="; + hash = "sha256-+kBuQn73P8yxa8l6/R3NGj61LB6kKwa2lfNKZmhI5Dk="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); From a0396d34c73dea29d229f9112414947098c6c75f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 11:55:19 +0000 Subject: [PATCH 103/484] gauge-unwrapped: 1.6.12 -> 1.6.13 --- pkgs/development/tools/gauge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 414edd86d0fc..e2ce2edfa477 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.12"; + version = "1.6.13"; patches = [ # adds a check which adds an error message when trying to @@ -18,7 +18,7 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-CstlH7KOSUK3Oe5d8LyUswcebwusVv5iuB7gaZOKpVg="; + hash = "sha256-oyZDz3SX68rlnAG+JzKeIKyKUjQ+ttTrzthHUwW0b54="; }; vendorHash = "sha256-nqyzNbD2j6b34QpFiv2yVxEVkrZkuzcwAt9uqAB2iA4="; From d278283dbcc65691d0afa5693ffcdeb3820ce81c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 12:01:26 +0000 Subject: [PATCH 104/484] polylux2pdfpc: 0.3.1 -> 0.4.0 --- pkgs/by-name/po/polylux2pdfpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix index 0e95e56ca816..99eea57f3d89 100644 --- a/pkgs/by-name/po/polylux2pdfpc/package.nix +++ b/pkgs/by-name/po/polylux2pdfpc/package.nix @@ -10,14 +10,14 @@ let in rustPlatform.buildRustPackage rec { pname = "polylux2pdfpc"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "andreasKroepelin"; repo = "polylux"; rev = "v${version}"; sparseCheckout = [ dirname ]; - hash = "sha256-GefX7XsUfOMCp2THstSizRGpKAoq7yquVukWQjGuFgc="; + hash = "sha256-41FgRejonvVTmE89WGm0Cqumm8lb6kkfxtkWV74UKJA="; }; sourceRoot = "${src.name}/${dirname}"; From 9f2b7c3596619befc64a50d8198ee5f30d3b975b Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Wed, 5 Feb 2025 13:01:35 +0000 Subject: [PATCH 105/484] polylux2pdfpc: update github owner to new org Upstream repository has moved --- pkgs/by-name/po/polylux2pdfpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix index 99eea57f3d89..a2d535413c53 100644 --- a/pkgs/by-name/po/polylux2pdfpc/package.nix +++ b/pkgs/by-name/po/polylux2pdfpc/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { version = "0.4.0"; src = fetchFromGitHub { - owner = "andreasKroepelin"; + owner = "polylux-typ"; repo = "polylux"; rev = "v${version}"; sparseCheckout = [ dirname ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Tool to make pdfpc interpret slides created by polylux correctly"; - homepage = "https://github.com/andreasKroepelin/polylux/tree/main/pdfpc-extractor"; + homepage = "https://github.com/polylux-typ/polylux/tree/main/pdfpc-extractor"; license = licenses.mit; mainProgram = "polylux2pdfpc"; maintainers = [ maintainers.diogotcorreia ]; From f2a397ef7bee5f2067b9f3dec6efc982304dea8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 12:36:04 +0000 Subject: [PATCH 106/484] gnustep-make: 2.9.2 -> 2.9.3 --- pkgs/by-name/gn/gnustep-make/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnustep-make/package.nix b/pkgs/by-name/gn/gnustep-make/package.nix index 66fe1c42b1b3..03b0ead9f25b 100644 --- a/pkgs/by-name/gn/gnustep-make/package.nix +++ b/pkgs/by-name/gn/gnustep-make/package.nix @@ -8,11 +8,11 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-make"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-9UDfnw4drrPSOwjhSyBLKkbx0KQAXLFxyVMjQTgG5OE="; + sha256 = "sha256-k8oyC3BieevKU3YNqJ1MPyu8VH9HI5ZxQKNDRtnwTCQ="; }; configureFlags = [ From b8fb8aeccd577f805fac30bbb136be19362c42a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:03:07 +0000 Subject: [PATCH 107/484] tellico: 4.1 -> 4.1.1 --- pkgs/applications/misc/tellico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index d5450e48fdcd..556ce02e0546 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "tellico"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-xzMPYze77oajMjS2fprjGu2FsZgI7MjnWVxIxYYN0TY="; + hash = "sha256-eYmLDQfnC0/R7VF+oMBwb5Q56CBl2icusoit/LIIpUs="; }; nativeBuildInputs = [ From cb9bcda34ef69561dba41c33f27d07c4a4af21d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:05:54 +0000 Subject: [PATCH 108/484] tabiew: 0.8.1 -> 0.8.2 --- pkgs/by-name/ta/tabiew/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index b98a2fdfc096..2eed66124863 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; rev = "v${version}"; - hash = "sha256-Q/GX3kcGx83h0XFlG0r2RGpoh63ijnaM4mp/ewrf920="; + hash = "sha256-bYmHFH39DYtv7AbKTteiAiRyzTJXzBHmQ/Mu/oEQ3fI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rViJDF0cC8j8OVGNCxf6C1xpA8GXrt2UZvnkOuEJEmA="; + cargoHash = "sha256-JECqyR+ONiotJhKv3AJv1JfFtP2XBECqmvXTc1kNL20="; nativeBuildInputs = [ installShellFiles ]; From 72f62e3e7843657da6cb85d2279415e5015cf608 Mon Sep 17 00:00:00 2001 From: binarydigitz01 Date: Tue, 11 Feb 2025 18:55:04 +0530 Subject: [PATCH 109/484] maintainers: add binarydigitz01 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3aeb6c6f3b37..c7e8d6826704 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3053,6 +3053,12 @@ githubId = 19915050; name = "binarycat"; }; + binarydigitz01 = { + email = "binarydigitz01@protonmail.com"; + github = "binarydigitz01"; + githubId = 47600778; + name = "Arnav Vijaywargiya"; + }; binary-eater = { email = "sergeantsagara@protonmail.com"; github = "Binary-Eater"; From ce8a55eb34b8876dbca588aedba88439da5ca0b3 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 17:59:00 +0100 Subject: [PATCH 110/484] lpcnetfreedv: provide update script --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index ea1815a5731e..50860d1335cd 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchurl, cmake, + nix-update-script, }: let @@ -31,6 +32,10 @@ stdenv.mkDerivation rec { ln -s ${data} build/lpcnet_${dataVersion}.tgz ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = with lib; { homepage = "https://freedv.org/"; description = "Experimental Neural Net speech coding for FreeDV"; From 4a1de84ca360c1b517040f7a292e3242f0cd88e1 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 10:03:54 -0700 Subject: [PATCH 111/484] mautrix-facebook: remove The mautrix-facebook project was deprecated as of 2 March 2024: https://github.com/mautrix/facebook/commit/2ab4342c0d1ec1714de2b05f1a7ef6698d4fcf3f The repository is archived, and it is now recommended to use mautrix-meta. Signed-off-by: Sumner Evans --- nixos/modules/module-list.nix | 1 - .../services/matrix/mautrix-facebook.nix | 203 ------------------ pkgs/by-name/ma/mautrix-facebook/package.nix | 68 ------ 3 files changed, 272 deletions(-) delete mode 100644 nixos/modules/services/matrix/mautrix-facebook.nix delete mode 100644 pkgs/by-name/ma/mautrix-facebook/package.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e09380faa6df..81dca2243104 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -737,7 +737,6 @@ ./services/matrix/hebbot.nix ./services/matrix/hookshot.nix ./services/matrix/maubot.nix - ./services/matrix/mautrix-facebook.nix ./services/matrix/mautrix-meta.nix ./services/matrix/mautrix-signal.nix ./services/matrix/mautrix-telegram.nix diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix deleted file mode 100644 index 2368e4e39d19..000000000000 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ /dev/null @@ -1,203 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - cfg = config.services.mautrix-facebook; - settingsFormat = pkgs.formats.json { }; - settingsFile = settingsFormat.generate "mautrix-facebook-config.json" cfg.settings; - - puppetRegex = lib.concatStringsSep ".*" ( - map lib.escapeRegex (lib.splitString "{userid}" cfg.settings.bridge.username_template) - ); -in -{ - options = { - services.mautrix-facebook = { - enable = lib.mkEnableOption "Mautrix-Facebook, a Matrix-Facebook hybrid puppeting/relaybot bridge"; - - settings = lib.mkOption rec { - apply = lib.recursiveUpdate default; - type = settingsFormat.type; - default = { - homeserver = { - address = "http://localhost:8008"; - software = "standard"; - }; - - appservice = rec { - id = "facebook"; - address = "http://${hostname}:${toString port}"; - hostname = "localhost"; - port = 29319; - - database = "postgresql://"; - - bot_username = "facebookbot"; - }; - - metrics.enabled = false; - manhole.enabled = false; - - bridge = { - encryption = { - allow = true; - default = true; - - verification_levels = { - receive = "cross-signed-tofu"; - send = "cross-signed-tofu"; - share = "cross-signed-tofu"; - }; - }; - username_template = "facebook_{userid}"; - }; - - logging = { - version = 1; - formatters.journal_fmt.format = "%(name)s: %(message)s"; - handlers.journal = { - class = "systemd.journal.JournalHandler"; - formatter = "journal_fmt"; - SYSLOG_IDENTIFIER = "mautrix-facebook"; - }; - root = { - level = "INFO"; - handlers = [ "journal" ]; - }; - }; - }; - example = lib.literalExpression '' - { - homeserver = { - address = "http://localhost:8008"; - domain = "mydomain.example"; - }; - - bridge.permissions = { - "@admin:mydomain.example" = "admin"; - "mydomain.example" = "user"; - }; - } - ''; - description = '' - {file}`config.yaml` configuration as a Nix attribute set. - Configuration options should match those described in - [example-config.yaml](https://github.com/mautrix/facebook/blob/master/mautrix_facebook/example-config.yaml). - - Secret tokens should be specified using {option}`environmentFile` - instead of this world-readable attribute set. - ''; - }; - - environmentFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = '' - File containing environment variables to be passed to the mautrix-facebook service. - - Any config variable can be overridden by setting `MAUTRIX_FACEBOOK_SOME_KEY` to override the `some.key` variable. - ''; - }; - - configurePostgresql = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Enable PostgreSQL and create a user and database for mautrix-facebook. The default `settings` reference this database, if you disable this option you must provide a database URL. - ''; - }; - - registrationData = lib.mkOption { - type = lib.types.attrs; - default = { }; - description = '' - Output data for appservice registration. Simply make any desired changes and serialize to JSON. Note that this data contains secrets so think twice before putting it into the nix store. - - Currently `as_token` and `hs_token` need to be added as they are not known to this module. - ''; - }; - }; - }; - - config = lib.mkIf cfg.enable { - users.groups.mautrix-facebook = { }; - - users.users.mautrix-facebook = { - group = "mautrix-facebook"; - isSystemUser = true; - }; - - services.postgresql = lib.mkIf cfg.configurePostgresql { - ensureDatabases = [ "mautrix-facebook" ]; - ensureUsers = [ - { - name = "mautrix-facebook"; - ensureDBOwnership = true; - } - ]; - }; - - systemd.services.mautrix-facebook = rec { - wantedBy = [ "multi-user.target" ]; - wants = - [ - "network-online.target" - ] - ++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit - ++ lib.optional cfg.configurePostgresql "postgresql.service"; - after = wants; - - serviceConfig = { - Type = "simple"; - Restart = "always"; - - User = "mautrix-facebook"; - - ProtectSystem = "strict"; - ProtectHome = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; - PrivateTmp = true; - - EnvironmentFile = cfg.environmentFile; - - ExecStart = '' - ${pkgs.mautrix-facebook}/bin/mautrix-facebook --config=${settingsFile} - ''; - }; - }; - - services.mautrix-facebook = { - registrationData = { - id = cfg.settings.appservice.id; - - namespaces = { - users = [ - { - exclusive = true; - regex = lib.escapeRegex "@${cfg.settings.appservice.bot_username}:${cfg.settings.homeserver.domain}"; - } - { - exclusive = true; - regex = "@${puppetRegex}:${lib.escapeRegex cfg.settings.homeserver.domain}"; - } - ]; - aliases = [ ]; - }; - - url = cfg.settings.appservice.address; - sender_localpart = "mautrix-facebook-sender"; - - rate_limited = false; - "de.sorunome.msc2409.push_ephemeral" = true; - push_ephemeral = true; - }; - }; - }; - - meta.maintainers = with lib.maintainers; [ kevincox ]; -} diff --git a/pkgs/by-name/ma/mautrix-facebook/package.nix b/pkgs/by-name/ma/mautrix-facebook/package.nix deleted file mode 100644 index 3ae5c76fb19e..000000000000 --- a/pkgs/by-name/ma/mautrix-facebook/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python3, - enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd, -}: - -python3.pkgs.buildPythonPackage rec { - pname = "mautrix-facebook"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "facebook"; - rev = "v${version}"; - hash = "sha256-8uleN7L3fgNqqRjva3kJU7fLPJZpO6b0J4z0RxZ9B64="; - }; - - propagatedBuildInputs = - with python3.pkgs; - [ - commonmark - aiohttp - asyncpg - commonmark - (mautrix.override { withOlm = true; }) - paho-mqtt - pillow - prometheus-client - pycryptodome - python-olm - python-magic - ruamel-yaml - unpaddedbase64 - yarl - zstandard - ] - ++ lib.optional enableSystemd systemd; - - postPatch = '' - # Drop version limiting so that every dependency update doesn't break this package. - sed -i -e 's/,<.*//' requirements.txt - ''; - - postInstall = '' - mkdir -p $out/bin - - cat <<-END >$out/bin/mautrix-facebook - #!/bin/sh - PYTHONPATH="$PYTHONPATH" exec ${python3}/bin/python -m mautrix_facebook "\$@" - END - chmod +x $out/bin/mautrix-facebook - ''; - - checkPhase = '' - $out/bin/mautrix-facebook --help - ''; - - meta = with lib; { - homepage = "https://github.com/mautrix/facebook"; - changelog = "https://github.com/mautrix/facebook/releases/tag/v${version}"; - description = "Matrix-Facebook Messenger puppeting bridge"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ kevincox ]; - mainProgram = "mautrix-facebook"; - }; -} From 157c574c95b230284afc5d79eca0084218b05ef5 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 10:18:57 -0700 Subject: [PATCH 112/484] maintainers/team-list: remove sumnerevans from matrix Signed-off-by: Sumner Evans --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index bced164f9518..aa77c3245932 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -770,7 +770,6 @@ with lib.maintainers; mguentner ralith dandellion - sumnerevans nickcao teutat3s ]; From a87068b870558d840d6e98be8beeb1badba25df2 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 10:19:10 -0700 Subject: [PATCH 113/484] matrix-synapse: update maintainers and make tests inherit maintainers from package Signed-off-by: Sumner Evans --- nixos/modules/services/matrix/synapse.nix | 2 +- nixos/tests/matrix/mjolnir.nix | 4 ++-- nixos/tests/matrix/synapse-workers.nix | 4 ++-- nixos/tests/matrix/synapse.nix | 4 ++-- pkgs/servers/matrix-synapse/default.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 48372d9c4874..1adc02852a4d 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -1597,9 +1597,9 @@ in }; meta = { + inherit (pkgs.matrix-synapse.meta) maintainers; buildDocsInSandbox = false; doc = ./synapse.md; - maintainers = teams.matrix.members; }; } diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index 67a53d045c2e..a4a4426758d3 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -30,8 +30,8 @@ import ../make-test-python.nix ( in { name = "mjolnir"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + inherit (pkgs.mjolnir.meta) maintainers; }; nodes = { diff --git a/nixos/tests/matrix/synapse-workers.nix b/nixos/tests/matrix/synapse-workers.nix index 10b72da70d43..f75a0528769a 100644 --- a/nixos/tests/matrix/synapse-workers.nix +++ b/nixos/tests/matrix/synapse-workers.nix @@ -2,8 +2,8 @@ import ../make-test-python.nix ( { pkgs, ... }: { name = "matrix-synapse-workers"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + inherit (pkgs.matrix-synapse.meta) maintainers; }; nodes = { diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix index 96454491a7a4..c16182a46cd2 100644 --- a/nixos/tests/matrix/synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -54,8 +54,8 @@ import ../make-test-python.nix ( { name = "matrix-synapse"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + inherit (pkgs.matrix-synapse.meta) maintainers; }; nodes = { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b2cab540a8e5..d3a1a8f9449f 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -186,6 +186,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/element-hq/synapse/releases/tag/v${version}"; description = "Matrix reference homeserver"; license = licenses.agpl3Plus; - maintainers = teams.matrix.members; + maintainers = with lib.maintainers; teams.matrix.members ++ [ sumnerevans ]; }; } From 12ad7461c9241f095a4c225e9c39d5de010a0bfb Mon Sep 17 00:00:00 2001 From: Commander <45269106+Commander07@users.noreply.github.com> Date: Tue, 11 Feb 2025 19:18:04 +0100 Subject: [PATCH 114/484] autosubsync-mpv: 0-unstable-2022-12-26 -> 0-unstable-2024-10-29 New version has added the `overwrite_old_sub` option. Default behavior remains unchanged. --- pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix b/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix index ac2876055890..59daec0aa67d 100644 --- a/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix +++ b/pkgs/applications/video/mpv/scripts/autosubsync-mpv.nix @@ -7,13 +7,13 @@ buildLua { pname = "autosubsync-mpv"; - version = "0-unstable-2022-12-26"; + version = "0-unstable-2024-10-29"; src = fetchFromGitHub { owner = "joaquintorres"; repo = "autosubsync-mpv"; - rev = "22cb928ecd94cc8cadaf8c354438123c43e0c70d"; - sha256 = "sha256-XQPFC7l9MTZAW5FfULRQJfu/7FuGj9bbjQUZhNv0rlc="; + rev = "125ac13d1b84b3a64bb2e912225a8356c1c01364"; + sha256 = "sha256-Xwu8WTB3p3YDTydfyidF/zpN6CyTQyZgQvGX/HAa9hw="; }; # While nixpkgs only packages alass, we might as well make that the default From 395ce6cc75c89b3aca04180772a17ff8dc5d9f18 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Feb 2025 11:27:17 -0700 Subject: [PATCH 115/484] mautrix-meta: 0.4.0 -> 0.4.3 https://github.com/mautrix/meta/releases/tag/v0.4.3 Also add myself as a maintainer Signed-off-by: Sumner Evans --- pkgs/by-name/ma/mautrix-meta/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 1b5204f6d20b..dcabe80c261b 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.4.0"; + version = "0.4.3"; subPackages = [ "cmd/mautrix-meta" ]; @@ -23,13 +23,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4="; + hash = "sha256-aq1tmw19evTxmSNpDQyFdjyc0ow1Rsm2jlodglcj084="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ="; + vendorHash = "sha256-1ulBTkhb/MDmu26R8v8HUt1HkRNpsufpp+EzTQrlaCQ="; passthru = { tests = { @@ -46,7 +46,10 @@ buildGoModule rec { homepage = "https://github.com/mautrix/meta"; description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ eyjhb ]; + maintainers = with lib.maintainers; [ + eyjhb + sumnerevans + ]; mainProgram = "mautrix-meta"; }; } From 2e4d084c588d812a08ab83424467ae9e8e92c8de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 18:47:53 +0000 Subject: [PATCH 116/484] python312Packages.astropy-healpix: 1.0.3 -> 1.1.0 --- pkgs/development/python-modules/astropy-healpix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index fce3ab8e11e9..53af110b3836 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "1.0.3"; + version = "1.1.0"; pyproject = true; src = fetchPypi { inherit version; pname = lib.replaceStrings [ "-" ] [ "_" ] pname; - hash = "sha256-3l0qfsl7FnBFBmlx8loVDR5AYfBxWb4jZJY02zbnl0Y="; + hash = "sha256-0YFlh6YEkYjiqi6fABJZ3j+LoVjwS5O1BruEcmQAf24="; }; nativeBuildInputs = [ From 0344bd7f882b1c485f025239be420cb50d5b0d86 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 11 Feb 2025 21:12:31 +0100 Subject: [PATCH 117/484] ci/eval: Refactor to cleanly separate stderr Previously stderr was mixed with the time stats This allows checking stderr in the next commit --- ci/eval/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 927dec5a908d..fe4a8027383f 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -87,7 +87,8 @@ let export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk" echo "Chunk $myChunk on $system start" set +e - command time -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \ + command time -o "$outputDir/timestats/$myChunk" \ + -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \ nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \ --option restrict-eval true \ --option allow-import-from-derivation false \ @@ -102,9 +103,12 @@ let --arg includeBroken ${lib.boolToString includeBroken} \ -I ${nixpkgs} \ -I ${attrpathFile} \ - > "$outputDir/result/$myChunk" + > "$outputDir/result/$myChunk" \ + 2> "$outputDir/stderr/$myChunk" exitCode=$? set -e + cat "$outputDir/stderr/$myChunk" + cat "$outputDir/timestats/$myChunk" if (( exitCode != 0 )); then echo "Evaluation failed with exit code $exitCode" # This immediately halts all xargs processes @@ -164,7 +168,7 @@ let ''} chunkOutputDir=$(mktemp -d) - mkdir "$chunkOutputDir"/{result,stats} + mkdir "$chunkOutputDir"/{result,stats,timestats,stderr} seq -w 0 "$seq_end" | command time -f "%e" -o "$out/total-time" \ From 7c62a764b4872d6a1de0bb564d9dd8d9b1a2ac56 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 11 Feb 2025 21:16:58 +0100 Subject: [PATCH 118/484] ci/eval: Fail on non-empty stderr Just like the channel eval requires. --- ci/eval/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/eval/default.nix b/ci/eval/default.nix index fe4a8027383f..377582b96068 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -113,6 +113,9 @@ let echo "Evaluation failed with exit code $exitCode" # This immediately halts all xargs processes kill $PPID + elif [[ -s "$outputDir/stderr/$myChunk" ]]; then + echo "Nixpkgs on $system evaluated with warnings, aborting" + kill $PPID fi ''; in From 052d936cfec2fe741b06754a310ffe7087c17f46 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sat, 16 Nov 2024 18:03:12 +0100 Subject: [PATCH 119/484] nixos/rss-bridge: refactor --- .../modules/services/web-apps/rss-bridge.nix | 81 ++++++++++++------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index f375635c94b6..0f91c6d6c4b0 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -4,33 +4,53 @@ pkgs, ... }: -with lib; let + inherit (lib) + literalExpression + mkDefault + mkEnableOption + mkIf + mkOption + mkRenamedOptionModule + types + ; + cfg = config.services.rss-bridge; - poolName = "rss-bridge"; - cfgHalf = lib.mapAttrsRecursive ( - path: value: - let - envName = lib.toUpper ("RSSBRIDGE_" + lib.concatStringsSep "_" path); - envValue = - if lib.isList value then - lib.concatStringsSep "," value - else if lib.isBool value then - lib.boolToString value - else - toString value; - in - if (value != null) then "fastcgi_param \"${envName}\" \"${envValue}\";" else null - ) cfg.config; - cfgEnv = lib.concatStringsSep "\n" (lib.collect lib.isString cfgHalf); + cfgEnv = lib.pipe cfg.config [ + (lib.mapAttrsRecursive ( + path: value: + lib.optionalAttrs (value != null) { + name = lib.toUpper "RSSBRIDGE_${lib.concatStringsSep "_" path}"; + value = + if lib.isList value then + lib.concatStringsSep "," value + else if lib.isBool value then + lib.boolToString value + else + toString value; + } + )) + (lib.collect (x: lib.isString x.name or false && lib.isString x.value or false)) + lib.listToAttrs + ]; in { imports = [ (mkRenamedOptionModule - [ "services" "rss-bridge" "whitelist" ] - [ "services" "rss-bridge" "config" "system" "enabled_bridges" ] + [ + "services" + "rss-bridge" + "whitelist" + ] + [ + "services" + "rss-bridge" + "config" + "system" + "enabled_bridges" + ] ) ]; @@ -55,12 +75,11 @@ in }; pool = mkOption { - type = types.str; - default = poolName; + type = types.nullOr types.str; + default = "rss-bridge"; description = '' - Name of existing phpfpm pool that is used to run web-application. - If not specified a pool will be created automatically with - default values. + Name of phpfpm pool that is used to run web-application. + If `null` specified none will be created, otherwise automatically created with default values. ''; }; @@ -97,12 +116,12 @@ in type = types.str; description = "Directory where to store cache files (if cache.type = \"file\")."; default = "${cfg.dataDir}/cache/"; - defaultText = options.literalExpression "\${config.services.rss-bridge.dataDir}/cache/"; + defaultText = literalExpression "\${config.services.rss-bridge.dataDir}/cache/"; }; }; }; }; - example = options.literalExpression '' + example = literalExpression '' { system.enabled_bridges = [ "*" ]; error = { @@ -124,12 +143,12 @@ in }; config = mkIf cfg.enable { - services.phpfpm.pools = mkIf (cfg.pool == poolName) { - ${poolName} = { + services.phpfpm.pools = mkIf (cfg.pool != null) { + ${cfg.pool} = { user = cfg.user; - settings = mapAttrs (name: mkDefault) { + settings = lib.mapAttrs (name: mkDefault) { "listen.owner" = cfg.user; - "listen.group" = cfg.user; + "listen.group" = cfg.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 75; @@ -166,7 +185,7 @@ in fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - ${cfgEnv} + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "fastcgi_param \"${n}\" \"${v}\";") cfgEnv)} ''; }; }; From 05d63a6bd538e5c28d76dfaa0ad466455801f061 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sat, 16 Nov 2024 18:07:31 +0100 Subject: [PATCH 120/484] nixos/rss-bridge: adopt --- nixos/modules/services/web-apps/rss-bridge.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index 0f91c6d6c4b0..3e0ff0207f63 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -192,4 +192,6 @@ in }; }; }; + + meta.maintainers = with lib.maintainers; [ quantenzitrone ]; } From b8735ce2549f8a8c6a7fc09a03f38de83dea7136 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 10 Feb 2025 23:28:03 +0100 Subject: [PATCH 121/484] nixos/rss-bridge: add package option Co-authored-by: Zitrone --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/services/web-apps/rss-bridge.nix | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 37dab65d2eba..cbd051dbeb54 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -463,6 +463,8 @@ - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. +- `services.rss-bridge` now has a `package` option. + - `services.avahi.ipv6` now defaults to true. - The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories. diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index 3e0ff0207f63..fff760b0199b 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -11,6 +11,7 @@ let mkEnableOption mkIf mkOption + mkPackageOption mkRenamedOptionModule types ; @@ -74,6 +75,8 @@ in ''; }; + package = mkPackageOption pkgs "rss-bridge" { }; + pool = mkOption { type = types.nullOr types.str; default = "rss-bridge"; @@ -173,7 +176,7 @@ in enable = true; virtualHosts = { ${cfg.virtualHost} = { - root = "${pkgs.rss-bridge}"; + root = "${cfg.package}"; locations."/" = { tryFiles = "$uri /index.php$is_args$args"; From 3b776d2c98195ed911f57a011e7faf9f14493844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 22:52:43 +0000 Subject: [PATCH 122/484] python312Packages.pyzx: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/pyzx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix index b3b52c8fbb5a..9878448f6ef5 100644 --- a/pkgs/development/python-modules/pyzx/default.nix +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyzx"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zxcalc"; repo = "pyzx"; tag = "v${version}"; - hash = "sha256-4yc4P2v2L/F/A1A9z41ow2KA0aUA+3SJyC+wyMWzhwM="; + hash = "sha256-MhsbJIDeSIeF0LaHhI6nNxPD3ZjBWh5yvLGuwBH41a4="; }; build-system = [ setuptools ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { description = "Library for quantum circuit rewriting and optimisation using the ZX-calculus"; homepage = "https://github.com/zxcalc/pyzx"; - changelog = "https://github.com/zxcalc/pyzx/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/zxcalc/pyzx/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; }; From 3cade1b5aca8637714c8705d05d31b1ed9aebfec Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 10 Feb 2025 23:30:07 +0100 Subject: [PATCH 123/484] nixos/rss-bridge: add webserver option Co-authored-by: Zitrone --- .../manual/release-notes/rl-2505.section.md | 2 +- .../modules/services/web-apps/rss-bridge.nix | 41 +++++++++++++++---- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index cbd051dbeb54..6e0951a1ed2b 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -463,7 +463,7 @@ - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. -- `services.rss-bridge` now has a `package` option. +- `services.rss-bridge` now has a `package` option as well as support for `caddy` as reverse proxy. - `services.avahi.ipv6` now defaults to true. diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index fff760b0199b..d847f6005309 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -18,7 +18,6 @@ let cfg = config.services.rss-bridge; - cfgEnv = lib.pipe cfg.config [ (lib.mapAttrsRecursive ( path: value: @@ -61,17 +60,19 @@ in user = mkOption { type = types.str; - default = "nginx"; + default = if cfg.webserver == null then "rss-bridge" else cfg.webserver; + defaultText = "{option}`config.services.rss-bridge.webserver` or \"rss-bridge\""; description = '' - User account under which both the service and the web-application run. + The user account under which both the service and the web application run. ''; }; group = mkOption { type = types.str; - default = "nginx"; + default = if cfg.webserver == null then "rss-bridge" else cfg.webserver; + defaultText = "{option}`config.services.rss-bridge.webserver` or \"rss-bridge\""; description = '' - Group under which the web-application run. + The group under which the web application runs. ''; }; @@ -99,7 +100,20 @@ in type = types.nullOr types.str; default = "rss-bridge"; description = '' - Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. + Name of the nginx or caddy virtualhost to use and setup. If null, do not setup any virtualhost. + ''; + }; + + webserver = mkOption { + type = types.nullOr ( + types.enum [ + "nginx" + "caddy" + ] + ); + default = "nginx"; + description = '' + Type of virtualhost to use and setup. If null, do not setup any virtualhost. ''; }; @@ -172,7 +186,7 @@ in }; }; - services.nginx = mkIf (cfg.virtualHost != null) { + services.nginx = mkIf (cfg.virtualHost != null && cfg.webserver == "nginx") { enable = true; virtualHosts = { ${cfg.virtualHost} = { @@ -194,6 +208,19 @@ in }; }; }; + + services.caddy = mkIf (cfg.virtualHost != null && cfg.webserver == "caddy") { + enable = true; + virtualHosts.${cfg.virtualHost} = { + extraConfig = '' + root * ${cfg.package} + file_server + php_fastcgi unix/${config.services.phpfpm.pools.${cfg.pool}.socket} { + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: " env ${n} \"${v}\"") cfgEnv)} + } + ''; + }; + }; }; meta.maintainers = with lib.maintainers; [ quantenzitrone ]; From 874d00ecf44ff941889a24b04c678e5946bf2389 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Feb 2025 22:25:20 +0100 Subject: [PATCH 124/484] nixosTests/rss-bridge: improve and add caddy --- nixos/tests/all-tests.nix | 2 +- nixos/tests/web-apps/rss-bridge.nix | 22 ---------------- nixos/tests/web-apps/rss-bridge/caddy.nix | 28 +++++++++++++++++++++ nixos/tests/web-apps/rss-bridge/default.nix | 5 ++++ nixos/tests/web-apps/rss-bridge/nginx.nix | 27 ++++++++++++++++++++ pkgs/by-name/rs/rss-bridge/package.nix | 2 +- 6 files changed, 62 insertions(+), 24 deletions(-) delete mode 100644 nixos/tests/web-apps/rss-bridge.nix create mode 100644 nixos/tests/web-apps/rss-bridge/caddy.nix create mode 100644 nixos/tests/web-apps/rss-bridge/default.nix create mode 100644 nixos/tests/web-apps/rss-bridge/nginx.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cb7f599eb6ea..a33e4ee8fdd4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -921,7 +921,7 @@ in { rshim = handleTest ./rshim.nix {}; rspamd = handleTest ./rspamd.nix {}; rspamd-trainer = handleTest ./rspamd-trainer.nix {}; - rss-bridge = handleTest ./web-apps/rss-bridge.nix {}; + rss-bridge = handleTest ./web-apps/rss-bridge {}; rss2email = handleTest ./rss2email.nix {}; rstudio-server = handleTest ./rstudio-server.nix {}; rsyncd = handleTest ./rsyncd.nix {}; diff --git a/nixos/tests/web-apps/rss-bridge.nix b/nixos/tests/web-apps/rss-bridge.nix deleted file mode 100644 index 16ab6cd8b584..000000000000 --- a/nixos/tests/web-apps/rss-bridge.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -{ - name = "rss-bridge"; - meta.maintainers = with pkgs.lib.maintainers; [ mynacol ]; - - nodes.machine = - { ... }: - { - services.rss-bridge = { - enable = true; - }; - }; - - testScript = '' - start_all() - machine.wait_for_unit("nginx.service") - machine.wait_for_unit("phpfpm-rss-bridge.service") - - # check for successful feed download - machine.succeed("curl -sS -f 'http://localhost/?action=display&bridge=DemoBridge&context=testCheckbox&format=Atom'") - ''; -} diff --git a/nixos/tests/web-apps/rss-bridge/caddy.nix b/nixos/tests/web-apps/rss-bridge/caddy.nix new file mode 100644 index 000000000000..4e1d9b9347c9 --- /dev/null +++ b/nixos/tests/web-apps/rss-bridge/caddy.nix @@ -0,0 +1,28 @@ +import ../../make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "rss-bridge-caddy"; + meta.maintainers = with lib.maintainers; [ mynacol ]; + + nodes.machine = + { ... }: + { + services.rss-bridge = { + enable = true; + webserver = "caddy"; + virtualHost = "localhost:80"; + config.system.enabled_bridges = [ "DemoBridge" ]; + }; + }; + + testScript = '' + machine.wait_for_unit("caddy.service") + machine.wait_for_unit("phpfpm-rss-bridge.service") + machine.wait_for_open_port(80) + + # check for successful feed download + response = machine.succeed("curl -f 'http://localhost:80/?action=display&bridge=DemoBridge&context=testCheckbox&format=Atom'") + assert 'Test' in response, "Feed didn't load successfully" + ''; + } +) diff --git a/nixos/tests/web-apps/rss-bridge/default.nix b/nixos/tests/web-apps/rss-bridge/default.nix new file mode 100644 index 000000000000..fe3e9a5cd897 --- /dev/null +++ b/nixos/tests/web-apps/rss-bridge/default.nix @@ -0,0 +1,5 @@ +{ system, pkgs, ... }: +{ + nginx = import ./nginx.nix { inherit system pkgs; }; + caddy = import ./caddy.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/web-apps/rss-bridge/nginx.nix b/nixos/tests/web-apps/rss-bridge/nginx.nix new file mode 100644 index 000000000000..78f3fd77aa2f --- /dev/null +++ b/nixos/tests/web-apps/rss-bridge/nginx.nix @@ -0,0 +1,27 @@ +import ../../make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "rss-bridge-nginx"; + meta.maintainers = with lib.maintainers; [ mynacol ]; + + nodes.machine = + { ... }: + { + services.rss-bridge = { + enable = true; + webserver = "nginx"; + config.system.enabled_bridges = [ "DemoBridge" ]; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx.service") + machine.wait_for_unit("phpfpm-rss-bridge.service") + machine.wait_for_open_port(80) + + # check for successful feed download + response = machine.succeed("curl -f 'http://localhost:80/?action=display&bridge=DemoBridge&context=testCheckbox&format=Atom'") + assert 'Test' in response, "Feed didn't load successfully" + ''; + } +) diff --git a/pkgs/by-name/rs/rss-bridge/package.nix b/pkgs/by-name/rs/rss-bridge/package.nix index 0baedb8dc21e..c622a937a19d 100644 --- a/pkgs/by-name/rs/rss-bridge/package.nix +++ b/pkgs/by-name/rs/rss-bridge/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { tests = { - basic-functionality = nixosTests.rss-bridge; + inherit (nixosTests.rss-bridge) caddy nginx; }; updateScript = nix-update-script { }; }; From 2be02aaa18ee4fbb33e29ec34fecc9dcf4b53cd1 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 11 Feb 2025 18:53:11 -0500 Subject: [PATCH 125/484] waytrogen: 0.6.8 -> 0.6.9 --- pkgs/by-name/wa/waytrogen/package.nix | 46 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 95d3746a7820..87bfcfdc749d 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -6,46 +6,56 @@ wrapGAppsHook4, glib, nix-update-script, + stdenv, + meson, + ninja, + cargo, + rustc, + sqlite, + openssl, }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "waytrogen"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; tag = version; - hash = "sha256-/NvLgC1IB3YrilnuuZFMuDYaUDQ4fDrtYNf1xL8H+Ng="; + hash = "sha256-bHQhgavD7L0jCWafOGnGRGOBigdcpSBvsFxTlJudZSY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cdomE3K8T1urvRK1TAm+IvnKC8ZuPgEVnN3TzlJVtBQ="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-577bzSc2iEoTotG55qBZOR3SdRUvp3gGQP2zrtkePAw="; + }; nativeBuildInputs = [ pkg-config wrapGAppsHook4 + meson + ninja + rustPlatform.cargoSetupHook + cargo + rustc ]; - buildInputs = [ glib ]; + buildInputs = [ + glib + sqlite + openssl + ]; + + preBuild = ''export OUT_PATH=$out''; env = { OPENSSL_NO_VENDOR = 1; }; - postBuild = '' - install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas - glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - postInstall = '' - install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop - install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg - while IFS= read -r lang; do - mkdir -p $out/share/locale/$lang/LC_MESSAGES - msgfmt locales/$lang/LC_MESSAGES/waytrogen.po -o $out/share/locale/$lang/LC_MESSAGES/waytrogen.mo - done < locales/LINGUAS - ''; + mesonFlags = [ "-Dcargo_features=nixos" ]; passthru.updateScript = nix-update-script { }; From 82f16a6df680777f2f7f532193c5f0815deccb53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 00:35:17 +0000 Subject: [PATCH 126/484] aiken: 1.1.10 -> 1.1.11 --- pkgs/by-name/ai/aiken/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index a3fd09b6c233..dcbf74ad9960 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-qM6rBBBwLUwB3g+jjT0R6z0473x929t2W8tOY663EcI="; + hash = "sha256-RCMUF9+dj+zJM1tyuUs2oOMk+5xdHrzWYejuOPd/Ngc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bgf9iVqQ7HuUV+idlPxyuILmxjBi2ThihdeCLjhj8Hk="; + cargoHash = "sha256-R6jTr4F+ZbRracW8yQdpDHHerzbJy1jQYr/ttFSwCWc="; buildInputs = [ openssl ] From 3ff372bfa0f27e3c8a190b141f75fdcbcbec537a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 12 Feb 2025 08:40:09 +0100 Subject: [PATCH 127/484] rustdesk-server: 1.1.12 -> 1.1.14 Diff: https://github.com/rustdesk/rustdesk-server/compare/1.1.12...1.1.14 Changelog: https://github.com/rustdesk/rustdesk-server/releases/tag/1.1.14 --- .../ru}/rustdesk-server/Cargo.lock | 1692 +++++++++++++---- .../ru/rustdesk-server/package.nix} | 13 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1344 insertions(+), 363 deletions(-) rename pkgs/{servers => by-name/ru}/rustdesk-server/Cargo.lock (64%) rename pkgs/{servers/rustdesk-server/default.nix => by-name/ru/rustdesk-server/package.nix} (67%) diff --git a/pkgs/servers/rustdesk-server/Cargo.lock b/pkgs/by-name/ru/rustdesk-server/Cargo.lock similarity index 64% rename from pkgs/servers/rustdesk-server/Cargo.lock rename to pkgs/by-name/ru/rustdesk-server/Cargo.lock index eb4d0342067f..a87da66a2922 100644 --- a/pkgs/servers/rustdesk-server/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-server/Cargo.lock @@ -1,6 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -15,13 +30,28 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -43,6 +73,19 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "async-compression" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-speed-limit" version = "0.3.1" @@ -60,9 +103,9 @@ version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 1.0.93", ] [[package]] @@ -80,7 +123,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -99,7 +142,7 @@ checksum = "00f1e8a972137fad81e2a1a60b86ff17ce0338f8017264e45a9723d0083c39a1" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "headers", @@ -137,30 +180,86 @@ dependencies = [ "mime", ] +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + [[package]] name = "base64" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bcrypt" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e7c93a3fb23b2fdde989b2c9ec4dd153063ec81f408507f84c090cd91c6641" dependencies = [ - "base64", + "base64 0.13.0", "blowfish", "getrandom", "zeroize", ] +[[package]] +name = "bindgen" +version = "0.59.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "clap", + "env_logger 0.9.0", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2 1.0.93", + "quote 1.0.38", + "regex", + "rustc-hash", + "shlex", + "which", +] + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" + [[package]] name = "block-buffer" version = "0.10.2" @@ -194,20 +293,37 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.73" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" dependencies = [ "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom 7.1.1", ] [[package]] @@ -218,15 +334,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", - "time 0.1.43", - "winapi", + "wasm-bindgen", + "windows-targets 0.52.6", ] [[package]] @@ -239,6 +356,17 @@ dependencies = [ "inout", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" version = "2.34.0" @@ -247,13 +375,23 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim", "textwrap", "unicode-width", "vec_map", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "config" version = "0.11.0" @@ -267,20 +405,20 @@ dependencies = [ [[package]] name = "confy" -version = "0.4.0" -source = "git+https://github.com/open-trade/confy#630cc28a396cb7d01eefdd9f3824486fe4d8554b" +version = "0.4.0-2" +source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", "serde", "thiserror", - "toml", + "toml 0.5.9", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -288,9 +426,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -316,6 +454,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam" version = "0.8.1" @@ -408,6 +555,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "default_net" +version = "0.1.0" +source = "git+https://github.com/rustdesk-org/default_net#78f8f70cd85151a3a2c4a3230d80d5272703c02e" +dependencies = [ + "anyhow", + "regex", + "winapi", +] + [[package]] name = "digest" version = "0.10.3" @@ -449,6 +606,29 @@ dependencies = [ "winapi", ] +[[package]] +name = "dlopen" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" +dependencies = [ + "dlopen_derive", + "lazy_static", + "libc", + "winapi", +] + +[[package]] +name = "dlopen_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" +dependencies = [ + "libc", + "quote 0.6.13", + "syn 0.15.44", +] + [[package]] name = "dlv-list" version = "0.3.0" @@ -484,9 +664,18 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] [[package]] name = "env_logger" @@ -501,6 +690,25 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "event-listener" version = "2.5.2" @@ -528,6 +736,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "flate2" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "flexi_logger" version = "0.22.3" @@ -544,7 +762,25 @@ dependencies = [ "regex", "rustversion", "thiserror", - "time 0.3.9", + "time", +] + +[[package]] +name = "flexi_logger" +version = "0.27.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" +dependencies = [ + "chrono", + "crossbeam-channel", + "crossbeam-queue", + "glob", + "is-terminal", + "lazy_static", + "log", + "nu-ansi-term", + "regex", + "thiserror", ] [[package]] @@ -565,6 +801,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.0.1" @@ -640,9 +891,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 1.0.93", ] [[package]] @@ -681,15 +932,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.5" @@ -702,21 +944,46 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.7.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -732,6 +999,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "hashlink" version = "0.8.0" @@ -746,51 +1019,67 @@ name = "hbb_common" version = "0.1.0" dependencies = [ "anyhow", + "backtrace", + "base64 0.22.1", "bytes", "chrono", "confy", + "default_net", "directories-next", "dirs-next", - "env_logger", + "dlopen", + "env_logger 0.10.2", "filetime", + "flexi_logger 0.27.4", "futures", "futures-util", + "httparse", "lazy_static", + "libc", "log", "mac_address", - "machine-uid", + "machine-uid 0.3.0", + "osascript", "protobuf", "protobuf-codegen", - "quinn", "rand", "regex", + "rustls-pki-types", + "rustls-platform-verifier", "serde", "serde_derive", "serde_json", + "sha2", "socket2 0.3.19", "sodiumoxide", + "sysinfo", + "thiserror", "tokio", - "tokio-socks", - "tokio-util 0.7.1", - "toml", + "tokio-native-tls", + "tokio-rustls 0.26.1", + "tokio-socks 0.5.2-1", + "tokio-util", + "toml 0.7.8", + "url", + "uuid", "winapi", "zstd", ] [[package]] name = "hbbs" -version = "1.1.12" +version = "1.1.14" dependencies = [ "async-speed-limit", "async-trait", "axum", - "base64", + "base64 0.13.0", "bcrypt", "chrono", "clap", "deadpool", "dns-lookup", - "flexi_logger", + "flexi_logger 0.22.3", "hbb_common", "headers", "http", @@ -799,11 +1088,12 @@ dependencies = [ "lazy_static", "local-ip-address", "mac_address", - "machine-uid", + "machine-uid 0.2.0", "minreq", "once_cell", "ping", "regex", + "reqwest", "rust-ini", "serde", "serde_derive", @@ -823,8 +1113,8 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" dependencies = [ - "base64", - "bitflags", + "base64 0.13.0", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -860,6 +1150,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -896,9 +1192,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" -version = "1.7.1" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -914,27 +1210,78 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.4", + "socket2 0.5.8", "tokio", "tower-service", "tracing", "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls 0.21.12", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "idna" version = "0.2.3" @@ -956,6 +1303,16 @@ dependencies = [ "hashbrown 0.11.2", ] +[[package]] +name = "indexmap" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", +] + [[package]] name = "inout" version = "0.1.3" @@ -974,6 +1331,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + [[package]] name = "ipnetwork" version = "0.20.0" @@ -983,6 +1346,17 @@ dependencies = [ "serde", ] +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.3" @@ -999,20 +1373,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] -name = "jobserver" -version = "0.1.24" +name = "jni" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1022,9 +1417,9 @@ version = "8.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc9051c17f81bae79440afa041b3a278e1de71bfb96d32454b477fd4703ccb6f" dependencies = [ - "base64", + "base64 0.13.0", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -1036,6 +1431,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "lexical-core" version = "0.7.6" @@ -1043,7 +1444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "cfg-if", "ryu", "static_assertions", @@ -1051,9 +1452,19 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.125" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "libloading" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] [[package]] name = "libsodium-sys" @@ -1125,7 +1536,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f1595709b0a7386bcd56ba34d250d626e5503917d05d32cdccddcd68603e212" dependencies = [ - "winreg", + "winreg 0.6.2", +] + +[[package]] +name = "machine-uid" +version = "0.3.0" +source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" +dependencies = [ + "bindgen", + "cc", + "winreg 0.11.0", ] [[package]] @@ -1142,9 +1563,9 @@ checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1177,6 +1598,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +dependencies = [ + "adler2", +] + [[package]] name = "minreq" version = "2.6.0" @@ -1189,36 +1619,30 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "log", - "miow", - "ntapi", - "winapi", + "wasi", + "windows-sys 0.52.0", ] [[package]] -name = "mio" -version = "0.8.3" +name = "native-tls" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] @@ -1240,10 +1664,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" dependencies = [ "either", - "proc-macro2", - "quote", + "proc-macro2 1.0.93", + "quote 1.0.38", "serde", - "syn", + "syn 1.0.93", ] [[package]] @@ -1252,7 +1676,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", @@ -1282,39 +1706,46 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] [[package]] -name = "num-bigint" -version = "0.4.3" +name = "nu-ansi-term" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1325,7 +1756,7 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -1339,10 +1770,45 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.10.0" +name = "object" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.7.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", +] [[package]] name = "openssl-probe" @@ -1350,6 +1816,18 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "ordered-multimap" version = "0.4.3" @@ -1360,6 +1838,17 @@ dependencies = [ "hashbrown 0.12.1", ] +[[package]] +name = "osascript" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" +dependencies = [ + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "parking_lot" version = "0.11.2" @@ -1414,13 +1903,19 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + [[package]] name = "pem" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.0", ] [[package]] @@ -1431,29 +1926,29 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "1.0.10" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1486,18 +1981,27 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro2" -version = "1.0.38" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" dependencies = [ - "unicode-xid", + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +dependencies = [ + "unicode-ident", ] [[package]] name = "protobuf" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee4a7d8b91800c8f167a6268d1a1026607368e1adc84e98fe044aeb905302f7" +checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "bytes", "once_cell", @@ -1507,9 +2011,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b893e5e7d3395545d5244f8c0d33674025bd566b26c03bfda49b82c6dec45e" +checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" dependencies = [ "anyhow", "once_cell", @@ -1522,12 +2026,12 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1447dd751c434cc1b415579837ebd0411ed7d67d465f38010da5d7cd33af4d" +checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" dependencies = [ "anyhow", - "indexmap", + "indexmap 2.7.0", "log", "protobuf", "protobuf-support", @@ -1538,9 +2042,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.1.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca157fe12fc7ee2e315f2f735e27df41b3d97cdd70ea112824dac1ffb08ee1c" +checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ "thiserror", ] @@ -1561,66 +2065,21 @@ dependencies = [ ] [[package]] -name = "quinn" -version = "0.8.2" +name = "quote" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d147472bc9a09f13b06c044787b6683cdffa02e2865b7f0fb53d67c49ed2988e" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto", - "quinn-udp", - "rustls", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359c5eb33845f3ee05c229e65f87cdbc503eea394964b8f1330833d460b4ff3e" -dependencies = [ - "bytes", - "fxhash", - "rand", - "ring", - "rustls", - "rustls-native-certs", - "rustls-pemfile 0.2.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df185e5e5f7611fa6e628ed8f9633df10114b03bbaecab186ec55822c44ac727" -dependencies = [ - "futures-util", - "libc", - "mio 0.7.14", - "quinn-proto", - "socket2 0.4.4", - "tokio", - "tracing", + "proc-macro2 0.4.30", ] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.93", ] [[package]] @@ -1653,13 +2112,33 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1675,9 +2154,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1686,9 +2177,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "remove_dir_all" @@ -1699,6 +2190,53 @@ dependencies = [ "winapi", ] +[[package]] +name = "reqwest" +version = "0.11.23" +source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" +dependencies = [ + "async-compression", + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-native-certs 0.6.2", + "rustls-pemfile 1.0.0", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.24.1", + "tokio-socks 0.5.2", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "winreg 0.50.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -1709,11 +2247,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.3", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rust-ini" version = "0.18.0" @@ -1724,6 +2276,18 @@ dependencies = [ "ordered-multimap", ] +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustls" version = "0.20.4" @@ -1731,11 +2295,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring 0.17.3", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +dependencies = [ + "log", + "once_cell", + "ring 0.17.3", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -1749,12 +2340,16 @@ dependencies = [ ] [[package]] -name = "rustls-pemfile" -version = "0.2.1" +name = "rustls-native-certs" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ - "base64", + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", ] [[package]] @@ -1763,7 +2358,70 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" dependencies = [ - "base64", + "base64 0.13.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.21", + "rustls-native-certs 0.7.3", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.8", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.7", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.3", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.3", + "rustls-pki-types", + "untrusted 0.9.0", ] [[package]] @@ -1789,12 +2447,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "lazy_static", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -1809,28 +2466,29 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "security-framework" -version = "2.6.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags", + "bitflags 2.7.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -1838,22 +2496,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", ] [[package]] @@ -1867,6 +2525,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1901,6 +2568,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -1925,7 +2598,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.9", + "time", ] [[package]] @@ -1961,6 +2634,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "sodiumoxide" version = "0.2.7" @@ -2017,7 +2700,7 @@ checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093" dependencies = [ "ahash", "atoi", - "bitflags", + "bitflags 1.3.2", "byteorder", "bytes", "chrono", @@ -2033,7 +2716,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap", + "indexmap 1.8.1", "itoa", "libc", "libsqlite3-sys", @@ -2042,7 +2725,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.20.4", "rustls-pemfile 1.0.0", "serde", "serde_json", @@ -2054,7 +2737,7 @@ dependencies = [ "thiserror", "tokio-stream", "url", - "webpki-roots", + "webpki-roots 0.22.4", ] [[package]] @@ -2067,13 +2750,13 @@ dependencies = [ "either", "heck", "once_cell", - "proc-macro2", - "quote", + "proc-macro2 1.0.93", + "quote 1.0.38", "serde_json", "sha2", "sqlx-core", "sqlx-rt", - "syn", + "syn 1.0.93", "url", ] @@ -2085,7 +2768,7 @@ checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f" dependencies = [ "once_cell", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", ] [[package]] @@ -2110,22 +2793,85 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + [[package]] name = "syn" version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", + "proc-macro2 1.0.93", + "quote 1.0.38", + "unicode-xid 0.2.3", +] + +[[package]] +name = "syn" +version = "2.0.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +dependencies = [ + "proc-macro2 1.0.93", + "quote 1.0.38", + "unicode-ident", ] [[package]] name = "sync_wrapper" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sysinfo" +version = "0.29.10" +source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "tempfile" @@ -2174,19 +2920,9 @@ version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 1.0.93", ] [[package]] @@ -2225,34 +2961,41 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", - "mio 0.8.3", - "num_cpus", - "once_cell", + "mio", "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.4", + "socket2 0.5.8", "tokio-macros", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", ] [[package]] @@ -2261,15 +3004,35 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.4", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +dependencies = [ + "rustls 0.23.21", + "tokio", +] + [[package]] name = "tokio-socks" -version = "0.5.1" -source = "git+https://github.com/open-trade/tokio-socks#3de8300fbce37e2cdaef042e016aa95058d007cf" +version = "0.5.2-1" +source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" dependencies = [ "bytes", "either", @@ -2279,7 +3042,19 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.6.9", + "tokio-util", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", ] [[package]] @@ -2305,20 +3080,6 @@ dependencies = [ "tungstenite", ] -[[package]] -name = "tokio-util" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.1" @@ -2345,6 +3106,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.7.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.12" @@ -2356,7 +3151,7 @@ dependencies = [ "pin-project", "pin-project-lite", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tower-layer", "tower-service", "tracing", @@ -2368,7 +3163,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d342c6d58709c0a6d48d48dabbb62d4ef955cf5f0f3bbfd845838e7ae88dbae" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -2381,7 +3176,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tower", "tower-layer", "tower-service", @@ -2402,11 +3197,10 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -2415,22 +3209,22 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", ] [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -2445,7 +3239,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" dependencies = [ - "base64", + "base64 0.13.0", "byteorder", "bytes", "http", @@ -2479,6 +3273,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -2500,6 +3300,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + [[package]] name = "unicode-xid" version = "0.2.3" @@ -2518,6 +3324,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.2.2" @@ -2538,9 +3350,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.1.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", ] @@ -2584,12 +3396,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2598,63 +3404,80 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", - "lazy_static", "log", - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.80" +name = "wasm-bindgen-futures" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ - "quote", + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote 1.0.38", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.93", + "quote 1.0.38", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2666,8 +3489,8 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2679,6 +3502,21 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.2.5" @@ -2731,6 +3569,34 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.36.1" @@ -2750,29 +3616,69 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2782,9 +3688,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2794,9 +3706,21 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2806,9 +3730,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2818,15 +3748,27 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2836,9 +3778,24 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -2850,36 +3807,55 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.5.5" +name = "winreg" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/pkgs/servers/rustdesk-server/default.nix b/pkgs/by-name/ru/rustdesk-server/package.nix similarity index 67% rename from pkgs/servers/rustdesk-server/default.nix rename to pkgs/by-name/ru/rustdesk-server/package.nix index 11aae268c537..9f15d8a80ba0 100644 --- a/pkgs/servers/rustdesk-server/default.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -14,21 +14,26 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk-server"; - version = "1.1.12"; + version = "1.1.14"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk-server"; rev = version; - hash = "sha256-5QyrI3KLZZcQpudYqghrotLrLjSOhdDFR5eqnJC/0fU="; + hash = "sha256-5LRMey1cxmjLg1s9RtVwgPjHjwYLSQHa6Tyv7r/XEQs="; + fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async-speed-limit-0.3.1" = "sha256-iOel6XA07RPrBjQAFLnxXX4VBpDrYZaqQc9clnsOorI="; - "confy-0.4.0" = "sha256-e91cvEixhpPzIthAxzTa3fDY6eCsHUy/eZQAqs7QTDo="; - "tokio-socks-0.5.1" = "sha256-inmAJk0fAlsVNIwfD/M+htwIdQHwGSTRrEy6N/mspMI="; + "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; + "default_net-0.1.0" = "sha256-wwVcnS99I1NJFeSihy5YrB5p0y+OHXTX81DQ+TtyFBU="; + "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; + "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; + "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a1272fc905..ea87dc31c9ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4928,7 +4928,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - rustdesk-server = callPackage ../servers/rustdesk-server { + rustdesk-server = callPackage ../by-name/ru/rustdesk-server/package.nix { inherit (darwin.apple_sdk.frameworks) Security; }; From 6e3495c9253f661f202f126d52d43720f7c48153 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 23:21:17 -0500 Subject: [PATCH 128/484] gitbutler: 0.14.4 -> 0.14.7 Diff: https://github.com/gitbutlerapp/gitbutler/compare/refs/tags/release/0.14.4...0.14.7 Changelog: https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.7 --- pkgs/by-name/gi/gitbutler/package.nix | 42 ++++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index f984ca11b2e4..fcaf71596538 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -35,37 +35,36 @@ in rustPlatform.buildRustPackage rec { pname = "gitbutler"; - version = "0.14.4"; + version = "0.14.7"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; tag = "release/${version}"; - hash = "sha256-JeiiV7OXRI4xTTQp1dXqT1ozTrIc7cltvZ6yVOhcjGU="; + hash = "sha256-4RWZ1eRUvHj+PU9iNnDsq8k5qHpkAn6g4Zn0cXyUEzM="; }; - # Deactivate the upstream updater, set the version, and merge Tauri's - # configuration files + # Let Tauri know what version we're building # # Remove references to non-existent workspaces in `gix` crates + # + # Deactivate the built-in updater postPatch = '' - jq --slurp \ - '.[0] * .[1] - | .version = "${version}" - | .bundle.createUpdaterArtifacts = false - | .plugins.updater.endpoints = [ ]' \ - crates/gitbutler-tauri/tauri.conf{,.release}.json \ - | sponge crates/gitbutler-tauri/tauri.conf.json + tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json" + jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease" tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml + + substituteInPlace apps/desktop/src/lib/backend/tauri.ts \ + --replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;' ''; useFetchCargoVendor = true; - cargoHash = "sha256-ooe9in3JfEPMbZSMjobVJpWZdqBTf2AsfEkcsQc0Fts="; + cargoHash = "sha256-f7FMJ4h+gFwHnKwisbn1c7Si2/aPJqxhqQ7ablNu3yo="; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-bLuKG+7QncLwiwKDrlcHKaSrUmDaJUxdvpdv0Jc6UPo="; + hash = "sha256-w7DGB9OlzXMsgikCbhBcsVQzKx2atSqIOAKF+kfNoTM="; }; nativeBuildInputs = [ @@ -96,7 +95,7 @@ rustPlatform.buildRustPackage rec { tauriBuildFlags = [ "--config" - "crates/gitbutler-tauri/tauri.conf.json" + "crates/gitbutler-tauri/tauri.conf.release.json" ]; nativeCheckInputs = [ git ]; @@ -107,9 +106,18 @@ rustPlatform.buildRustPackage rec { [ "--workspace" ] - # Errors with "Lazy instance has previously been poisoned" - ++ excludeSpec "gitbutler-branch-actions" - ++ excludeSpec "gitbutler-stack"; + ++ lib.concatMap excludeSpec [ + # Requires Git directories + "but-core" + # Fails due to the issues above and below + "but-hunk-dependency" + # Errors with "Lazy instance has previously been poisoned" + "gitbutler-branch-actions" + "gitbutler-stack" + # `Expecting driver to be located at "../../target/debug/gitbutler-cli" - we also assume a certain crate location` + # We're not (usually) building in debug mode and always have a different target directory, so... + "gitbutler-edit-mode" + ]; env = { # Make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our From 1708b35228fed3458805fb5cf879d55a1b7d8a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 12 Feb 2025 09:36:53 +0100 Subject: [PATCH 129/484] kickstart: add missing cli feature --- pkgs/by-name/ki/kickstart/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix index aa91fbfe5288..464de7d1ec80 100644 --- a/pkgs/by-name/ki/kickstart/package.nix +++ b/pkgs/by-name/ki/kickstart/package.nix @@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-J9sGXJbGbO9UgZfgqxqzbiJz9j6WMpq3qC2ys7OJnII="; + buildFeatures = [ "cli" ]; + checkFlags = [ # remote access "--skip=generation::tests::can_generate_from_remote_repo_with_subdir" From 4430156e4115057eac5cb5e1caace7c657498554 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 12 Feb 2025 10:33:07 +0100 Subject: [PATCH 130/484] zk: 0.14.1 -> 0.14.2 --- pkgs/by-name/zk/zk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index ed3381218a5a..4f02ee01d544 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "zk"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-PbF2k7b03Oo3fIWIN4BHUZJ625HUeX+htT9FTINowIs="; + sha256 = "sha256-h6qQcaAgxWeBzMjxGk7b8vrVu5NO/V6b/ZvZMWtZTpg="; }; - vendorHash = "sha256-UZsJa5hmMQwe9lhrp4ey8GGTkWUF8xJW+LPWMR0qfoo="; + vendorHash = "sha256-2PlaIw7NaW4pAVIituSVWhssSBKjowLOLuBV/wz829I="; doCheck = false; From 7309a1da2598f7e791cd7fea932b30f88492cdef Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 12 Feb 2025 10:35:26 +0100 Subject: [PATCH 131/484] Add update script --- pkgs/by-name/zk/zk/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index 4f02ee01d544..78cfb7ae281a 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildGoModule, + nix-update-script, }: buildGoModule rec { @@ -28,6 +29,8 @@ buildGoModule rec { "-X=main.Version=${version}" ]; + passthru.updateScript = nix-update-script { }; + tags = [ "fts5" ]; meta = with lib; { From 5660e174315a5aa10a2de6fb958d227dd541866c Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 12 Feb 2025 23:03:44 +0900 Subject: [PATCH 132/484] podman: 5.3.1 -> 5.4.0 Signed-off-by: misilelab --- pkgs/by-name/po/podman/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 428c57edbd5a..f21b7ff4b861 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -75,13 +75,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-kABP10QX4r11UDUcd6Sukb+9+LRm/ba3iATz6DTOJYw="; + hash = "sha256-iEO4njjNByLkhXFLgZ8tO8M8RkwT+Lb0zyfedQDHcNc="; }; patches = [ @@ -91,15 +91,6 @@ buildGoModule rec { # we intentionally don't build and install the helper so we shouldn't display messages to users about it ./rm-podman-mac-helper-msg.patch - - # backport of fix for https://github.com/containers/storage/issues/2184 - # https://github.com/containers/storage/pull/2185 - (fetchpatch2 { - url = "https://github.com/containers/storage/commit/99b0d2d423c8093807d8a1464437152cd04d7d95.diff?full_index=1"; - hash = "sha256-aahYXnDf3qCOlb6MfVDqFKCcQG257r5sbh5qnL0T40I="; - stripLen = 1; - extraPrefix = "vendor/github.com/containers/storage/"; - }) ]; vendorHash = null; From 842a8bffe2be2487d42af97b39026571b8dcbe65 Mon Sep 17 00:00:00 2001 From: Felix Zieger <67903933+felixzieger@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:09:40 +0100 Subject: [PATCH 133/484] scooter: 0.2.1 -> 0.2.3 --- pkgs/by-name/sc/scooter/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 03f082d63121..988c42fc62ff 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -6,17 +6,23 @@ rustPlatform.buildRustPackage rec { pname = "scooter"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "thomasschafer"; repo = "scooter"; rev = "v${version}"; - hash = "sha256-dojVVBdXBtWvD/YIfouRmnsf1AWgfB3CYjH2KhtCsvI="; + hash = "sha256-1BotQpkcw0RwPmHjQ/uoHKwerToxQ3OzHCvE/mbnSug"; }; useFetchCargoVendor = true; - cargoHash = "sha256-yQhnN1GoosUx8YjUJsjtg2okDbSOFx0sUV26ggRDGI8="; + cargoHash = "sha256-BN5h6IENeogkM79uZONNushEFLM/vw+QFyPjz1V1vVk"; + + checkFlags = [ + # failed only for buildRustPackage + # might be related to https://ryantm.github.io/nixpkgs/languages-frameworks/rust/#tests-relying-on-the-structure-of-the-target-directory + "--skip=test_search_current_dir" + ]; meta = { description = "Interactive find and replace in the terminal"; From 512644d83d4b871d1d09c1a87f223644e2c650c2 Mon Sep 17 00:00:00 2001 From: binarydigitz01 Date: Tue, 11 Feb 2025 19:02:29 +0530 Subject: [PATCH 134/484] guile-websocket: init at 0.2.0 --- pkgs/by-name/gu/guile-websocket/package.nix | 40 +++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/gu/guile-websocket/package.nix diff --git a/pkgs/by-name/gu/guile-websocket/package.nix b/pkgs/by-name/gu/guile-websocket/package.nix new file mode 100644 index 000000000000..9c2a8ec5a38e --- /dev/null +++ b/pkgs/by-name/gu/guile-websocket/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchurl, + guile, + guile-gnutls, + texinfo, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-websocket"; + version = "0.2.0"; + + src = fetchurl { + url = "https://files.dthompson.us/releases/guile-websocket/guile-websocket-${finalAttrs.version}.tar.gz"; + hash = "sha256-7jxj+I5WpqtGu99zrzl92eIZUThy69A4CsLzXnp4dpA="; + }; + + strictDeps = true; + nativeBuildInputs = [ + guile + pkg-config + texinfo + ]; + buildInputs = [ + guile + guile-gnutls + ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + meta = { + description = "Provides an implementation of the WebSocket protocol in Guile"; + homepage = "https://dthompson.us/projects/guile-websocket.html"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ binarydigitz01 ]; + platforms = lib.platforms.all; + }; +}) From 6b2689b8ede6ab912c1b7885ee72dcdfdf17e5c3 Mon Sep 17 00:00:00 2001 From: rein Date: Wed, 12 Feb 2025 20:11:07 +0530 Subject: [PATCH 135/484] unifont-csur: init at v16.0.02 RESOLVES #379591 --- pkgs/by-name/un/unifont-csur/package.nix | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/un/unifont-csur/package.nix diff --git a/pkgs/by-name/un/unifont-csur/package.nix b/pkgs/by-name/un/unifont-csur/package.nix new file mode 100644 index 000000000000..576f48bd0d22 --- /dev/null +++ b/pkgs/by-name/un/unifont-csur/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "unifont-csur"; + version = "16.0.02"; + + src = fetchurl { + url = "https://unifoundry.com/pub/unifont/unifont-${finalAttrs.version}/font-builds/unifont_csur-${finalAttrs.version}.otf"; + hash = "sha256-orLV0a0dQUAnzWnSTD1ALfbAsqWtFscH3rMCDyaXNfo="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -Dm644 $src $out/share/fonts/truetype/unifont_csur.ttf + runHook postInstall + ''; + + meta = { + description = "Unifont CSUR - Private Use Area font covering ConScript Unicode Registry"; + homepage = "https://unifoundry.com/unifont/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.qxrein ]; + }; +}) From fbe520b3a9bce08262f269241809f210565849a5 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 12 Feb 2025 15:29:48 +0100 Subject: [PATCH 136/484] nixos/glpi-agent: fix missing directory --- nixos/modules/services/monitoring/glpi-agent.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/monitoring/glpi-agent.nix b/nixos/modules/services/monitoring/glpi-agent.nix index 8ee18b5599bf..78c4d85a16e5 100644 --- a/nixos/modules/services/monitoring/glpi-agent.nix +++ b/nixos/modules/services/monitoring/glpi-agent.nix @@ -77,6 +77,16 @@ in } ]; + systemd.tmpfiles.settings."10-glpi-agent" = { + ${cfg.stateDir} = { + d = { + mode = "0755"; + user = "root"; + group = "root"; + }; + }; + }; + systemd.services.glpi-agent = { description = "GLPI Agent"; wantedBy = [ "multi-user.target" ]; From 4ac85d1fc6f3e0cf6ad1872e3f5ea9573d5cae9a Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 13 Feb 2025 03:25:11 +0900 Subject: [PATCH 137/484] ArchiSteamFarm: 6.1.1.3 -> 6.1.2.3 Changelog: https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/6.1.2.3 Signed-off-by: Ludovico Piero --- .../misc/ArchiSteamFarm/default.nix | 4 +- .../misc/ArchiSteamFarm/deps.json | 154 ++++++++++-------- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +- 3 files changed, 87 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index b48ff429f651..7419c240d111 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.1.1.3"; + version = "6.1.2.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-e0LzM0N5N7BHyQDRQIPziQrAilJN1aUttKyLod/T8rU="; + hash = "sha256-FYh54KE42DizwpleBquDP7CNLHJySSz5pjsfjpn63u8="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index 6bb07afcc405..ee6678a59cd2 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -281,14 +281,19 @@ }, { "pname": "Markdig.Signed", - "version": "0.39.1", - "hash": "sha256-jofkP6JUp4xuUjJ6B6+HDfBJ3+V2vgECt2CWmFq62k4=" + "version": "0.40.0", + "hash": "sha256-msd36cVKi3MTkT1QQg/b5yW4oLM3e8hbahPPkvhzRZw=" }, { "pname": "Microsoft.ApplicationInsights", "version": "2.22.0", "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA=" }, + { + "pname": "Microsoft.AspNetCore.OpenApi", + "version": "9.0.1", + "hash": "sha256-L93MBkDOrxiQx0YRZrxDwli7to5Va5+7VJFffyhk8cE=" + }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "6.0.0", @@ -296,8 +301,8 @@ }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", - "version": "3.11.0-beta1.24527.2", - "hash": "sha256-NVqJ5cRa9G+ilWKazOTA8Xfm6ExOPpst8HMIFBC1/BU=" + "version": "3.11.0-beta1.24605.2", + "hash": "sha256-N+A3i0qC364THr1rmehG168V3W+3xXaQYIjgFE1zO6Q=" }, { "pname": "Microsoft.CodeCoverage", @@ -426,23 +431,23 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.3.0", - "hash": "sha256-LSZ91DbPswCWibHNSGWC3Jh3KQwAthVaU3r7XQJyutM=" + "version": "8.3.1", + "hash": "sha256-K2ahV9EZFZD7idRzF0wKD/5FD7BuSiRtSNuFAqauo1Y=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.3.0", - "hash": "sha256-Hiiv10LSOMIt7KsQSsteJV4DFkLebHMYmoISn/pl2F8=" + "version": "8.3.1", + "hash": "sha256-laNV7ziGznCb7TuYO6987C62To870os1az4YbhG84vc=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.3.0", - "hash": "sha256-0P14ilpV+9yp+nqZWI/ilkTnRas4pic8NjNVcYxuXWs=" + "version": "8.3.1", + "hash": "sha256-uLgVE2ZCiz5F3/SMes+nNEqXNEdDH0vfUk3eOv3MXbU=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.3.0", - "hash": "sha256-+TzBeZH2Tgs0EMoU5QuCdOD/5V8xM7MHClX578AUIxw=" + "version": "8.3.1", + "hash": "sha256-C9Aj8YZ7corhP6LOCx/fBXbyAR9baqzQtFvhsGeQ/Mo=" }, { "pname": "Microsoft.NET.Test.Sdk", @@ -454,6 +459,11 @@ "version": "5.0.0", "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, + { + "pname": "Microsoft.OpenApi", + "version": "1.6.17", + "hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk=" + }, { "pname": "Microsoft.OpenApi", "version": "1.6.22", @@ -461,28 +471,28 @@ }, { "pname": "Microsoft.Testing.Extensions.Telemetry", - "version": "1.5.0", - "hash": "sha256-aKKGFpsp88Yy29GLbWRWnEil2M2WEHjRXZ62Q8x5QRQ=" + "version": "1.5.3", + "hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "1.5.0", - "hash": "sha256-oiePvWpZMkT2AnEpfzWgvaXJai6crgHdoUSMZct3JB0=" + "version": "1.5.3", + "hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc=" }, { "pname": "Microsoft.Testing.Extensions.VSTestBridge", - "version": "1.5.0", - "hash": "sha256-XauIF+r05RDgORsnxEp6Cq0WZjLycJ1hPH79QUi/SgM=" + "version": "1.5.3", + "hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g=" }, { "pname": "Microsoft.Testing.Platform", - "version": "1.5.0", - "hash": "sha256-67ZNhvMifCIM7SFnwDN25EanRNKsjAFQWugrrYWAkrM=" + "version": "1.5.3", + "hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", - "version": "1.5.0", - "hash": "sha256-nJ5fv8MwFw2PeJIZA9qKLfGPWYKmHww1CtVFICz6S00=" + "version": "1.5.3", + "hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", @@ -501,23 +511,23 @@ }, { "pname": "MSTest", - "version": "3.7.0", - "hash": "sha256-z302okYPT36ebQhReEihire5fyig5pLkrx09nLyVuME=" + "version": "3.7.3", + "hash": "sha256-0fFXB4ZYX+RFntYFin9SrgiW/neD7iXEHF+nJoN6Iys=" }, { "pname": "MSTest.Analyzers", - "version": "3.7.0", - "hash": "sha256-TVMFle7oE2ZU6U+VkJ0G9iNjJxnRU4rDIJCtZFwDhz0=" + "version": "3.7.3", + "hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg=" }, { "pname": "MSTest.TestAdapter", - "version": "3.7.0", - "hash": "sha256-b6JCu2yyZmTZwZVd4MHaIwa01eQGWpFd8mNzHUBS6Tg=" + "version": "3.7.3", + "hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc=" }, { "pname": "MSTest.TestFramework", - "version": "3.7.0", - "hash": "sha256-fIHwuc/zimd8oxvTiA3gmUzmJAj7JsQYh9IOb8NRJ/Y=" + "version": "3.7.3", + "hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs=" }, { "pname": "Newtonsoft.Json", @@ -546,23 +556,23 @@ }, { "pname": "NLog", - "version": "5.3.4", - "hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k=" + "version": "5.4.0", + "hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A=" }, { "pname": "NLog.Extensions.Logging", - "version": "5.3.15", - "hash": "sha256-otzOJncsEmzeGkJ9yxuwQgYFlKIG9ALX+DaKJ/Jhux4=" + "version": "5.4.0", + "hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo=" }, { "pname": "NLog.Web.AspNetCore", - "version": "5.3.15", - "hash": "sha256-JaxCAfsgYM8N7bmAciDowSdOxtMS3eoMszODqWPcqao=" + "version": "5.4.0", + "hash": "sha256-tDCsOqYNVg+dNBk85HjNgbZuQwMgGPIdsMqoPhhPROk=" }, { "pname": "OpenTelemetry", - "version": "1.10.0", - "hash": "sha256-ucUy3vIabYb0TGDhraqMEzT+LLPmXrO1NgAjEeyVCO8=" + "version": "1.11.1", + "hash": "sha256-Z4U/FCSlY+qdQRS2haJDSYyxI624mDCwHZhf5At2Atk=" }, { "pname": "OpenTelemetry", @@ -571,13 +581,13 @@ }, { "pname": "OpenTelemetry.Api", - "version": "1.10.0", - "hash": "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU=" + "version": "1.11.1", + "hash": "sha256-1qDEHEvelvySuCPcevWgO7N9ZEmPXwnFog+tiWXr2qU=" }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", - "version": "1.10.0", - "hash": "sha256-hLw3Sf1fviAlVJYhaMudVJEdG5pjX5JvVrqv9DgYAk8=" + "version": "1.11.1", + "hash": "sha256-rioqazZAS6aZ7W8jJ4owu58rcnRbQyPrWVTBoqu1zPc=" }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", @@ -591,38 +601,38 @@ }, { "pname": "OpenTelemetry.Extensions.Hosting", - "version": "1.10.0", - "hash": "sha256-+O9oaAUYaKUItLAaT7yQUs2nrHVDNkj8YcFuUxiTy6M=" + "version": "1.11.1", + "hash": "sha256-eHQaUToWOpmJgD5XCHDCWsUcChKH3roaO8ZTAIulJVk=" }, { "pname": "OpenTelemetry.Instrumentation.AspNetCore", - "version": "1.10.1", - "hash": "sha256-HqMFDpFsMaPlgyFt1MU3Un+BysEoj5qPc8HVxTlt0mE=" + "version": "1.11.0", + "hash": "sha256-F3WTwCPVUe+VppF1ZOAdBKaSseKmFZEU7D81uegqpGo=" }, { "pname": "OpenTelemetry.Instrumentation.Http", - "version": "1.10.0", - "hash": "sha256-U9ojqPSJu4OQEAfRJ+7MjzxayzsGWI0Ep8CPAcpkhhA=" + "version": "1.11.0", + "hash": "sha256-4J7ZvginaiISaLB4M9tTK2o6avBz2dSI+fAhyfraBQ4=" }, { "pname": "OpenTelemetry.Instrumentation.Runtime", - "version": "1.10.0", - "hash": "sha256-cCTYKxHh1Qzu8X51B8gGsrxwKhVSqJfiql/+o4TWrwg=" + "version": "1.11.0", + "hash": "sha256-VBSSJ3eORWUlVH12xzubtMtrDACAsyd1nSfgUt5ltCg=" }, { "pname": "protobuf-net", - "version": "3.2.45", - "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + "version": "3.2.46", + "hash": "sha256-NirxAUXEIUQz0HHLS+KS4fgOZwJy1zJZYGcjPa5ujTs=" }, { "pname": "protobuf-net.Core", - "version": "3.2.45", - "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" + "version": "3.2.46", + "hash": "sha256-Srg7pP7rleL462idLPFUxgXBLrywWeHFyEvSV+keA4E=" }, { "pname": "SteamKit2", - "version": "3.0.0", - "hash": "sha256-bRRdX8WFo9k+QCZWh0KHb3TULpJxpR4Hg9FDXKBW6d4=" + "version": "3.0.2", + "hash": "sha256-bRiLFaq/hsr+7BKtSKoD2+pf0VCGhBYe/rO3DgqMZpo=" }, { "pname": "Swashbuckle.AspNetCore", @@ -661,33 +671,33 @@ }, { "pname": "System.Composition", - "version": "9.0.0", - "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM=" + "version": "9.0.1", + "hash": "sha256-KUJnkjMNNJ2b/1664xflRM9AmAs00PkmXLfbTnNdL6U=" }, { "pname": "System.Composition.AttributedModel", - "version": "9.0.0", - "hash": "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M=" + "version": "9.0.1", + "hash": "sha256-93Q8jFzbF0tEhk+UAHoULA+DWiwgrKiBxcm8k/dQ75M=" }, { "pname": "System.Composition.Convention", - "version": "9.0.0", - "hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U=" + "version": "9.0.1", + "hash": "sha256-FQihbXN3FkEiPprS5XLDIbYLye3RI0yHba099oDuIxY=" }, { "pname": "System.Composition.Hosting", - "version": "9.0.0", - "hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s=" + "version": "9.0.1", + "hash": "sha256-jas95z5TZo4VtLIev6Ixqfh0Xv54CI7zCzJ8867bpVE=" }, { "pname": "System.Composition.Runtime", - "version": "9.0.0", - "hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s=" + "version": "9.0.1", + "hash": "sha256-wAciMAsH7WR8ETiulgFhBRLBihdNEXb8Zjtzook2UQ4=" }, { "pname": "System.Composition.TypedParts", - "version": "9.0.0", - "hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog=" + "version": "9.0.1", + "hash": "sha256-fyLCfmGKgUSIpizl6OiSX61Td9xmLjii/PDQAowCihc=" }, { "pname": "System.Diagnostics.DiagnosticSource", @@ -701,8 +711,8 @@ }, { "pname": "System.IO.Hashing", - "version": "8.0.0", - "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" + "version": "9.0.1", + "hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs=" }, { "pname": "System.Linq.Async", @@ -726,8 +736,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.0", - "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=" + "version": "9.0.1", + "hash": "sha256-U2c8q6vD+O42zNTGRSAbsdj+r3+nXegoDYdB/Qm4nvU=" }, { "pname": "System.Security.Principal.Windows", diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 6d0c35262370..dd7420c46fb1 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "6be24065cd4904389d94140f4ed1f6738b1f7fbb"; + version = "fbdc518fa1e82c16b9de0a5e2228898796d3f5a2"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-DFl+DCNj4JFKZG1awX5rlsHzj+67OFyBj9d16zDiKRA="; + hash = "sha256-n9V5xUHIByspVSkpcwkohgcPlk22UfA2FBZq7CG1LmE="; }; - npmDepsHash = "sha256-jZSiWZDckfGfgrBMHTX/sm7Pcl5ap3lfmwGi8SHXqu8="; + npmDepsHash = "sha256-lJZgHVO770aYwnudUj2wkUqrSV6rbSDJ9zwtCe+36k8="; installPhase = '' runHook preInstall From eb75114522c38cdb28268d212d81119cfaccb098 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 18:28:41 +0000 Subject: [PATCH 138/484] python312Packages.rclone-python: 0.1.20 -> 0.1.21 --- pkgs/development/python-modules/rclone-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rclone-python/default.nix b/pkgs/development/python-modules/rclone-python/default.nix index fed23e85c3a0..6d0a508c3fc2 100644 --- a/pkgs/development/python-modules/rclone-python/default.nix +++ b/pkgs/development/python-modules/rclone-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rclone-python"; - version = "0.1.20"; + version = "0.1.21"; pyproject = true; src = fetchFromGitHub { owner = "Johannes11833"; repo = "rclone_python"; tag = "v${version}"; - hash = "sha256-TGSASkvlh4ku7gZ7JhKX5yEKgSZp5VDyNz962gG6Lk0="; + hash = "sha256-lYrPSDBWGVQmT2/MgzbtZ6hHNZXINCmmFP+ZHFZQDw8="; }; build-system = [ setuptools ]; From 40f9597859616a590342cb96f1859bc195d17ec9 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 8 Feb 2025 18:04:00 +0100 Subject: [PATCH 139/484] zoom-us: add simple test This test starts zoom with an Xvfb X server and verifies that the "Zoom Workplace" window is created. zoom is started with `prlimit` to avoid problems like https://github.com/NixOS/nixpkgs/issues/371488 . Note: During my experiments, it turned out that if certain libraries are missing (I don't recall which ones), then zoom still opens its Workplace window, then immediatelly closes it again. To reduce the likelihood of the test passing in that scenario, another "sleep 20" is included. --- pkgs/by-name/zo/zoom-us/package.nix | 2 ++ pkgs/by-name/zo/zoom-us/test.nix | 44 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/by-name/zo/zoom-us/test.nix diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 7cc46715e99c..96419e7ad8b9 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -40,6 +40,7 @@ pulseaudioSupport ? true, libpulseaudio, pulseaudio, + callPackage, }: let @@ -220,6 +221,7 @@ stdenv.mkDerivation { dontPatchELF = true; passthru.updateScript = ./update.sh; + passthru.tests.startwindow = callPackage ./test.nix { }; meta = with lib; { homepage = "https://zoom.us/"; diff --git a/pkgs/by-name/zo/zoom-us/test.nix b/pkgs/by-name/zo/zoom-us/test.nix new file mode 100644 index 000000000000..98ededc27563 --- /dev/null +++ b/pkgs/by-name/zo/zoom-us/test.nix @@ -0,0 +1,44 @@ +{ + lib, + xvfb-run, + zoom-us, + runCommand, + writeShellApplication, + xorg, +}: + +let + testScript = writeShellApplication { + name = "zoom-us-test-script"; + runtimeInputs = [ + xorg.xwininfo + zoom-us + ]; + text = '' + function is_zoom_window_present { + echo + xwininfo -root -tree \ + | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \ + | tee window-names + grep -q "Zoom Workplace" window-names + } + # don't let zoom eat all RAM, like it did + # https://github.com/NixOS/nixpkgs/issues/371488 + prlimit --{as,data}=$((4*2**30)):$((4*2**30)) zoom-us & + for _ in {0..900} ; do + if is_zoom_window_present ; then + break + fi + sleep 1 + done + # if libraries are missing, the window still appears, + # but disappears again immediatelly; check for that too: + sleep 20 + is_zoom_window_present + ''; + }; +in +runCommand "zoom-us-test" { buildInputs = [ xvfb-run ]; } '' + HOME=$PWD xvfb-run ${lib.getExe testScript} + touch ${placeholder "out"} +'' From a4a3b20f20909ef755139541b7d9609db8aa6ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 12 Feb 2025 20:16:44 +0100 Subject: [PATCH 140/484] ansible_2_16: fix build the setuptools version restriction doesn't exist in 2_16 removed patch as it breaks the build --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a1272fc905..133f5159410b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7465,6 +7465,13 @@ with pkgs; inherit version; hash = "sha256-WeSqQO1azbTvm789BYkY//k/ZqFJNz2BWciilgRBC9o="; }; + + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + + patchShebangs --build packaging/cli-doc/build.py + ''; })); ansible-builder = with python3Packages; toPythonApplication ansible-builder; From 7b30dbddcc6ebe592a8895d365c305b2d0b0daa3 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 12 Feb 2025 20:23:54 +0100 Subject: [PATCH 141/484] zoom-us: provide pipewire program to fix error message Without `pipewire` being in PATH, zoom complains > sh: pipewire: not found --- pkgs/by-name/zo/zoom-us/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 96419e7ad8b9..24308f72809e 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -123,6 +123,7 @@ let coreutils glib.dev pciutils + pipewire procps util-linux ] From 3f58227a38fa6f3931ef82541572123dc49958f6 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 8 Feb 2025 17:22:54 +0100 Subject: [PATCH 142/484] zoom-us (x86-64): don't touch the core `zoom` binary Without the commit at hand, zoom-us stops working and instead simply maxes out RAM when updated from version 6.2.11.5069 to version 6.3.0.5527 . https://github.com/NixOS/nixpkgs/issues/371488 Some experimenting yielded these observations regarding newer (problematic) zoom-us versions on NixOS: * They still work if started via flatpak (which creates a virtual FHS-compatible environment) * They still work if started with `buildFHSEnv` with all libraries provided in `multiPkgs`. * They still work if the unmodified zoom binary is started by manually invoking the `ld-linux` elf interpreter. However, this again requires that libraries are available via `LD_PRELOAD_PATH`. It seems very much that the `patchelf --set-interpreter` call on the `zoom` binary breaks something inside the binary. The commit at hand removes `zoom` from the list of binaries that are to be patched. To ensure that program can still be executed, the `makeWrapper` call (which is already there to wrap `zoom`) is extended such that is explicitely uses the elf interpreter. Unfortunatelly, when zoom tries to find its data files (e.g. ring tones), it determines its data directory by looking at `/proc/self/exe`. If we start zoom by calling the elf interpreter, `/proc/self/exe` acutally points to that interpreter. The only solution is to copy the interpreter into the zoom data directory (a symlink isn't enough here). --- pkgs/by-name/zo/zoom-us/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 24308f72809e..33841a2b01f4 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Zoom.desktop \ --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" - for i in aomhost zopen zoom ZoomLauncher ZoomWebviewHost; do + for i in aomhost zopen ZoomLauncher ZoomWebviewHost; do if [ -f $out/opt/zoom/$i ]; then patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i fi @@ -189,8 +189,14 @@ stdenv.mkDerivation { # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom # IPC breaks if the executable name does not end in 'zoom' + # zoom binary does not like being touched by patchelf + # => we call it indirectly via the dynamic linker + # zoom binary inspects /proc/self/exe to find its data files + # => we must place a copy (not symlink) of the linker in zoom's data dir mv $out/opt/zoom/zoom $out/opt/zoom/.zoom - makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ + cp "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/ld.so + makeWrapper $out/opt/zoom/ld.so $out/opt/zoom/zoom \ + --add-flags $out/opt/zoom/.zoom \ --prefix LD_LIBRARY_PATH ":" ${libs} rm $out/bin/zoom From 4357610c85ccd36a3b7f0450e7332e70104d21a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 00:10:42 +0000 Subject: [PATCH 143/484] zoom-us: 6.2.11.5069 -> 6.3.6.6315 --- pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 33841a2b01f4..828afbbbd62b 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -51,23 +51,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.3.1.45300"; - versions.x86_64-darwin = "6.3.1.45300"; - versions.x86_64-linux = "6.2.11.5069"; + versions.aarch64-darwin = "6.3.6.47101"; + versions.x86_64-darwin = "6.3.6.47101"; + versions.x86_64-linux = "6.3.6.6315"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-WPhqYof/XR6TDkuA4NK2a30ksdhN7NBfs4KCQwqKJ0g="; + hash = "sha256-tqDf3Z5RRf4aRvtINWdM3oppZXbDdtihhPBHu4QxzDM="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-BywBvJCcNXARHTkO/UJbOFRjuiXRkmFWmSuZsW9t1pk="; + hash = "sha256-BZkBx5eZ3c3p9JIz+ChyJrGM12HwyNToSuS86f9QnF0="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw="; + hash = "sha256-QJR8SsMtyYBvd5G+mEjEEISkJJukCYeHErKrgs1uDQc="; }; }; From f47cb5ab347006fa03bc87d8a76e242acbbcb73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 12 Feb 2025 20:31:56 +0100 Subject: [PATCH 144/484] ansible_2_17: use correct version --- pkgs/top-level/all-packages.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 133f5159410b..74a0806edebc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7457,8 +7457,25 @@ with pkgs; anybadge = with python3Packages; toPythonApplication anybadge; - ansible = ansible_2_17; - ansible_2_17 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible = ansible_2_18; + ansible_2_18 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_17 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.17.8"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc="; + }; + + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + + patchShebangs --build packaging/cli-doc/build.py + + substituteInPlace pyproject.toml \ + --replace-fail "setuptools >= 66.1.0, <= 75.8.0" setuptools + ''; + })); ansible_2_16 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.16.8"; src = oldAttrs.src.override { From 9aae517513c32643717a82a505a92aecb647f88e Mon Sep 17 00:00:00 2001 From: lyranico Date: Tue, 11 Feb 2025 02:52:23 +0800 Subject: [PATCH 145/484] mihomo-party: remove wrapGAppsHook3 --- pkgs/by-name/mi/mihomo-party/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 9dcf3279ca42..c510a4dd2f8b 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, dpkg, - wrapGAppsHook3, autoPatchelfHook, nss, nspr, @@ -43,7 +42,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ dpkg - wrapGAppsHook3 autoPatchelfHook ]; From 2da5248f84020065c1ade1cf3d2342e292fcbcaa Mon Sep 17 00:00:00 2001 From: lyranico Date: Tue, 11 Feb 2025 02:54:42 +0800 Subject: [PATCH 146/484] mihomo-party: use patchelf --- pkgs/by-name/mi/mihomo-party/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index c510a4dd2f8b..b4e8203ed352 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -54,30 +54,27 @@ stdenv.mkDerivation { (lib.getLib stdenv.cc.cc) ]; - runtimeDependencies = map lib.getLib [ - udev - libayatana-appindicator - ]; - installPhase = '' runHook preInstall - mkdir $out + mkdir -p $out/bin cp -r opt/mihomo-party usr/share $out substituteInPlace $out/share/applications/mihomo-party.desktop \ --replace-fail "/opt/mihomo-party/mihomo-party" "mihomo-party" + ln -s $out/mihomo-party/mihomo-party $out/bin/mihomo-party runHook postInstall ''; preFixup = '' - mkdir $out/bin - makeWrapper $out/mihomo-party/mihomo-party $out/bin/mihomo-party \ - --prefix LD_LIBRARY_PATH : "${ + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ lib.makeLibraryPath [ libGL + udev + libayatana-appindicator ] - }" + } $out/mihomo-party/mihomo-party ''; meta = { From 09e97e00caf77f3035bf9d1df2f276a7e5729e4d Mon Sep 17 00:00:00 2001 From: lyranico Date: Tue, 11 Feb 2025 02:58:46 +0800 Subject: [PATCH 147/484] mihomo-party: refactor --- pkgs/by-name/mi/mihomo-party/package.nix | 35 ++++++++++++------------ pkgs/by-name/mi/mihomo-party/update.sh | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index b4e8203ed352..02467ca6ebd1 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -13,32 +13,28 @@ libayatana-appindicator, libGL, }: -let + +stdenv.mkDerivation rec { + pname = "mihomo-party"; version = "1.7.1"; + src = let - inherit (stdenv.hostPlatform) system; - selectSystem = attrs: attrs.${system}; - suffix = selectSystem { + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + arch = selectSystem { x86_64-linux = "amd64"; aarch64-linux = "arm64"; }; + in + fetchurl { + url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb"; hash = selectSystem { x86_64-linux = "sha256-fVPW4lk+1uY+zTPk0wNeHz7ILKB+7p9hunHrqnuPI6w="; aarch64-linux = "sha256-wEOOP5ha7R0z0DCTCsmn5lfwJdzEWtNGdWNjVB5cI6k="; }; - in - fetchurl { - url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${suffix}.deb"; - inherit hash; }; -in -stdenv.mkDerivation { - inherit version src; - - pname = "mihomo-party"; - - passthru.updateScript = ./update.sh; nativeBuildInputs = [ dpkg @@ -58,10 +54,11 @@ stdenv.mkDerivation { runHook preInstall mkdir -p $out/bin - cp -r opt/mihomo-party usr/share $out + cp -r opt $out/opt + cp -r usr/share $out/share substituteInPlace $out/share/applications/mihomo-party.desktop \ --replace-fail "/opt/mihomo-party/mihomo-party" "mihomo-party" - ln -s $out/mihomo-party/mihomo-party $out/bin/mihomo-party + ln -s $out/opt/mihomo-party/mihomo-party $out/bin/mihomo-party runHook postInstall ''; @@ -74,9 +71,11 @@ stdenv.mkDerivation { udev libayatana-appindicator ] - } $out/mihomo-party/mihomo-party + } $out/opt/mihomo-party/mihomo-party ''; + passthru.updateScript = ./update.sh; + meta = { description = "Another Mihomo GUI"; homepage = "https://github.com/mihomo-party-org/mihomo-party"; diff --git a/pkgs/by-name/mi/mihomo-party/update.sh b/pkgs/by-name/mi/mihomo-party/update.sh index 380b997c2512..406680fd0208 100755 --- a/pkgs/by-name/mi/mihomo-party/update.sh +++ b/pkgs/by-name/mi/mihomo-party/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts +#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/mihomo-party-org/mihomo-party/releases/latest | jq -r ".tag_name") latestVersion="$(expr "$latestTag" : 'v\(.*\)')" From c747b86a8ec74e94d8b5b4c69368c6f7ad328ac8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 20:59:42 +0000 Subject: [PATCH 148/484] python312Packages.google-cloud-securitycenter: 1.36.0 -> 1.37.0 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index cd31bf8e9e48..18301c5cedb1 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.36.0"; + version = "1.37.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_securitycenter"; inherit version; - hash = "sha256-z5Q9ScyCLfNQlByW0xgBb9XtDLx/ZZngiwO8FUZFCAI="; + hash = "sha256-98EpC9bqtcgd/5k++gbH2fRLGEAUvW80l6tcWOdnrDU="; }; build-system = [ setuptools ]; From d38afbcf6015b672d57c800f32a335eaf1fdca1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 21:02:36 +0000 Subject: [PATCH 149/484] python312Packages.parallel-ssh: 2.13.0 -> 2.14.0 --- pkgs/development/python-modules/parallel-ssh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parallel-ssh/default.nix b/pkgs/development/python-modules/parallel-ssh/default.nix index 107d5548d9cf..cf73fe716fb8 100644 --- a/pkgs/development/python-modules/parallel-ssh/default.nix +++ b/pkgs/development/python-modules/parallel-ssh/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "parallel-ssh"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "ParallelSSH"; repo = "parallel-ssh"; tag = version; - hash = "sha256-J/rwlJ9BOcENngIVz5cU+uA34hEEw7QsgsPnpNbbZbk="; + hash = "sha256-TeNQitaNVbK96Aui8OcKin2sHpF8VlMQmb5ODT2lQh4="; }; build-system = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Asynchronous parallel SSH client library"; homepage = "https://github.com/ParallelSSH/parallel-ssh"; - changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${version}/Changelog.rst"; + changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${src.tag}/Changelog.rst"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ infinidoge ]; }; From 0e638b5ab9aa610514455cc714b481f34c782a82 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Wed, 12 Feb 2025 21:15:08 +0000 Subject: [PATCH 150/484] intiface-central: 2.6.4 -> 2.6.5 --- pkgs/by-name/in/intiface-central/package.nix | 6 +- .../in/intiface-central/pubspec.lock.json | 74 ++++++++++++------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index f79235ba55f0..ea01452438b3 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -12,12 +12,12 @@ }: flutterPackages.stable.buildFlutterApplication rec { pname = "intiface-central"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "intiface"; repo = "intiface-central"; rev = "v${version}"; - hash = "sha256-QBNEKhjBfKxArBykUq/fE4lftCYzGdAaWYD1F7rar5Y="; + hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; }; patches = [ ./corrosion.patch @@ -29,7 +29,7 @@ flutterPackages.stable.buildFlutterApplication rec { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-1j1maTrR7V/Tlu7uimTJuoEtxhn5Hn0VmR0GnJuKIoo="; + hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json index 7e4a916a879b..8c97f04835e0 100644 --- a/pkgs/by-name/in/intiface-central/pubspec.lock.json +++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json @@ -4,27 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" + "version": "76.0.0" }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", - "version": "0.3.2" + "version": "0.3.3" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "6.11.0" }, "archive": { "dependency": "transitive", @@ -76,6 +76,16 @@ "source": "hosted", "version": "2.1.1" }, + "buffer": { + "dependency": "transitive", + "description": { + "name": "buffer", + "sha256": "389da2ec2c16283c8787e0adaede82b1842102f8c8aae2f49003a766c5c6b3d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, "build": { "dependency": "transitive", "description": { @@ -230,11 +240,11 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.0" }, "console": { "dependency": "transitive", @@ -316,6 +326,16 @@ "source": "hosted", "version": "7.0.1" }, + "discord_rich_presence": { + "dependency": "direct main", + "description": { + "name": "discord_rich_presence", + "sha256": "ed30f3aa310fb96afe1d410ac0263f4f3013943981935332db08a037f340f4fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, "easy_debounce": { "dependency": "direct main", "description": { @@ -668,21 +688,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.7" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.8" }, "leak_tracker_testing": { "dependency": "transitive", @@ -728,11 +748,11 @@ "dependency": "transitive", "description": { "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2-main.4" + "version": "0.1.3-main.0" }, "markdown": { "dependency": "direct main", @@ -1258,7 +1278,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_gen": { "dependency": "transitive", @@ -1304,11 +1324,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "stream_channel": { "dependency": "transitive", @@ -1334,11 +1354,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "term_glyph": { "dependency": "transitive", @@ -1354,11 +1374,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "timezone": { "dependency": "transitive", @@ -1394,11 +1414,11 @@ "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "url_launcher": { "dependency": "direct main", @@ -1484,11 +1504,11 @@ "dependency": "transitive", "description": { "name": "uuid", - "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.4.2" + "version": "4.5.1" }, "vector_math": { "dependency": "transitive", @@ -1514,11 +1534,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.0" }, "watcher": { "dependency": "transitive", @@ -1622,7 +1642,7 @@ } }, "sdks": { - "dart": ">=3.5.0-259.0.dev <4.0.0", + "dart": ">=3.5.3 <4.0.0", "flutter": ">=3.22.0" } } From b17b1f67c1a0e85f8f298ef1237e20148dae4e74 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Wed, 12 Feb 2025 21:16:54 +0000 Subject: [PATCH 151/484] intiface-central: refactor --- pkgs/by-name/in/intiface-central/package.nix | 31 ++++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index ea01452438b3..26ae0d211eba 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutterPackages, + flutter327, corrosion, rustPlatform, cargo, @@ -10,15 +10,18 @@ copyDesktopItems, makeDesktopItem, }: -flutterPackages.stable.buildFlutterApplication rec { + +flutter327.buildFlutterApplication rec { pname = "intiface-central"; version = "2.6.5"; + src = fetchFromGitHub { owner = "intiface"; repo = "intiface-central"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; }; + patches = [ ./corrosion.patch ]; @@ -29,8 +32,9 @@ flutterPackages.stable.buildFlutterApplication rec { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-goN0750EvGw5G8cb4jy6wWnjlLwlwMeTz4GQEilbwpY="; + hash = "sha256-z9i0xT0e8G9spOmXpI2yFee/y3ZEh69YqL+7zRWszzA="; }; + cargoRoot = "intiface-engine-flutter-bridge"; preConfigure = '' @@ -45,19 +49,14 @@ flutterPackages.stable.buildFlutterApplication rec { copyDesktopItems ]; - buildInputs = [ - udev - ]; + buildInputs = [ udev ]; # without this, only the splash screen will be shown and the logs will contain the # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` - # Environmental variables don't quite eval outside of hooks so use pname and - # version directly. - extraWrapProgramArgs = "--chdir $out/app/${pname}"; + extraWrapProgramArgs = "--chdir $out/app/intiface-central"; postInstall = '' - mkdir -p $out/share/pixmaps - cp $out/app/$pname/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png + install -Dm644 $out/app/intiface-central/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png ''; desktopItems = [ @@ -70,12 +69,12 @@ flutterPackages.stable.buildFlutterApplication rec { }) ]; - meta = with lib; { + meta = { mainProgram = "intiface_central"; description = "Intiface Central (Buttplug Frontend) Application for Desktop"; homepage = "https://intiface.com/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ _999eagle ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ _999eagle ]; + platforms = lib.platforms.linux; }; } From a4016310457d819bb9523557ec67a663d32a6cbe Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 5 Feb 2025 07:27:12 +0800 Subject: [PATCH 152/484] sqlpage: 0.29.0 -> 0.32.1 --- pkgs/by-name/sq/sqlpage/package.nix | 50 ++++++++++++----------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix index 2b925fdb2333..4da6b416f5da 100644 --- a/pkgs/by-name/sq/sqlpage/package.nix +++ b/pkgs/by-name/sq/sqlpage/package.nix @@ -10,8 +10,8 @@ let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js"; - hash = "sha256-2sxp9+shRA5LMxzhgx+fpeQPIY2ZWgBdt4mp5V2Yn+E="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@4.3.0/dist/apexcharts.min.js"; + hash = "sha256-zceUTsCKa8Y2SqjqZjLjifXQDnqsvKRTmT8fTIUix/4="; }; tablerCss = fetchurl { url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; @@ -22,37 +22,33 @@ let hash = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY="; }; tablerJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js"; - hash = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ="; - }; - listJsFixed = fetchurl { - url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js"; - hash = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/js/tabler.min.js"; + hash = "sha256-c01wM5Q9GIKYbvvjIaxt67o1CpIBkFMMmz1Dgsi0K7A="; }; tablerIcons = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg"; - hash = "sha256-lEUAtxI+NffqLDllirLgcCRjEgbeCaz9Gkn3Tu9e9F4="; + url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.21.0/dist/tabler-sprite.svg"; + hash = "sha256-TUlx6LLnZ7sDN7Xzt+/zAuxLYgUkQSqRgdQm8H4cohY="; }; tomselect = fetchurl { - url = "https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js"; - hash = "sha256-51NcdIM8GseVFFmg8mUWDxfhjLCA+n8kw/Ojyo+6Hjk="; + url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js"; + hash = "sha256-Cb1Xmb9qQO8I1mMVkz4t2bT8l7HX+1JeKncGBSytSHQ="; }; in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.29.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; - rev = "v${version}"; - hash = "sha256-wI+nXrjX98vqyCE6Ofa5KxKUvpLfHqd7KFCsILuOnGk="; + tag = "v${version}"; + hash = "sha256-PfBZCfwXL5/ItBFrEod27BIuWbWR9gVGTfbdxQ/IIuQ="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@4.3.0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ @@ -61,39 +57,33 @@ rustPlatform.buildRustPackage rec { --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \ "$(cat ${tablerVendorsCss})" substituteInPlace sqlpage/sqlpage.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/js/tabler.min.js */' \ "$(cat ${tablerJs})" - substituteInPlace sqlpage/sqlpage.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \ - "$(cat ${listJsFixed})" substituteInPlace sqlpage/tabler-icons.svg \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.21.0/dist/tabler-sprite.svg */' \ "$(cat ${tablerIcons})" substituteInPlace sqlpage/tomselect.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js */' \ "$(cat ${tomselect})" ''; useFetchCargoVendor = true; - cargoHash = "sha256-pXmWXHoGbo1YRUjHGVEMZDk4YYqP8XwcDSPWX474Z2c="; - nativeBuildInputs = [ - pkg-config - ]; + cargoHash = "sha256-HbNVBMysowIV62l7eSHu4YaBMIku+IT11jlEgWrjaWE="; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite zstd ]; - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; + env.ZSTD_SYS_USE_PKG_CONFIG = true; meta = { description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly"; homepage = "https://github.com/lovasoa/SQLpage"; - changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/lovasoa/SQLpage/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dit7ya ]; mainProgram = "sqlpage"; From 6106bc7d42f465cfd7c240a6d6d957e59dc13751 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 6 Feb 2025 11:05:36 +0800 Subject: [PATCH 153/484] ardour: format with nixfmt --- pkgs/applications/audio/ardour/default.nix | 288 +++++++++++---------- 1 file changed, 152 insertions(+), 136 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index b24da8fb3297..bae0b9b9ce4f 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,65 +1,66 @@ -{ lib -, stdenv -, fetchgit -, fetchzip -, alsa-lib -, aubio -, boost -, cairomm -, cppunit -, curl -, dbus -, doxygen -, ffmpeg -, fftw -, fftwSinglePrec -, flac -, fluidsynth -, glibc -, glibmm -, graphviz -, gtkmm2 -, harvid -, hidapi -, itstool -, kissfft -, libarchive -, libjack2 -, liblo -, libltc -, libogg -, libpulseaudio -, librdf_rasqal -, libsamplerate -, libsigcxx -, libsndfile -, libusb1 -, libuv -, libwebsockets -, libxml2 -, libxslt -, lilv -, lrdf -, lv2 -, makeWrapper -, pango -, perl -, pkg-config -, python3 -, qm-dsp -, readline -, rubberband -, serd -, sord -, soundtouch -, sratom -, suil -, taglib -, vamp-plugin-sdk -, wafHook -, xjadeo -, optimize ? true # disable to print Lua DSP script output to stdout -, videoSupport ? true +{ + lib, + stdenv, + fetchgit, + fetchzip, + alsa-lib, + aubio, + boost, + cairomm, + cppunit, + curl, + dbus, + doxygen, + ffmpeg, + fftw, + fftwSinglePrec, + flac, + fluidsynth, + glibc, + glibmm, + graphviz, + gtkmm2, + harvid, + hidapi, + itstool, + kissfft, + libarchive, + libjack2, + liblo, + libltc, + libogg, + libpulseaudio, + librdf_rasqal, + libsamplerate, + libsigcxx, + libsndfile, + libusb1, + libuv, + libwebsockets, + libxml2, + libxslt, + lilv, + lrdf, + lv2, + makeWrapper, + pango, + perl, + pkg-config, + python3, + qm-dsp, + readline, + rubberband, + serd, + sord, + soundtouch, + sratom, + suil, + taglib, + vamp-plugin-sdk, + wafHook, + xjadeo, + optimize ? true, # disable to print Lua DSP script output to stdout + videoSupport ? true, }: stdenv.mkDerivation rec { pname = "ardour"; @@ -93,8 +94,8 @@ stdenv.mkDerivation rec { sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ substituteInPlace libs/ardour/video_tools_paths.cc \ - --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ - --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' + --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ + --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' ''; nativeBuildInputs = [ @@ -108,56 +109,61 @@ stdenv.mkDerivation rec { wafHook ]; - buildInputs = [ - alsa-lib - aubio - boost - cairomm - cppunit - curl - dbus - ffmpeg - fftw - fftwSinglePrec - flac - fluidsynth - glibmm - gtkmm2 - hidapi - itstool - kissfft - libarchive - libjack2 - liblo - libltc - libogg - libpulseaudio - librdf_rasqal - libsamplerate - libsigcxx - libsndfile - libusb1 - libuv - libwebsockets - libxml2 - libxslt - lilv - lrdf - lv2 - pango - perl - python3 - qm-dsp - readline - rubberband - serd - sord - soundtouch - sratom - suil - taglib - vamp-plugin-sdk - ] ++ lib.optionals videoSupport [ harvid xjadeo ]; + buildInputs = + [ + alsa-lib + aubio + boost + cairomm + cppunit + curl + dbus + ffmpeg + fftw + fftwSinglePrec + flac + fluidsynth + glibmm + gtkmm2 + hidapi + itstool + kissfft + libarchive + libjack2 + liblo + libltc + libogg + libpulseaudio + librdf_rasqal + libsamplerate + libsigcxx + libsndfile + libusb1 + libuv + libwebsockets + libxml2 + libxslt + lilv + lrdf + lv2 + pango + perl + python3 + qm-dsp + readline + rubberband + serd + sord + soundtouch + sratom + suil + taglib + vamp-plugin-sdk + ] + ++ lib.optionals videoSupport [ + harvid + xjadeo + ]; wafConfigureFlags = [ "--cxx17" @@ -175,29 +181,36 @@ stdenv.mkDerivation rec { # "--use-external-libs" ] ++ lib.optional optimize "--optimize"; - postInstall = '' - # wscript does not install these for some reason - install -vDm 644 "build/gtk2_ardour/ardour.xml" \ - -t "$out/share/mime/packages" - install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \ - -t "$out/share/applications" - for size in 16 22 32 48 256 512; do - install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ - "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png" - done - install -vDm 644 "ardour.1"* -t "$out/share/man/man1" + postInstall = + '' + # wscript does not install these for some reason + install -vDm 644 "build/gtk2_ardour/ardour.xml" \ + -t "$out/share/mime/packages" + install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \ + -t "$out/share/applications" + for size in 16 22 32 48 256 512; do + install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ + "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png" + done + install -vDm 644 "ardour.1"* -t "$out/share/man/man1" - # install additional bundled beats, chords and progressions - cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media" - '' + lib.optionalString videoSupport '' - # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. - wrapProgram "$out/bin/ardour${lib.versions.major version}" \ - --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}" - ''; + # install additional bundled beats, chords and progressions + cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media" + '' + + lib.optionalString videoSupport '' + # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. + wrapProgram "$out/bin/ardour${lib.versions.major version}" \ + --prefix PATH : "${ + lib.makeBinPath [ + harvid + xjadeo + ] + }" + ''; LINKFLAGS = "-lpthread"; - meta = with lib; { + meta = { description = "Multi-track hard disk recording software"; longDescription = '' Ardour is a digital audio workstation (DAW), You can use it to @@ -209,9 +222,12 @@ stdenv.mkDerivation rec { https://community.ardour.org/donate ''; homepage = "https://ardour.org/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; mainProgram = "ardour8"; - platforms = platforms.linux; - maintainers = with maintainers; [ magnetophon mitchmindtree ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + magnetophon + mitchmindtree + ]; }; } From c0148636adf0ca76b1e39d88b9d9a5abf23e4891 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 6 Feb 2025 11:07:58 +0800 Subject: [PATCH 154/484] ardour: 8.10 -> 8.11 --- pkgs/applications/audio/ardour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index bae0b9b9ce4f..45e8e95d2c0a 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.10"; + version = "8.11"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-y4eNo0ukRL6v0T1XvJ46sYnsiVSdL527punnkmf/TIU="; + hash = "sha256-z+rIWFVua1IG4GZ8kH3quKaBbN+I7Yr62vukJZk6KAg="; }; bundledContent = fetchzip { From 9fb53cf2943617f6ac81fb711b75fdede484dcc7 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 11 Feb 2025 20:28:30 +0800 Subject: [PATCH 155/484] v2raya: add update script --- pkgs/by-name/v2/v2raya/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index 2d54d4271225..8d12dc057cbd 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -14,6 +14,7 @@ v2ray, v2ray-geoip, v2ray-domain-list-community, + nix-update-script, }: let pname = "v2raya"; @@ -87,6 +88,16 @@ buildGoModule { --prefix XDG_DATA_DIRS ":" ${assetsDir}/share ''; + passthru = { + inherit web; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "web" + ]; + }; + }; + meta = { description = "Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel"; homepage = "https://github.com/v2rayA/v2rayA"; From d191dc38708b586513c2d2ab2078cc9132cd3269 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 11 Feb 2025 12:32:24 +0000 Subject: [PATCH 156/484] v2raya: 2.2.6.3 -> 2.2.6.6 --- pkgs/by-name/v2/v2raya/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index 8d12dc057cbd..5ec5a2eddecb 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -18,13 +18,13 @@ }: let pname = "v2raya"; - version = "2.2.6.3"; + version = "2.2.6.6"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; tag = "v${version}"; - hash = "sha256-Du7DqOkneOFBiPK5BeQtnKRsX0Tcuhq8iiugDMGTk7o="; + hash = "sha256-OXydUg9prJ3Rc5yecEqHfv+kyx/rMzzDQdz+lHvPG6k="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; @@ -35,7 +35,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/gui/yarn.lock"; - hash = "sha256-AexW4FFGkQBQlci/FAm9rpfbPn76v+O3nMX3xHymhPw="; + hash = "sha256-g+hI9n+nfXAcuEpjvDDaHg/DfjtNusOaw3S6kC1QDn4="; }; env.OUTPUT_DIR = placeholder "out"; @@ -61,7 +61,7 @@ buildGoModule { sourceRoot = "${src.name}/service"; - vendorHash = "sha256-kK99Y0CgesvlaM2WsFIPgdtWo2975m9TqyJXoNv43yU="; + vendorHash = "sha256-uiURsB1V4IB77YKLu5gdaqw9Fuja6fC5adWYDE3OE+Q="; ldflags = [ "-s" From 9cddbd5a5fc277a91714b8a87ae78df8d4ed3218 Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Wed, 12 Feb 2025 22:48:44 +0100 Subject: [PATCH 157/484] vscode-extensions: use sri hashes in update script --- .../editors/vscode/extensions/update_installed_exts.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh index 17fe10604340..dd2e8ef24789 100755 --- a/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh +++ b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh @@ -43,8 +43,8 @@ function get_vsixpkg() { curl --silent --show-error --retry 3 --fail -X GET -o "$EXTTMP/$N.zip" "$URL" # Unpack the file we need to stdout then pull out the version VER=$(jq -r '.version' <(unzip -qc "$EXTTMP/$N.zip" "extension/package.json")) - # Calculate the SHA - SHA=$(nix-hash --flat --base32 --type sha256 "$EXTTMP/$N.zip") + # Calculate the hash + HASH=$(nix-hash --flat --sri --type sha256 "$EXTTMP/$N.zip") # Clean up. rm -Rf "$EXTTMP" @@ -55,7 +55,7 @@ function get_vsixpkg() { name = "$2"; publisher = "$1"; version = "$VER"; - sha256 = "$SHA"; + hash = "$HASH"; } EOF } From 95917979db2a16f7e5401043fc9fdcc67ac6522f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 12 Feb 2025 19:02:06 -0300 Subject: [PATCH 158/484] vimix-icon-theme: 2023-06-26 -> 2025.02.10 Diff: https://github.com/vinceliuice/vimix-icon-theme/compare/2023-06-26...2025.02.10 --- pkgs/by-name/vi/vimix-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix index 9c0e0d9b9f7f..eefc7aed915a 100644 --- a/pkgs/by-name/vi/vimix-icon-theme/package.nix +++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix @@ -29,13 +29,13 @@ lib.checkListOfEnum "${pname}: color variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-06-26"; + version = "2025.02.10"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "5pTYsWdmjSDyrEK+Jbg/9dQ1FHI2rdnr1n0Ysd5mg/U="; + hash = "sha256-HNwEqp6G9nZDIJo9b6FD4d5NSXUx523enENM0NVwviA="; }; nativeBuildInputs = [ From e02d71a970af11fbe0b1abd7fe507e3d8dd71201 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:30:05 +0000 Subject: [PATCH 159/484] python312Packages.pyemvue: 0.18.6 -> 0.18.7 --- pkgs/development/python-modules/pyemvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index c2b6ac4d22ce..3b43c1628d36 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.6"; + version = "0.18.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FQ34pKRK1HDLoupMDfVaNxAhn1HbZHYi6se4ewlUWGA="; + hash = "sha256-tDLI1j5WAP93A+FKx1m6QBOu/eNeCCV6Y4I2N6BgLD0="; }; nativeBuildInputs = [ hatchling ]; From 27a7aa6114b6ea425c3e729903ac53b75220461d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:33:31 +0000 Subject: [PATCH 160/484] python312Packages.google-cloud-texttospeech: 2.24.0 -> 2.25.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 72ef09fd9610..a9b597f989e2 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.24.0"; + version = "2.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-yfXzvL5NNF4mcBVTGJD0+ZHXbBnLm2v63A5jxgCxA04="; + hash = "sha256-d25wtYOFyMNLhCXHrbJ+lGqFg3fCJ7lRUzFddSY8HiM="; }; build-system = [ setuptools ]; From 6ab21960d63ca4464cffce6a3a22f0b012b9b4c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:33:44 +0000 Subject: [PATCH 161/484] python312Packages.google-cloud-websecurityscanner: 1.16.0 -> 1.17.0 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 119cdb45d588..0f7cb6551e74 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_websecurityscanner"; inherit version; - hash = "sha256-bZMP5SFE9g1FQa/z4eusS1ohvtblCuzNA2RNURx31D0="; + hash = "sha256-JqKKtjBeJ/jyGZZ9SGhQ9a89khuZKSJMPhqc5BOnFcg="; }; build-system = [ setuptools ]; From a79ee8c78b4ed4561240f1ee68d51c64978e78f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 22:49:25 +0000 Subject: [PATCH 162/484] python312Packages.google-cloud-trace: 1.15.0 -> 1.16.0 --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 2a8cedcca90e..ad6913e56796 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.15.0"; + version = "1.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_trace"; inherit version; - hash = "sha256-wgy+9eUr6MpiiiL+vmW49F/dpoW7Rv/KNvTs6keOxKM="; + hash = "sha256-nSexY3cVcrVh6/dTpeR5H5nSXlTtrUywEheriC899Bo="; }; build-system = [ setuptools ]; From fa345dc7ca7aa2899cf240560982f1ba685f2ca1 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 12 Feb 2025 17:58:19 -0500 Subject: [PATCH 163/484] kubernetes-helm: 3.17.0 -> 3.17.1 Diff: https://github.com/helm/helm/compare/v3.17.0...v3.17.1 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 816923ed2462..c994b155d469 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.17.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-kLiYzZFqJQGkqpjFPTB9BHQf7yWiWRUvWDpF5WkfJEU="; + sha256 = "sha256-wGORNOlfnBt8iApAP5s5tvy4Zfk87fOTpLSY5XYnzQM="; }; - vendorHash = "sha256-mARUYjnbn5dmR0cKAXiHFJcYNx1ROabLv9Z7KCY9PRM="; + vendorHash = "sha256-dZN1rOcGDIvhqXi35904kTBQ8RPeS1PFgspzn/j1ZQU="; subPackages = [ "cmd/helm" ]; ldflags = [ From ecc601b47d5d897433db3c66027dae2c0d52074b Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Wed, 12 Feb 2025 23:47:48 +0100 Subject: [PATCH 164/484] prisma: fix dangling symlinks Make sure we don't leave dangling symlinks in `$out` when building `prisma`. 1. We remove the original `node_modules` after buliding the packages to re-install the runtime dependencies without the dev dependencies. The way it was done was incorrect: only the root `node_modules` directory was removed but not the nested ones inside the packages. The follow-up `pnpm install` command didn't re-create or empty them and only created new files within, so we were left with tons of dangling symlinks from the first, full, `pnpm install` invocation. 2. `.pnpm/node_modules` inside the root `node_modules` contains symlinks to each workspace member package. However, we don't copy every package to `$out`, so we need to clean up this directory to remove the references to the missing packages. Fixes: https://github.com/NixOS/nixpkgs/issues/380427 --- pkgs/by-name/pr/prisma/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index a1cea0b3c3e8..5240f890a1a7 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") # Remove unnecessary external dependencies - rm -rf node_modules + find . -name node_modules -type d -prune -exec rm -rf {} + pnpm install --offline --ignore-scripts --frozen-lockfile --prod cp -r node_modules $out/lib/prisma @@ -72,10 +72,14 @@ stdenv.mkDerivation (finalAttrs: { for package in cli $deps; do filename=$(npm pack --json ./packages/$package | jq -r '.[].filename') mkdir -p $out/lib/prisma/packages/$package - cp -r packages/$package/node_modules $out/lib/prisma/packages/$package + [ -d "packages/$package/node_modules" ] && \ + cp -r packages/$package/node_modules $out/lib/prisma/packages/$package tar xf $filename --strip-components=1 -C $out/lib/prisma/packages/$package done + # Remove dangling symlinks to packages we didn't copy to $out + find $out/lib/prisma/node_modules/.pnpm/node_modules -type l -exec test ! -e {} \; -delete + makeWrapper "${lib.getExe nodejs}" "$out/bin/prisma" \ --add-flags "$out/lib/prisma/packages/cli/build/index.js" \ --set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \ From d0af2e5fe402b1632899fe587cb9fa7aa4b655ba Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:10:11 +0100 Subject: [PATCH 165/484] samply: remove readme patch The problem has been fixed upstream in linux-perf-data 0.9.0 and linux-perf-event-reader 0.10.0 --- pkgs/by-name/sa/samply/package.nix | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index c8e4c86e66f8..0a85af8003b5 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - jq, - moreutils, stdenv, darwin, }: @@ -21,29 +19,6 @@ rustPlatform.buildRustPackage rec { # https://github.com/NixOS/nixpkgs/issues/377986 cargoLock.lockFile = ./Cargo.lock; - # the dependencies linux-perf-data and linux-perf-event-reader contains both README.md and Readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - for crate in linux-perf-data linux-perf-event-reader; do - pushd $name/$crate - - rm -f README.md Readme.md - jq 'del(.files."README.md") | del(.files."Readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - done - ''; - }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; From 60bde6ae54f1cdc57a44863759f13092e5f6cf22 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:19:24 +0100 Subject: [PATCH 166/484] samply: useFetchCargoVendor --- pkgs/by-name/sa/samply/Cargo.lock | 2497 ---------------------------- pkgs/by-name/sa/samply/package.nix | 5 +- 2 files changed, 2 insertions(+), 2500 deletions(-) delete mode 100644 pkgs/by-name/sa/samply/Cargo.lock diff --git a/pkgs/by-name/sa/samply/Cargo.lock b/pkgs/by-name/sa/samply/Cargo.lock deleted file mode 100644 index c8a43ddb2fdb..000000000000 --- a/pkgs/by-name/sa/samply/Cargo.lock +++ /dev/null @@ -1,2497 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli 0.28.1", -] - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "fallible-iterator 0.3.0", - "gimli 0.29.0", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-compression" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "futures-io", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line 0.21.0", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object 0.32.2", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "binary-merge" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bitvec" -version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "brotli" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cab" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171228650e6721d5acc0868a462cd864f49ac5f64e4a42cde270406e64e404d2" -dependencies = [ - "byteorder", - "flate2", - "lzxd", - "time", -] - -[[package]] -name = "cc" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpp_demangle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "elsa" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "framehop" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775adc24f975a49a55a31d53664838836e70d8bafac569ee19f5fd9b6403eb88" -dependencies = [ - "arrayvec", - "cfg-if", - "fallible-iterator 0.3.0", - "gimli 0.29.0", - "macho-unwind-info", - "pe-unwind-info", - "thiserror", - "thiserror-no-std", -] - -[[package]] -name = "fs4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dabded2e32cd57ded879041205c60a4a4c4bab47bd0fd2fa8b01f30849f02b" -dependencies = [ - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "fxprof-processed-profile" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce20bbb48248608ba4908b45fe36e17e40f56f8c6bb385ecf5d3c4a1e8b05a22" -dependencies = [ - "bitflags 2.5.0", - "debugid", - "fxhash", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "getrandom" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" -dependencies = [ - "fallible-iterator 0.3.0", - "stable_deref_trait", -] - -[[package]] -name = "h2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "inplace-vec-builder" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307" -dependencies = [ - "smallvec", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.5.0", - "libc", -] - -[[package]] -name = "linear-map" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" - -[[package]] -name = "linux-perf-data" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4533101fd9e7cdabbdb80e09b45cf200ee3c2252a5d4aadaae5325ab46769747" -dependencies = [ - "byteorder", - "linear-map", - "linux-perf-event-reader", - "memchr", - "thiserror", -] - -[[package]] -name = "linux-perf-event-reader" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41064623ecf100db029bd29e4a1cdec25fc513d45c15619ecd03504e2ffb1687" -dependencies = [ - "bitflags 2.5.0", - "byteorder", - "memchr", - "thiserror", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "lzma-rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder", - "crc", -] - -[[package]] -name = "lzxd" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de7336a183103429ad66d11d56d8bdc9c4a2916f6b85a8f11e5b127bde12001" - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "macho-unwind-info" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6086acc74bc23f56b60e88bb082d505e23849d68d6c0f12bb6a7ad5c60e03e" -dependencies = [ - "thiserror", - "zerocopy", - "zerocopy-derive", -] - -[[package]] -name = "maybe-owned" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "msvc-demangler" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2588c982e3a7fbfbd73b21f824cacc43fc6392a1103c709ffd6001c0bf33fdb3" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "nix-base32" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8548db8274cf1b2b4c093557783f99e9ad64ffdaaa29a6c1af0abc9895c15612" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "normpath" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "object" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" -dependencies = [ - "crc32fast", - "flate2", - "hashbrown", - "indexmap", - "memchr", - "ruzstd", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opener" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9901cb49d7fc923b256db329ee26ffed69130bf05d74b9efdd1875c92d6af01" -dependencies = [ - "bstr", - "normpath", - "windows-sys 0.52.0", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "pdb-addr2line" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb51ef7ed9998e108891711812822831daac0b17d67768c3bdc69aa909366123" -dependencies = [ - "bitflags 2.5.0", - "elsa", - "maybe-owned", - "pdb2", - "range-collections", - "thiserror", -] - -[[package]] -name = "pdb2" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e30e131bcab0d41a2e471cf777ea9b1402f2a0764bcf1780251eab1b0d175d" -dependencies = [ - "fallible-iterator 0.2.0", - "scroll", - "uuid", -] - -[[package]] -name = "pe-unwind-info" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec3b43050c38ffb9de87e17d874e9956e3a9131b343c9b7b7002597727c3891" -dependencies = [ - "arrayvec", - "bitflags 2.5.0", - "thiserror", - "zerocopy", - "zerocopy-derive", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "range-collections" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537" -dependencies = [ - "binary-merge", - "inplace-vec-builder", - "ref-cast", - "smallvec", -] - -[[package]] -name = "rangemap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "ref-cast" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" - -[[package]] -name = "reqwest" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" -dependencies = [ - "async-compression", - "base64", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - -[[package]] -name = "rustls-webpki" -version = "0.102.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "ruzstd" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" -dependencies = [ - "byteorder", - "derive_more", - "twox-hash", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "samply" -version = "0.12.0" -dependencies = [ - "byteorder", - "clap", - "crossbeam-channel", - "debugid", - "dirs", - "flate2", - "framehop", - "futures-util", - "fxhash", - "fxprof-processed-profile", - "http-body-util", - "hyper", - "hyper-util", - "lazy_static", - "libc", - "linux-perf-data", - "mach", - "memchr", - "memmap2", - "mio", - "nix", - "nix-base32", - "num_cpus", - "object 0.35.0", - "once_cell", - "opener", - "parking_lot", - "percent-encoding", - "rand", - "serde", - "serde_derive", - "serde_json", - "signal-hook", - "sysctl", - "tempfile", - "thiserror", - "tokio", - "tokio-util", - "uname", - "uuid", - "wholesym", -] - -[[package]] -name = "samply-api" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba2d4cd2e2684f911e234613f0659e2df56db773609ab940b1b02e984bda886" -dependencies = [ - "samply-symbols", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "yaxpeax-arch", - "yaxpeax-arm", - "yaxpeax-x86", -] - -[[package]] -name = "samply-symbols" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d7259f93744ea3f094eea6f0f2be59facc45245fd8e0f693fad1e69ea5d16" -dependencies = [ - "addr2line 0.22.0", - "bitflags 2.5.0", - "cpp_demangle", - "debugid", - "elsa", - "flate2", - "gimli 0.29.0", - "linux-perf-data", - "lzma-rs", - "macho-unwind-info", - "memchr", - "msvc-demangler", - "nom", - "object 0.35.0", - "pdb-addr2line", - "rangemap", - "rustc-demangle", - "scala-native-demangle", - "srcsrv", - "thiserror", - "uuid", - "yoke", - "yoke-derive", - "zerocopy", - "zerocopy-derive", -] - -[[package]] -name = "scala-native-demangle" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4416eddc0eaf31e04aa4039bd3db4288ea1ba613955d86cf9c310049c5d1e2" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "srcsrv" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022437a70e522e49b1952cb1d923589d629cb4aee97eb56d65ce938c04e8ac70" -dependencies = [ - "memchr", - "thiserror", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "symsrv" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098492916b4954d05c9f195d073714401a48ad9d0c1d4690a4074146c9924804" -dependencies = [ - "async-compression", - "cab", - "dirs", - "fs4", - "futures-util", - "http", - "reqwest", - "scopeguard", - "thiserror", - "tokio", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "sysctl" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" -dependencies = [ - "bitflags 2.5.0", - "byteorder", - "enum-as-inner", - "libc", - "thiserror", - "walkdir", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "thiserror-impl-no-std" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "thiserror-no-std" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea" -dependencies = [ - "thiserror-impl-no-std", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "wholesym" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dd2331e4836f219a2da809a672abbd7f1d3ee33e0db30a28357a5a0fd6f4157" -dependencies = [ - "bytes", - "core-foundation", - "core-foundation-sys", - "debugid", - "futures-util", - "libc", - "memmap2", - "reqwest", - "samply-api", - "samply-symbols", - "symsrv", - "tokio", - "uuid", - "yoke", - "yoke-derive", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - -[[package]] -name = "yaxpeax-arch" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ba5c2f163fa2f866c36750c6c931566c6d93231ae9410083b0738953b609d5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "yaxpeax-arm" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0430c0047803b6aabfa3cb62f84a78d05b933e62bfcee97c7491bf634df9123" -dependencies = [ - "bitvec", - "yaxpeax-arch", -] - -[[package]] -name = "yaxpeax-x86" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107477944697db42c41326f82d4c65b769b32512cdad1e086f36f0e0f25ff45" -dependencies = [ - "cfg-if", - "num-traits", - "yaxpeax-arch", -] - -[[package]] -name = "yoke" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" -dependencies = [ - "serde", - "stable_deref_trait", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "zerofrom" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 0a85af8003b5..790c83058fbe 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -15,9 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7bf1lDIZGhRpvnn8rHNwzH2GBY8CwtYCjuRAUTQgbsA="; }; - # Can't use fetchCargoVendor: - # https://github.com/NixOS/nixpkgs/issues/377986 - cargoLock.lockFile = ./Cargo.lock; + useFetchCargoVendor = true; + cargoHash = "sha256-o9YGKHxcC7msF7OPiUiFMLw1XX2WJ0/KVvkSwKNhU/E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From a1f11928e7df9099c306cec7cff5415e759ff48d Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:21:22 +0100 Subject: [PATCH 167/484] samply: refactor --- pkgs/by-name/sa/samply/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 790c83058fbe..b442478cf278 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -4,6 +4,8 @@ fetchCrate, stdenv, darwin, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -22,15 +24,21 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Command line profiler for macOS and Linux"; - mainProgram = "samply"; homepage = "https://github.com/mstange/samply"; changelog = "https://github.com/mstange/samply/releases/tag/samply-v${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; + mainProgram = "samply"; }; } From 8b9bbf8b6dd25f82cfbf925aca2d0e9e52cd00d5 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 13 Feb 2025 00:29:12 +0100 Subject: [PATCH 168/484] samply: 0.12.0 -> 0.13.1 --- pkgs/by-name/sa/samply/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index b442478cf278..b0fba4887cd4 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "samply"; - version = "0.12.0"; + version = "0.13.1"; src = fetchCrate { inherit pname version; - hash = "sha256-7bf1lDIZGhRpvnn8rHNwzH2GBY8CwtYCjuRAUTQgbsA="; + hash = "sha256-zTwAsE6zXY3esO7x6UTCO2DbzdUSKZ6qc5Rr9qcI+Z8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-o9YGKHxcC7msF7OPiUiFMLw1XX2WJ0/KVvkSwKNhU/E="; + cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 3fd2f9b036c971d709abe7a90cd34be87c43b589 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 00:03:07 +0100 Subject: [PATCH 169/484] python312Packages.pomegranate: 0.14.8 -> 1.1.0 Diff: https://github.com/jmschrei/pomegranate/compare/refs/tags/v0.14.8...v1.1.0 Changelog: https://github.com/jmschrei/pomegranate/releases/tag/v1.1.0 --- .../python-modules/pomegranate/default.nix | 55 +++++++++++++------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 071c15c7e100..cbf7630bfa6b 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -7,45 +8,63 @@ setuptools, # dependencies - numpy, - joblib, + apricot-select, networkx, + numpy, + scikit-learn, scipy, - pyyaml, - cython, + torch, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "pomegranate"; - version = "0.14.8"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; - # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974 tag = "v${version}"; - hash = "sha256-PoDAtNm/snq4isotkoCTVYUuwr9AKKwiXIojUFMH/YE="; + hash = "sha256-p2Gn0FXnsAHvRUeAqx4M1KH0+XvDl3fmUZZ7MiMvPSs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numpy - joblib + dependencies = [ + apricot-select networkx + numpy + scikit-learn scipy - pyyaml - cython + torch ]; - # https://github.com/etal/cnvkit/issues/815 - passthru.skipBulkUpdate = true; + pythonImportsCheck = [ "pomegranate" ]; - meta = with lib; { + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: Arrays are not almost equal to 6 decimals + "--deselect=tests/distributions/test_normal_full.py::test_fit" + "--deselect=tests/distributions/test_normal_full.py::test_from_summaries" + "--deselect=tests/distributions/test_normal_full.py::test_serialization" + ]; + + disabledTests = [ + # AssertionError: Arrays are not almost equal to 6 decimals + "test_sample" + ]; + + meta = { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; homepage = "https://github.com/jmschrei/pomegranate"; - license = licenses.mit; - maintainers = with maintainers; [ rybern ]; + changelog = "https://github.com/jmschrei/pomegranate/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rybern ]; }; } From 545c5dd68b7e7a86203df097866fa388cf9815d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:47:17 +0000 Subject: [PATCH 170/484] python312Packages.google-cloud-appengine-logging: 1.5.0 -> 1.6.0 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 6c0dee2d5a9d..4c60425d242a 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_appengine_logging"; inherit version; - hash = "sha256-OaLfaU2XmB7QDvXfVB98/MqSCpJJZwdVfysHu3up1no="; + hash = "sha256-L271LfqI7KO+oHi8PCtV6mH/CLXgw3kSAn+7Kl8tkc4="; }; build-system = [ setuptools ]; From be208c66f98e61d50065b41fba656f5524b92512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 23:59:35 +0000 Subject: [PATCH 171/484] python312Packages.google-cloud-datacatalog: 3.24.1 -> 3.25.0 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bcf48bb812d5..145683193c59 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.24.1"; + version = "3.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_datacatalog"; inherit version; - hash = "sha256-JYcOb+suHqXNPGNoGhXm1GI33UWFM3lo766HXf9mek8="; + hash = "sha256-NBLojGvNx1m6rT2z7h1sj7bXlo8gUMwvyYGquzy1u0g="; }; build-system = [ setuptools ]; From d8519b0be891e8fd7521ace0f81b652438eed1a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:26:46 +0000 Subject: [PATCH 172/484] python312Packages.google-cloud-compute: 1.23.0 -> 1.25.0 --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index a76c25b1933e..87f232533051 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.23.0"; + version = "1.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_compute"; inherit version; - hash = "sha256-LLAlY69Sj3Rg8sjJBSMJloc+KE//5pzP4uR4kPnlSQs="; + hash = "sha256-Z1I34qVG+OX6WMGccxDgladTgzgxKoKLGXDyrwlb84c="; }; build-system = [ setuptools ]; From 7e5d18b1b15164f083134c5ccd70cea2ea7f78e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:32:32 +0000 Subject: [PATCH 173/484] gnustep-back: 0.31.0 -> 0.32.0 --- pkgs/by-name/gn/gnustep-back/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnustep-back/package.nix b/pkgs/by-name/gn/gnustep-back/package.nix index 3ba7512c4b67..94b4cdf356e5 100644 --- a/pkgs/by-name/gn/gnustep-back/package.nix +++ b/pkgs/by-name/gn/gnustep-back/package.nix @@ -14,11 +14,11 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-back"; - version = "0.31.0"; + version = "0.32.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; + sha256 = "sha256-E9rg3ySRUXSVgdPLeg1WrMO8u+SHHmM2Kb/XDAYqIOQ="; }; nativeBuildInputs = [ From 5252a8268e3adc55cea5974721b2dcf7f814ec84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:39:18 +0000 Subject: [PATCH 174/484] blst: 0.3.13 -> 0.3.14 --- pkgs/by-name/bl/blst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blst/package.nix b/pkgs/by-name/bl/blst/package.nix index 0148fe0d0a94..34c66eeb0eb5 100644 --- a/pkgs/by-name/bl/blst/package.nix +++ b/pkgs/by-name/bl/blst/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blst"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; rev = "v${finalAttrs.version}"; - hash = "sha256-+Ae2cCVVEXnV/ftVOApxDcXM3COf/4DXXd1AOuGS5uc="; + hash = "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY="; }; buildPhase = '' From 4ee8be94120c52ef5ddfecbe0eeb24b38f031975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 00:40:07 +0000 Subject: [PATCH 175/484] gnustep-gui: 0.31.1 -> 0.32.0 --- pkgs/by-name/gn/gnustep-gui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnustep-gui/package.nix b/pkgs/by-name/gn/gnustep-gui/package.nix index 560daf72581f..5ade6dec4b51 100644 --- a/pkgs/by-name/gn/gnustep-gui/package.nix +++ b/pkgs/by-name/gn/gnustep-gui/package.nix @@ -7,12 +7,12 @@ }: clangStdenv.mkDerivation (finalAttrs: { - version = "0.31.1"; + version = "0.32.0"; pname = "gnustep-gui"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; + sha256 = "sha256-HEH80P51mnLRt4+d+gzpGCv4u6oOdf+x68CcvkR6G/o="; }; nativeBuildInputs = [ wrapGNUstepAppsHook ]; From ae0ca1c65a0b1253ff3c3625f199bf0ebb590c45 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 00:18:24 +0100 Subject: [PATCH 176/484] python312.cnvkit: cleanup & fix --- .../python-modules/cnvkit/default.nix | 110 ++++++++++-------- 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 168ba0b0882b..4911f8b004cd 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -1,31 +1,31 @@ { lib, - fetchFromGitHub, - rPackages, buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + # dependencies + R, biopython, - numpy, - scipy, - scikit-learn, - pandas, matplotlib, - reportlab, - pysam, - future, - pillow, + numpy, + pandas, pomegranate, pyfaidx, - python, - pythonOlder, - R, + pysam, + rPackages, + reportlab, + scikit-learn, + scipy, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "cnvkit"; version = "0.9.12"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "etal"; @@ -34,50 +34,58 @@ buildPythonPackage rec { hash = "sha256-ZdE3EUNZpEXRHTRKwVhuj3BWQWczpdFbg4pVr0+AHiQ="; }; - postPatch = '' - # see https://github.com/etal/cnvkit/issues/589 - substituteInPlace setup.py \ - --replace 'joblib < 1.0' 'joblib' - # see https://github.com/etal/cnvkit/issues/680 - substituteInPlace test/test_io.py \ - --replace 'test_read_vcf' 'dont_test_read_vcf' - ''; - - propagatedBuildInputs = [ - biopython - numpy - scipy - scikit-learn - pandas - matplotlib - reportlab - pyfaidx - pysam - future - pillow - pomegranate - rPackages.DNAcopy + patches = [ + (fetchpatch { + name = "fix-numpy2-compat"; + url = "https://github.com/etal/cnvkit/commit/5cb6aeaf40ea5572063cf9914c456c307b7ddf7a.patch"; + hash = "sha256-VwGAMGKuX2Kx9xL9GX/PB94/7LkT0dSLbWIfVO8F9NI="; + }) ]; - nativeCheckInputs = [ R ]; + pythonRelaxDeps = [ + # https://github.com/etal/cnvkit/issues/815 + "pomegranate" + ]; - checkPhase = '' - pushd test/ - ${python.interpreter} test_io.py - ${python.interpreter} test_genome.py - ${python.interpreter} test_cnvlib.py - ${python.interpreter} test_commands.py - ${python.interpreter} test_r.py - popd # test/ + # Numpy 2 compatibility + postPatch = '' + substituteInPlace skgenome/intersect.py \ + --replace-fail "np.string_" "np.bytes_" ''; + dependencies = [ + biopython + matplotlib + numpy + pandas + pomegranate + pyfaidx + pysam + rPackages.DNAcopy + reportlab + scikit-learn + scipy + ]; + pythonImportsCheck = [ "cnvlib" ]; - meta = with lib; { + nativeCheckInputs = [ + pytestCheckHook + R + ]; + + disabledTests = [ + # AttributeError: module 'pomegranate' has no attribute 'NormalDistribution' + # https://github.com/etal/cnvkit/issues/815 + "test_batch" + "test_segment_hmm" + ]; + + meta = { homepage = "https://cnvkit.readthedocs.io"; description = "Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; changelog = "https://github.com/etal/cnvkit/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.jbedo ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jbedo ]; }; } From cdea5670aa783cd5f68ac527745efb7c9bbd1ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 12 Feb 2025 21:47:03 -0300 Subject: [PATCH 177/484] reversal-icon-theme: temporarily set dontCheckForBrokenSymlinks --- pkgs/by-name/re/reversal-icon-theme/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index c56104e4c288..c7e445851e60 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -60,6 +60,9 @@ lib.checkListOfEnum "${pname}: color variants" dontPatchELF = true; dontRewriteSymlinks = true; + # FIXME: https://github.com/yeyushengfan258/Reversal-icon-theme/issues/108 + dontCheckForBrokenSymlinks = true; + postPatch = '' patchShebangs install.sh ''; From cd99068bb0dcef264ccfc55095ab81ef09c63a37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 01:08:48 +0000 Subject: [PATCH 178/484] gnu-shepherd: 1.0.1 -> 1.0.2 --- pkgs/by-name/gn/gnu-shepherd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 4b573b1712f1..964176154388 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; - hash = "sha256-iV0AUeHMRzsfefY5E3d7TRX4nxbQpyN3QXbaEC4nEMU="; + hash = "sha256-30usBLSwR2+o+e0TgpKsLMVLQwS17v2FntSJLU+ZJL8="; }; configureFlags = [ "--localstatedir=/" ]; From 67f475548563a7bd42b64ac5da29ae0d1b159016 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Thu, 13 Feb 2025 12:29:11 +1100 Subject: [PATCH 179/484] goresym: 2.7.4 -> 3.0.2 --- pkgs/by-name/go/goresym/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix index 80ed06fd0fb8..e498701b9707 100644 --- a/pkgs/by-name/go/goresym/package.nix +++ b/pkgs/by-name/go/goresym/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "goresym"; - version = "2.7.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "mandiant"; - repo = pname; + repo = "goresym"; rev = "v${version}"; - sha256 = "sha256-qFDacInIiV1thuYMjyzTG7ru5bkd2Af1iao7Oes1mRg="; + hash = "sha256-tt13vHe6wE27kv+1HVXytY1hKmOt6rWJaMBgLRCvO2E="; }; subPackages = [ "." ]; From 57324a5cf6e06a7b106977e536ff60f654aae143 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 02:10:33 +0000 Subject: [PATCH 180/484] mendeley: 2.129.0 -> 2.130.0 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 5db268a26a33..a11d13efaaaf 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.129.0"; + version = "2.130.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-lA3ald0pgNd6az7nP5MPMrs12EEvJaHpEypXFfCvKCQ="; + hash = "sha256-ldlMWitLe3pcA1ip+/NZuswKvPdpn9l8tVSCOOr4pbc="; }; appimageContents = appimageTools.extractType2 { From f9aa79dafc308a7b79491b4e197cf4ed4cab7ca8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 02:39:48 +0000 Subject: [PATCH 181/484] zimfw: 1.17.0 -> 1.17.1 --- pkgs/by-name/zi/zimfw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix index b12b74bea670..d10264923d5a 100644 --- a/pkgs/by-name/zi/zimfw/package.nix +++ b/pkgs/by-name/zi/zimfw/package.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - hash = "sha256-h8VhnUxelnc67TngQzmKY/098uKgvopBA1YleTiJhWc="; + hash = "sha256-W0yjDebHyhsjPQF8CZMAUv+nJ/oLx/mxolxiCNvAs00="; }; strictDeps = true; dontConfigure = true; From 79da88a08a15a7e3167a9dd872a6a394b44ab20a Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Wed, 12 Feb 2025 19:11:12 -0700 Subject: [PATCH 182/484] peertube: remove broken symlinks --- pkgs/servers/peertube/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index a43d959baff1..e62bf9005deb 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -77,9 +77,6 @@ stdenv.mkDerivation rec { hash = "sha256-x5qFCprn8q0xC88HudLV7W53X1Nkbz3F52RMp2PxIu8="; }; - # There are broken symlinks in the node_modules - dontCheckForBrokenSymlinks = true; - outputs = [ "out" "cli" @@ -171,6 +168,14 @@ stdenv.mkDerivation rec { mv ~/packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils mv ~/{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,yarn.lock} $out + # Remove broken symlinks in node_modules from workspace packages that aren't needed + # by the built artifact. If any new packages break the check for broken symlinks, + # they should be checked before adding them here to make sure they aren't likely to + # be needed, either now or in the future. If they might be, then we probably want + # to move the package to $out above instead of removing the broken symlink. + rm $out/node_modules/@peertube/{peertube-server,peertube-transcription-devtools,peertube-types-generator,tests} + rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests} + mkdir -p $cli/bin mv ~/apps/peertube-cli/{dist,node_modules,package.json,yarn.lock} $cli ln -s $cli/dist/peertube.js $cli/bin/peertube-cli From 2ca887931074ca3c0570ead6a19e4609097746cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 02:50:34 +0000 Subject: [PATCH 183/484] mark: 12.0.0 -> 12.0.1 --- pkgs/by-name/ma/mark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index c84e8c9eed6f..8039b639a3a5 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mark"; - version = "12.0.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-kMP6+L7kfK/qfVI49ssD6Ar1c7ugKgiXUIk9yjQYXE8="; + sha256 = "sha256-2vY1s4ZR6y+R/tRUsM/1hmqRdmrFXmalk9eAAGL2ElQ="; }; - vendorHash = "sha256-40hYy3rXyTqrmTp6lNsLI5c2GWZ6Aoi3KRPJV0Ry5Ds="; + vendorHash = "sha256-XPTnsV0JVSatfHzI4ajq8nnN2HTKc8FeKwmOIuXo2GU="; ldflags = [ "-s" From e61496ff4b8397c20beca1de6ada6c50c18023db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:13:36 +0000 Subject: [PATCH 184/484] prometheus-ipmi-exporter: 1.9.0 -> 1.10.0 --- pkgs/servers/monitoring/prometheus/ipmi-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index 9432dcd839b1..26ff81f60e32 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-0JNt3XbXGbAfaBQ13X/vrBhhN39hY4kwoBQ9obxsAd0="; + hash = "sha256-Go47Txf/NX9ytMvvFQeNVCw0ORWqbsg2sIWK4MVRyIA="; }; - vendorHash = "sha256-dUf++LhoKWJxQfu9Latr8mCkeid5EAi+6yRdWDkTeP8="; + vendorHash = "sha256-OXVUFamFv1BZTXuIfmaYHc1y9B9j4ndo1/2CGLNavh0="; nativeBuildInputs = [ makeWrapper ]; From 35f27cfb2b564429cb5168db0338fc68ffa27039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:29:54 +0000 Subject: [PATCH 185/484] broot: 1.44.6 -> 1.44.7 --- pkgs/by-name/br/broot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 9d3a37a10bae..0a13cf83a336 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.6"; + version = "1.44.7"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-cvrWcfQj5Pc2tyaQjhhTK9Ko240Bz6dbUe+OFLTz/+M="; + hash = "sha256-GaOPC1lIu48qFo99AQ99f49e8qH/TEQubpluptLc0jY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-k0H68lvciLjfRx2J1s1dKA8kijFkSBryoGWXCVAR6Ic="; + cargoHash = "sha256-J7zc1aTH62nL96cSb9CiIk8uJdR7nk9EnERiAfMvqNM="; nativeBuildInputs = [ installShellFiles From 03122787a2a9adad7ce14c5addd31211b60f3def Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:31:47 +0000 Subject: [PATCH 186/484] python312Packages.internetarchive: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/internetarchive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 9b61c2bb55b1..bc23a5c41e72 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; tag = "v${version}"; - hash = "sha256-xi3cR/j25gRe+muWjk8towzELgDciqLxGvBIpRqJHd0="; + hash = "sha256-2CShbIS5hq+queeHHlE53Vf8sl4HQySp1ZU8mz67Qbc="; }; build-system = [ setuptools ]; @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; - changelog = "https://github.com/jjjake/internetarchive/blob/v${version}/HISTORY.rst"; + changelog = "https://github.com/jjjake/internetarchive/blob/${src.tag}/HISTORY.rst"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ pyrox0 ]; mainProgram = "ia"; From a71964835b0aa3d21d9f2636cd1e8fb8206a58bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:40:01 +0000 Subject: [PATCH 187/484] pay-respects: 0.6.12 -> 0.6.13 --- pkgs/by-name/pa/pay-respects/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index dd5c3b3857e0..87347e27f763 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -8,18 +8,18 @@ }: rustPlatform.buildRustPackage rec { pname = "pay-respects"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitea { domain = "codeberg.org"; owner = "iff"; repo = "pay-respects"; rev = "v${version}"; - hash = "sha256-lDIhI9CnWwVVGyAJAS3gDUEkeXShTvPd8JKC1j9/9yU="; + hash = "sha256-uiNGx0+tN75pGZy3kW0ibZfjT9Cs+P2M5fT5CtFwJDo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z0nHq5qiT59bCgOWb7D3h25LcejwJlp64j5zaUx9jb0="; + cargoHash = "sha256-ItXWks18xxb+bP35hBdB3UL5TNSo4vCc/Tm4+EX8NUs="; nativeBuildInputs = [ pkg-config From 6933f63d0696e200093688914c0dc23519d86538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:53:52 +0000 Subject: [PATCH 188/484] netbird-ui: 0.36.5 -> 0.36.6 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 284d79489090..70616fad3b71 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.36.5"; + version = "0.36.6"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${version}"; - hash = "sha256-3k41lydp6bIfANblvdYK07xY/B3SbXwipbLAIUxmf9I="; + hash = "sha256-qXwpYGFAQvOKor/acJJqjgNiFNf2YxDsawFne3dkfYc="; }; - vendorHash = "sha256-30KSccdeQ+DrYjotCR0w0LvY1jCBBJIAy5rKQtSsD9Q="; + vendorHash = "sha256-/8SoQAQoFuuHTi+rTkmQSZxCt9sAl0yDCVccrqlx4VE="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 7b1ff3b7b530581394d21312d2cce8d2cd433578 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:54:07 +0000 Subject: [PATCH 189/484] python312Packages.google-cloud-bigquery-datatransfer: 3.18.0 -> 3.19.0 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 9fc7a4856091..9324adcc0835 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.18.0"; + version = "3.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-K4Hiiy7PotLAS0pmU1K/osLufp0tQypWy12BhICrwC0="; + hash = "sha256-qQ330hnnZyC4X+QvlrSF+Z/FGCsaETzP47CgzAHHS+0="; }; build-system = [ setuptools ]; From f7954dc3824ad6cc5cc3c62c5486411f9ab98378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:56:48 +0000 Subject: [PATCH 190/484] python312Packages.google-cloud-monitoring: 2.26.0 -> 2.27.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 878c69c14ec7..df4d2ae4719b 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.26.0"; + version = "2.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_monitoring"; inherit version; - hash = "sha256-KQQf3/2y24bIvlRayYXHSQwXDpEQtDZfC9YIjGhEGIQ="; + hash = "sha256-9mVSUogS57ap8vt+C3w+eQTMDBNQT0/LQgNXIrXaK8Q="; }; build-system = [ setuptools ]; From d704f439e529dc68065eff4536d89096efd22b17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 03:59:33 +0000 Subject: [PATCH 191/484] trealla: 2.63.33 -> 2.63.35 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 7fa13c081d06..157615cab1e8 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.63.33"; + version = "2.63.35"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-ivbjnYKuZW3xvyPxOF3Ov/0obI71lri/itsVFJ4Cb4k="; + hash = "sha256-7mdA6p4jalxVmL89mE3WB0wgOZPADOhvZ6P8wijGFt0="; }; postPatch = '' From 8089f50126b4cd8b340ac871beac71fa93267863 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 04:02:09 +0000 Subject: [PATCH 192/484] python312Packages.google-cloud-container: 2.55.0 -> 2.56.0 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 2dc8dd2a3de5..6a39f3f66822 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.55.0"; + version = "2.56.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-ZAJAHnGb3k62B7H+FT/bKTHKwo+cWdkS8RSkiy5YA5g="; + hash = "sha256-BD2e/4aDhyY5Cs95YZwAO1sJK7t+s9VCYwbpsrlQDg8="; }; build-system = [ setuptools ]; From 5216309c25c6b082f35585640325972d6cc0d049 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:02:51 +0100 Subject: [PATCH 193/484] komikku: 1.69.0 -> 1.70.0 --- pkgs/by-name/ko/komikku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 3512c4742ba3..4adc8364adfd 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.69.0"; + version = "1.70.0"; pyproject = false; src = fetchFromGitea { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-YrqoUU2BYM6AMD5s6FJn8GV+UmyeKV2mFQyfJjLI8HA="; + hash = "sha256-JkuA7He3gVhKZGsZGZkfQad8jUDlG7MaLlfkuhpcd3w="; }; nativeBuildInputs = [ From 74ea9987e7f8600624a322f354ad2e4df490eaf9 Mon Sep 17 00:00:00 2001 From: Jan Votava Date: Thu, 13 Feb 2025 07:03:23 +0000 Subject: [PATCH 194/484] timoni: 0.23.0 -> 0.24.0 --- pkgs/applications/networking/cluster/timoni/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 3e34edc3c519..75977b38cdaa 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "timoni"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-WlsBW8c6x68oM6g/bVXzPgIglMn+rPcfJKXmUZPC0n0="; + hash = "sha256-nI0yy/zhsJUvisHo+C+/uNRF96ZQ1Ve8VWpE8ZvUeJc="; }; - vendorHash = "sha256-mv9H0D99am/VXTP01sXQ+4Dt513Zmo0VffkUVPyF3Kk="; + vendorHash = "sha256-YpwESaR+X2eOyaPdR+I3mURD7yvwzmpPmgPoSPrXjH8="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; From 2ee7b5ee169e9634ea8c331ac67ada859a386676 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:10:08 +0100 Subject: [PATCH 195/484] signal-desktop: 7.41.0 -> 7.42.0 --- pkgs/by-name/si/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix index 8d2e187c6f14..4a703e4e17d3 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.41.0"; + version = "7.42.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-au0a//9P0dNDZnh1LzuHhpimWAzKRj5oJmUHls5mSxU="; + hash = "sha256-LuqE2SE6RurcwU5fl3uOJNtNZTBTR+xO2W6z98Gv53A="; } From c2d39e074cf56d9e0385384c99fec6d26efa3419 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:10:22 +0100 Subject: [PATCH 196/484] signal-desktop(darwin): 7.41.0 -> 7.42.0 --- pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix index 304124fce886..1e822d96cd28 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop"; - version = "7.41.0"; + version = "7.42.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-0nolZgoTlmfsAUWUXITTa1FzBHyfHWTZRO2LjccdjNg="; + hash = "sha256-N/BgLpEvpcl29+AN0zZDBGBwkYqYqjW953jfdwm5+/4="; }; sourceRoot = "."; From 60174a6bfe05fba27493e6509d10ebb29d751352 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 13 Feb 2025 13:43:01 +0530 Subject: [PATCH 197/484] uboot: 2024.10 -> 2025.01 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 7de987053784..c3fc877c7479 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -29,10 +29,10 @@ }: let - defaultVersion = "2024.10"; + defaultVersion = "2025.01"; defaultSrc = fetchurl { url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-so2vSsF+QxVjYweL9RApdYQTf231D87ZsS3zT2GpL7A="; + hash = "sha256-ze99UHyT8bvZ8BXqm8IfoHQmhIFAVQGUWrxvhU1baG8="; }; # Dependencies for the tools need to be included as either native or cross, From d016fedb1924a0888f1a346a8ee381b7fa5f06bc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 13 Feb 2025 09:13:04 +0000 Subject: [PATCH 198/484] wlr-randr: 0.4.1 -> 0.5.0 Changes: https://gitlab.freedesktop.org/emersion/wlr-randr/-/tags --- pkgs/by-name/wl/wlr-randr/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/wl/wlr-randr/package.nix b/pkgs/by-name/wl/wlr-randr/package.nix index 4064d5538bbf..95d57a5e3d83 100644 --- a/pkgs/by-name/wl/wlr-randr/package.nix +++ b/pkgs/by-name/wl/wlr-randr/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromSourcehut, + fetchFromGitLab, meson, ninja, pkg-config, @@ -11,13 +11,14 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.4.1"; + version = "0.5.0"; - src = fetchFromSourcehut { - owner = "~emersion"; - repo = pname; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = "wlr-randr"; rev = "v${version}"; - hash = "sha256-2kWTVAi4hq2d9jQ6yBLVzm3x7n/oSvBdZ45WyjhXhc4="; + hash = "sha256-lHOGpY0IVnR8QdSqJbtIA4FkhmQ/zDiFNqqXyj8iw/s="; }; strictDeps = true; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Xrandr clone for wlroots compositors"; - homepage = "https://git.sr.ht/~emersion/wlr-randr"; + homepage = "https://gitlab.freedesktop.org/emersion/wlr-randr"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; From 75124f4d3b4421e1910d4c0af541a520a2f9b56d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 10:19:32 +0000 Subject: [PATCH 199/484] python312Packages.wikipedia-api: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/wikipedia-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wikipedia-api/default.nix b/pkgs/development/python-modules/wikipedia-api/default.nix index d31652738025..e169f9864670 100644 --- a/pkgs/development/python-modules/wikipedia-api/default.nix +++ b/pkgs/development/python-modules/wikipedia-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wikipedia-api"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "martin-majlis"; repo = "Wikipedia-API"; tag = "v${version}"; - hash = "sha256-L/XjFV3jUW4WNV4+5J60oAwtZMFSmM1y1/z4eNsFjIY="; + hash = "sha256-5wi1HVkD36RnmIAKSKRYTc30HtYMiFrRoYzZRWENd/M="; }; propagatedBuildInputs = [ requests ]; From 13106496ecb4ca3c2a7866e10bfe14ec9389726c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Feb 2025 08:35:53 +0100 Subject: [PATCH 200/484] python313Packages.neo4j: 5.28.0 -> 5.28.1 Diff: https://github.com/neo4j/neo4j-python-driver/compare/refs/tags/5.28.0...5.28.1 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.28.1 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 2a63d512164c..7a9110fdd9c5 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.28.0"; + version = "5.28.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; tag = version; - hash = "sha256-1hq0XuHb7R/ROkeyEyfGQMH//E632aiNYVSjszM1OEY="; + hash = "sha256-6Qa6llM8ke9dOkZ7q057ruM0h7pByxAQ+I6Mus2ExVA="; }; postPatch = '' From 36acd90a17fdd1f202c0b8fc47890ed8f471c41e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Feb 2025 09:24:14 +0100 Subject: [PATCH 201/484] python312Packages.cramjam: 2.8.3 -> 2.9.1-unstable-2025-01-04 Diff: https://github.com/milesgranger/pyrus-cramjam/compare/refs/tags/v2.8.3...61564e7761e38e5ec55e7939ccd6a276c2c55d11 Changelog: https://github.com/milesgranger/cramjam/releases/tag/v2.9.1 --- .../python-modules/cramjam/default.nix | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index dc35cbc2c6ff..750ff3fa7076 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -3,8 +3,8 @@ buildPythonPackage, fetchFromGitHub, rustPlatform, - stdenv, - libiconv, + + # tests hypothesis, numpy, pytest-xdist, @@ -13,30 +13,30 @@ buildPythonPackage rec { pname = "cramjam"; - version = "2.8.3"; + # 2.9.1 ships with experimental decoders that were having issues. + # They were removed afterwards but the change has not been released yet: + # https://github.com/milesgranger/cramjam/pull/197 + # TODO: update to the next stable release when available + version = "2.9.1-unstable-2025-01-04"; pyproject = true; src = fetchFromGitHub { owner = "milesgranger"; - repo = "pyrus-cramjam"; - tag = "v${version}"; - hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE="; + repo = "cramjam"; + rev = "61564e7761e38e5ec55e7939ccd6a276c2c55d11"; + hash = "sha256-KTYTelQdN5EIJFbyQgrYcayqkAQQSNF+SHqUFFHf1Z8="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - hash = "sha256-Gpj/LUCx/ivYlmxNJnEZr8caEfV4OaQwEPNjz7vobsw="; + inherit pname src version; + hash = "sha256-Jw9zbgcrX3pofW7E8b4xzZYKj3h6ufCVLjv2xD/qONo="; }; - buildAndTestSubdir = "cramjam-python"; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - nativeCheckInputs = [ hypothesis numpy @@ -44,22 +44,23 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "cramjam-python/tests" ]; + env = { + # Makes tests less flaky by relaxing performance constraints + # https://github.com/HypothesisWorks/hypothesis/issues/3713 + CI = true; + }; disabledTestPaths = [ - "cramjam-python/benchmarks/test_bench.py" - # test_variants.py appears to be flaky - # - # https://github.com/NixOS/nixpkgs/pull/311584#issuecomment-2117656380 - "cramjam-python/tests/test_variants.py" + "benchmarks/test_bench.py" ]; pythonImportsCheck = [ "cramjam" ]; - meta = with lib; { + meta = { description = "Thin Python bindings to de/compression algorithms in Rust"; homepage = "https://github.com/milesgranger/pyrus-cramjam"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ veprbl ]; + changelog = "https://github.com/milesgranger/cramjam/releases/tag/v${version}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } From 0fe38d49a58b5b168d9b464dcc970956897716a4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 10:33:15 +0100 Subject: [PATCH 202/484] python312Packages.uproot: 5.5.1 -> 5.5.2 Diff: https://github.com/scikit-hep/uproot5/compare/refs/tags/v5.5.1...v5.5.2 Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.5.2 --- .../python-modules/uproot/default.nix | 81 +++++++++---------- 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index fb49f9b6e9cc..9c34d6798579 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -11,30 +10,31 @@ # dependencies awkward, cramjam, - numpy, fsspec, + numpy, packaging, - # checks + # tests awkward-pandas, pandas, - pytestCheckHook, pytest-timeout, + pytestCheckHook, rangehttpserver, scikit-hep-testdata, + writableTmpDirAsHomeHook, xxhash, }: buildPythonPackage rec { pname = "uproot"; - version = "5.5.1"; + version = "5.5.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; tag = "v${version}"; - hash = "sha256-a5gCsv8iBUUASHCJIpxFbgBXTSm/KJOTt6fvSvP/Lio="; + hash = "sha256-vMTZ3ajCEkKKerPXThSxk0vgGxK2Po9hVf8ofaGCO04="; }; build-system = [ @@ -45,8 +45,8 @@ buildPythonPackage rec { dependencies = [ awkward cramjam - numpy fsspec + numpy packaging xxhash ]; @@ -54,50 +54,41 @@ buildPythonPackage rec { nativeCheckInputs = [ awkward-pandas pandas - pytestCheckHook pytest-timeout + pytestCheckHook rangehttpserver scikit-hep-testdata + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME="$(mktemp -d)" - ''; + disabledTests = [ + # Tests that try to download files + "test_descend_into_path_classname_of" + "test_fallback" + "test_fsspec_cache_http" + "test_fsspec_cache_http_directory" + "test_fsspec_chunks" + "test_fsspec_globbing_http" + "test_http" + "test_http_fallback_workers" + "test_http_multipart" + "test_http_port" + "test_http_size" + "test_http_size_port" + "test_http_workers" + "test_issue176" + "test_issue176_again" + "test_issue_1054_filename_colons" + "test_no_multipart" + "test_open_fsspec_github" + "test_open_fsspec_http" + "test_pickle_roundtrip_http" - disabledTests = - [ - # Tests that try to download files - "test_descend_into_path_classname_of" - "test_fallback" - "test_fsspec_cache_http" - "test_fsspec_cache_http_directory" - "test_fsspec_chunks" - "test_fsspec_globbing_http" - "test_http" - "test_http_fallback_workers" - "test_http_multipart" - "test_http_port" - "test_http_size" - "test_http_size_port" - "test_http_workers" - "test_issue176" - "test_issue176_again" - "test_issue_1054_filename_colons" - "test_no_multipart" - "test_open_fsspec_github" - "test_open_fsspec_http" - "test_pickle_roundtrip_http" - - # Cyclic dependency with dask-awkward - "test_dask_duplicated_keys" - "test_decompression_executor_for_dask" - "test_decompression_threadpool_executor_for_dask" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Tries to connect to localhost:22 - # PermissionError: [Errno 1] Operation not permitted - "test_open_fsspec_ssh" - ]; + # Cyclic dependency with dask-awkward + "test_dask_duplicated_keys" + "test_decompression_executor_for_dask" + "test_decompression_threadpool_executor_for_dask" + ]; disabledTestPaths = [ # Tests that try to download files From 5d094105cd741e732f635d366c72b7f5253e0fd9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 13 Feb 2025 10:05:02 +0100 Subject: [PATCH 203/484] hawkeye: init at 6.0.0 Signed-off-by: Matthias Beyer --- pkgs/by-name/ha/hawkeye/package.nix | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ha/hawkeye/package.nix diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix new file mode 100644 index 000000000000..36d883ccdc56 --- /dev/null +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPackages, + fetchFromGitHub, + pkg-config, +}: + +rustPackages.rustPlatform.buildRustPackage rec { + pname = "hawkeye"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "korandoru"; + repo = "hawkeye"; + tag = "v${version}"; + hash = "sha256-VfJWj9BwNVR7RVUW+CjFuaniyiEath1U0F/7QJcA3r4="; + }; + + cargoHash = "sha256-tTXoxWjcTtEcRcuSs0ewCN1VJYmTIKRgL3s7QSYt7sk="; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = { + homepage = "https://github.com/korandoro/hawkeye"; + description = "Simple license header checker and formatter, in multiple distribution forms"; + license = lib.licenses.asl20; + mainProgram = "hawkeye"; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + }; +} From f322b888ccdebc122fbd2dd6d81f04941559e66e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 11:05:04 +0000 Subject: [PATCH 204/484] python312Packages.msldap: 0.5.12 -> 0.5.13 --- pkgs/development/python-modules/msldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 7bfe74af8ab9..5a4e99891336 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.5.12"; + version = "0.5.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RKKj0oUPkl5QtrgtRRXHTO6lSLfB/E09DT9t9loMxUA="; + hash = "sha256-iNWFnq+CSc1mvukFewr3jE0tbqmVTHHuXeVcwbsCkdI="; }; build-system = [ setuptools ]; From 92812316ff477d526ceda74ec7748f1673964671 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 11:10:48 +0000 Subject: [PATCH 205/484] python312Packages.diff-cover: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/diff-cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index c1e0f4f64b85..bc1206611558 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.2.1"; + version = "9.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-X6Wy1xzPXRbNIipxwsoGnZv1+j1lf2+sm02cIzeTI78="; + hash = "sha256-mhv/2Kn9GJifgXOYeCaBiFTf+2Wexvuv5mnzBNHk/Vc="; }; build-system = [ poetry-core ]; From d1ec5a1c203d64efa42d4448ba193bb8d3a65436 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:05:09 +0000 Subject: [PATCH 206/484] python312Packages.pywikibot: 9.6.1 -> 9.6.2 --- pkgs/development/python-modules/pywikibot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix index c55ad44ff921..a16fd50f0972 100644 --- a/pkgs/development/python-modules/pywikibot/default.nix +++ b/pkgs/development/python-modules/pywikibot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pywikibot"; - version = "9.6.1"; + version = "9.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-736LEUwW1LofS1105TxVWHMGFaEpQGwa+WGIk2OQxmA="; + hash = "sha256-iPmQxOJmc9Ms8UhK43HrYgyyvu0g4/hO8bmO39AXOTo="; }; propagatedBuildInputs = [ From 95aeb07b87d2261ac4d0ebf549adc5ab6b069c04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:06:59 +0000 Subject: [PATCH 207/484] python312Packages.blis: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 076b2a65ab78..91a41aaf54d8 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "blis"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "cython-blis"; tag = "release-v${version}"; - hash = "sha256-TyyB0kPGX517fe0rI4T+VkSnFvTRCFR06BLwo67X9zQ="; + hash = "sha256-krUqAEPxJXdlolSbV5R0ZqrWaFuXh7IxSeFTsCr6iss="; }; preCheck = '' From ebb34d9b893944b08dea6ca52e3c7c904d51cada Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:12:58 +0000 Subject: [PATCH 208/484] python312Packages.iterative-telemetry: 0.0.9 -> 0.0.10 --- .../python-modules/iterative-telemetry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix index 18f1a865dbf3..64ee06e02927 100644 --- a/pkgs/development/python-modules/iterative-telemetry/default.nix +++ b/pkgs/development/python-modules/iterative-telemetry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "iterative-telemtry"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "telemetry-python"; tag = version; - hash = "sha256-bcGniytjlN3JFPeMQYjyIP8Ruty9/dnzp9neclbdsfU="; + hash = "sha256-+l9JH9MbN+Pai3MIcKZJObzoPGhQipfMd7T8v4SoSws="; }; build-system = [ setuptools-scm ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Common library to send usage telemetry"; homepage = "https://github.com/iterative/iterative-telemetry"; - changelog = "https://github.com/iterative/iterative-telemetry/releases/tag/${version}"; + changelog = "https://github.com/iterative/iterative-telemetry/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; }; From a9638c1ac8eab5f808fb6726e7450ad13a185372 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 13:28:03 +0100 Subject: [PATCH 209/484] python312Packages.vector: skip tests crashing on aarch64-linux --- .../python-modules/vector/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 41b3156e3186..715a13dbdf06 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -58,10 +58,18 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # AssertionError: assert 2.1073424255447017e-08 == 0.0 - "test_issue_463" - ]; + disabledTests = + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault + # numba/typed/typeddict.py", line 185 in __setitem__ + "test_method_transform2D" + "test_method_transform3D" + "test_method_transform4D" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: assert 2.1073424255447017e-08 == 0.0 + "test_issue_463" + ]; meta = { description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; From 1876a43bbfd58fdcb26e786031fec9b573389095 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 13:35:54 +0100 Subject: [PATCH 210/484] python312Packages.fastjet: mark as broken --- pkgs/development/python-modules/fastjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix index d3e62027ae77..6b57b4a8f031 100644 --- a/pkgs/development/python-modules/fastjet/default.nix +++ b/pkgs/development/python-modules/fastjet/default.nix @@ -1,8 +1,6 @@ { lib, - stdenv, fetchPypi, - fetchurl, buildPythonPackage, pytestCheckHook, pkgs, @@ -88,5 +86,7 @@ buildPythonPackage rec { changelog = "https://github.com/scikit-hep/fastjet/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; + # ImportError: fastjetcontribfragile.so.0: cannot open shared object file: No such file or directory + broken = true; }; } From 1e84f83d2eac906b0972556896a81e1e7a52c65b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:45:55 +0000 Subject: [PATCH 211/484] cdncheck: 1.1.0 -> 1.1.1 --- pkgs/by-name/cd/cdncheck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 146df1742574..54490c56a6ee 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-1TYUSWbcWnRsOM8ctY1g9CmFSAXiK9NmN5ZDaKeJIgw="; + hash = "sha256-vz/PAu/YMrlUQ6oXERNm1bl3fZ0YDrvYCv64Qe0+zUo="; }; - vendorHash = "sha256-0fiZJeBvxUib8a9CeTmYottOp+15YEdTVYhdzKSSCrk="; + vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; subPackages = [ "cmd/cdncheck/" ]; From be52d291c44c769e613463f60a7b2eed08eec37a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:53:41 +0000 Subject: [PATCH 212/484] python312Packages.metaflow: 2.13.9 -> 2.14.0 --- pkgs/development/python-modules/metaflow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index 6e356c81b47d..259c02a36d52 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.13.9"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-f/cWZl59i1PRqNqLV5LtcZoDKdovdCKoQJNxzXKczgs="; + hash = "sha256-EyPA8GT1jskCWtsaBvwL8MW5B4mWw2tfXIKgvePeQ+E="; }; build-system = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = { description = "Open Source AI/ML Platform"; homepage = "https://metaflow.org/"; - changelog = "https://github.com/Netflix/metaflow/releases/tag/${version}"; + changelog = "https://github.com/Netflix/metaflow/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kr7x ]; }; From 4cd21f169a489a514c98ebab7a7d1bdb413cc7ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 12:58:00 +0000 Subject: [PATCH 213/484] cglm: 0.9.4 -> 0.9.5 --- pkgs/by-name/cg/cglm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cg/cglm/package.nix b/pkgs/by-name/cg/cglm/package.nix index 69d05316785a..06b2175ac2ca 100644 --- a/pkgs/by-name/cg/cglm/package.nix +++ b/pkgs/by-name/cg/cglm/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-VQgnc3DSZoY1ounc9fj3Mju52noI0JZ7ck8FqWpEgY8="; + sha256 = "sha256-yc8UFKl0q+QZ9helTzrxfZdk7yeRSb3bUVyIL+uRWdQ="; }; nativeBuildInputs = [ cmake ]; From 64b711b4a3148eab8c62c7ddb49f58c50e50b4d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:07:32 +0000 Subject: [PATCH 214/484] ttdl: 4.8.0 -> 4.9.0 --- pkgs/by-name/tt/ttdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 0ef0dc2920d7..3ee92e70b69b 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA="; + sha256 = "sha256-qFOZj214iw/d1wvWz8wwIFB2kaDSPH80blDkohQxSro="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Jrr9/H9c9/u5Vf5Ym/WGIKPH/wXyt25LjK3XWidUyIc="; + cargoHash = "sha256-gdFLT04pNedU30/Qw2OiXpdLL+6cC6ryUoeZLKu/myQ="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; From 410516938046de0d7b7b4fb7a782ecf70d81c676 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:08:00 +0000 Subject: [PATCH 215/484] quill-log: 8.1.0 -> 8.1.1 --- pkgs/by-name/qu/quill-log/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 65c7d5fa2c8f..07c62d568a3d 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-bzu+IKURT/+WPfmsUlzLrXqY2l62CLolqwWg2BwGnO0="; + hash = "sha256-7+yJRhTdYyGiOrsWnzagTPtxH2Gqqd4VNw/2i2C6Mak="; }; nativeBuildInputs = [ cmake ]; From acd9639d88942b0d4b94d73135d5cd2f6ddb6666 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:15:38 +0100 Subject: [PATCH 216/484] ldid: move to pkgs/by-name --- .../tools/ldid/default.nix => by-name/ld/ldid/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools/ldid/default.nix => by-name/ld/ldid/package.nix} (100%) diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/by-name/ld/ldid/package.nix similarity index 100% rename from pkgs/development/tools/ldid/default.nix rename to pkgs/by-name/ld/ldid/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cdb7c778357..1afbcacb55f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18290,7 +18290,7 @@ with pkgs; wlroots = wlroots_0_17; }; - ldid = callPackage ../development/tools/ldid { + ldid = callPackage ../by-name/ld/ldid/package.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; From d0049daf4b5240c9e232612db4bd2f9d7dcaec5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:17:41 +0000 Subject: [PATCH 217/484] gosec: 2.22.0 -> 2.22.1 --- pkgs/by-name/go/gosec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index 35d505bce1e1..3fb760cbc20a 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-LI4tb4rMzdEFWr8ZnYB3K9YE5GrvXB9XTkG1ZC/JqZs="; + hash = "sha256-iYva3ri2X6A6CAEpmt8xrqL7L9JAZlGcVPeMkWG47Ss="; }; - vendorHash = "sha256-Hx/9jO40viu9vxXwGC2292C5GRfIyM2ihjrRNVDQLYc="; + vendorHash = "sha256-a9cgl8oOkGZl4fi/uP+yXgoByNm3+wRQ3n5wSAJz0JQ="; subPackages = [ "cmd/gosec" From 75c99c03db5f15676068bf60e7e62835b95b48d7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:19:51 +0100 Subject: [PATCH 218/484] ldid: use new apple sdk pattern --- pkgs/by-name/ld/ldid/package.nix | 33 ++++++++++---------------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/ld/ldid/package.nix b/pkgs/by-name/ld/ldid/package.nix index c0c2645ab094..43b34a567543 100644 --- a/pkgs/by-name/ld/ldid/package.nix +++ b/pkgs/by-name/ld/ldid/package.nix @@ -5,8 +5,6 @@ libplist, libxml2, openssl, - CoreFoundation, - Security, }: stdenv.mkDerivation rec { @@ -21,33 +19,22 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = - [ - libplist - libxml2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; + buildInputs = [ + libplist + libxml2 + openssl + ]; - NIX_LDFLAGS = - [ - "-lcrypto" - "-lplist-2.0" - "-lxml2" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-framework CoreFoundation" - "-framework Security" - ]; + env.NIX_LDFLAGS = toString ([ + "-lcrypto" + "-lplist-2.0" + ]); buildPhase = '' runHook preBuild cc -c -o lookup2.o lookup2.c -I. - c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I. ${toString NIX_LDFLAGS} + c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I. runHook postBuild ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1afbcacb55f0..925c68f77eff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18290,10 +18290,6 @@ with pkgs; wlroots = wlroots_0_17; }; - ldid = callPackage ../by-name/ld/ldid/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - zrythm = callPackage ../applications/audio/zrythm { inherit (plasma5Packages) breeze-icons; }; From 5f99f2bdbbf78f8009eed64e551bc9f92a89e32b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:22:39 +0100 Subject: [PATCH 219/484] ldid: refactor --- pkgs/by-name/ld/ldid/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ld/ldid/package.nix b/pkgs/by-name/ld/ldid/package.nix index 43b34a567543..5dcd0622db0b 100644 --- a/pkgs/by-name/ld/ldid/package.nix +++ b/pkgs/by-name/ld/ldid/package.nix @@ -7,13 +7,13 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldid"; version = "2.1.5"; src = fetchgit { url = "git://git.saurik.com/ldid.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM="; }; @@ -48,11 +48,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Link Identity Editor"; homepage = "https://cydia.saurik.com/info/ldid/"; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; + mainProgram = "ldid"; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.unix; }; -} +}) From a0a6f30c9765dcb7e7761e13ba4649c2fcafc537 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:25:34 +0000 Subject: [PATCH 220/484] k6: 0.56.0 -> 0.57.0 --- pkgs/by-name/k6/k6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index edd51aadb23e..14c95944d2c5 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "k6"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-QU/FJZqyodwUGxb3MjaQXIGWZSlrkxKe4bh6r/p7jrQ="; + hash = "sha256-wU/Kelv/5N86xHJT6E5dfdzBgSYiTYZJ8rkjLyU7RAo="; }; subPackages = [ "./" ]; From b36dc5bd6e16ba1f7559187f54c5b442c66d5d78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:37:49 +0000 Subject: [PATCH 221/484] jay: 1.9.0 -> 1.9.1 --- pkgs/by-name/ja/jay/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index c787cb9aa8fa..d66d4a0a34f2 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RGBFIYVeunMhZbpRExKYh7VlhodOsCN7WzN/7UPEJdc="; + sha256 = "sha256-dUp3QYno2rB3wuJmSvBpCqowSpfMQIJqUYc0lDVqVPA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vW+87tqc9bJ/xDOqcgz3PrqEkf7daZp3nb0hwXDxULI="; + cargoHash = "sha256-ovQxpUrRZAP1lHlsObfbIsgIjgMp+BLf6Ul+mzDVN5o="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; From 44044c06fe3b6696e37afd13cf23a9e98278d9a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:39:50 +0000 Subject: [PATCH 222/484] kubernetes: 1.32.1 -> 1.32.2 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 87abb370d07d..a2fc303698fd 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-6KZlbwSMmFvh6XKJR1W/qa3xU0O3fuQaMW/P5An/AtQ="; + hash = "sha256-pie36Y3zKGKvnCDHtjNHYox1b2xhy6w7MShkAfkDVrs="; }; vendorHash = null; From 15b955f4289065441eddf7e1f70c4f6cab17bf32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:41:55 +0000 Subject: [PATCH 223/484] python312Packages.exiv2: 0.17.1 -> 0.17.2 --- pkgs/development/python-modules/exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix index 0192bd465f15..0ca80a01bb97 100644 --- a/pkgs/development/python-modules/exiv2/default.nix +++ b/pkgs/development/python-modules/exiv2/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "exiv2"; - version = "0.17.1"; + version = "0.17.2"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "python-exiv2"; tag = version; - hash = "sha256-AXBhCe7AvhQkGZaLMTGExwgUYQGdRkk14Rtceugexag="; + hash = "sha256-OWy/LPfeji5/lJ5itLcAUE6Q1hR1EHGwkABvLQk+LYM="; }; # FAIL: test_localisation (test_types.TestTypesModule.test_localisation) From 6c64d6daf932cabf8e63619e7590a4770e3e446a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 13 Feb 2025 12:55:41 +0000 Subject: [PATCH 224/484] nixos/autobrr: use systemd credentials Make use of systemd's LoadCredentials feature to allow for the secret file to be better managed without having to be world-readable, since due to DynamicUser it was not possible to assign it to one specific user. --- nixos/modules/services/misc/autobrr.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index 097bcc10096e..4694b8e80ed3 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -9,7 +9,7 @@ let cfg = config.services.autobrr; configFormat = pkgs.formats.toml { }; configTemplate = configFormat.generate "autobrr.toml" cfg.settings; - templaterCmd = "${lib.getExe pkgs.dasel} put -f '${configTemplate}' -v $(cat ${cfg.secretFile}) -o %S/autobrr/config.toml 'sessionSecret'"; + templaterCmd = ''${lib.getExe pkgs.dasel} put -f '${configTemplate}' -v "$(${config.systemd.package}/bin/systemd-creds cat sessionSecret)" -o %S/autobrr/config.toml "sessionSecret"''; in { options = { @@ -73,6 +73,7 @@ in serviceConfig = { Type = "simple"; DynamicUser = true; + LoadCredential = "sessionSecret:${cfg.secretFile}"; StateDirectory = "autobrr"; ExecStartPre = "${lib.getExe pkgs.bash} -c '${templaterCmd}'"; ExecStart = "${lib.getExe pkgs.autobrr} --config %S/autobrr"; From ce9137b32dc6bfa747ea78fdb683f0a12571574a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 13 Feb 2025 13:31:29 +0000 Subject: [PATCH 225/484] nixos/autobrr: make use of package option The package option was defined, but the generated systemd service was hardcoded to use pkgs.autobrr. --- nixos/modules/services/misc/autobrr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/autobrr.nix b/nixos/modules/services/misc/autobrr.nix index 4694b8e80ed3..c898351c4316 100644 --- a/nixos/modules/services/misc/autobrr.nix +++ b/nixos/modules/services/misc/autobrr.nix @@ -76,7 +76,7 @@ in LoadCredential = "sessionSecret:${cfg.secretFile}"; StateDirectory = "autobrr"; ExecStartPre = "${lib.getExe pkgs.bash} -c '${templaterCmd}'"; - ExecStart = "${lib.getExe pkgs.autobrr} --config %S/autobrr"; + ExecStart = "${lib.getExe cfg.package} --config %S/autobrr"; Restart = "on-failure"; }; }; From c8d935e107fea993d27cd6cf7615016f6c5065bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 13:55:58 +0000 Subject: [PATCH 226/484] python312Packages.beanhub-import: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/beanhub-import/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix index c79aa99ec891..f1be289c5995 100644 --- a/pkgs/development/python-modules/beanhub-import/default.nix +++ b/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; tag = version; - hash = "sha256-cDvYebzR9OmBYC+sjwNNf2nm4lxWGZVKuW4BusecDCk="; + hash = "sha256-lafSOk+MS9MqB9KSxVR7S1HJJ6R6RZeCrFK8JGCZAIg="; }; build-system = [ poetry-core ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Declarative idempotent rule-based Beancount transaction import engine in Python"; homepage = "https://github.com/LaunchPlatform/beanhub-import/"; - changelog = "https://github.com/LaunchPlatform/beanhub-import/releases/tag/${version}"; + changelog = "https://github.com/LaunchPlatform/beanhub-import/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fangpen ]; }; From 4fdf1fb8e6d11072f4825e03014cfb08f4856ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 13 Feb 2025 14:42:01 +0100 Subject: [PATCH 227/484] dbeaver-bin: remove files for unsupported architectures --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 64866f90bf5b..88eafe1938d8 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -107,9 +107,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - autoPatchelfIgnoreMissingDeps = [ - "libc.so.8" - ]; + preFixup = '' + # most directories are for different architectures, only keep what we need + shopt -s extglob + pushd $out/opt/dbeaver/plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ + rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ + popd + ''; passthru.updateScript = ./update.sh; From 41242015108d5c7704970f1d5ce3af48d3e88866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 13 Feb 2025 15:03:33 +0100 Subject: [PATCH 228/484] eza: 0.20.20 -> 0.20.21 changelog: https://github.com/eza-community/eza/releases/tag/v0.20.21 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 3c81fa198d91..133df14e2abd 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.20"; + version = "0.20.21"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-+duTIPM1SJoCijqKDWN3H5tO8rAaqMWzMMQbJvvurcE="; + hash = "sha256-qMzBSGV33rQwR6snEqEXsa7cw05B3SszZH0/Fb9Yxjw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9mHS74PgQWSwipRpazb9fmAHFXRCp35juVMcjwuD4bY="; + cargoHash = "sha256-+LaDGq/blYoTYIWmKtlvJe6SC8RG7PrIiYugrjchgw0="; nativeBuildInputs = [ cmake From 8e0c372d12e7978bb2890289d6369145c73eb44b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:07:03 +0000 Subject: [PATCH 229/484] python312Packages.myst-nb: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/myst-nb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 520919e7fa46..f12ee7e8c1b7 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-lhtABWVwKcqJiSpMde2/CFbFTOr2FyNotGv3Z2wfdwA="; + hash = "sha256-r0Wex1OzQZUhgrRbCoC0d2zr+Aye5qrKKj9AJ7RAyd4="; }; nativeBuildInputs = [ flit-core ]; From 1b9a4fe5d830a720a8b3f956e455a961196f50c4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Feb 2025 22:07:35 +0800 Subject: [PATCH 230/484] pantheon.elementary-greeter: 8.0.0 -> 8.0.1 https://github.com/elementary/greeter/compare/8.0.0...8.0.1 --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 55fe603c7b48..f27eaf74cbb1 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "sha256-fx3KHMF6UhIFXyJHQ4dKJnVidsNMBk7AvHzaF3ELH1k="; + sha256 = "sha256-T/tI8WRVbTLdolDYa98M2Vm26p0xhGiai74lXAlpQ8k="; }; patches = [ From f850d7a1408433fb9fa9aa7d468cdc8e27492c10 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Feb 2025 22:09:28 +0800 Subject: [PATCH 231/484] pantheon.wingpanel-indicator-power: 8.0.1 -> 8.0.2 https://github.com/elementary/wingpanel-indicator-power/compare/8.0.1...8.0.2 --- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 41d8e5f88275..28b0333882b9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-zMvw96uRr9hrgXck+OhMiPku9qu8/zUtusiaJLUcuys="; + sha256 = "sha256-AeeL/OcQ7V3HT3IWhTQHx/dcCSqL/0s/fShPq96V3xE="; }; patches = [ From fee2c2d067a9046e2d816f6d7136298f87408ac3 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Thu, 13 Feb 2025 22:22:45 +0800 Subject: [PATCH 232/484] add-determinism: 0.5.0 -> 0.6.0 Signed-off-by: Qiming Chu --- pkgs/by-name/ad/add-determinism/Cargo.lock | 311 ++++++++++++-------- pkgs/by-name/ad/add-determinism/package.nix | 4 +- 2 files changed, 184 insertions(+), 131 deletions(-) mode change 100755 => 100644 pkgs/by-name/ad/add-determinism/Cargo.lock diff --git a/pkgs/by-name/ad/add-determinism/Cargo.lock b/pkgs/by-name/ad/add-determinism/Cargo.lock old mode 100755 new mode 100644 index 887a7e469ba6..a23863544736 --- a/pkgs/by-name/ad/add-determinism/Cargo.lock +++ b/pkgs/by-name/ad/add-determinism/Cargo.lock @@ -4,7 +4,7 @@ version = 4 [[package]] name = "add-determinism" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "chrono", @@ -28,10 +28,10 @@ dependencies = [ ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -74,61 +74,62 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -138,9 +139,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.98" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -156,9 +160,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -170,9 +174,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" dependencies = [ "clap_builder", "clap_derive", @@ -180,9 +184,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" dependencies = [ "anstream", "anstyle", @@ -192,9 +196,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck", "proc-macro2", @@ -204,21 +208,21 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "crc32fast" @@ -231,9 +235,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "deranged" @@ -252,9 +256,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", "windows-sys", @@ -262,15 +266,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "libz-sys", @@ -285,7 +289,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets", ] [[package]] @@ -308,9 +324,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -337,9 +353,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -352,10 +368,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -370,9 +387,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -382,9 +399,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" dependencies = [ "cc", "pkg-config", @@ -393,21 +410,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "log" -version = "0.4.21" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -420,11 +437,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -494,15 +511,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "powerfmt" @@ -530,9 +547,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -564,14 +581,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -581,9 +598,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -592,15 +609,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags", "errno", @@ -609,6 +626,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "same-file" version = "1.0.6" @@ -620,9 +643,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -639,15 +662,21 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "smallvec" version = "1.13.2" @@ -668,9 +697,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -679,12 +708,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", + "getrandom 0.3.1", + "once_cell", "rustix", "windows-sys", ] @@ -711,9 +742,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "num-conv", @@ -730,15 +761,15 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "vcpkg" @@ -763,24 +794,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.92" +name = "wasi" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -789,9 +830,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -799,9 +840,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -812,15 +853,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ "windows-sys", ] @@ -836,18 +880,18 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -861,51 +905,60 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags", +] [[package]] name = "zerocopy" diff --git a/pkgs/by-name/ad/add-determinism/package.nix b/pkgs/by-name/ad/add-determinism/package.nix index dfc8b3f18c24..da19cebb445c 100644 --- a/pkgs/by-name/ad/add-determinism/package.nix +++ b/pkgs/by-name/ad/add-determinism/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "add-determinism"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "keszybz"; repo = pname; tag = "v${version}"; - hash = "sha256-YfY0l57SjBfO5nLlCfEBzwyVPdzZKK5YKVvVATsObi0="; + hash = "sha256-QFhed8YTgvfm6bB/cRsrnN0foplJhK1b9IYD9HGdJUc="; }; # this project has no Cargo.lock now From 97209dbaf504c0c89f5d84a210d52dbe1497ff85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:30:43 +0000 Subject: [PATCH 233/484] ogen: 1.9.0 -> 1.10.0 --- pkgs/by-name/og/ogen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix index 1e1f549cf6c0..8f95e9172ddb 100644 --- a/pkgs/by-name/og/ogen/package.nix +++ b/pkgs/by-name/og/ogen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ogen"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ogen-go"; repo = "ogen"; tag = "v${version}"; - hash = "sha256-clskb5DA1dNVKjKgtYakvshRrkeoqiwYX4QKAqSdKnE="; + hash = "sha256-I+SCgOVH0Fo0f5lbv610PPB7dduE2MHixlKoN+v/m7c="; }; - vendorHash = "sha256-Ud1fg2wv+EM6h8dRO4R5SABOhPldF7uc9VwEw2/B6No="; + vendorHash = "sha256-OEESbftF9pF5e2GT31Jo0vugS4WOCBX5I04my/PG99M="; patches = [ ./modify-version-handling.patch ]; From a09044eb2cc7bb829a799e627f9285d2fd968c91 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Thu, 13 Feb 2025 15:39:11 +0100 Subject: [PATCH 234/484] timew-sync-client: 1.0.1-unstable-2024-08-05 -> 1.1 --- pkgs/by-name/ti/timew-sync-client/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/timew-sync-client/package.nix b/pkgs/by-name/ti/timew-sync-client/package.nix index 1635865e33f0..7ad8a4c9c418 100644 --- a/pkgs/by-name/ti/timew-sync-client/package.nix +++ b/pkgs/by-name/ti/timew-sync-client/package.nix @@ -4,15 +4,15 @@ python3Packages, }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "timew-sync-client"; - version = "1.0.1-unstable-2024-08-05"; + version = "1.1"; src = fetchFromGitHub { owner = "timewarrior-synchronize"; repo = "timew-sync-client"; - rev = "de3442bd29b071f54cd1e10af99f3378a83b4794"; - hash = "sha256-AKRAMEUTIPvR+kaEZZYjd4II2KzYZTwRgGzFMGD5aio="; + rev = "v${version}"; + hash = "sha256-8Bw+BI7EiW9UcHo6gaDthX4VH4kAlycm4EvAJEEAOWc="; }; pyproject = true; From 2a578fd78d5efd3c4be46fe2a5d6d305281bb830 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 15:10:52 +0100 Subject: [PATCH 235/484] python312Packages.coffea: skip tests crashing on aarch64-linux --- .../python-modules/coffea/default.nix | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 0710ca0f5dba..85c37de53b18 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -36,8 +37,8 @@ # checks distributed, pyinstrument, - pytestCheckHook, pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { @@ -91,30 +92,46 @@ buildPythonPackage rec { nativeCheckInputs = [ distributed pyinstrument - pytestCheckHook pytest-xdist + pytestCheckHook ]; pythonImportsCheck = [ "coffea" ]; - disabledTests = [ - # Requires internet access - # https://github.com/CoffeaTeam/coffea/issues/1094 - "test_lumimask" + disabledTests = + [ + # Requires internet access + # https://github.com/CoffeaTeam/coffea/issues/1094 + "test_lumimask" - # Flaky: FileNotFoundError: [Errno 2] No such file or directory - # https://github.com/scikit-hep/coffea/issues/1246 - "test_packed_selection_cutflow_dak" # cutflow.npz - "test_packed_selection_nminusone_dak" # nminusone.npz + # Flaky: FileNotFoundError: [Errno 2] No such file or directory + # https://github.com/scikit-hep/coffea/issues/1246 + "test_packed_selection_cutflow_dak" # cutflow.npz + "test_packed_selection_nminusone_dak" # nminusone.npz - # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array - "test_apply_to_fileset" - "test_lorentz_behavior" + # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array + "test_apply_to_fileset" + "test_lorentz_behavior" - # ValueError: The array to mask was deleted before it could be masked. - # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly. - "test_read_nanomc" - ]; + # ValueError: The array to mask was deleted before it could be masked. + # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly. + "test_read_nanomc" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault + # coffea/nanoevents/transforms.py", line 287 in index_range + "test_KaonParent_to_PionDaughters_Loop" + "test_MCRecoAssociations" + "test_MC_daughters" + "test_MC_parents" + "test_field_is_present" + + # Fatal Python error: Segmentation fault + # File "/build/source/tests/test_lumi_tools.py", line 37 in test_lumidata + "test_lumidata" + # coffea/lumi_tools/lumi_tools.py", line 113 in get_lumi + "test_lumilist" + ]; __darwinAllowLocalNetworking = true; From 911eaaa675e49846a6865c89ccc90e255bbcd215 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Thu, 13 Feb 2025 15:54:36 +0100 Subject: [PATCH 236/484] python3Packages.nanobind: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/nanobind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 8255cd578439..992ff08227a7 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -25,14 +25,14 @@ }: buildPythonPackage rec { pname = "nanobind"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "wjakob"; repo = "nanobind"; tag = "v${version}"; - hash = "sha256-9OpDsjFEeJGtbti4Q9HHl78XaGf8M3lG4ukvHCMzyMU="; + hash = "sha256-sH+qZHd9OKDxl2yTAeDh4xLwW64k6nIToyLfd3cR6kE="; fetchSubmodules = true; }; From 485f47ce6489e2ef8c67ecaf2827212915ab9b6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:54:55 +0000 Subject: [PATCH 237/484] muffet: 2.10.7 -> 2.10.8 --- pkgs/by-name/mu/muffet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 0987a312b2a6..ad69ddb22310 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.7"; + version = "2.10.8"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-txIH3FqKQ6IWN19aABmLAJicmXi6NK7VpH6NDMtAGUE="; + hash = "sha256-vpckg0zx8RNR7dAKjdlSHyevn7kDslrysah8jCLSaBw="; }; vendorHash = "sha256-IbpTQdJ6OssyzwS2H4iNgJybC9rvvlW6UYkihNkBYOE="; From 372fa7fc987a438e65675c03f51f5b365389a214 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 14:57:23 +0000 Subject: [PATCH 238/484] lzbench: 1.8.1 -> 2.0.1 --- pkgs/by-name/lz/lzbench/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lz/lzbench/package.nix b/pkgs/by-name/lz/lzbench/package.nix index a024d4eae070..2af7bd2a3cbb 100644 --- a/pkgs/by-name/lz/lzbench/package.nix +++ b/pkgs/by-name/lz/lzbench/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "lzbench"; - version = "1.8.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "inikep"; repo = pname; rev = "v${version}"; - sha256 = "19zlvcjb1qg4fx30rrp6m650660y35736j8szvdxmqh9ipkisyia"; + sha256 = "sha256-946AcnD9z60Oihm2pseS8D5j6pGdYeCxmhTLNcW9Mmc="; }; enableParallelBuilding = true; From 4247ec2c9b9088020cd99fd2689fa693c72f52cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 15:20:37 +0000 Subject: [PATCH 239/484] snazy: 0.54.0 -> 0.55.0 --- pkgs/by-name/sn/snazy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix index cb367b1e7c5b..38efbbf4ec75 100644 --- a/pkgs/by-name/sn/snazy/package.nix +++ b/pkgs/by-name/sn/snazy/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - hash = "sha256-1+UbUwvv5HWiQ+u9gPtJ3JwP6cMi4IZOCSMedXzWEoQ="; + hash = "sha256-Vc3L93S7WQAcqsLIhiCrTGmmc+1q26zRpOWXyUNFNVc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Y2GUE9S0bZFVvu9bvs8WptrdO1V27z+Vu/eQDNvq7pE="; + cargoHash = "sha256-ZieQfjRSxO5LEpQaXFIPcdejoG+6Mw4FCM/7LcbwRro="; nativeBuildInputs = [ installShellFiles ]; From 8e3d4b3e7a2538b6d3d9a777b2182167461737b2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:29:22 +0100 Subject: [PATCH 240/484] nextcloud29: 29.0.11 -> 29.0.12 https://github.com/nextcloud/server/releases/tag/v29.0.12 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a06f49658769..6815dc591274 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -59,8 +59,8 @@ let in { nextcloud29 = generic { - version = "29.0.11"; - hash = "sha256-UGf8F91zICzC39m5ccp7uUy5UEghRgJ9rGILEjweztE="; + version = "29.0.12"; + hash = "sha256-wCA1T/Ph0ghzcPcOBY/hcXE2NroPBzpRlK29/zwcr8Y="; packages = nextcloud29Packages; }; From d37ed07048e65b5e9b46ed9ec6b1c68f2d104870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 15:29:31 +0000 Subject: [PATCH 241/484] python312Packages.succulent: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/succulent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 176d16318531..15648e91f617 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "succulent"; tag = version; - hash = "sha256-rD0qKYmWTu0LMRdWgul8OGp1FcczSY2/OxT8+oXO78E="; + hash = "sha256-lmN31Xdp1PCLhgInGxvTKTLBXFpz3NnHYSFjKQfRfec="; }; pythonRelaxDeps = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collect POST requests"; homepage = "https://github.com/firefly-cpp/succulent"; - changelog = "https://github.com/firefly-cpp/succulent/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/firefly-cpp/succulent/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; From 183e6a6dfc863b3fb275b8308b357d596ea84c6b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:30:32 +0100 Subject: [PATCH 242/484] nextcloud30: 30.0.5 -> 30.0.6 https://github.com/nextcloud/server/releases/tag/v30.0.6 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6815dc591274..038b07fb4ae6 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -65,8 +65,8 @@ in }; nextcloud30 = generic { - version = "30.0.5"; - hash = "sha256-JIxubmEs7usXDE0luFebCvDmYTq9+gfy/mmTQmt4G+o="; + version = "30.0.6"; + hash = "sha256-rA4JG+aSCWXcDILxSbYy1rWt563uhKezyM/YR0UKjdw="; packages = nextcloud30Packages; }; From 2d522ae1414fd3c1a5ade474aea1e57b4cf8cfc0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:31:03 +0100 Subject: [PATCH 243/484] nextcloud29Packages.apps: update --- pkgs/servers/nextcloud/packages/29.json | 52 ++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 3897465a9e3e..5ebdc3dbcf15 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -30,9 +30,9 @@ ] }, "collectives": { - "hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=", - "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz", - "version": "2.16.0", + "hash": "sha256-1BEK5T+6w8yLSXyj/Me8QMls/LSWaor5TpvC2HK3/4U=", + "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.1/collectives-2.16.1.tar.gz", + "version": "2.16.1", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-hqCDr7qEqsi8tZ9Woz9hsUm1HENK16FNz4pcQCto8S4=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.2/contacts-v6.0.2.tar.gz", - "version": "6.0.2", + "hash": "sha256-o7RoBhg0UFzZoxXj1Qovbheq1i7wBHnn4hSnEbc/D/c=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.3/contacts-v6.0.3.tar.gz", + "version": "6.0.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-7g18TdAQKLNKrKPZO+TNiUoHtncy6aLBy4KHq7j7VHo=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.9/groupfolders-v17.0.9.tar.gz", - "version": "17.0.9", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-yfTZjAsmv2wdMNNP1Tm0fmzSIlUwRfMraNPgFEHW238=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.10/groupfolders-v17.0.10.tar.gz", + "version": "17.0.10", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-i2gBkqRPvHyZL8raWTIordGVhY1NWi4KN1JLbsQd/8k=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.19/mail-v3.7.19.tar.gz", - "version": "3.7.19", + "hash": "sha256-YGgJgWZYnJuhhHxabx/tUmcnmfDgjWiZUBnhGThihrU=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.20/mail-v3.7.20.tar.gz", + "version": "3.7.20", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -250,10 +250,10 @@ ] }, "onlyoffice": { - "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", - "version": "9.5.0", - "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", + "hash": "sha256-zAhrnZ/rzzo6+ycozd8ihxIHVRHmQ+haudts2PcxnoM=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.6.0/onlyoffice.tar.gz", + "version": "9.6.0", + "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ "agpl" @@ -280,9 +280,9 @@ ] }, "previewgenerator": { - "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", - "version": "5.7.0", + "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz", + "version": "5.8.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -330,9 +330,9 @@ ] }, "sociallogin": { - "hash": "sha256-P9OBXDW3+iOtC9/dQ/M89YxY3OQ0u5I8Z1XQLvYznEo=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.8.4/release.tar.gz", - "version": "5.8.4", + "hash": "sha256-XJbeVUYr3NZvynZyRlRtc0NNEJxcIHjwNst/J2+IBUM=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.9.1/release.tar.gz", + "version": "5.9.1", "description": "# Social login\n\nMake possible create users and login via Telegram, OAuth or OpenID\n\nFor OAuth you must create app for certain providers. Login button appear at login page if app id specified. Settings are in \"Social login\" section of settings page.\n\n## Installation\n\nLogin to your NextCloud installation as an administrator and under \"Apps\" click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n\n\n## Custom OAuth2/OIDC groups\n\nYou can use groups from your custom provider. For that you should specify \"Groups claim\" in custom OAuth2/OIDC provider settings. That claim should be returned from provider in `id_token` or at user info endpoint. Format should be `array` or comma separated string. Eg (with claim named `roles`)\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nAlso nested claims is supported. For example `resource_access.client-id.roles` for\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\nThere is also support for setting the displayName:\n```\n{\"roles\": [{gid: 1, displayName: \"admin\"}, {gid: 2, displayName: \"user\"}]}\n```\n\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing nextcloud groups\n2. Create provider groups in nextcloud and associate it to user (if appropriate option specified)\n\nIf you want sync groups on every login do not forget to check \"Update user profile every login\" setting\n\n## Examples for groups\n\n* You can find example how to configure WSO2IS for return roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff)\n* [GitLab OIDC allowing specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n\n## Built-in OAuth providers\n\nYou can copy link of certain login button to get proper \"redirect url\" for OAuth app setting.\n\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n* [GitHub](https://github.com/settings/developers)\n* [Discord](#configure-discord)\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* PlexTv - you can use any title as app id\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n\nDetails about \"Allow login only from specified domain\" google setting you can find here [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44)\nYou can use comma separated list for multiple domains\n\n## Config\n\nYou can use `'social_login_auto_redirect' => true` setting in `config.php` for auto redirect unauthorized users to social login if only one provider is configured.\nIf you want to temporary disable this function (e.g. for login as local admin), you can add `noredir=1` query parameter in url for login page. Something like `https://cloud.domain.com/login?noredir=1`\n\nTo set options for http client, you can use\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // Check https://curl.se/libcurl/c/CURLOPT_PROXY.html for allowed variants\n ],\n```\nin `config.php`\n\n### Configurate a provider via CLI\n\nYou can configure everything from commandline by using the occ utility. To setup a oidc-provider replace the variables and URLs with values that match your deployment.\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nto do this with docker you just need to add `docker exec -t -uwww-data CONTAINER_NAME` in front of the command, or run it interactively from `docker exec -it -uwww-data CONTAINER_NAME sh`\n\nTo find out how to configure other providers, just configure them in the GUI and take a look at the database afterwards:\n```\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\n\nOr just run\n\n`docker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers`\n\n### Configure Discord\n\nTo properly configure discord you have to:\n\n1. Create new discord application on [DiscordApp developers](https://discordapp.com/developers/applications/me#top)\n2. Open tab `Settings -> OAuth2 -> General`. In `Redirects` add new redirection link looking like this: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy `CLIENT ID` and generate and copy `CLIENT SECRET`\n4. Open in Nextcloud `Settings -> Social Login` and paste `CLIENT ID` into field `App id` and `CLIENT SECRET` into `Secret`.\n5. Select default group for users created this way.\n6. For group mapping check [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395)\n\n## Hint\n\n### About Callback(Reply) Url\nYou can copy link from specific login button on login page and paste it on provider's website as callback url. To make proper button visible, just fill certain provider settings with random data and change it later.\n\nSome users may get strange reply(Callback) url error from provider even if you pasted the right url, that's because your nextcloud server may generate http urls when you are actually using https.\nPlease set 'overwriteprotocol' => 'https', in your config.php file.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -340,9 +340,9 @@ ] }, "spreed": { - "hash": "sha256-8C2TopybeFczpaNQF3IWeVh3uPXmNjQ1mdcWTyYOsZw=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.12/spreed-v19.0.12.tar.gz", - "version": "19.0.12", + "hash": "sha256-JJp0dzFKJttDBuPOavraF7odo/0tVoDAeMPHVkmB78s=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.13/spreed-v19.0.13.tar.gz", + "version": "19.0.13", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ From fa16f61c2aabb9304c8d73fc38a25e20368457a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 13 Feb 2025 16:31:25 +0100 Subject: [PATCH 244/484] nextcloud30Packages.apps: update --- pkgs/servers/nextcloud/packages/30.json | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 43b275a222f5..c8b141c9b863 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-nroc7URZtN5LhGg4wYgr3wD0k8k3vYj9k/V4H0JF2C0=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.9/calendar-v5.0.9.tar.gz", - "version": "5.0.9", + "hash": "sha256-QWJJOj4Iy/BLXWzHihoQaAhFkU05plZ/AV55QrW0Pag=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.10/calendar-v5.0.10.tar.gz", + "version": "5.0.10", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "collectives": { - "hash": "sha256-IAnJZuaj6KW6kF4daIKxvCEDCViWu30gogm8q2/ooQs=", - "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.0/collectives-2.16.0.tar.gz", - "version": "2.16.0", + "hash": "sha256-1BEK5T+6w8yLSXyj/Me8QMls/LSWaor5TpvC2HK3/4U=", + "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.1/collectives-2.16.1.tar.gz", + "version": "2.16.1", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-MPNSmqVzYSwEXM9ZyV7xEvUrmH8WYdpKHPcVWWQpt8M=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.9/groupfolders-v18.0.9.tar.gz", - "version": "18.0.9", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-LR+b5weiFGsk/uozT39rwCeo98PjLcJOMyn5B/OgkvU=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.10/groupfolders-v18.0.10.tar.gz", + "version": "18.0.10", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -250,10 +250,10 @@ ] }, "onlyoffice": { - "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", - "version": "9.5.0", - "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", + "hash": "sha256-zAhrnZ/rzzo6+ycozd8ihxIHVRHmQ+haudts2PcxnoM=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.6.0/onlyoffice.tar.gz", + "version": "9.6.0", + "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ "agpl" @@ -280,9 +280,9 @@ ] }, "previewgenerator": { - "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", - "version": "5.7.0", + "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz", + "version": "5.8.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -330,9 +330,9 @@ ] }, "sociallogin": { - "hash": "sha256-P9OBXDW3+iOtC9/dQ/M89YxY3OQ0u5I8Z1XQLvYznEo=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.8.4/release.tar.gz", - "version": "5.8.4", + "hash": "sha256-XJbeVUYr3NZvynZyRlRtc0NNEJxcIHjwNst/J2+IBUM=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.9.1/release.tar.gz", + "version": "5.9.1", "description": "# Social login\n\nMake possible create users and login via Telegram, OAuth or OpenID\n\nFor OAuth you must create app for certain providers. Login button appear at login page if app id specified. Settings are in \"Social login\" section of settings page.\n\n## Installation\n\nLogin to your NextCloud installation as an administrator and under \"Apps\" click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n\n\n## Custom OAuth2/OIDC groups\n\nYou can use groups from your custom provider. For that you should specify \"Groups claim\" in custom OAuth2/OIDC provider settings. That claim should be returned from provider in `id_token` or at user info endpoint. Format should be `array` or comma separated string. Eg (with claim named `roles`)\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nAlso nested claims is supported. For example `resource_access.client-id.roles` for\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\nThere is also support for setting the displayName:\n```\n{\"roles\": [{gid: 1, displayName: \"admin\"}, {gid: 2, displayName: \"user\"}]}\n```\n\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing nextcloud groups\n2. Create provider groups in nextcloud and associate it to user (if appropriate option specified)\n\nIf you want sync groups on every login do not forget to check \"Update user profile every login\" setting\n\n## Examples for groups\n\n* You can find example how to configure WSO2IS for return roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff)\n* [GitLab OIDC allowing specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n\n## Built-in OAuth providers\n\nYou can copy link of certain login button to get proper \"redirect url\" for OAuth app setting.\n\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n* [GitHub](https://github.com/settings/developers)\n* [Discord](#configure-discord)\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* PlexTv - you can use any title as app id\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n\nDetails about \"Allow login only from specified domain\" google setting you can find here [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44)\nYou can use comma separated list for multiple domains\n\n## Config\n\nYou can use `'social_login_auto_redirect' => true` setting in `config.php` for auto redirect unauthorized users to social login if only one provider is configured.\nIf you want to temporary disable this function (e.g. for login as local admin), you can add `noredir=1` query parameter in url for login page. Something like `https://cloud.domain.com/login?noredir=1`\n\nTo set options for http client, you can use\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // Check https://curl.se/libcurl/c/CURLOPT_PROXY.html for allowed variants\n ],\n```\nin `config.php`\n\n### Configurate a provider via CLI\n\nYou can configure everything from commandline by using the occ utility. To setup a oidc-provider replace the variables and URLs with values that match your deployment.\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nto do this with docker you just need to add `docker exec -t -uwww-data CONTAINER_NAME` in front of the command, or run it interactively from `docker exec -it -uwww-data CONTAINER_NAME sh`\n\nTo find out how to configure other providers, just configure them in the GUI and take a look at the database afterwards:\n```\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\n\nOr just run\n\n`docker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers`\n\n### Configure Discord\n\nTo properly configure discord you have to:\n\n1. Create new discord application on [DiscordApp developers](https://discordapp.com/developers/applications/me#top)\n2. Open tab `Settings -> OAuth2 -> General`. In `Redirects` add new redirection link looking like this: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy `CLIENT ID` and generate and copy `CLIENT SECRET`\n4. Open in Nextcloud `Settings -> Social Login` and paste `CLIENT ID` into field `App id` and `CLIENT SECRET` into `Secret`.\n5. Select default group for users created this way.\n6. For group mapping check [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395)\n\n## Hint\n\n### About Callback(Reply) Url\nYou can copy link from specific login button on login page and paste it on provider's website as callback url. To make proper button visible, just fill certain provider settings with random data and change it later.\n\nSome users may get strange reply(Callback) url error from provider even if you pasted the right url, that's because your nextcloud server may generate http urls when you are actually using https.\nPlease set 'overwriteprotocol' => 'https', in your config.php file.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -340,9 +340,9 @@ ] }, "spreed": { - "hash": "sha256-j2r0dJ5QYrGHFbCfuuyOmXR7oEN78Nagn5Qb8kzmknA=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.3/spreed-v20.1.3.tar.gz", - "version": "20.1.3", + "hash": "sha256-+MYplCq6Kx1UiEz+Isbit7kQNhe4dncy6W+y7eMzuiA=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.4/spreed-v20.1.4.tar.gz", + "version": "20.1.4", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ From 054a8e73de970eac9a140d11bf64cc82e5423394 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 13 Feb 2025 16:39:29 +0100 Subject: [PATCH 245/484] go-ethereum 1.14.13 -> 1.15.0 The bootnode sub-package has been removed in https://github.com/ethereum/go-ethereum/pull/30813. --- pkgs/by-name/go/go-ethereum/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index abff2184e684..679de8f72c76 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -18,17 +18,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.14.13"; + version = "1.15.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-oJe+V11WArXVmoIC7nYN6oKc0VoHtRtelidyb3v6skI="; + hash = "sha256-qfk9G3/wzeh8Nf7BG4Qv6It/bY1ZYoYyHsgoqgCyd6E="; }; proxyVendor = true; - vendorHash = "sha256-IEwy3XRyj+5GjAWRjPsd5qzwEMpI/pZIwPjKdeATgkE="; + vendorHash = "sha256-gTwmtrdj3+Pa4UxaUuhwk2Dtgur82Tbd0ict1cgVinw="; doCheck = false; @@ -46,7 +46,6 @@ buildGoModule rec { "cmd/abidump" "cmd/abigen" "cmd/blsync" - "cmd/bootnode" "cmd/clef" "cmd/devp2p" "cmd/era" From 9569ee01c536b37b813da042a5e7d2296dfa0425 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 15:43:04 +0000 Subject: [PATCH 246/484] python312Packages.wagtail-localize: 1.11.1 -> 1.11.3 --- .../development/python-modules/wagtail-localize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index bd492a5171b8..d1c9a6614d0e 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.11.1"; + version = "1.11.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { repo = "wagtail-localize"; owner = "wagtail"; tag = "v${version}"; - hash = "sha256-HBc5t74zA7kUE8pvaYRZtslVInWrTw0UkmrGd+xaW0Q="; + hash = "sha256-uTZqpitexB5e2/W9HtNo0j4gOW9vDS2BsaVq16BUFM4="; }; build-system = [ flit-core ]; @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Translation plugin for Wagtail CMS"; homepage = "https://github.com/wagtail/wagtail-localize"; - changelog = "https://github.com/wagtail/wagtail-localize/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/wagtail/wagtail-localize/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ sephi ]; }; From 8562dce80e7082b95758556b203ddf883e912dc1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:44:30 +0100 Subject: [PATCH 247/484] akkuPackages.akku: fix aarch64 build --- pkgs/tools/package-management/akku/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/akku/overrides.nix b/pkgs/tools/package-management/akku/overrides.nix index 1de84dcae643..d885e686c9db 100644 --- a/pkgs/tools/package-management/akku/overrides.nix +++ b/pkgs/tools/package-management/akku/overrides.nix @@ -25,6 +25,7 @@ in tables-test.ikarus.sps lazy.sps pipeline-operators.sps + os-environment-variables.sps ' ''; }) @@ -45,7 +46,9 @@ in src = akku.src; }) # not a tar archive - (pkg: old: removeAttrs old [ "unpackPhase" ]) + (pkg: old: { + unpackPhase = null; + }) ]; machine-code = pkg: old: { From ca39ecc1a5eb7dd5fbffbe6828c29a7a77d1c10f Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 13 Feb 2025 16:46:11 +0100 Subject: [PATCH 248/484] go-ethereum: add asymmetric as maintainer --- pkgs/by-name/go/go-ethereum/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 679de8f72c76..df1dc289bd45 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -74,7 +74,10 @@ buildGoModule rec { lgpl3Only gpl3Only ]; - maintainers = with maintainers; [ RaghavSood ]; + maintainers = with maintainers; [ + asymmetric + RaghavSood + ]; mainProgram = "geth"; }; } From 97804c7e62ea070d9138f38f2f93e428388c013f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:54:20 +0100 Subject: [PATCH 249/484] python313Packages.archinfo: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 6a44d191d51e..fd16daacfbb8 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-7yBjLamoxFs+9XJNb/BcHiTgzRuEnszaahMm1HBmlfo="; + hash = "sha256-DRkviSduWDxps5XPdoTRL+Sy/fXrjsZjO4aeBVFjT9E="; }; build-system = [ setuptools ]; From 508c8ff7e3854221bec45db01d4485449cca1a77 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:54:36 +0100 Subject: [PATCH 250/484] python313Packages.ailment: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 3b72a533f979..855cd8902a6d 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-J4Wu2EbDnwj63kDQSIPWZmTB61nAATZHeawCxLC5lbY="; + hash = "sha256-TNwqf5MMqIaugOEiB0CQKAPI7AvjKTp9zJocc4GUvpg="; }; build-system = [ setuptools ]; From 1bdf86d94d958b90fb822c1706e0579b6e7078f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:56:00 +0100 Subject: [PATCH 251/484] python313Packages.pyvex: 9.2.140 -> 9.2.141 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ce5ca8b9ee53..44fc8b4b3bf0 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-UdUODBxVoCwJw8eNHNix6oimHz2oa6oWnIPEfmCJ50w="; + hash = "sha256-8Z2Xy6N/P2THbi/wRoM/59XzRrwDgiOxALn7OvHY4GY="; }; build-system = [ setuptools ]; From 612f328087580d534ce0012a366f59919776213e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:56:18 +0100 Subject: [PATCH 252/484] python313Packages.claripy: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index a5ad48ef74d9..4ab30cc416f9 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-VnvAIQm4TiNUGmpg1agOj/qEQZiR011M1BQdSyrCY5Y="; + hash = "sha256-CP7U8S9JDeElR39XvcSKt3l7Um5qDJ19aJ2x9nj2+2Q="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 352da57d86d555425f97211e745d6b54acb01778 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 16:57:55 +0100 Subject: [PATCH 253/484] python313Packages.cle: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 15156a0c5186..b9f3a48bdf30 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.140"; + version = "9.2.141"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-H+2ZfSqbu4dsioQdIZxSQZW2Q6liqL114GgZgflSqqE="; + hash = "sha256-QrelXkl+hpiz+7Uwobx+ZY9I9lhCuhevpXq2JqJNj5c="; }; in buildPythonPackage rec { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-3z1cOaSO2XMA4h1U6N+PS+YnrS/ujGDDsZqTks1hu5w="; + hash = "sha256-1l3wiyRhUuaw2eO+34lBcS2POlJoBVBuiOY6VoglD+A="; }; build-system = [ setuptools ]; From 3d9bfbf8dfe0be1f3887915385883040deab6ab6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 17:00:17 +0100 Subject: [PATCH 254/484] python312Packages.angr: 9.2.140 -> 9.2.141 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.140...v9.2.141 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 2c4ebdd856aa..78827310fb12 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.140"; + version = "9.2.141"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-wo+4DgZlcUvuz8DJR7upsKeWlTh1CYAaxpNlfCnbYN0="; + hash = "sha256-rrJTYe3o/Ra8+EKAA7t0M02tWVN4Ul5ueUar7lpUvMg="; }; postPatch = '' From 5d6301ccb103082ff3967e3a7a1aae4ab6c0373a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Feb 2025 17:03:07 +0100 Subject: [PATCH 255/484] golangci-lint: 1.64.2 -> 1.64.4 Diff: https://github.com/golangci/golangci-lint/compare/v1.64.2...v1.64.4 Changelog: https://github.com/golangci/golangci-lint/blob/v1.64.4/CHANGELOG.md --- pkgs/by-name/go/golangci-lint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 1bdc8b7d2d8d..ce403419611e 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.64.2"; + version = "1.64.4"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-ODnNBwtfILD0Uy2AKDR/e76ZrdyaOGlCktVUcf9ujy8="; + hash = "sha256-BrkBIf4WP3COAac/5vre8fHLgDneg5Gm31nNq8sXzEE="; }; - vendorHash = "sha256-/iq7Ju7c2gS7gZn3n+y0kLtPn2Nn8HY/YdqSDYjtEkI="; + vendorHash = "sha256-xUKse9yTAVuysmPwmX4EXdlpg6NYKfT5QB1RgmBQvhk="; subPackages = [ "cmd/golangci-lint" ]; From 4bca511d16ee1182227baca1e60ec83dc6a44a9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 16:07:47 +0000 Subject: [PATCH 256/484] python312Packages.microsoft-kiota-serialization-json: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-serialization-json/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 270ea442ab89..544620ed15ed 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-json"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-serialization-json-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/serialization/json/"; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON serialization implementation for Kiota clients in Python"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/json"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-json-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-json-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 44c96ea66f60f8cff053b6b4fabebae48c18d0fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 16:09:58 +0000 Subject: [PATCH 257/484] python312Packages.sshfs: 2024.9.0 -> 2025.2.0 --- pkgs/development/python-modules/sshfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 6e056ad9b569..c9724a63a82f 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2024.9.0"; + version = "2025.2.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "sshfs"; tag = version; - hash = "sha256-rRcXimthyFLBqt0nMEv7bisL+JNLLZuRH7BopSLM7QQ="; + hash = "sha256-O9Va3dLfTko9AfyK4iJa8U6xrtJsNNEeBn9UeRAgmVc="; }; build-system = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "SSH/SFTP implementation for fsspec"; homepage = "https://github.com/fsspec/sshfs/"; - changelog = "https://github.com/fsspec/sshfs/releases/tag/${version}"; + changelog = "https://github.com/fsspec/sshfs/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; }; From befafa5657f72c064cfb835461e4cc9f35b7670d Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 13 Feb 2025 17:23:55 +0100 Subject: [PATCH 258/484] python3Packages.pydevd: 3.2.3 -> 3.3.0 --- pkgs/development/python-modules/pydevd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 2de0d42c6755..e138896db2d4 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydevd"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fabioz"; repo = "PyDev.Debugger"; rev = "pydev_debugger_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-IJSy6BoQCHNo2YsnrHGXsEaWsLy5dq3jG6Jn4MgpgCg="; + hash = "sha256-V5pM0xnMFnpR1oK0purHFCV3wu+4fOmd72kmy7pVeyk="; }; postPatch = '' @@ -79,11 +79,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydevd" ]; - meta = with lib; { + meta = { description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"; homepage = "https://github.com/fabioz/PyDev.Debugger"; - license = licenses.epl10; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.epl10; + maintainers = with lib.maintainers; [ onny ]; mainProgram = "pydevd"; }; } From da2bf4271c431bb24926d219a04417212585a605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 17:45:45 +0100 Subject: [PATCH 259/484] python313Packages.tencentcloud-sdk-python: 3.0.1317 -> 3.0.1318 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1317...3.0.1318 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1318/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 82921c10b838..e8f812e21de9 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1317"; + version = "3.0.1318"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-UIDr9RkApo2vH5TaUwtPLMcqQd89vFMMzEBGk0Zy+Fo="; + hash = "sha256-pH0gm+/bZqMKWt3800rfMdKba0ZxuPNmkXDR2lPc3fs="; }; build-system = [ setuptools ]; From e1858153fc7417bc8045921cdce68761b62167c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 17:12:58 +0000 Subject: [PATCH 260/484] python312Packages.presenterm-export: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/presenterm-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/presenterm-export/default.nix b/pkgs/development/python-modules/presenterm-export/default.nix index 0e789e3c738d..b508f284d982 100644 --- a/pkgs/development/python-modules/presenterm-export/default.nix +++ b/pkgs/development/python-modules/presenterm-export/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "presenterm-export"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; src = fetchPypi { pname = "presenterm_export"; inherit version; - hash = "sha256-ZC/U0G3DEMoqzl/5mcKShOyOm1Zw6VQhP1txA7tlMR8="; + hash = "sha256-9TkZ52lA1l3PYs2DTgji0LDrG5kixnFffuMIfhILY1E="; }; pythonRelaxDeps = true; From 1aca3c42132e5231776c7199a78d6aec184be729 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 13 Feb 2025 18:15:21 +0100 Subject: [PATCH 261/484] devenv: disable telemetry by default --- pkgs/by-name/de/devenv/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 6e64ccf592e2..0153deb0433c 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -74,6 +74,7 @@ rustPlatform.buildRustPackage { wrapProgram $out/bin/devenv \ --prefix PATH ":" "$out/bin:${cachix}/bin" \ --set DEVENV_NIX ${devenv_nix} \ + --set-default DO_NOT_TRACK 1 \ ${setDefaultLocaleArchive} # Generate manpages From b04fc7b0ea06a6173cb922e8836cf18d27f56b88 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Thu, 13 Feb 2025 17:23:22 +0000 Subject: [PATCH 262/484] linuxPackages_latest.prl-tools: 20.2.0-55872 -> 20.2.1-55876 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b5ac3562128a..935fcb4001fc 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.2.0-55872"; + version = "20.2.1-55876"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-oOilbF5MzZxZXNVQYAp/JxyMVdM0oltG8pGfzzsQ1kY="; + hash = "sha256-MZuvEjSjRqtdr22bl4NhcKZBNDmdM/axI/8wOP/SvPU="; }; hardeningDisable = [ From d444960d1a98ea85bddeec6b21e241bdc2d43860 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:42:52 -0300 Subject: [PATCH 263/484] forecast: use libcosmicAppHook --- pkgs/by-name/fo/forecast/package.nix | 39 ++++------------------------ 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 9caca19cafdb..87ced2b58bba 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -5,22 +5,16 @@ fetchFromGitHub, # nativeBuildInputs - autoPatchelfHook, + libcosmicAppHook, just, - pkg-config, - wrapGAppsHook3, # buildInputs - libxkbcommon, openssl, - vulkan-loader, - wayland, - nix-update-script, - cosmic-icons, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "forecast"; version = "0-unstable-2024-09-23"; @@ -49,37 +43,14 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - autoPatchelfHook + libcosmicAppHook just - pkg-config - wrapGAppsHook3 ]; dontUseJustBuild = true; dontUseJustCheck = true; - buildInputs = [ - libxkbcommon - openssl - vulkan-loader - wayland - ]; - - env = { - # COSMIC applications now uses vergen for the About page - VERGEN_GIT_COMMIT_DATE = "1970-01-01"; - VERGEN_GIT_SHA = src.rev; - }; - - runtimeDependencies = [ - libxkbcommon - wayland - ]; - - postFixup = '' - wrapProgram $out/bin/cosmic-ext-forecast \ - --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" - ''; + buildInputs = [ openssl ]; justFlags = [ "--set" From 8fa08cdc675e731dc5ccffeb96004501fcfc6412 Mon Sep 17 00:00:00 2001 From: Jorik Date: Sat, 2 Nov 2024 15:19:53 +0100 Subject: [PATCH 264/484] posting: init at 2.3.0 --- pkgs/by-name/po/posting/package.nix | 56 +++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/po/posting/package.nix diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix new file mode 100644 index 000000000000..4550df713fd3 --- /dev/null +++ b/pkgs/by-name/po/posting/package.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + xorg, +}: +python3Packages.buildPythonApplication rec { + pname = "posting"; + version = "2.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "darrenburns"; + repo = "posting"; + tag = version; + hash = "sha256-lL85gJxFw8/e8Js+UCE9VxBMcmWRUkHh8Cq5wTC93KA="; + }; + + pythonRelaxDeps = true; + + build-system = with python3Packages; [ + hatchling + ]; + + # Required for x resources themes + buildInputs = [ xorg.xrdb ]; + + dependencies = + with python3Packages; + [ + click + xdg-base-dirs + click-default-group + pyperclip + pyyaml + python-dotenv + watchfiles + pydantic + pydantic-settings + httpx + textual-autocomplete + textual + ] + ++ httpx.optional-dependencies.brotli + ++ textual.optional-dependencies.syntax; + + meta = { + description = "Modern API client that lives in your terminal"; + mainProgram = "posting"; + homepage = "https://posting.sh/"; + changelog = "https://github.com/darrenburns/posting/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jorikvanveen ]; + platforms = lib.platforms.unix; + }; +} From 318e57b3867136741e4325b374ad5de54f68e1cd Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:45:27 -0300 Subject: [PATCH 265/484] forecast: fix updateScript --- pkgs/by-name/fo/forecast/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 87ced2b58bba..893b0150ae57 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -62,7 +62,12 @@ rustPlatform.buildRustPackage { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; }; meta = { From 007d4fc4a1a649678b85ed96350331252609efed Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:52:26 -0300 Subject: [PATCH 266/484] forecast: 0-unstable-2024-09-23 -> 0-unstable-2025-02-12 --- pkgs/by-name/fo/forecast/Cargo.lock | 1728 +++++++++++++------------- pkgs/by-name/fo/forecast/package.nix | 21 +- 2 files changed, 884 insertions(+), 865 deletions(-) diff --git a/pkgs/by-name/fo/forecast/Cargo.lock b/pkgs/by-name/fo/forecast/Cargo.lock index 49a40caae702..1830507aa82e 100644 --- a/pkgs/by-name/fo/forecast/Cargo.lock +++ b/pkgs/by-name/fo/forecast/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" @@ -20,43 +20,53 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" + +[[package]] +name = "accesskit_atspi_common" +version = "0.9.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +dependencies = [ + "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror", + "zvariant 3.15.2", +] [[package]] name = "accesskit_consumer" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.24.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "icrate 0.1.2", - "objc2 0.5.0", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.12.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", - "accesskit_consumer", - "async-channel", - "async-executor", - "async-task", + "accesskit_atspi_common", "atspi", "futures-lite 1.13.0", - "futures-util", - "once_cell", "serde", "tokio", "tokio-stream", @@ -65,21 +75,20 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", "paste", "static_assertions", - "windows 0.48.0", + "windows 0.54.0", ] [[package]] name = "accesskit_winit" -version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_macos", @@ -152,12 +161,12 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -166,7 +175,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -233,7 +242,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -244,9 +253,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -256,11 +265,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -269,7 +278,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ - "async-fs 2.1.2", + "async-fs", "async-net", "enumflags2", "futures-channel", @@ -360,18 +369,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - [[package]] name = "async-fs" version = "2.1.2" @@ -416,7 +413,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.6.0", - "rustix 0.38.32", + "rustix 0.38.39", "slab", "tracing", "windows-sys 0.52.0", @@ -466,7 +463,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.32", + "rustix 0.38.39", "windows-sys 0.48.0", ] @@ -485,7 +482,7 @@ dependencies = [ "cfg-if", "event-listener 5.3.0", "futures-lite 2.3.0", - "rustix 0.38.32", + "rustix 0.38.39", "tracing", "windows-sys 0.52.0", ] @@ -498,7 +495,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -513,7 +510,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix 0.38.39", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -533,7 +530,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -547,7 +544,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.39", "tempfile", "windows-sys 0.48.0", ] @@ -667,18 +664,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bit_field" @@ -694,9 +691,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -722,33 +719,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" -dependencies = [ - "block-sys", - "objc2 0.5.0", + "objc2", ] [[package]] @@ -793,7 +770,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -814,54 +791,28 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.5.0", - "log", - "polling 3.6.0", - "rustix 0.38.32", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "polling 3.6.0", - "rustix 0.38.32", + "rustix 0.38.39", "slab", "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix 0.38.32", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", - "rustix 0.38.32", + "calloop", + "rustix 0.38.39", "wayland-backend", "wayland-client", ] @@ -907,9 +858,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cfg_aliases" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -923,7 +874,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -938,7 +889,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "objc", "objc-foundation", @@ -948,7 +899,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "dnd", "mime 0.1.0", @@ -958,7 +909,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "thiserror", "x11rb", @@ -1120,14 +1071,26 @@ dependencies = [ "libc", ] +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" +dependencies = [ + "cosmic-protocols", + "libc", + "smithay-client-toolkit", + "wayland-client", + "wayland-protocols", +] + [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "atomicwrites", "cosmic-config-derive", - "dirs", + "dirs 5.0.1", "iced_futures", "known-folders", "notify", @@ -1142,7 +1105,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "quote", "syn 1.0.109", @@ -1150,7 +1113,7 @@ dependencies = [ [[package]] name = "cosmic-ext-forecast" -version = "0.1.0" +version = "1.1.0" dependencies = [ "bytes", "chrono", @@ -1164,21 +1127,46 @@ dependencies = [ "rust-embed", "serde", "tokio", - "vergen", +] + +[[package]] +name = "cosmic-freedesktop-icons" +version = "0.2.6" +source = "git+https://github.com/pop-os/freedesktop-icons#5a3b4163148a9600a54cc846aa863f4e6389635d" +dependencies = [ + "dirs 5.0.1", + "once_cell", + "rust-ini", + "thiserror", + "tracing", + "xdg", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "wayland-server", ] [[package]] name = "cosmic-text" version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#c7512170201910cfb8a021f8d749c4125dfed18d" +source = "git+https://github.com/pop-os/cosmic-text.git#166b59f560c551dab391a864f7c1f503c1e18446" dependencies = [ - "bitflags 2.5.0", - "fontdb", + "bitflags 2.6.0", + "fontdb 0.16.2", "log", "rangemap", - "rayon", - "rustc-hash", - "rustybuzz 0.14.1", + "rustc-hash 1.1.0", + "rustybuzz", "self_cell 1.0.3", "smol_str", "swash", @@ -1193,12 +1181,12 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "almost", "cosmic-config", "csscolorparser", - "dirs", + "dirs 5.0.1", "lazy_static", "palette", "ron", @@ -1305,11 +1293,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading", "winapi", ] @@ -1334,7 +1323,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1345,7 +1334,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1368,15 +1357,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - [[package]] name = "derivative" version = "2.2.0" @@ -1397,7 +1377,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1410,13 +1390,33 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys 0.3.7", +] + [[package]] name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", ] [[package]] @@ -1445,7 +1445,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1454,7 +1454,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading", ] [[package]] @@ -1469,32 +1469,46 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smithay-clipboard", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" + [[package]] name = "drm" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.32", + "rustix 0.38.39", ] [[package]] @@ -1504,7 +1518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.32", + "rustix 0.38.39", ] [[package]] @@ -1544,17 +1558,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" -[[package]] -name = "enum-repr" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enumflags2" version = "0.7.9" @@ -1573,7 +1576,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1758,9 +1761,6 @@ name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] [[package]] name = "float_next_after" @@ -1788,7 +1788,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -1829,9 +1829,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "11c3a23a5a151afb1f74ea797f8c300dee41eff9ee3cb1bf94ed316d860c46b3" dependencies = [ "bytemuck", ] @@ -1842,7 +1842,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" dependencies = [ - "roxmltree", + "roxmltree 0.19.0", ] [[package]] @@ -1859,6 +1859,20 @@ dependencies = [ "ttf-parser 0.20.0", ] +[[package]] +name = "fontdb" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser 0.21.1", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -1886,7 +1900,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -1911,24 +1925,14 @@ dependencies = [ ] [[package]] -name = "fraction" -version = "0.15.3" +name = "freedesktop-desktop-entry" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7" +checksum = "c201444ddafb5506fe85265b48421664ff4617e3b7090ef99e42a0070c1aead0" dependencies = [ - "lazy_static", - "num", -] - -[[package]] -name = "freedesktop-icons" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" -dependencies = [ - "dirs", - "once_cell", - "rust-ini", + "dirs 3.0.2", + "gettext-rs", + "memchr", "thiserror", "xdg", ] @@ -2027,7 +2031,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -2092,13 +2096,23 @@ dependencies = [ ] [[package]] -name = "gif" -version = "0.12.0" +name = "gettext-rs" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" dependencies = [ - "color_quant", - "weezl", + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" +dependencies = [ + "cc", + "temp-dir", ] [[package]] @@ -2130,9 +2144,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glow" @@ -2148,31 +2162,20 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2182,14 +2185,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2200,22 +2203,22 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2279,10 +2282,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading", "thiserror", "widestring", "winapi", @@ -2467,7 +2470,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.71", + "syn 2.0.87", "unic-langid", ] @@ -2481,7 +2484,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -2495,7 +2498,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2509,15 +2512,14 @@ dependencies = [ [[package]] name = "iced" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", "iced_renderer", - "iced_sctk", "iced_widget", "iced_winit", "image 0.24.9", @@ -2529,57 +2531,69 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "accesskit", - "accesskit_unix", "accesskit_winit", ] [[package]] name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "bytes", "dnd", - "iced_accessibility", + "glam", "log", "mime 0.1.0", "num-traits", + "once_cell", "palette", "raw-window-handle", + "rustc-hash 2.0.0", "serde", - "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", "window_clipboard", - "xxhash-rust", ] [[package]] name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "futures", "iced_core", "log", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", ] [[package]] -name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +name = "iced_glyphon" +version = "0.6.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" dependencies = [ - "bitflags 2.5.0", + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + +[[package]] +name = "iced_graphics" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" +dependencies = [ + "bitflags 2.6.0", "bytemuck", "cosmic-text", - "glam", "half", "iced_core", "iced_futures", @@ -2589,16 +2603,15 @@ dependencies = [ "lyon_path", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", - "xxhash-rust", ] [[package]] name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2609,95 +2622,60 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ + "bytes", "dnd", - "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.2", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_sctk" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" -dependencies = [ - "enum-repr", - "float-cmp", - "futures", - "iced_futures", - "iced_graphics", - "iced_runtime", - "iced_style", - "itertools", - "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.2", "thiserror", - "tracing", - "wayland-backend", - "wayland-protocols 0.32.3", "window_clipboard", - "xkbcommon", - "xkbcommon-dl", - "xkeysym", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" -dependencies = [ - "iced_core", - "once_cell", - "palette", ] [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", - "kurbo", + "kurbo 0.10.4", "log", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", - "xxhash-rust", ] [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "as-raw-xcb-connection", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", + "cosmic-client-toolkit", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.32", - "smithay-client-toolkit 0.19.2", + "rustc-hash 2.0.0", + "rustix 0.38.39", + "thiserror", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols", "wayland-sys", "wgpu", "x11rb", @@ -2705,15 +2683,16 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "dnd", "iced_renderer", "iced_runtime", - "iced_style", "num-traits", + "once_cell", "ouroboros", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", "window_clipboard", @@ -2721,43 +2700,24 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "dnd", + "iced_futures", "iced_graphics", "iced_runtime", - "iced_style", "log", + "rustc-hash 2.0.0", "thiserror", "tracing", + "wasm-bindgen-futures", "web-sys", "winapi", "window_clipboard", "winit", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[package]] -name = "icrate" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" -dependencies = [ - "block2 0.4.0", - "objc2 0.5.0", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2784,7 +2744,7 @@ dependencies = [ "byteorder", "color_quant", "exr", - "gif 0.13.1", + "gif", "jpeg-decoder", "num-traits", "png", @@ -2802,7 +2762,7 @@ dependencies = [ "byteorder-lite", "color_quant", "exr", - "gif 0.13.1", + "gif", "image-webp", "num-traits", "png", @@ -2837,6 +2797,15 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" +[[package]] +name = "immutable-chunkmap" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec", +] + [[package]] name = "include_dir" version = "0.7.4" @@ -2903,7 +2872,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -2936,6 +2905,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "io-lifetimes" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" + [[package]] name = "ipnet" version = "2.9.0" @@ -3018,9 +2993,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3041,7 +3016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading", "pkg-config", ] @@ -3082,11 +3057,22 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec", + "smallvec", +] + +[[package]] +name = "kurbo" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +dependencies = [ + "arrayvec", + "smallvec", ] [[package]] @@ -3103,39 +3089,43 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" dependencies = [ "apply", "ashpd 0.9.1", "chrono", "cosmic-config", + "cosmic-freedesktop-icons", "cosmic-theme", "css-color", "derive_setters", - "fraction", - "freedesktop-icons", + "freedesktop-desktop-entry", "iced", "iced_core", "iced_futures", "iced_renderer", "iced_runtime", - "iced_style", "iced_tiny_skia", "iced_wgpu", "iced_widget", "iced_winit", "image 0.25.2", "lazy_static", + "libc", + "license", + "mime 0.3.17", "palette", "rfd", + "rustix 0.38.39", "serde", + "shlex", "slotmap", "taffy", "thiserror", @@ -3157,16 +3147,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.3" @@ -3174,7 +3154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -3189,7 +3169,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -3200,10 +3180,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] +[[package]] +name = "license" +version = "3.6.0+3.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b517725daf998729e5ef4c4881cdde19cd5bbdde09741ba1b0f1ba0ce018961" +dependencies = [ + "reword", + "serde", + "serde_json", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -3212,9 +3203,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -3222,6 +3213,12 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "locale_config" version = "0.3.0" @@ -3265,9 +3262,6 @@ name = "lru" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown", -] [[package]] name = "lyon" @@ -3384,11 +3378,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3400,7 +3394,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "smithay-clipboard", ] @@ -3447,18 +3441,19 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3485,14 +3480,14 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -3513,6 +3508,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -3537,7 +3541,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases 0.1.1", "libc", @@ -3566,7 +3570,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3579,20 +3583,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -3603,21 +3593,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - [[package]] name = "num-derive" version = "0.4.2" @@ -3626,7 +3601,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -3638,17 +3613,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.2" @@ -3698,16 +3662,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", + "syn 2.0.87", ] [[package]] @@ -3717,7 +3672,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -3733,35 +3687,95 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 3.0.0", + "objc2-encode", ] [[package]] -name = "objc2" -version = "0.5.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9c7f0d511a4ce26b078183179dca908171cfc69f88986fe36c5138e1834476" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "objc-sys", - "objc2-encode 4.0.3", + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-cloud-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] [[package]] name = "objc2-encode" @@ -3770,12 +3784,108 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-foundation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "cc", + "bitflags 2.6.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] @@ -3819,7 +3929,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3836,7 +3946,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -3894,9 +4004,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", @@ -3905,15 +4015,16 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck 0.4.1", - "proc-macro-error", + "itertools", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -3946,7 +4057,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4051,7 +4162,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4060,7 +4171,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4086,7 +4197,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4157,7 +4268,7 @@ dependencies = [ "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.39", "tracing", "windows-sys 0.52.0", ] @@ -4168,12 +4279,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4238,6 +4343,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "version_check", + "yansi", +] + [[package]] name = "profiling" version = "1.0.15" @@ -4254,7 +4372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4274,9 +4392,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] @@ -4408,17 +4526,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "f6f9e8a4f503e5c8750e4cd3b32a4e090035c46374b305a15c70bad833dca05f" dependencies = [ "bytemuck", "font-types", @@ -4433,15 +4545,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4543,21 +4646,29 @@ dependencies = [ [[package]] name = "resvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" dependencies = [ - "gif 0.12.0", + "gif", "jpeg-decoder", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", "usvg", ] +[[package]] +name = "reword" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe272098dce9ed76b479995953f748d1851261390b08f8a0ff619c885a1f0765" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "rfd" version = "0.14.1" @@ -4597,7 +4708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -4608,6 +4719,12 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + [[package]] name = "rust-embed" version = "8.3.0" @@ -4628,7 +4745,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.71", + "syn 2.0.87", "walkdir", ] @@ -4664,6 +4781,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustix" version = "0.37.27" @@ -4672,7 +4795,7 @@ checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", - "io-lifetimes", + "io-lifetimes 1.0.11", "libc", "linux-raw-sys 0.3.8", "windows-sys 0.48.0", @@ -4680,14 +4803,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -4707,41 +4830,19 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring 0.1.0", - "unicode-ccc 0.1.2", - "unicode-properties", - "unicode-script", -] - [[package]] name = "rustybuzz" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "libm", "smallvec", "ttf-parser 0.21.1", - "unicode-bidi-mirroring 0.2.0", - "unicode-ccc 0.2.0", + "unicode-bidi-mirroring", + "unicode-ccc", "unicode-properties", "unicode-script", ] @@ -4784,14 +4885,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2 0.9.4", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -4850,7 +4951,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4873,7 +4974,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -4965,10 +5066,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] -name = "skrifa" -version = "0.19.3" +name = "siphasher" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skrifa" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6667e349abb2e6e850b31bc638a11f7fadd7e4cf113b71947c46bf6d5fe0dbc9" dependencies = [ "bytemuck", "read-fonts", @@ -4998,54 +5105,29 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.5.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.32", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.4", "pkg-config", - "rustix 0.38.32", + "rustix 0.38.39", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.3", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5058,7 +5140,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -5098,7 +5180,7 @@ source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e9839 dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases 0.2.0", + "cfg_aliases 0.2.1", "cocoa", "core-graphics", "drm", @@ -5110,7 +5192,7 @@ dependencies = [ "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.32", + "rustix 0.38.39", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5136,7 +5218,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5174,19 +5256,19 @@ checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ - "kurbo", - "siphasher", + "kurbo 0.11.1", + "siphasher 1.0.1", ] [[package]] name = "swash" -version = "0.1.17" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "f0e25b48fd1c222c9fdb61148e2203b750f9840c07922fd61b87c6015560b8f6" dependencies = [ "skrifa", "yazi", @@ -5206,9 +5288,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -5281,6 +5363,12 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "temp-dir" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" + [[package]] name = "tempfile" version = "3.10.1" @@ -5289,7 +5377,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.2", - "rustix 0.38.32", + "rustix 0.38.39", "windows-sys 0.52.0", ] @@ -5304,22 +5392,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -5333,39 +5421,6 @@ dependencies = [ "weezl", ] -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -5409,7 +5464,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.3", + "libloading", "pkg-config", "tracing", ] @@ -5465,7 +5520,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -5598,9 +5653,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5610,20 +5665,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -5652,7 +5707,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -5697,24 +5752,12 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - [[package]] name = "unicode-bidi-mirroring" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - [[package]] name = "unicode-ccc" version = "0.2.0" @@ -5798,63 +5841,29 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" dependencies = [ + "base64 0.22.0", "data-url", "flate2", + "fontdb 0.18.0", "imagesize", - "kurbo", + "kurbo 0.11.1", "log", - "roxmltree", + "pico-args", + "roxmltree 0.20.0", + "rustybuzz", "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz 0.12.1", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -5874,18 +5883,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vergen" -version = "8.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" -dependencies = [ - "anyhow", - "cfg-if", - "rustversion", - "time", -] - [[package]] name = "version-compare" version = "0.2.0" @@ -5931,34 +5928,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -5968,9 +5966,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5978,22 +5976,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-timer" @@ -6012,13 +6010,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.32", + "rustix 0.38.39", "scoped-tls", "smallvec", "wayland-sys", @@ -6026,12 +6024,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.32", + "bitflags 2.6.0", + "rustix 0.38.39", "wayland-backend", "wayland-scanner", ] @@ -6042,7 +6040,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] @@ -6053,58 +6051,34 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.39", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", + "wayland-server", ] [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] @@ -6114,18 +6088,19 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols", "wayland-scanner", + "wayland-server", ] [[package]] name = "wayland-scanner" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -6133,10 +6108,24 @@ dependencies = [ ] [[package]] -name = "wayland-sys" -version = "0.31.4" +name = "wayland-server" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +checksum = "c89532cc712a2adb119eb4d09694b402576052254d0bb284f82ac1c47fb786ad" +dependencies = [ + "bitflags 2.6.0", + "downcast-rs", + "io-lifetimes 2.0.4", + "rustix 0.38.39", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-sys" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -6146,9 +6135,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6156,9 +6145,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6172,12 +6161,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6196,14 +6186,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6211,24 +6202,24 @@ dependencies = [ "parking_lot 0.12.1", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -6242,10 +6233,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.1", @@ -6253,7 +6245,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6264,10 +6256,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -6312,7 +6305,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6324,25 +6317,26 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", - "windows-targets 0.52.4", + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-implement", + "windows-interface", + "windows-targets 0.52.6", ] [[package]] @@ -6351,29 +6345,48 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6400,7 +6413,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6435,17 +6448,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6462,9 +6476,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6480,9 +6494,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6498,9 +6512,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6516,9 +6536,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6534,9 +6554,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6552,9 +6572,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6570,52 +6590,56 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.10" -source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +version = "0.30.5" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", + "block2", "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", + "calloop", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate 0.0.4", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.32", + "redox_syscall 0.4.1", + "rustix 0.38.39", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -6669,9 +6693,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading", "once_cell", - "rustix 0.38.32", + "rustix 0.38.39", "x11rb-protocol", ] @@ -6720,7 +6744,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -6749,16 +6773,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] -name = "xxhash-rust" -version = "0.8.10" +name = "yansi" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yazi" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" +checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" [[package]] name = "zbus" @@ -6767,15 +6791,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", "async-process 1.8.1", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", @@ -6810,7 +6828,7 @@ checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" dependencies = [ "async-broadcast 0.7.1", "async-executor", - "async-fs 2.1.2", + "async-fs", "async-io 2.3.2", "async-lock 3.3.0", "async-process 2.2.3", @@ -6864,7 +6882,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "zvariant_utils 2.0.0", ] @@ -6892,9 +6910,9 @@ dependencies = [ [[package]] name = "zeno" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" +checksum = "cc0de2315dc13d00e5df3cd6b8d2124a6eaec6a2d4b6a1c5f37b7efad17fcc17" [[package]] name = "zerocopy" @@ -6913,7 +6931,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] [[package]] @@ -6990,7 +7008,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", "zvariant_utils 2.0.0", ] @@ -7013,5 +7031,5 @@ checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.87", ] diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 893b0150ae57..43da5ff5aadb 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,29 +16,30 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2024-09-23"; + version = "0-unstable-2025-02-12"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "d3c274932847aa101fb7aacf1d01ded265b6fad4"; - hash = "sha256-6hlh9T0h1Yi8io2sMU/r8uMtP6isH6JJxE5LvZrj9Cs="; + rev = "08030d27dc7751122a3d5d228ef25eb0a6725c8f"; + hash = "sha256-06HZ38yW1xnRhXQZ6tHg2Yr0LmfJVRu7Cpp245B7tBg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-zamYPvxmIqh4IT4G+aqceP1mXNNBA1TAcJwAtjlbYAU="; - "cosmic-text-0.12.1" = "sha256-5Gk220HTiHuxDvyqwz1Dwr+BaLvH/6X7M14IirQzcsE="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; + "cosmic-client-toolkit-0.1.0" = "sha256-/DJ/PfqnZHB6VeRi7HXWp0Vruk+jWBe+VCLPpiJeEv4="; + "cosmic-config-0.1.0" = "sha256-7CKtRpQKYyUwANz5OMkfqDkfbGP4y0pSjvWBngby+yI="; + "cosmic-freedesktop-icons-0.2.6" = "sha256-+WmCBP9BQx7AeGdFW2KM029vuweYKM/OzuCap5aTImw="; + "cosmic-text-0.12.1" = "sha256-+litEIoCWfwt/+wqRCtWuGr5DHAuDFV/naHnADNLbQI="; + "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; + "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; From 9f2205b4ef5de22a0c2fed71307204de4a8aeb0d Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:57:09 -0300 Subject: [PATCH 267/484] forecast: migrate to useFetchCargoVendor --- pkgs/by-name/fo/forecast/Cargo.lock | 7035 -------------------------- pkgs/by-name/fo/forecast/package.nix | 19 +- 2 files changed, 2 insertions(+), 7052 deletions(-) delete mode 100644 pkgs/by-name/fo/forecast/Cargo.lock diff --git a/pkgs/by-name/fo/forecast/Cargo.lock b/pkgs/by-name/fo/forecast/Cargo.lock deleted file mode 100644 index 1830507aa82e..000000000000 --- a/pkgs/by-name/fo/forecast/Cargo.lock +++ /dev/null @@ -1,7035 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "ab_glyph" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "accesskit" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" - -[[package]] -name = "accesskit_atspi_common" -version = "0.9.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_consumer", - "atspi-common", - "serde", - "thiserror", - "zvariant 3.15.2", -] - -[[package]] -name = "accesskit_consumer" -version = "0.24.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "immutable-chunkmap", -] - -[[package]] -name = "accesskit_macos" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_consumer", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "once_cell", -] - -[[package]] -name = "accesskit_unix" -version = "0.12.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_atspi_common", - "atspi", - "futures-lite 1.13.0", - "serde", - "tokio", - "tokio-stream", - "zbus 3.15.2", -] - -[[package]] -name = "accesskit_windows" -version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_consumer", - "paste", - "static_assertions", - "windows 0.54.0", -] - -[[package]] -name = "accesskit_winit" -version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" -dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_unix", - "accesskit_windows", - "raw-window-handle", - "winit", -] - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] -name = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "almost" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" - -[[package]] -name = "android-activity" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" -dependencies = [ - "android-properties", - "bitflags 2.6.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys 0.6.0+11769913", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "apply" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arg_enum_proc_macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "ash" -version = "0.38.0+1.3.281" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" -dependencies = [ - "libloading", -] - -[[package]] -name = "ashpd" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" -dependencies = [ - "async-fs", - "async-net", - "enumflags2", - "futures-channel", - "futures-util", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus 4.3.0", -] - -[[package]] -name = "ashpd" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus 4.3.0", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-broadcast" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" -dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" -dependencies = [ - "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-executor" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.0.2", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock 3.3.0", - "blocking", - "futures-lite 2.3.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.6.0", - "rustix 0.38.39", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io 2.3.2", - "blocking", - "futures-lite 2.3.0", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.39", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-process" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" -dependencies = [ - "async-channel", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.0", - "futures-lite 2.3.0", - "rustix 0.38.39", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io 2.3.2", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.39", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atomicwrites" -version = "0.4.2" -source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" -dependencies = [ - "rustix 0.38.39", - "tempfile", - "windows-sys 0.48.0", -] - -[[package]] -name = "atspi" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" -dependencies = [ - "atspi-common", - "atspi-connection", - "atspi-proxies", -] - -[[package]] -name = "atspi-common" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" -dependencies = [ - "enumflags2", - "serde", - "static_assertions", - "zbus 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "atspi-connection" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" -dependencies = [ - "atspi-common", - "atspi-proxies", - "futures-lite 1.13.0", - "zbus 3.15.2", -] - -[[package]] -name = "atspi-proxies" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" -dependencies = [ - "atspi-common", - "serde", - "zbus 3.15.2", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "av1-grain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "basic-toml" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "bitstream-io" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "built" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytemuck" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "calloop" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.6.0", - "rustix 0.38.39", - "slab", - "thiserror", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" -dependencies = [ - "calloop", - "rustix 0.38.39", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "cc" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "clipboard-win" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" -dependencies = [ - "error-code", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "dnd", - "mime 0.1.0", - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "thiserror", - "x11rb", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "cosmic-client-toolkit" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" -dependencies = [ - "cosmic-protocols", - "libc", - "smithay-client-toolkit", - "wayland-client", - "wayland-protocols", -] - -[[package]] -name = "cosmic-config" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "atomicwrites", - "cosmic-config-derive", - "dirs 5.0.1", - "iced_futures", - "known-folders", - "notify", - "once_cell", - "ron", - "serde", - "tokio", - "tracing", - "xdg", -] - -[[package]] -name = "cosmic-config-derive" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cosmic-ext-forecast" -version = "1.1.0" -dependencies = [ - "bytes", - "chrono", - "i18n-embed", - "i18n-embed-fl", - "include_dir", - "libcosmic", - "log", - "open", - "reqwest", - "rust-embed", - "serde", - "tokio", -] - -[[package]] -name = "cosmic-freedesktop-icons" -version = "0.2.6" -source = "git+https://github.com/pop-os/freedesktop-icons#5a3b4163148a9600a54cc846aa863f4e6389635d" -dependencies = [ - "dirs 5.0.1", - "once_cell", - "rust-ini", - "thiserror", - "tracing", - "xdg", -] - -[[package]] -name = "cosmic-protocols" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "cosmic-text" -version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#166b59f560c551dab391a864f7c1f503c1e18446" -dependencies = [ - "bitflags 2.6.0", - "fontdb 0.16.2", - "log", - "rangemap", - "rustc-hash 1.1.0", - "rustybuzz", - "self_cell 1.0.3", - "smol_str", - "swash", - "sys-locale", - "ttf-parser 0.21.1", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - -[[package]] -name = "cosmic-theme" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "almost", - "cosmic-config", - "csscolorparser", - "dirs 5.0.1", - "lazy_static", - "palette", - "ron", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "css-color" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" - -[[package]] -name = "csscolorparser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" -dependencies = [ - "phf", - "serde", -] - -[[package]] -name = "ctor-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" - -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "d3d12" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" -dependencies = [ - "bitflags 2.6.0", - "libloading", - "winapi", -] - -[[package]] -name = "darling" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.87", -] - -[[package]] -name = "darling_macro" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_setters" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "dnd" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "bitflags 2.6.0", - "mime 0.1.0", - "raw-window-handle", - "smithay-client-toolkit", - "smithay-clipboard", -] - -[[package]] -name = "document-features" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" -dependencies = [ - "litrs", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dpi" -version = "0.1.1" -source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" - -[[package]] -name = "drm" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "rustix 0.38.39", -] - -[[package]] -name = "drm-ffi" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" -dependencies = [ - "drm-sys", - "rustix 0.38.39", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" -dependencies = [ - "libc", - "linux-raw-sys 0.6.4", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enumflags2" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "etagere" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "euclid" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" -dependencies = [ - "num-traits", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.3.0", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "find-crate" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "float_next_after" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" - -[[package]] -name = "fluent" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - -[[package]] -name = "fluent-bundle" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" -dependencies = [ - "fluent-langneg", - "fluent-syntax", - "intl-memoizer", - "intl_pluralrules", - "rustc-hash 1.1.0", - "self_cell 0.10.3", - "smallvec", - "unic-langid", -] - -[[package]] -name = "fluent-langneg" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "fluent-syntax" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" -dependencies = [ - "thiserror", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font-types" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c3a23a5a151afb1f74ea797f8c300dee41eff9ee3cb1bf94ed316d860c46b3" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "fontconfig-parser" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" -dependencies = [ - "roxmltree 0.19.0", -] - -[[package]] -name = "fontdb" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.9.4", - "slotmap", - "tinyvec", - "ttf-parser 0.20.0", -] - -[[package]] -name = "fontdb" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.9.4", - "slotmap", - "tinyvec", - "ttf-parser 0.21.1", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "freedesktop-desktop-entry" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c201444ddafb5506fe85265b48421664ff4617e3b7090ef99e42a0070c1aead0" -dependencies = [ - "dirs 3.0.2", - "gettext-rs", - "memchr", - "thiserror", - "xdg", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.0.2", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glam" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.6.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "gpu-allocator" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" -dependencies = [ - "log", - "presser", - "thiserror", - "winapi", - "windows 0.52.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" -dependencies = [ - "bitflags 2.6.0", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "grid" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "h2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.6.0", - "com", - "libc", - "libloading", - "thiserror", - "widestring", - "winapi", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "hyper" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2 0.5.6", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "i18n-config" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" -dependencies = [ - "basic-toml", - "log", - "serde", - "serde_derive", - "thiserror", - "unic-langid", -] - -[[package]] -name = "i18n-embed" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e901c87176ac0b615033c81dbe927c230f74700abfd60ed953a6f547c87bbe6d" -dependencies = [ - "arc-swap", - "fluent", - "fluent-langneg", - "fluent-syntax", - "i18n-embed-impl", - "intl-memoizer", - "lazy_static", - "locale_config", - "log", - "parking_lot 0.12.1", - "rust-embed", - "thiserror", - "unic-langid", - "walkdir", -] - -[[package]] -name = "i18n-embed-fl" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d73fe51b9655599147183495551696628b335f75b2dbfa225196b16d69d7288e" -dependencies = [ - "dashmap", - "find-crate", - "fluent", - "fluent-syntax", - "i18n-config", - "i18n-embed", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.87", - "unic-langid", -] - -[[package]] -name = "i18n-embed-impl" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" -dependencies = [ - "find-crate", - "i18n-config", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "iced" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "dnd", - "iced_accessibility", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_widget", - "iced_winit", - "image 0.24.9", - "mime 0.1.0", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_accessibility" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "accesskit", - "accesskit_winit", -] - -[[package]] -name = "iced_core" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "dnd", - "glam", - "log", - "mime 0.1.0", - "num-traits", - "once_cell", - "palette", - "raw-window-handle", - "rustc-hash 2.0.0", - "serde", - "smol_str", - "thiserror", - "web-time", - "window_clipboard", -] - -[[package]] -name = "iced_futures" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "futures", - "iced_core", - "log", - "rustc-hash 2.0.0", - "tokio", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_glyphon" -version = "0.6.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "rustc-hash 2.0.0", - "wgpu", -] - -[[package]] -name = "iced_graphics" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "cosmic-text", - "half", - "iced_core", - "iced_futures", - "image 0.24.9", - "kamadak-exif", - "log", - "lyon_path", - "once_cell", - "raw-window-handle", - "rustc-hash 2.0.0", - "thiserror", - "unicode-segmentation", -] - -[[package]] -name = "iced_renderer" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "iced_graphics", - "iced_tiny_skia", - "iced_wgpu", - "log", - "thiserror", -] - -[[package]] -name = "iced_runtime" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bytes", - "dnd", - "iced_core", - "iced_futures", - "raw-window-handle", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_tiny_skia" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "bytemuck", - "cosmic-text", - "iced_graphics", - "kurbo 0.10.4", - "log", - "resvg", - "rustc-hash 2.0.0", - "softbuffer", - "tiny-skia", -] - -[[package]] -name = "iced_wgpu" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "as-raw-xcb-connection", - "bitflags 2.6.0", - "bytemuck", - "cosmic-client-toolkit", - "futures", - "glam", - "guillotiere", - "iced_glyphon", - "iced_graphics", - "log", - "lyon", - "once_cell", - "raw-window-handle", - "resvg", - "rustc-hash 2.0.0", - "rustix 0.38.39", - "thiserror", - "tiny-xlib", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-sys", - "wgpu", - "x11rb", -] - -[[package]] -name = "iced_widget" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "dnd", - "iced_renderer", - "iced_runtime", - "num-traits", - "once_cell", - "ouroboros", - "rustc-hash 2.0.0", - "thiserror", - "unicode-segmentation", - "window_clipboard", -] - -[[package]] -name = "iced_winit" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "dnd", - "iced_futures", - "iced_graphics", - "iced_runtime", - "log", - "rustc-hash 2.0.0", - "thiserror", - "tracing", - "wasm-bindgen-futures", - "web-sys", - "winapi", - "window_clipboard", - "winit", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "image" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" -dependencies = [ - "bytemuck", - "byteorder-lite", - "color_quant", - "exr", - "gif", - "image-webp", - "num-traits", - "png", - "qoi", - "ravif", - "rayon", - "rgb", - "tiff", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "image-webp" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" -dependencies = [ - "byteorder-lite", - "quick-error", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - -[[package]] -name = "immutable-chunkmap" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "interpolate_name" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "intl-memoizer" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" -dependencies = [ - "type-map", - "unic-langid", -] - -[[package]] -name = "intl_pluralrules" -version = "7.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "io-lifetimes" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "known-folders" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "kurbo" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "kurbo" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.162" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" - -[[package]] -name = "libcosmic" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" -dependencies = [ - "apply", - "ashpd 0.9.1", - "chrono", - "cosmic-config", - "cosmic-freedesktop-icons", - "cosmic-theme", - "css-color", - "derive_setters", - "freedesktop-desktop-entry", - "iced", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_runtime", - "iced_tiny_skia", - "iced_wgpu", - "iced_widget", - "iced_winit", - "image 0.25.2", - "lazy_static", - "libc", - "license", - "mime 0.3.17", - "palette", - "rfd", - "rustix 0.38.39", - "serde", - "shlex", - "slotmap", - "taffy", - "thiserror", - "tokio", - "tracing", - "unicode-segmentation", - "url", - "zbus 4.3.0", -] - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "license" -version = "3.6.0+3.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b517725daf998729e5ef4c4881cdde19cd5bbdde09741ba1b0f1ba0ce018961" -dependencies = [ - "reword", - "serde", - "serde_json", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "linux-raw-sys" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" - -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" - -[[package]] -name = "lyon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" -dependencies = [ - "lyon_algorithms", - "lyon_tessellation", -] - -[[package]] -name = "lyon_algorithms" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" -dependencies = [ - "lyon_path", - "num-traits", -] - -[[package]] -name = "lyon_geom" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" -dependencies = [ - "arrayvec", - "euclid", - "num-traits", -] - -[[package]] -name = "lyon_path" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" -dependencies = [ - "lyon_geom", - "num-traits", -] - -[[package]] -name = "lyon_tessellation" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0" -dependencies = [ - "float_next_after", - "lyon_path", - "num-traits", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", - "rayon", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "mime" -version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "rustc-hash 1.1.0", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" -dependencies = [ - "bitflags 2.6.0", - "jni-sys", - "log", - "ndk-sys 0.6.0+11769913", - "num_enum", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", - "memoffset 0.9.1", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "noop_proc_macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" - -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.6.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.6.0", - "block2", - "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-cloud-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc2-contacts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-core-location" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" -dependencies = [ - "block2", - "objc2", - "objc2-contacts", - "objc2-foundation", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2", - "dispatch", - "libc", - "objc2", -] - -[[package]] -name = "objc2-link-presentation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" -dependencies = [ - "block2", - "objc2", - "objc2-app-kit", - "objc2-foundation", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-symbols" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" -dependencies = [ - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-ui-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-cloud-kit", - "objc2-core-data", - "objc2-core-image", - "objc2-core-location", - "objc2-foundation", - "objc2-link-presentation", - "objc2-quartz-core", - "objc2-symbols", - "objc2-uniform-type-identifiers", - "objc2-user-notifications", -] - -[[package]] -name = "objc2-uniform-type-identifiers" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-user-notifications" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "open" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "orbclient" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" -dependencies = [ - "libredox 0.0.2", -] - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "ouroboros" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" -dependencies = [ - "heck 0.4.1", - "itertools", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" -dependencies = [ - "ttf-parser 0.20.0", -] - -[[package]] -name = "palette" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" -dependencies = [ - "approx", - "fast-srgb8", - "palette_derive", - "phf", - "serde", -] - -[[package]] -name = "palette_derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.2", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi", - "pin-project-lite", - "rustix 0.38.39", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "pollster" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc-macro2-diagnostics" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", - "version_check", - "yansi", -] - -[[package]] -name = "profiling" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" -dependencies = [ - "profiling-procmacros", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" -dependencies = [ - "quote", - "syn 2.0.87", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quick-xml" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "rangemap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" - -[[package]] -name = "rav1e" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" -dependencies = [ - "arbitrary", - "arg_enum_proc_macro", - "arrayvec", - "av1-grain", - "bitstream-io", - "built", - "cfg-if", - "interpolate_name", - "itertools", - "libc", - "libfuzzer-sys", - "log", - "maybe-rayon", - "new_debug_unreachable", - "noop_proc_macro", - "num-derive", - "num-traits", - "once_cell", - "paste", - "profiling", - "rand", - "rand_chacha", - "simd_helpers", - "system-deps", - "thiserror", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.11.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error", - "rav1e", - "rayon", - "rgb", -] - -[[package]] -name = "raw-window-handle" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "read-fonts" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f9e8a4f503e5c8750e4cd3b32a4e090035c46374b305a15c70bad833dca05f" -dependencies = [ - "bytemuck", - "font-types", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox 0.1.3", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "renderdoc-sys" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" - -[[package]] -name = "reqwest" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" -dependencies = [ - "async-compression", - "base64 0.22.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime 0.3.17", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "resvg" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" -dependencies = [ - "gif", - "jpeg-decoder", - "log", - "pico-args", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "reword" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe272098dce9ed76b479995953f748d1851261390b08f8a0ff619c885a1f0765" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "rfd" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" -dependencies = [ - "ashpd 0.8.1", - "block", - "dispatch", - "js-sys", - "log", - "objc", - "objc-foundation", - "objc_id", - "pollster", - "raw-window-handle", - "urlencoding", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.6.0", - "serde", - "serde_derive", -] - -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - -[[package]] -name = "rust-embed" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.87", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" -dependencies = [ - "sha2", - "walkdir", -] - -[[package]] -name = "rust-ini" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.0", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - -[[package]] -name = "rustybuzz" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "libm", - "smallvec", - "ttf-parser 0.21.1", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sctk-adwaita" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.9.4", - "smithay-client-toolkit", - "tiny-skia", -] - -[[package]] -name = "security-framework" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "self_cell" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" -dependencies = [ - "self_cell 1.0.3", -] - -[[package]] -name = "self_cell" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" - -[[package]] -name = "serde" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "skrifa" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6667e349abb2e6e850b31bc638a11f7fadd7e4cf113b71947c46bf6d5fe0dbc9" -dependencies = [ - "bytemuck", - "read-fonts", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smithay-client-toolkit" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "calloop", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "pkg-config", - "rustix 0.38.39", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkbcommon", - "xkeysym", -] - -[[package]] -name = "smithay-clipboard" -version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a" -dependencies = [ - "libc", - "raw-window-handle", - "smithay-client-toolkit", - "wayland-backend", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "softbuffer" -version = "0.4.1" -source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" -dependencies = [ - "as-raw-xcb-connection", - "bytemuck", - "cfg_aliases 0.2.1", - "cocoa", - "core-graphics", - "drm", - "fastrand 2.0.2", - "foreign-types 0.5.0", - "js-sys", - "log", - "memmap2 0.9.4", - "objc", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.39", - "tiny-xlib", - "wasm-bindgen", - "wayland-backend", - "wayland-client", - "wayland-sys", - "web-sys", - "windows-sys 0.52.0", - "x11rb", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spirv" -version = "0.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "svg_fmt" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" - -[[package]] -name = "svgtypes" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" -dependencies = [ - "kurbo 0.11.1", - "siphasher 1.0.1", -] - -[[package]] -name = "swash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e25b48fd1c222c9fdb61148e2203b750f9840c07922fd61b87c6015560b8f6" -dependencies = [ - "skrifa", - "yazi", - "zeno", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" -dependencies = [ - "libc", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.12", - "version-compare", -] - -[[package]] -name = "taffy" -version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" -dependencies = [ - "arrayvec", - "grid", - "num-traits", - "slotmap", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "temp-dir" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand 2.0.2", - "rustix 0.38.39", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-xlib" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" -dependencies = [ - "as-raw-xcb-connection", - "ctor-lite", - "libloading", - "pkg-config", - "tracing", -] - -[[package]] -name = "tinystr" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" -dependencies = [ - "displaydoc", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.6", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.9", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.5", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "ttf-parser" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" - -[[package]] -name = "type-map" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" -dependencies = [ - "rustc-hash 1.1.0", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", -] - -[[package]] -name = "unic-langid" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" -dependencies = [ - "serde", - "tinystr", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" - -[[package]] -name = "unicode-ccc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "usvg" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" -dependencies = [ - "base64 0.22.0", - "data-url", - "flate2", - "fontdb 0.18.0", - "imagesize", - "kurbo 0.11.1", - "log", - "pico-args", - "roxmltree 0.20.0", - "rustybuzz", - "simplecss", - "siphasher 1.0.1", - "strict-num", - "svgtypes", - "tiny-skia-path", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] - -[[package]] -name = "v_frame" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" -dependencies = [ - "aligned-vec", - "num-traits", - "wasm-bindgen", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.87", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" - -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-backend" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.39", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" -dependencies = [ - "bitflags 2.6.0", - "rustix 0.38.39", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-csd-frame" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" -dependencies = [ - "bitflags 2.6.0", - "cursor-icon", - "wayland-backend", -] - -[[package]] -name = "wayland-cursor" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" -dependencies = [ - "rustix 0.38.39", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-server" -version = "0.31.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89532cc712a2adb119eb4d09694b402576052254d0bb284f82ac1c47fb786ad" -dependencies = [ - "bitflags 2.6.0", - "downcast-rs", - "io-lifetimes 2.0.4", - "rustix 0.38.39", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-sys" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" -dependencies = [ - "dlib", - "log", - "once_cell", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wgpu" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" -dependencies = [ - "arrayvec", - "cfg_aliases 0.1.1", - "document-features", - "js-sys", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "document-features", - "indexmap", - "log", - "naga", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "rustc-hash 1.1.0", - "smallvec", - "thiserror", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.6.0", - "block", - "cfg_aliases 0.1.1", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading", - "log", - "metal", - "naga", - "ndk-sys 0.5.0+25.2.9519653", - "objc", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash 1.1.0", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" -dependencies = [ - "bitflags 2.6.0", - "js-sys", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window_clipboard" -version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" -dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "dnd", - "mime 0.1.0", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-implement", - "windows-interface", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "windows-interface" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winit" -version = "0.30.5" -source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" -dependencies = [ - "ahash", - "android-activity", - "atomic-waker", - "bitflags 2.6.0", - "block2", - "bytemuck", - "calloop", - "cfg_aliases 0.2.1", - "concurrent-queue", - "core-foundation", - "core-graphics", - "cursor-icon", - "dpi", - "js-sys", - "libc", - "memmap2 0.9.4", - "ndk", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "objc2-ui-kit", - "orbclient", - "percent-encoding", - "pin-project", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.39", - "sctk-adwaita", - "smithay-client-toolkit", - "smol_str", - "tracing", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.52.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading", - "once_cell", - "rustix 0.38.39", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xcursor" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "xdg-home" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "xkbcommon" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" -dependencies = [ - "libc", - "memmap2 0.8.0", - "xkeysym", -] - -[[package]] -name = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.6.0", - "dlib", - "log", - "once_cell", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "xml-rs" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - -[[package]] -name = "yazi" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" - -[[package]] -name = "zbus" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" -dependencies = [ - "async-broadcast 0.5.1", - "async-process 1.8.1", - "async-recursion", - "async-trait", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" -dependencies = [ - "async-broadcast 0.7.1", - "async-executor", - "async-fs", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-process 2.2.3", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener 5.3.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.28.0", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.3.0", - "zbus_names 3.0.0", - "zvariant 4.1.2", -] - -[[package]] -name = "zbus_macros" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zbus_macros" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.87", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.1.2", -] - -[[package]] -name = "zeno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0de2315dc13d00e5df3cd6b8d2124a6eaec6a2d4b6a1c5f37b7efad17fcc17" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - -[[package]] -name = "zune-core" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zune-jpeg" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" -dependencies = [ - "zune-core", -] - -[[package]] -name = "zvariant" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.15.2", -] - -[[package]] -name = "zvariant" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "url", - "zvariant_derive 4.1.2", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zvariant_derive" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.87", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zvariant_utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 43da5ff5aadb..e97bf249026b 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -25,23 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-06HZ38yW1xnRhXQZ6tHg2Yr0LmfJVRu7Cpp245B7tBg="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; - "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; - "cosmic-client-toolkit-0.1.0" = "sha256-/DJ/PfqnZHB6VeRi7HXWp0Vruk+jWBe+VCLPpiJeEv4="; - "cosmic-config-0.1.0" = "sha256-7CKtRpQKYyUwANz5OMkfqDkfbGP4y0pSjvWBngby+yI="; - "cosmic-freedesktop-icons-0.2.6" = "sha256-+WmCBP9BQx7AeGdFW2KM029vuweYKM/OzuCap5aTImw="; - "cosmic-text-0.12.1" = "sha256-+litEIoCWfwt/+wqRCtWuGr5DHAuDFV/naHnADNLbQI="; - "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; - "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; - "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; - "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; - "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-mqZ2tIZzQWU39SMj8UBnScsGAg4xGhkcm51aXx3UBSk="; nativeBuildInputs = [ libcosmicAppHook From fc6336715d4995e2c2d6244b7fd8c92cbb3d4904 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 14:58:34 -0300 Subject: [PATCH 268/484] forecast: add HeitorAugustoLN as a maintainer --- pkgs/by-name/fo/forecast/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index e97bf249026b..f17051154863 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -60,7 +60,10 @@ rustPlatform.buildRustPackage { description = "Weather app written in rust and libcosmic"; homepage = "https://github.com/cosmic-utils/forecast"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + HeitorAugustoLN + ]; platforms = lib.platforms.linux; mainProgram = "cosmic-ext-forecast"; }; From 6fd701cc309defbb987b874df282dd714f2cec6b Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Thu, 13 Feb 2025 18:05:39 +0000 Subject: [PATCH 269/484] python3Packages.datauri: add missing dependency --- pkgs/development/python-modules/datauri/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index fd83056f3250..87da3ec656d3 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -7,6 +7,7 @@ pythonOlder, setuptools, typing-extensions, + cached-property, }: buildPythonPackage rec { @@ -25,7 +26,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ typing-extensions ]; + dependencies = [ + typing-extensions + cached-property + ]; nativeCheckInputs = [ pydantic From 675abe72b865af269f6549dec7c7638af48cb8c3 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 13 Feb 2025 13:14:41 -0500 Subject: [PATCH 270/484] anki-bin: 24.11 -> 25.02 Changelog: https://github.com/ankitects/anki/releases/tag/25.02 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 11c03ec3bebe..ecc8b0833d1c 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -15,22 +15,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.11"; + version = "25.02"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - hash = "sha256-JXn4oxhRODHh6b5hFFj393xMRlaJRVcbMJ5AyXr+jq8="; + hash = "sha256-9g9ktEME4P8wQYv8i8TzIXThpsTi4QuJNTdGdA+YqNA="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - hash = "sha256-d94lfk1pUJgxk4Dylw+fC2qt8wfRJ7tJQYm+Chp1J5k="; + hash = "sha256-5soE9JZugwuEIUdzU+ki7PoXluvmG9bnlaV5EAmlIOs="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - hash = "sha256-AEpyrZBQ+0FI9CxwCacGlbMDMZ7eebBRPkQ0Nstubnk="; + hash = "sha256-4N6ukTOxJ2FprmtSxUCxmathKf5J6oXNCJyqLZ39ysk="; }; }; From 459aa8f67e6fc19d16c8799a39bc1af6affaa8bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 18:23:27 +0000 Subject: [PATCH 271/484] python312Packages.pyeconet: 0.1.26 -> 0.1.27 --- pkgs/development/python-modules/pyeconet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index f26cd0f67f64..aef69fa52484 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.26"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "w1ll1am23"; repo = "pyeconet"; tag = "v${version}"; - hash = "sha256-3A37/LHCYkqFjbjP3mtO4kRnWZ8NQiFAS67mT2igvqM="; + hash = "sha256-oGQwwzNOPMdlpdSZld4vA9bDMOzTH247LTNN5ywOBX8="; }; build-system = [ setuptools ]; From e1430b00098d8f83c3f560ebec309595f2f5651c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 13 Feb 2025 17:18:58 +0700 Subject: [PATCH 272/484] python312Packages.ipylab: init at 1.0.0 --- .../python-modules/ipylab/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/ipylab/default.nix diff --git a/pkgs/development/python-modules/ipylab/default.nix b/pkgs/development/python-modules/ipylab/default.nix new file mode 100644 index 000000000000..90c9b8a0ae1f --- /dev/null +++ b/pkgs/development/python-modules/ipylab/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + hatch-nodejs-version, + ipywidgets, + jupyterlab, +}: + +buildPythonPackage rec { + pname = "ipylab"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-xPB0Sx+W1sRgW5hqpZ68zWRFG/cclIOgGat6UsVlYXA="; + }; + + build-system = [ + hatchling + hatch-nodejs-version + jupyterlab + ]; + + env.HATCH_BUILD_NO_HOOKS = true; + + dependencies = [ + ipywidgets + ]; + + pythonImportsCheck = [ "ipylab" ]; + + # There are no tests + doCheck = false; + + meta = { + description = "Control JupyterLab from Python notebooks."; + homepage = "https://github.com/jtpio/ipylab"; + changelog = "https://github.com/jtpio/ipylab/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ flokli ]; + badPlatforms = [ + # Unclear why it breaks on darwin only + # ModuleNotFoundError: No module named 'ipylab._version' + lib.systems.inspect.patterns.isDarwin + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac494ea9806f..fb7a6da9d98e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6492,6 +6492,8 @@ self: super: with self; { ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + ipylab = callPackage ../development/python-modules/ipylab { }; + ipynbname = callPackage ../development/python-modules/ipynbname { }; ipyniivue = callPackage ../development/python-modules/ipyniivue { }; From 1562f5286858b3c1e5ea7e60f4bf6b3578519248 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 13 Feb 2025 13:15:30 -0500 Subject: [PATCH 273/484] anki-bin: add cything as maintainer --- pkgs/games/anki/bin.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index ecc8b0833d1c..7ccafd81b6f9 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -67,7 +67,10 @@ let "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ mahmoudk1000 ]; + maintainers = with maintainers; [ + mahmoudk1000 + cything + ]; }; passthru = { From c081e2b8941ed58fe8b8c70b32a9a1ca9ac5a276 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 15:32:21 -0300 Subject: [PATCH 274/484] oboete: use `libcosmicAppHook` --- pkgs/by-name/ob/oboete/package.nix | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index 037d72024ce5..779ff37241e1 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -2,12 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - pkg-config, - wrapGAppsHook3, - libxkbcommon, + libcosmicAppHook, sqlite, - vulkan-loader, - wayland, nix-update-script, }: @@ -25,27 +21,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-91JMgdpMXL0a7oZXAG5xgiulOIyVXQ5x09wN3XDeSy0="; - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; + nativeBuildInputs = [ libcosmicAppHook ]; - buildInputs = [ - libxkbcommon - sqlite - vulkan-loader - wayland - ]; - - postFixup = '' - wrapProgram $out/bin/oboete \ - --prefix LD_LIBRARY_PATH : "${ - lib.makeLibraryPath [ - libxkbcommon - wayland - ] - }" - ''; + buildInputs = [ sqlite ]; passthru = { updateScript = nix-update-script { }; From 50e7d579aa6caffeca66b86e57ef368a710e5090 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 15:34:19 -0300 Subject: [PATCH 275/484] oboete: add HeitorAugustoLN as a maintainer --- pkgs/by-name/ob/oboete/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index 779ff37241e1..5c8f86b09648 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -34,7 +34,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mariinkys/oboete"; changelog = "https://github.com/mariinkys/oboete/releases/tag/${version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + HeitorAugustoLN + ]; platforms = lib.platforms.linux; mainProgram = "oboete"; }; From ff375cefb9aa52a7c0830b51e3c743234731414a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 18:42:02 +0000 Subject: [PATCH 276/484] python312Packages.pysqueezebox: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/pysqueezebox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index c61e5aa324f9..3c141bfc2fa1 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.11.1"; + version = "0.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rajlaud"; repo = "pysqueezebox"; tag = "v${version}"; - hash = "sha256-8eCf0y8xbnSP+c+QP8fRkamUj5kN4EUQVZpotdo7hbs="; + hash = "sha256-WZrj9YNVQSS1M+PKLkX1zyERVmcvJGnHal6JKgl/fC0="; }; build-system = [ setuptools ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous library to control Logitech Media Server"; homepage = "https://github.com/rajlaud/pysqueezebox"; - changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/v${version}"; + changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; From c9e4b908b5ca8321e89c62998b983c3d724a17f3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 13 Feb 2025 19:44:07 +0100 Subject: [PATCH 277/484] open-webui: 0.5.10 -> 0.5.11 changelog: https://github.com/open-webui/open-webui/releases/tag/v0.5.11 diff: https://github.com/open-webui/open-webui/compare/v0.5.10..v0.5.11 --- pkgs/by-name/op/open-webui/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 80a000b83b11..a67b263f07fc 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-zwVrDdCMapuHKmtlEUnCwxXCBU93C5uT9eqDk5Of2BE="; + hash = "sha256-U+zY/Jgzo52x/H4xcW2/LjM52r+hdJvZ/xsIeAeJniE="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-G08r+2eelxV3ottsNEZ6xysu13AbzPNTwkwZdY1qadg="; + npmDepsHash = "sha256-bAzcNLMB8OqzYRfw9Cr0xuFFl4FIKvBQT/4M2nZP0C8="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -140,6 +140,7 @@ python312.pkgs.buildPythonApplication rec { rapidocr-onnxruntime redis requests + restrictedpython sentence-transformers soundfile tiktoken From dc27af6815504e7b3264e437413939f8720cfe1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 19:13:50 +0000 Subject: [PATCH 278/484] ada: 3.0.0 -> 3.1.0 --- pkgs/by-name/ad/ada/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index 55264bc6b50d..8548477c5432 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; rev = "v${version}"; - hash = "sha256-6heohik9MlIvDTSWe8U6/mdHuSHaEv4rkGwaz0LH8NU="; + hash = "sha256-BVVYK4JyLyjIjkTCohiA20qwftFdyCo84fWMVVgia0Q="; }; nativeBuildInputs = [ cmake ]; From 4910bf15877f16aa3db7140c748920ee63aa3ad6 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 13 Nov 2024 19:49:14 -0800 Subject: [PATCH 279/484] widevine-cdm: add aarch64-linux --- .../by-name/wi/widevine-cdm/aarch64-linux.nix | 49 +++++++++++++++++++ pkgs/by-name/wi/widevine-cdm/meta.nix | 12 +++++ pkgs/by-name/wi/widevine-cdm/package.nix | 36 +------------- pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix | 28 +++++++++++ 4 files changed, 91 insertions(+), 34 deletions(-) create mode 100644 pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix create mode 100644 pkgs/by-name/wi/widevine-cdm/meta.nix create mode 100644 pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix diff --git a/pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix b/pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix new file mode 100644 index 000000000000..f8ce102acdda --- /dev/null +++ b/pkgs/by-name/wi/widevine-cdm/aarch64-linux.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + fetchFromGitHub, + squashfsTools, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "widevine-cdm"; + version = "${finalAttrs.lacrosVersion}-${builtins.substring 0 7 finalAttrs.widevineInstaller.rev}"; + lacrosVersion = "120.0.6098.0"; + + widevineInstaller = fetchFromGitHub { + owner = "AsahiLinux"; + repo = "widevine-installer"; + rev = "7a3928fe1342fb07d96f61c2b094e3287588958b"; + sha256 = "sha256-XI1y4pVNpXS+jqFs0KyVMrxcULOJ5rADsgvwfLF6e0Y="; + }; + + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/chromeos-lacros-arm64-squash-zstd-${finalAttrs.lacrosVersion}"; + hash = "sha256-OKV8w5da9oZ1oSGbADVPCIkP9Y0MVLaQ3PXS3ZBLFXY="; + }; + + nativeBuildInputs = [ + squashfsTools + python3 + ]; + + unpackPhase = '' + unsquashfs -q $src 'WidevineCdm/*' + python3 $widevineInstaller/widevine_fixup.py squashfs-root/WidevineCdm/_platform_specific/cros_arm64/libwidevinecdm.so libwidevinecdm.so + cp squashfs-root/WidevineCdm/manifest.json . + cp squashfs-root/WidevineCdm/LICENSE LICENSE.txt + ''; + + # Accoring to widevine-installer: "Hack because Chromium hardcodes a check for this right now..." + postInstall = '' + install -vD manifest.json "$out/share/google/chrome/WidevineCdm/manifest.json" + install -vD LICENSE.txt "$out/share/google/chrome/WidevineCdm/License.txt" + install -vD libwidevinecdm.so "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_arm64/libwidevinecdm.so" + mkdir -p "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64" + touch "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" + ''; + + meta = import ./meta.nix lib; +}) diff --git a/pkgs/by-name/wi/widevine-cdm/meta.nix b/pkgs/by-name/wi/widevine-cdm/meta.nix new file mode 100644 index 000000000000..0361d3ee1da5 --- /dev/null +++ b/pkgs/by-name/wi/widevine-cdm/meta.nix @@ -0,0 +1,12 @@ +lib: { + description = "Widevine CDM"; + homepage = "https://www.widevine.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jlamur ]; + platforms = lib.map (lib.removeSuffix ".nix") ( + lib.filter (name: name != "meta.nix" && name != "package.nix") ( + builtins.attrNames (builtins.readDir ./.) + ) + ); +} diff --git a/pkgs/by-name/wi/widevine-cdm/package.nix b/pkgs/by-name/wi/widevine-cdm/package.nix index a5e7bc2f1b40..f4e0d12fbe49 100644 --- a/pkgs/by-name/wi/widevine-cdm/package.nix +++ b/pkgs/by-name/wi/widevine-cdm/package.nix @@ -1,35 +1,3 @@ -{ - lib, - stdenv, - fetchzip, -}: +{ stdenv, callPackage }: -stdenv.mkDerivation rec { - pname = "widevine-cdm"; - version = "4.10.2830.0"; - - src = fetchzip { - url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE="; - stripRoot = false; - }; - - installPhase = '' - runHook preInstall - - install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json - install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt - install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - - runHook postInstall - ''; - - meta = with lib; { - description = "Widevine CDM"; - homepage = "https://www.widevine.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ jlamur ]; - platforms = [ "x86_64-linux" ]; - }; -} +callPackage (./. + "/${stdenv.hostPlatform.system}.nix") { inherit stdenv; } diff --git a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix new file mode 100644 index 000000000000..07432c73527f --- /dev/null +++ b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchzip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "widevine-cdm"; + version = "4.10.2830.0"; + + src = fetchzip { + url = "https://dl.google.com/widevine-cdm/${finalAttrs.version}-linux-x64.zip"; + hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json + install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt + install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so + + runHook postInstall + ''; + + meta = import ./meta.nix lib; +}) From cd26a4eaf05a9993525fee805d92774e93e6278a Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 13 Feb 2025 20:30:10 +0100 Subject: [PATCH 280/484] angular-language-server: 19.0.4 -> 19.1.0 --- pkgs/by-name/an/angular-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix index 7f0fd663652e..5434f506d01d 100644 --- a/pkgs/by-name/an/angular-language-server/package.nix +++ b/pkgs/by-name/an/angular-language-server/package.nix @@ -15,11 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "angular-language-server"; - version = "19.0.4"; + version = "19.1.0"; src = fetchurl { name = "angular-language-server-${finalAttrs.version}.zip"; url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix"; - hash = "sha256-0vED1AcNIbZ7SmXn4KaBBajxfAptQg+XKL3NtJfnvG8="; + hash = "sha256-ipF8UOUUuUr6LWetJ9V7Mm1EcxL4fQCZvl1ti5VBo5U="; }; nativeBuildInputs = [ From 19a013742d52f1976bca0ad116fb5747980a4821 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 13 Feb 2025 14:33:05 -0500 Subject: [PATCH 281/484] consul: 1.20.2 -> 1.20.3 Diff: https://github.com/hashicorp/consul/compare/refs/tags/v1.20.2...v1.20.3 Changelog: https://github.com/hashicorp/consul/releases/tag/v1.20.3 --- pkgs/by-name/co/consul/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index ad6fbcadeabe..37661766483c 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.20.2"; + version = "1.20.3"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; tag = "v${version}"; - hash = "sha256-pUKX94OgJ2PTchBokAI5QzLxvdzQjcePrKHEiB782hc="; + hash = "sha256-Bgzanv7z2mVtzp6UC5mxzkYaE82ULioVmaXN2DqJ4LI="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-pH9KVyHgSULZ+fuUSDIXOzLhrdhsbJEom67k6jaW31E="; + vendorHash = "sha256-Sa6OcRMgx1WUXVNbgSAR+2KWYlc6b/50ZqPS8/ycBkI="; doCheck = false; From 761e1f5aa13201e5677e115ecd2c1f4aef31a3b6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 19:28:53 +0000 Subject: [PATCH 282/484] nixos-rebuild-ng: add test_reexec and test_reexec_flake --- .../nixos-rebuild-ng/src/tests/test_main.py | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 823bc9bff536..347dbc228650 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -7,6 +7,7 @@ from typing import Any from unittest.mock import ANY, Mock, call, patch import pytest +from pytest import MonkeyPatch import nixos_rebuild as nr @@ -125,6 +126,96 @@ def test_parse_args() -> None: ] +@patch.dict(nr.os.environ, {}, clear=True) +@patch(get_qualified_name(nr.os.execve, nr.os), autospec=True) +@patch(get_qualified_name(nr.nix.build), autospec=True) +def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None: + monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng") + argv = ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"] + args, _ = nr.parse_args(argv) + mock_build.return_value = Path("/path") + + nr.reexec(argv, args, {"build": True}, {"flake": True}) + assert mock_build.call_args_list == [ + call( + "config.system.build.nixos-rebuild", + nr.models.BuildAttr(ANY, ANY), + {"build": True, "no_out_link": True}, + ) + ] + # do not exec if there is no new version + assert mock_execve.call_args_list == [] + + mock_build.return_value = Path("/path/new") + + nr.reexec(argv, args, {}, {}) + # exec in the new version successfully + assert mock_execve.call_args_list == [ + call( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + ] + + mock_execve.reset_mock() + mock_execve.side_effect = [OSError("BOOM"), None] + + nr.reexec(argv, args, {}, {}) + # exec in the previous version if the new version fails + assert mock_execve.call_args == call( + Path("/path/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + + +@patch.dict(nr.os.environ, {}, clear=True) +@patch(get_qualified_name(nr.os.execve, nr.os), autospec=True) +@patch(get_qualified_name(nr.nix.build_flake), autospec=True) +def test_reexec_flake( + mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch +) -> None: + monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng") + argv = ["/path/bin/nixos-rebuild-ng", "switch", "--flake"] + args, _ = nr.parse_args(argv) + mock_build.return_value = Path("/path") + + nr.reexec(argv, args, {"build": True}, {"flake": True}) + assert mock_build.call_args_list == [ + call( + "config.system.build.nixos-rebuild", + nr.models.Flake(ANY, ANY), + {"flake": True, "no_link": True}, + ) + ] + # do not exec if there is no new version + assert mock_execve.call_args_list == [] + + mock_build.return_value = Path("/path/new") + + nr.reexec(argv, args, {}, {}) + # exec in the new version successfully + assert mock_execve.call_args_list == [ + call( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + ] + + mock_execve.reset_mock() + mock_execve.side_effect = [OSError("BOOM"), None] + + nr.reexec(argv, args, {}, {}) + # exec in the previous version if the new version fails + assert mock_execve.call_args == call( + Path("/path/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) + + @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: From 76bec1b1a88dd36a09fa23dc9a792d783def7b63 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:08:18 +0000 Subject: [PATCH 283/484] python3Packages.craft-providers: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/craft-providers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index bcdbcf148b43..e2392e0b3531 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; tag = version; - hash = "sha256-aW3efKy3c7ZGXS4wsvby0ww3Gwjt+1tMKsJCGprkcZo="; + hash = "sha256-HCt6xdUu8+6CtkLeUrY2KYnULLwLLobDDm4O1DAiZrc="; }; patches = [ From b72bbe662b0a552d7cf948cc2b7972f0676cc338 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 13 Feb 2025 21:14:28 +0100 Subject: [PATCH 284/484] docs: Fix some links Discovered with xrefcheck --- pkgs/README.md | 6 +++--- pkgs/by-name/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/README.md b/pkgs/README.md index 842565fc3923..5771f7e1adbd 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -87,7 +87,7 @@ Now that this is out of the way. To add a package to Nixpkgs: - XML::Simple, a Perl module: [`pkgs/top-level/perl-packages.nix`](top-level/perl-packages.nix) (search for the `XMLSimple` attribute). Most Perl modules are so simple to build that they are defined directly in `perl-packages.nix`; no need to make a separate file for them. - - Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the [builder](applications/misc/adobe-reader/builder.sh) uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. + - Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the `postFixup` phase uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. Some notes: @@ -337,7 +337,7 @@ In Nixpkgs, there are generally three different names associated with a package: - The `pname` attribute of the derivation. This is what most users see, in particular when using `nix-env`. -- The attribute name used for the package in the [`pkgs/by-name` structure](./pkgs/by-name/README.md) or in [`all-packages.nix`](./pkgs/top-level/all-packages.nix), and when passing it as a dependency in recipes. +- The attribute name used for the package in the [`pkgs/by-name` structure](./by-name/README.md) or in [`all-packages.nix`](./top-level/all-packages.nix), and when passing it as a dependency in recipes. - The filename for (the directory containing) the Nix expression. @@ -729,7 +729,7 @@ $ nix-build -A phoronix-test-suite.tests Here are examples of package tests: -- [Jasmin compile test](development/compilers/jasmin/test-assemble-hello-world/default.nix) +- [Jasmin compile test](by-name/ja/jasmin/test-assemble-hello-world/default.nix) - [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix) - [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix) - [Libtorch test](development/libraries/science/math/libtorch/test/default.nix) diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index 5eb121b4f3f0..d19495730995 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -85,7 +85,7 @@ though it is expected to still take some time to get done. If you're interested in helping out with this effort, please see [this ticket](https://github.com/NixOS/nixpkgs-vet/issues/56). -Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests), +Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests-yourself), if package maintainers would like to use this feature, they are welcome to migrate their packages to `pkgs/by-name`. To lessen PR traffic, they're encouraged to also perform some more general maintenance on the package in the same PR, though this is not required and must not be expected. From fca650ed14e874f557247a4b97c460089fc35b0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:30:47 +0000 Subject: [PATCH 285/484] dayon: 15.0.2 -> 16.0.0 --- pkgs/by-name/da/dayon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/dayon/package.nix b/pkgs/by-name/da/dayon/package.nix index e53120b7d160..86731d7e43b4 100644 --- a/pkgs/by-name/da/dayon/package.nix +++ b/pkgs/by-name/da/dayon/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dayon"; - version = "15.0.2"; + version = "16.0.0"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${finalAttrs.version}"; - hash = "sha256-5gpST5c3UGutrGuysBEHWqbj9O5+XagA6fTZ7D/R7Oo="; + hash = "sha256-glE8Y8w70nIoOhGqYb90+HuiFeKkORjGLyixsPvjmOI="; }; nativeBuildInputs = [ From 614bcf1728292b9e495c493869516d9c12d6fdaf Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:24:44 +0000 Subject: [PATCH 286/484] google-chrome: 133.0.6943.53 -> 133.0.6943.98 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index f35d832b9c30..1cf2479d86f3 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "133.0.6943.53"; + version = "133.0.6943.98"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-73X2cohboI+GbFDk5ikjxnT1PKjG4UoyzhA9T9Qe9Vk="; + hash = "sha256-UHpt9ToxrE2VA3c5+zOpMYpKWPRWIIeCErIZwEWkfqg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -274,11 +274,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "133.0.6943.54"; + version = "133.0.6943.99"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acyg7rfg57oedifn3wrcxvaq5duq_133.0.6943.54/GoogleChrome-133.0.6943.54.dmg"; - hash = "sha256-VkLjnKjAgj9Fg21jh9Xl56XDBmG0OUuDsnj93rQvJ40="; + url = "http://dl.google.com/release2/chrome/adux5id3nnmm6yel34xr47dlcova_133.0.6943.99/GoogleChrome-133.0.6943.99.dmg"; + hash = "sha256-fcwFpGgbojvB1269/aWLNcj9JnzB0WlNimpYNETIyE8="; }; dontPatch = true; From 656ab3bba6af0087b822fe62f61b586224c71070 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:26:31 +0000 Subject: [PATCH 287/484] charmcraft: 3.4.2 -> 3.4.3 --- pkgs/by-name/ch/charmcraft/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 8ffad09d7a11..99d094dd7f50 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; tag = version; - hash = "sha256-6ucF0iQxQrFFz7jlaktYsB538W8jbX+Sw5hP0/VoYsk="; + hash = "sha256-TCr6iZHUIJ/dZhj8pWsCYKAfqv9LXD3fGP432UQh/Lo="; }; postPatch = '' From 95da217b9a21d0d9d1585e2088ee8cde4cb33745 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:28:02 +0000 Subject: [PATCH 288/484] python3Packages.craft-application: 4.9.0 -> 4.9.1 --- pkgs/development/python-modules/craft-application/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 2501fe7738fd..f2a4a3d6bc8b 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "craft-application"; - version = "4.9.0"; + version = "4.9.1"; pyproject = true; src = fetchFromGitHub { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-DprItAuGjw8AACeJDrIa6KIWLSyImuWI0qeROpPohtM="; + hash = "sha256-Jg+8C16qCr8HGUGtTi3eDhEFhoiR+0EFjLaUtPvXCW8="; }; postPatch = '' From 71661452441182b4713aa0113f2e72b4d8bbb4e3 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:28:32 +0000 Subject: [PATCH 289/484] python3Packages.craft-parts: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/craft-parts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index e7bbf01087cb..ac6dcf7cdfde 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-SybDzprUrKeL+Jl7Gm4XYLlvmy056D1OtJB7v/W2flY="; + hash = "sha256-KQS4jjA66rROglOrGR7UofJL+oYEEC2X+o6pROrR5r4="; }; patches = [ ./bash-path.patch ]; From 6a3317579da615bc7bbd8b33ce6db3fd1197499e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 01:19:24 +0100 Subject: [PATCH 290/484] python312Packages.kserve: fix on darwin and linux --- .../python-modules/kserve/default.nix | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 2fc4813f1a7a..20ed84acdf57 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -121,19 +122,44 @@ buildPythonPackage rec { pythonImportsCheck = [ "kserve" ]; + pytestFlagsArray = + [ + # AssertionError + "--deselect=test/test_server.py::TestTFHttpServerLoadAndUnLoad::test_unload" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: Failed to start GCS + "--deselect=test/test_dataplane.py::TestDataPlane::test_explain" + "--deselect=test/test_dataplane.py::TestDataPlane::test_infer" + "--deselect=test/test_dataplane.py::TestDataPlane::test_model_metadata" + "--deselect=test/test_dataplane.py::TestDataPlane::test_server_readiness" + "--deselect=test/test_server.py::TestRayServer::test_explain" + "--deselect=test/test_server.py::TestRayServer::test_health_handler" + "--deselect=test/test_server.py::TestRayServer::test_infer" + "--deselect=test/test_server.py::TestRayServer::test_list_handler" + "--deselect=test/test_server.py::TestRayServer::test_liveness_handler" + "--deselect=test/test_server.py::TestRayServer::test_predict" + ]; + disabledTestPaths = [ # Looks for a config file at the root of the repository "test/test_inference_service_client.py" ]; - disabledTests = [ - # Require network access - "test_infer_graph_endpoint" - "test_infer_path_based_routing" + disabledTests = + [ + # Require network access + "test_infer_graph_endpoint" + "test_infer_path_based_routing" - # Tries to access `/tmp` (hardcoded) - "test_local_path_with_out_dir_exist" - ]; + # Tries to access `/tmp` (hardcoded) + "test_local_path_with_out_dir_exist" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "test_local_path_with_out_dir_not_exist" + ]; + + __darwinAllowLocalNetworking = true; meta = { description = "Standardized Serverless ML Inference Platform on Kubernetes"; From ae077d04777ff7c781023ec027d279a2a11edc81 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 01:45:21 +0100 Subject: [PATCH 291/484] python312Packages.kserve: use pytest-xdist to speedup testing --- pkgs/development/python-modules/kserve/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 20ed84acdf57..8ba8618faa8e 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -44,6 +44,7 @@ avro, grpcio-testing, pytest-asyncio, + pytest-xdist, pytestCheckHook, tomlkit, }: @@ -116,6 +117,7 @@ buildPythonPackage rec { avro grpcio-testing pytest-asyncio + pytest-xdist pytestCheckHook tomlkit ] ++ lib.flatten (builtins.attrValues optional-dependencies); From acf8b759cdfdd71fc29239ec8a410eba96bab1b1 Mon Sep 17 00:00:00 2001 From: June Stepp Date: Thu, 13 Feb 2025 14:44:41 -0600 Subject: [PATCH 292/484] audacity: use xwayland on wayland by default Audacity doesn't support Wayland due to a memory leak. --- pkgs/by-name/au/audacity/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 061aea770cda..8c99fb7705bf 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -176,15 +176,17 @@ stdenv.mkDerivation (finalAttrs: { dontWrapGApps = true; # Replace audacity's wrapper, to: - # - put it in the right place, it shouldn't be in "$out/audacity" + # - Put it in the right place; it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency + # - Use Xwayland by default on Wayland. See https://github.com/audacity/audacity/pull/5977 postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram "$out/bin/audacity" \ "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ - --suffix AUDACITY_PATH : "$out/share/audacity" + --suffix AUDACITY_PATH : "$out/share/audacity" \ + --set-default GDK_BACKEND x11 '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} From 8b23d3eb84490ad838181a16bda20484880ee2c8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 19:14:43 +0100 Subject: [PATCH 293/484] python312Packages.textual: skip failing tests on darwin --- .../python-modules/textual/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 0bcc0d1f5a08..ec4513f5e7d2 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, jinja2, @@ -10,7 +11,6 @@ pytest-xdist, pytestCheckHook, pythonAtLeast, - pythonOlder, rich, syrupy, time-machine, @@ -24,8 +24,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; @@ -61,10 +59,15 @@ buildPythonPackage rec { tree-sitter ]; - disabledTestPaths = [ - # Snapshot tests require syrupy<4 - "tests/snapshot_tests/test_snapshots.py" - ]; + disabledTestPaths = + [ + # Snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: There is no current event loop in thread 'MainThread'. + "tests/test_focus.py" + ]; disabledTests = [ @@ -93,11 +96,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "TUI framework for Python inspired by modern web development"; homepage = "https://github.com/Textualize/textual"; changelog = "https://github.com/Textualize/textual/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From 81024f9037e0c74aa3fa0953fcfe7796a0b7969e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 21:43:56 +0100 Subject: [PATCH 294/484] python312Packages.textual-serve: init at 1.1.1 --- .../python-modules/textual-serve/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/textual-serve/default.nix diff --git a/pkgs/development/python-modules/textual-serve/default.nix b/pkgs/development/python-modules/textual-serve/default.nix new file mode 100644 index 000000000000..8a50b830ed0b --- /dev/null +++ b/pkgs/development/python-modules/textual-serve/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + hatchling, + + # dependencies + aiohttp, + aiohttp-jinja2, + jinja2, + rich, + textual, +}: + +buildPythonPackage rec { + pname = "textual-serve"; + version = "1.1.1"; + pyproject = true; + + # No tags on GitHub + src = fetchPypi { + pname = "textual_serve"; + inherit version; + hash = "sha256-ccZiRyxGLl42je/GYO5ujq47/aiMpAwFDFVHRobrDFQ="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + aiohttp + aiohttp-jinja2 + jinja2 + rich + textual + ]; + + pythonImportsCheck = [ + "textual_serve" + ]; + + # No tests in the pypi archive + doCheck = false; + + meta = { + description = "Turn your Textual TUIs in to web applications"; + homepage = "https://pypi.org/project/textual-serve/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3e04032c2d9..86b1f557c827 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16247,6 +16247,8 @@ self: super: with self; { textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { }; + textual-serve = callPackage ../development/python-modules/textual-serve { }; + textual-slider = callPackage ../development/python-modules/textual-slider { }; textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; From b78c758a4176ca5cb434662d5a0c4d56c2b7c230 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:23:16 +0000 Subject: [PATCH 295/484] python3Packages.craft-platforms: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/craft-platforms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix index 3219ba12b9b1..07482338e95c 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "craft-platforms"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-platforms"; tag = version; - hash = "sha256-P7GC+t/rs49/a85Bxy6x4cRyCEaHG4b7SIb85sMj7Yk="; + hash = "sha256-/mnRFw79YMG34/0aQMi237KMNxWanyJixkEKq+zaSuE="; }; postPatch = '' From 7dce0bdb437f99a2da7aa25f239886d8ade91d06 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:50:05 +0000 Subject: [PATCH 296/484] python3Packages.craft-application: ignore broken tests with later craft-platforms A later version of craft-platforms slightly changes the wording of some error messages, which breaks a few assertions. This is a temporary fix until craft-application ships supporting craft-platforms 0.6.0 No functional issues appear to be present. --- pkgs/development/python-modules/craft-application/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index f2a4a3d6bc8b..6e1456aad508 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -105,6 +105,10 @@ buildPythonPackage rec { "test_grammar_aware_part_error" "test_grammar_aware_part_error[part2]" "test_grammar_aware_project_error[project0]" + # Temp fix - asserts fail against error messages which have changed + # slightly in a later revision of craft-platforms. No functional error. + "test_platform_invalid_arch" + "test_platform_invalid_build_arch" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 From 4ae617874da5970db15ddd8c1932e6bb5b42cdc6 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 13 Feb 2025 21:58:04 +0100 Subject: [PATCH 297/484] ungoogled-chromium: 133.0.6943.53-1 -> 133.0.6943.98-1 https://chromereleases.googleblog.com/2025/02/stable-channel-update-for-desktop_12.html This update includes 4 security fixes. CVEs: CVE-2025-0995 CVE-2025-0996 CVE-2025-0997 CVE-2025-0998 --- .../networking/browsers/chromium/info.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 543b0b439df0..93f5f1d7dd83 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -791,7 +791,7 @@ } }, "ungoogled-chromium": { - "version": "133.0.6943.53", + "version": "133.0.6943.98", "deps": { "depot_tools": { "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2", @@ -802,16 +802,16 @@ "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss=" }, "ungoogled-patches": { - "rev": "133.0.6943.53-1", - "hash": "sha256-8n0BST0sqQRcfv0lCiEflrvyxt8Agj/kK0O2fVzWqCY=" + "rev": "133.0.6943.98-1", + "hash": "sha256-lSRJD8tKmZ89MJr6MkldV8/50iB/l8FEwl6ZM/KtZHA=" }, "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "9a80935019b0925b01cc21d254da203bc3986f04", - "hash": "sha256-doJ/HygMtLxr04S73lhs5kTt8qC7SHrCxHbjAoFPv2M=", + "rev": "da53563ceb66412e2637507c8724bd0cab05e453", + "hash": "sha256-yltjJNXU+YQD/sFEa8+ZKqUJpVZ2Yi0YDx27bnekcng=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1366,8 +1366,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "c674dba647e81805158339785c0c7e3b57643f8c", - "hash": "sha256-2Z7Dg3IuxMB+xKFURo0Z7NztPQht7Fd+A1dX99gQ+A4=" + "rev": "b57762c6c6ad261024f11fc724687593c03cce67", + "hash": "sha256-ksN/7volHAeQLJSFQMV/YOfkXyZ97GSawXp31uca4oc=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -1546,8 +1546,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "283b6ef9d3eabe5bb3ed7c9d6b6d211a92f9b6d0", - "hash": "sha256-KMyO88KoYiTHq+stdbc8vRYqeQbrqexDIiOeWbqytrU=" + "rev": "cd3e2951ff0f36fa12bea747862c52533a2b39f3", + "hash": "sha256-5tdES3wILTC25Lvos5mWYlfT4ZnM2pBFy5LVACVMXEY=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1576,8 +1576,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "fe051262efbbd92479a08436f733eba9f756e008", - "hash": "sha256-l3hMgnhy2Ml6kExwGFWi+M6Oq4YFsOSIkRDCmji+syY=" + "rev": "79c3c1ab7faee8247b740b4ec660a998f2881633", + "hash": "sha256-fmd2mIjJs6l9zRTJ2bFIMQNnApFN3epeS+57TBlF/Uk=" } } } From 2f323d5a906086f3b5dd263685bbecbdeda59c44 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Fri, 7 Feb 2025 13:05:44 +0100 Subject: [PATCH 298/484] nrfconnect: 4.4.1 -> 5.1.0 --- pkgs/by-name/nr/nrfconnect/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/nr/nrfconnect/package.nix b/pkgs/by-name/nr/nrfconnect/package.nix index c7f7c529f74d..8130d4f2a90a 100644 --- a/pkgs/by-name/nr/nrfconnect/package.nix +++ b/pkgs/by-name/nr/nrfconnect/package.nix @@ -6,11 +6,11 @@ let pname = "nrfconnect"; - version = "4.4.1"; + version = "5.1.0"; src = fetchurl { url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage"; - hash = "sha256-x/vVSOEajuQtLATRXk8DVLlXHegCqP+acecaOFNeBb8="; + hash = "sha256-QEoKIdi8tlZ86langbCYJXSO+dGONBEQPdwmREIhZBA="; name = "${pname}-${version}.AppImage"; }; @@ -22,7 +22,9 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ pkgs.segger-jlink ]; + extraPkgs = pkgs: [ + pkgs.segger-jlink-headless + ]; extraInstallCommands = '' install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications @@ -32,12 +34,12 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=nrfconnect' ''; - meta = with lib; { + meta = { description = "Nordic Semiconductor nRF Connect for Desktop"; homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ stargate01 ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ stargate01 ]; mainProgram = "nrfconnect"; }; } From 10952c87e367d3af7b877f79c41905429a4000b1 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 13 Feb 2025 14:26:57 -0500 Subject: [PATCH 299/484] zed-editor: 0.172.11 -> 0.173.8 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index b735dd0146ee..8f91dab205a0 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.172.11"; + version = "0.173.8"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-ozPARaFIPJZHsxB9e9c12nVuV/jGBRBXQJ1M+/luExY="; + hash = "sha256-xAmPfCRzgsH5305GTJj9000Jd8AQVyFzI3jVAcTGfYo="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-3xpsTAj4jrttMZIbZCZc2Qf7g3Q4B6FBSUYEHf0u2+w="; + cargoHash = "sha256-4MIfIU4z/Ot6XczmnCXKhE+DiR4vSguStgZLImXQ6Cg="; nativeBuildInputs = [ From 9144c79cddf8604ab1af2a9fa639f8a01c22d421 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 20:13:51 +0000 Subject: [PATCH 300/484] tig: 2.5.11 -> 2.5.12 --- pkgs/by-name/ti/tig/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tig/package.nix b/pkgs/by-name/ti/tig/package.nix index b1de77ff208d..ac1f711e17ed 100644 --- a/pkgs/by-name/ti/tig/package.nix +++ b/pkgs/by-name/ti/tig/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.11"; + version = "2.5.12"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-LFuuhivEg5J7TmrAv/WsKWMsbip0PszuKLPgLLeRzkA="; + sha256 = "sha256-2kNogpzu8e/abjwo18s1G5ZcSZdG5c/Ydp6tfezumdk="; }; nativeBuildInputs = [ From 76347d3a45c73f02730e26eaa2cab56bc48e00c7 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 13 Feb 2025 13:09:46 -0800 Subject: [PATCH 301/484] signalbackup-tools: 20250207 -> 20250213-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250207...20250213-1 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 4c86cc146f16..40f52e701c42 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250207"; + version = "20250213-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-pFaL6BWD6Kaw8fJhrPL7b2iDKjHr99gkytP5Kosf7Gw="; + hash = "sha256-616NpIZ2TWyZEoYWZx6XDDxmZbsnrpxcWmTc7QgiT70="; }; nativeBuildInputs = [ From 84f2c0747bef537de021afb044d9f884e8bd2f78 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 12:32:02 -0600 Subject: [PATCH 302/484] luaPackages.lush-nvim: fix package --- pkgs/development/lua-modules/overrides.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 0f581254e7b2..76e459e66922 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -517,9 +517,13 @@ in meta.broken = stdenv.hostPlatform.isDarwin; }); - lush-nvim = prev.lush-nvim.overrideAttrs (drv: { - doCheck = false; - }); + lush-nvim = prev.lush-nvim.overrideAttrs { + # Remove dangling symlink created during installation because we don't copy the source CREATE.md it links to + # Using a generic method because path changes depending on if building luaPackage or vimPlugin + postInstall = '' + find -L $out -type l -name "README.md" -print -delete + ''; + }; luuid = prev.luuid.overrideAttrs (oa: { externalDeps = [ From 383adab9e0e6c4563e8585b65271abcfa4cd2cb2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 17 May 2024 15:31:15 +0200 Subject: [PATCH 303/484] domino-chain: init at 1.1 --- .../do/domino-chain/algorithm-header.patch | 13 +++ pkgs/by-name/do/domino-chain/package.nix | 84 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 pkgs/by-name/do/domino-chain/algorithm-header.patch create mode 100644 pkgs/by-name/do/domino-chain/package.nix diff --git a/pkgs/by-name/do/domino-chain/algorithm-header.patch b/pkgs/by-name/do/domino-chain/algorithm-header.patch new file mode 100644 index 000000000000..f356554cf8b1 --- /dev/null +++ b/pkgs/by-name/do/domino-chain/algorithm-header.patch @@ -0,0 +1,13 @@ +diff --git a/src/domino-chain/tools.cpp b/src/domino-chain/tools.cpp +index 0eaa592..e91c760 100644 +--- a/src/domino-chain/tools.cpp ++++ b/src/domino-chain/tools.cpp +@@ -48,6 +48,8 @@ + + #include + ++#include ++ + uint64_t getTime(void) + { + #if defined(WIN32) || defined(_WIN32) diff --git a/pkgs/by-name/do/domino-chain/package.nix b/pkgs/by-name/do/domino-chain/package.nix new file mode 100644 index 000000000000..4d0ced53f0f1 --- /dev/null +++ b/pkgs/by-name/do/domino-chain/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitLab, + boost, + freefont_ttf, + fribidi, + gettext, + imagemagick, + libpng, + lua, + pkg-config, + povray, + SDL2, + SDL2_image, + SDL2_mixer, + SDL2_ttf, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "domino-chain"; + version = "1.1"; + + src = fetchFromGitLab { + owner = "domino-chain"; + repo = "domino-chain.gitlab.io"; + tag = finalAttrs.version; + hash = "sha256-ERR5QwQpTFLeAijlGtGU0Lpd40II/L5i3muYDN2EfX4="; + }; + + patches = [ + ./algorithm-header.patch + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-warn /usr/share/fonts/truetype/freefont/ ${freefont_ttf}/share/fonts/truetype/ + substituteInPlace src/domino-chain/screen.cpp \ + --replace-fail /usr/share/fonts/truetype/freefont/ ${freefont_ttf}/share/fonts/truetype/ + ''; + + nativeBuildInputs = [ + gettext + imagemagick + pkg-config + povray + ]; + + buildInputs = [ + boost + freefont_ttf + fribidi + libpng + lua + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + zlib + ]; + + enableParallelBuilding = true; + + __structuredAttrs = true; + makeFlags = [ + "PREFIX=$(out)" + "POVRAY=povray Work_Threads=$(NIX_BUILD_CORES)" + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${lib.getDev SDL2}/include/SDL2" + "-I${lib.getDev SDL2_mixer}/include/SDL2" + ]; + + meta = { + description = "Rearrange dominoes on different platforms to start a chain reaction"; + homepage = "https://domino-chain.gitlab.io/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "domino-chain"; + platforms = lib.platforms.all; + }; +}) From 52c671bafbc176f4583c5474b7f10e63b6980900 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:23:37 +0000 Subject: [PATCH 304/484] Revert "nixos-rebuild-ng: {assert_called_with,assert_has_calls} -> {call_args,call_args_list}" This reverts commit d6e849ee03d1849bd5151c651e66a8731a0c4891. It was a bad idea, the diffs are even worse than before for anything that has more 2 calls. --- .../nixos-rebuild-ng/src/tests/test_main.py | 1031 +++++++++-------- .../nixos-rebuild-ng/src/tests/test_models.py | 10 +- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 327 +++--- .../src/tests/test_process.py | 13 +- 4 files changed, 704 insertions(+), 677 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 347dbc228650..e6d40bc8bd19 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -4,7 +4,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, Mock, call, patch +from unittest.mock import ANY, call, patch import pytest from pytest import MonkeyPatch @@ -218,7 +218,7 @@ def test_reexec_flake( @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.mkdir() config_path = tmp_path / "test" @@ -238,59 +238,62 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--no-reexec"]) - assert mock_run.call_args_list == [ - call( - ["nix-instantiate", "--find-file", "nixpkgs", "-vvv"], - stdout=PIPE, - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], - check=False, - capture_output=True, - **DEFAULT_RUN_KWARGS, - ), - call( - ["git", "-C", nixpkgs_path, "diff", "--quiet"], - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.toplevel", - "-vvv", - "--no-out-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "boot"], - check=True, - **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}), - ), - ] + assert mock_run.call_count == 6 + mock_run.assert_has_calls( + [ + call( + ["nix-instantiate", "--find-file", "nixpkgs", "-vvv"], + stdout=PIPE, + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], + check=False, + capture_output=True, + **DEFAULT_RUN_KWARGS, + ), + call( + ["git", "-C", nixpkgs_path, "diff", "--quiet"], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.toplevel", + "-vvv", + "--no-out-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "boot"], + check=True, + **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}), + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -315,28 +318,31 @@ def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.vm", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ) - ] + assert mock_run.call_count == 1 + mock_run.assert_has_calls( + [ + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.vm", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ) + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -370,39 +376,42 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "eval", - "--json", - "/path/to/config#nixosConfigurations.hostname.config.system.build.images", - "--apply", - "builtins.mapAttrs (n: v: v.passthru.filePath)", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 2 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "eval", + "--json", + "/path/to/config#nixosConfigurations.hostname.config.system.build.images", + "--apply", + "builtins.mapAttrs (n: v: v.passthru.filePath)", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -431,43 +440,46 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", - "-v", - "--option", - "narinfo-cache-negative-ttl", - "1200", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "sudo", - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - ["sudo", config_path / "bin/switch-to-configuration", "switch"], - check=True, - **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}), - ), - ] + assert mock_run.call_count == 3 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", + "-v", + "--option", + "narinfo-cache-negative-ttl", + "1200", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "sudo", + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + ["sudo", config_path / "bin/switch-to-configuration", "switch"], + check=True, + **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}), + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @@ -475,9 +487,9 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) @patch(get_qualified_name(nr.nix.uuid4, nr.nix), autospec=True) def test_execute_nix_switch_build_target_host( - mock_uuid4: Mock, - mock_cleanup_ssh: Mock, - mock_run: Mock, + mock_uuid4: Any, + mock_cleanup_ssh: Any, + mock_run: Any, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -521,154 +533,157 @@ def test_execute_nix_switch_build_target_host( ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix-instantiate", - "--find-file", - "nixpkgs", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=False, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-instantiate", - "", - "--attr", - "config.system.build.toplevel", - "--add-root", - nr.tmpdir.TMPDIR_PATH / "00000000000000000000000000000000", - "--include", - "nixos-config=./configuration.nix", - "--include", - "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@build-host", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "mktemp", - "-d", - "-t", - "nixos-rebuild.XXXXX", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "nix-store", - "--realise", - str(config_path), - "--add-root", - "/tmp/tmpdir/00000000000000000000000000000000", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "readlink", - "-f", - "/tmp/tmpdir/config", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@build-host", - "--", - "rm", - "-rf", - "/tmp/tmpdir", - ], - check=False, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix", - "copy", - "--from", - "ssh://user@build-host", - "--to", - "ssh://user@target-host", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@target-host", - "--", - "sudo", - "nix-env", - "-p", - "/nix/var/nix/profiles/system", - "--set", - str(config_path), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@target-host", - "--", - "sudo", - "env", - "NIXOS_INSTALL_BOOTLOADER=0", - str(config_path / "bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 10 + mock_run.assert_has_calls( + [ + call( + [ + "nix-instantiate", + "--find-file", + "nixpkgs", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-instantiate", + "", + "--attr", + "config.system.build.toplevel", + "--add-root", + nr.tmpdir.TMPDIR_PATH / "00000000000000000000000000000000", + "--include", + "nixos-config=./configuration.nix", + "--include", + "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@build-host", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "mktemp", + "-d", + "-t", + "nixos-rebuild.XXXXX", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "nix-store", + "--realise", + str(config_path), + "--add-root", + "/tmp/tmpdir/00000000000000000000000000000000", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "readlink", + "-f", + "/tmp/tmpdir/config", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@build-host", + "--", + "rm", + "-rf", + "/tmp/tmpdir", + ], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix", + "copy", + "--from", + "ssh://user@build-host", + "--to", + "ssh://user@target-host", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + str(config_path / "bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_target_host( - mock_cleanup_ssh: Mock, - mock_run: Mock, + mock_cleanup_ssh: Any, + mock_run: Any, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -695,66 +710,69 @@ def test_execute_nix_switch_flake_target_host( ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@localhost", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "sudo", - "nix-env", - "-p", - "/nix/var/nix/profiles/system", - "--set", - str(config_path), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "sudo", - "env", - "NIXOS_INSTALL_BOOTLOADER=0", - str(config_path / "bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 4 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@localhost", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + str(config_path / "bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_build_host( - mock_cleanup_ssh: Mock, - mock_run: Mock, + mock_cleanup_ssh: Any, + mock_run: Any, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -782,74 +800,77 @@ def test_execute_nix_switch_flake_build_host( ] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "eval", - "--raw", - "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - ["nix-copy-closure", "--to", "user@localhost", config_path], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "ssh", - *nr.process.SSH_DEFAULT_OPTS, - "user@localhost", - "--", - "nix", - "--extra-experimental-features", - "'nix-command flakes'", - "build", - f"'{config_path}^*'", - "--print-out-paths", - "--no-link", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-copy-closure", - "--from", - "user@localhost", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "switch"], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 6 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@localhost", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "nix", + "--extra-experimental-features", + "'nix-command flakes'", + "build", + f"'{config_path}^*'", + "--print-out-paths", + "--no-link", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-copy-closure", + "--from", + "user@localhost", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "switch"], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() @@ -874,49 +895,52 @@ def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_args_list == [ - call( - ["nix-instantiate", "--find-file", "nixpkgs"], - check=False, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "git", - "-C", - nixpkgs_path, - "rev-parse", - "--short", - "HEAD", - ], - check=False, - capture_output=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - "nix-env", - "--rollback", - "-p", - Path("/nix/var/nix/profiles/system"), - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - Path("/nix/var/nix/profiles/system/bin/switch-to-configuration"), - "switch", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 4 + mock_run.assert_has_calls( + [ + call( + ["nix-instantiate", "--find-file", "nixpkgs"], + check=False, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "git", + "-C", + nixpkgs_path, + "rev-parse", + "--short", + "HEAD", + ], + check=False, + capture_output=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "nix-env", + "--rollback", + "-p", + Path("/nix/var/nix/profiles/system"), + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + Path("/nix/var/nix/profiles/system/bin/switch-to-configuration"), + "switch", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_build(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() mock_run.side_effect = [ @@ -926,23 +950,26 @@ def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: nr.execute(["nixos-rebuild", "build", "--no-flake", "--no-reexec"]) - assert mock_run.call_args_list == [ - call( - [ - "nix-build", - "", - "--attr", - "config.system.build.toplevel", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ) - ] + assert mock_run.call_count == 1 + mock_run.assert_has_calls( + [ + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.toplevel", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ) + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: +def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -958,35 +985,38 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--no-reexec"] ) - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - "github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [config_path / "bin/switch-to-configuration", "test"], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 2 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + "github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [config_path / "bin/switch-to-configuration", "test"], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.nix.Path.exists, nr.nix), autospec=True, return_value=True) @patch(get_qualified_name(nr.nix.Path.mkdir, nr.nix), autospec=True) def test_execute_test_rollback( - mock_path_mkdir: Mock, - mock_path_exists: Mock, - mock_run: Mock, + mock_path_mkdir: Any, + mock_path_exists: Any, + mock_run: Any, ) -> None: def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix-env": @@ -1008,26 +1038,29 @@ def test_execute_test_rollback( ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--no-reexec"] ) - assert mock_run.call_args_list == [ - call( - [ - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system-profiles/foo"), - "--list-generations", - ], - check=True, - stdout=PIPE, - **DEFAULT_RUN_KWARGS, - ), - call( - [ - Path( - "/nix/var/nix/profiles/system-profiles/foo-2083-link/bin/switch-to-configuration" - ), - "test", - ], - check=True, - **DEFAULT_RUN_KWARGS, - ), - ] + assert mock_run.call_count == 2 + mock_run.assert_has_calls( + [ + call( + [ + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system-profiles/foo"), + "--list-generations", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + Path( + "/nix/var/nix/profiles/system-profiles/foo-2083-link/bin/switch-to-configuration" + ), + "test", + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index cb318192fc2e..e02fc69848fb 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -1,7 +1,8 @@ import platform import subprocess from pathlib import Path -from unittest.mock import Mock, patch +from typing import Any +from unittest.mock import patch from pytest import MonkeyPatch @@ -78,9 +79,7 @@ def test_flake_to_attr() -> None: @patch(get_qualified_name(platform.node), autospec=True) -def test_flake_from_arg( - mock_node: Mock, monkeypatch: MonkeyPatch, tmpdir: Path -) -> None: +def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: mock_node.return_value = "hostname" # Flake string @@ -162,12 +161,11 @@ def test_flake_from_arg( @patch(get_qualified_name(m.Path.mkdir, m), autospec=True) -def test_profile_from_arg(mock_mkdir: Mock) -> None: +def test_profile_from_arg(mock_mkdir: Any) -> None: assert m.Profile.from_arg("system") == m.Profile( "system", Path("/nix/var/nix/profiles/system"), ) - mock_mkdir.assert_not_called() assert m.Profile.from_arg("something") == m.Profile( "something", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 861ba7ae0617..35fea00cbeef 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -3,7 +3,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, Mock, call, patch +from unittest.mock import ANY, call, patch import pytest from pytest import MonkeyPatch @@ -20,13 +20,13 @@ from .helpers import get_qualified_name autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build(mock_run: Mock) -> None: +def test_build(mock_run: Any) -> None: assert n.build( "config.system.build.attr", m.BuildAttr("", None), {"nix_flag": "foo"}, ) == Path("/path/to/file") - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-build", "", @@ -38,17 +38,13 @@ def test_build(mock_run: Mock) -> None: stdout=PIPE, ) - mock_run.reset_mock() - assert n.build( "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr") ) == Path("/path/to/file") - assert mock_run.call_args_list == [ - call( - ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], - stdout=PIPE, - ) - ] + mock_run.assert_called_with( + ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], + stdout=PIPE, + ) @patch( @@ -56,7 +52,7 @@ def test_build(mock_run: Mock) -> None: autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -65,7 +61,7 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> flake, {"no_link": True, "nix_flag": "foo"}, ) == Path("/path/to/file") - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "--extra-experimental-features", @@ -83,9 +79,7 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> @patch(get_qualified_name(n.run_wrapper, n), autospec=True) @patch(get_qualified_name(n.uuid4, n), autospec=True) -def test_build_remote( - mock_uuid4: Mock, mock_run: Mock, monkeypatch: MonkeyPatch -) -> None: +def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) -> None: build_host = m.Remote("user@host", [], None) monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") @@ -114,53 +108,58 @@ def test_build_remote( instantiate_flags={"inst": True}, copy_flags={"copy": True}, ) == Path("/path/to/config") - assert mock_run.call_args_list == [ - call( - [ - "nix-instantiate", - "", - "--attr", - "preAttr.config.system.build.toplevel", - "--add-root", - n.tmpdir.TMPDIR_PATH / "00000000000000000000000000000001", - "--inst", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={"NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"])}, - ), - call( - ["mktemp", "-d", "-t", "nixos-rebuild.XXXXX"], - remote=build_host, - stdout=PIPE, - ), - call( - [ - "nix-store", - "--realise", - Path("/path/to/file"), - "--add-root", - Path("/tmp/tmpdir/00000000000000000000000000000002"), - "--realise", - ], - remote=build_host, - stdout=PIPE, - ), - call( - ["readlink", "-f", "/tmp/tmpdir/config"], - remote=build_host, - stdout=PIPE, - ), - call(["rm", "-rf", Path("/tmp/tmpdir")], remote=build_host, check=False), - ] + + mock_run.assert_has_calls( + [ + call( + [ + "nix-instantiate", + "", + "--attr", + "preAttr.config.system.build.toplevel", + "--add-root", + n.tmpdir.TMPDIR_PATH / "00000000000000000000000000000001", + "--inst", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={ + "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"]) + }, + ), + call( + ["mktemp", "-d", "-t", "nixos-rebuild.XXXXX"], + remote=build_host, + stdout=PIPE, + ), + call( + [ + "nix-store", + "--realise", + Path("/path/to/file"), + "--add-root", + Path("/tmp/tmpdir/00000000000000000000000000000002"), + "--realise", + ], + remote=build_host, + stdout=PIPE, + ), + call( + ["readlink", "-f", "/tmp/tmpdir/config"], + remote=build_host, + stdout=PIPE, + ), + call(["rm", "-rf", Path("/tmp/tmpdir")], remote=build_host, check=False), + ] + ) @patch( @@ -169,7 +168,7 @@ def test_build_remote( return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_build_remote_flake( - mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path + mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path ) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -184,43 +183,47 @@ def test_build_remote_flake( copy_flags={"copy": True}, flake_build_flags={"build": True}, ) == Path("/path/to/file") - assert mock_run.call_args_list == [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "eval", - "--raw", - ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", - "--flake", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={"NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"])}, - ), - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "/path/to/file^*", - "--print-out-paths", - "--build", - ], - remote=build_host, - stdout=PIPE, - ), - ] + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + "--flake", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={ + "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh opts"]) + }, + ), + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "/path/to/file^*", + "--print-out-paths", + "--build", + ], + remote=build_host, + stdout=PIPE, + ), + ] + ) def test_copy_closure(monkeypatch: MonkeyPatch) -> None: @@ -233,7 +236,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: build_host = m.Remote("user@build.host", [], None) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-copy-closure", "--to", "user@target.host", closure], extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS)}, ) @@ -241,7 +244,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-opt") with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, None, build_host, {"copy_flag": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-copy-closure", "--copy-flag", "--from", "user@build.host", closure], extra_env={ "NIX_SSHOPTS": " ".join([*p.SSH_DEFAULT_OPTS, "--ssh build-opt"]) @@ -255,7 +258,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: } with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host, build_host, {"copy_flag": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "copy", @@ -272,24 +275,26 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: monkeypatch.setattr(n, "WITH_NIX_2_18", False) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.copy_closure(closure, target_host, build_host) - assert mock_run.call_args_list == [ - call( - ["nix-copy-closure", "--from", "user@build.host", closure], - extra_env=extra_env, - ), - call( - ["nix-copy-closure", "--to", "user@target.host", closure], - extra_env=extra_env, - ), - ] + mock_run.assert_has_calls( + [ + call( + ["nix-copy-closure", "--from", "user@build.host", closure], + extra_env=extra_env, + ), + call( + ["nix-copy-closure", "--to", "user@target.host", closure], + extra_env=extra_env, + ), + ] + ) @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: # Flake flake = m.Flake.parse(f"{tmpdir}#attr") n.edit(flake, {"commit_lock_file": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "--extra-experimental-features", @@ -311,7 +316,7 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: mp.setenv("EDITOR", "editor") n.edit(None) - assert mock_run.call_args == call(["editor", default_nix], check=False) + mock_run.assert_called_with(["editor", default_nix], check=False) @patch( @@ -328,13 +333,13 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: """, ), ) -def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: +def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: build_attr = m.BuildAttr("", None) assert n.get_build_image_variants(build_attr) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-instantiate", "--eval", @@ -352,14 +357,12 @@ def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: stdout=PIPE, ) - mock_run.reset_mock() - build_attr = m.BuildAttr(Path(tmp_path), "preAttr") assert n.get_build_image_variants(build_attr, {"inst_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-instantiate", "--eval", @@ -393,13 +396,13 @@ def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: """, ), ) -def test_get_build_image_variants_flake(mock_run: Mock) -> None: +def test_get_build_image_variants_flake(mock_run: Any) -> None: flake = m.Flake(Path("flake.nix"), "myAttr") assert n.get_build_image_variants_flake(flake, {"eval_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", } - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix", "eval", @@ -424,7 +427,7 @@ def test_get_nixpkgs_rev() -> None: side_effect=[CompletedProcess([], 0, "")], ) as mock_run: assert n.get_nixpkgs_rev(path) is None - assert mock_run.call_args == call( + mock_run.assert_called_with( ["git", "-C", path, "rev-parse", "--short", "HEAD"], check=False, capture_output=True, @@ -451,7 +454,7 @@ def test_get_nixpkgs_rev() -> None: ], ) as mock_run: assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6" - assert mock_run.call_args_list == expected_calls + mock_run.assert_has_calls(expected_calls) with patch( get_qualified_name(n.run_wrapper, n), @@ -462,7 +465,7 @@ def test_get_nixpkgs_rev() -> None: ], ) as mock_run: assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6M" - assert mock_run.call_args_list == expected_calls + mock_run.assert_has_calls(expected_calls) def test_get_generations(tmp_path: Path) -> None: @@ -503,7 +506,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), ] - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "-p", path, "--list-generations"], stdout=PIPE, remote=None, @@ -521,7 +524,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), ] - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "-p", path, "--list-generations"], stdout=PIPE, remote=remote, @@ -545,7 +548,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: ), ], ) -def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: +def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: # Probably better to test this function in a real system, this test is # mostly to make sure it doesn't break horribly assert n.list_generations(m.Profile("system", tmp_path)) == [ @@ -571,20 +574,18 @@ def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl(mock_run: Mock) -> None: +def test_repl(mock_run: Any) -> None: n.repl("attr", m.BuildAttr("", None), {"nix_flag": True}) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix", "repl", "--file", "", "--nix-flag"] ) n.repl("attr", m.BuildAttr(Path("file.nix"), "myAttr")) - assert mock_run.call_args == call( - ["nix", "repl", "--file", Path("file.nix"), "myAttr"] - ) + mock_run.assert_called_with(["nix", "repl", "--file", Path("file.nix"), "myAttr"]) @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl_flake(mock_run: Mock) -> None: +def test_repl_flake(mock_run: Any) -> None: n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True}) # See nixos-rebuild-ng.tests.repl for a better test, # this is mostly for sanity check @@ -592,14 +593,14 @@ def test_repl_flake(mock_run: Mock) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_rollback(mock_run: Mock, tmp_path: Path) -> None: +def test_rollback(mock_run: Any, tmp_path: Path) -> None: path = tmp_path / "test" path.touch() profile = m.Profile("system", path) assert n.rollback(profile, None, False) == profile.path - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "--rollback", "-p", path], remote=None, sudo=False, @@ -607,7 +608,7 @@ def test_rollback(mock_run: Mock, tmp_path: Path) -> None: target_host = m.Remote("user@localhost", [], None) assert n.rollback(profile, target_host, True) == profile.path - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "--rollback", "-p", path], remote=target_host, sudo=True, @@ -619,10 +620,8 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: path.touch() profile = m.Profile("system", path) - with patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess( + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + mock_run.return_value = CompletedProcess( [], 0, stdout=textwrap.dedent("""\ @@ -630,13 +629,12 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: 2083 2024-11-07 22:59:41 2084 2024-11-07 23:54:17 (current) """), - ), - ) as mock_run: + ) assert ( n.rollback_temporary_profile(m.Profile("system", path), None, False) == path.parent / "system-2083-link" ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-env", "-p", @@ -653,7 +651,7 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: n.rollback_temporary_profile(m.Profile("foo", path), target_host, True) == path.parent / "foo-2083-link" ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "nix-env", "-p", @@ -665,16 +663,13 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: sudo=True, ) - with patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess([], 0, stdout=""), - ) as mock_run: + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + mock_run.return_value = CompletedProcess([], 0, stdout="") assert n.rollback_temporary_profile(profile, None, False) is None @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_set_profile(mock_run: Mock) -> None: +def test_set_profile(mock_run: Any) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") n.set_profile( @@ -684,7 +679,7 @@ def test_set_profile(mock_run: Mock) -> None: sudo=False, ) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["nix-env", "-p", profile_path, "--set", config_path], remote=None, sudo=False, @@ -692,7 +687,7 @@ def test_set_profile(mock_run: Mock) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> None: +def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") @@ -707,7 +702,7 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No specialisation=None, install_bootloader=False, ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [profile_path / "bin/switch-to-configuration", "switch"], extra_env={"NIXOS_INSTALL_BOOTLOADER": "0"}, sudo=False, @@ -741,7 +736,7 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No install_bootloader=True, specialisation="special", ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ config_path / "specialisation/special/bin/switch-to-configuration", "test", @@ -762,17 +757,17 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No ], ) @patch(get_qualified_name(n.Path.is_dir, n), autospec=True, return_value=True) -def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: +def test_upgrade_channels(mock_is_dir: Any, mock_glob: Any) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) - assert mock_run.call_args == call(["nix-channel", "--update", "nixos"], check=False) - - mock_run.reset_mock() + mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(True) - assert mock_run.call_args_list == [ - call(["nix-channel", "--update", "nixos"], check=False), - call(["nix-channel", "--update", "nixos-hardware"], check=False), - call(["nix-channel", "--update", "home-manager"], check=False), - ] + mock_run.assert_has_calls( + [ + call(["nix-channel", "--update", "nixos"], check=False), + call(["nix-channel", "--update", "nixos-hardware"], check=False), + call(["nix-channel", "--update", "home-manager"], check=False), + ] + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index a62ee2355153..6458f54c06ef 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -1,4 +1,5 @@ -from unittest.mock import Mock, call, patch +from typing import Any +from unittest.mock import patch from pytest import MonkeyPatch @@ -9,9 +10,9 @@ from .helpers import get_qualified_name @patch(get_qualified_name(p.subprocess.run), autospec=True) -def test_run(mock_run: Mock) -> None: +def test_run(mock_run: Any) -> None: p.run_wrapper(["test", "--with", "flags"], check=True) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["test", "--with", "flags"], check=True, text=True, @@ -27,7 +28,7 @@ def test_run(mock_run: Mock) -> None: sudo=True, extra_env={"FOO": "bar"}, ) - assert mock_run.call_args == call( + mock_run.assert_called_with( ["sudo", "test", "--with", "flags"], check=False, text=True, @@ -44,7 +45,7 @@ def test_run(mock_run: Mock) -> None: check=True, remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "ssh", "--ssh", @@ -70,7 +71,7 @@ def test_run(mock_run: Mock) -> None: extra_env={"FOO": "bar"}, remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) - assert mock_run.call_args == call( + mock_run.assert_called_with( [ "ssh", "--ssh", From 8efe14c0245a86777a48bf64d27dba3606015237 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:27:19 +0000 Subject: [PATCH 305/484] nixos-rebuild-ng: add pytest-mock --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index df33313193fe..02e140fcc0a6 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -89,6 +89,7 @@ python3Packages.buildPythonApplication rec { ps: with ps; [ mypy pytest + pytest-mock ruff ] ); From b0ba32b3e73fec51f00d4bb17fe690d235e8e36b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:30:17 +0000 Subject: [PATCH 306/484] nixos-rebuild-ng: add pytest-mock in devShell It is included to help debugging only, so its helpers shouldn't be used in tests. --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index 02e140fcc0a6..5f75a21e2402 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -89,6 +89,8 @@ python3Packages.buildPythonApplication rec { ps: with ps; [ mypy pytest + # this is to help development (e.g.: better diffs) inside devShell + # only, do not use its helpers like `mocker` pytest-mock ruff ] From 83fc1380c37474fe987aadce26dd998bf71347a1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:30:52 +0000 Subject: [PATCH 307/484] nixos-rebuild-ng: use Mock as type in test mocks --- .../nixos-rebuild-ng/src/tests/test_main.py | 36 +++++++++---------- .../nixos-rebuild-ng/src/tests/test_models.py | 9 ++--- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 32 +++++++++-------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index e6d40bc8bd19..249d7b059774 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -4,7 +4,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, call, patch +from unittest.mock import ANY, Mock, call, patch import pytest from pytest import MonkeyPatch @@ -218,7 +218,7 @@ def test_reexec_flake( @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.mkdir() config_path = tmp_path / "test" @@ -293,7 +293,7 @@ def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -342,7 +342,7 @@ def test_execute_nix_build_vm(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -411,7 +411,7 @@ def test_execute_nix_build_image_flake(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -487,9 +487,9 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) @patch(get_qualified_name(nr.nix.uuid4, nr.nix), autospec=True) def test_execute_nix_switch_build_target_host( - mock_uuid4: Any, - mock_cleanup_ssh: Any, - mock_run: Any, + mock_uuid4: Mock, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -682,8 +682,8 @@ def test_execute_nix_switch_build_target_host( @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_target_host( - mock_cleanup_ssh: Any, - mock_run: Any, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -771,8 +771,8 @@ def test_execute_nix_switch_flake_target_host( @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_build_host( - mock_cleanup_ssh: Any, - mock_run: Any, + mock_cleanup_ssh: Mock, + mock_run: Mock, tmp_path: Path, ) -> None: config_path = tmp_path / "test" @@ -870,7 +870,7 @@ def test_execute_nix_switch_flake_build_host( @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: +def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() @@ -940,7 +940,7 @@ def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_build(mock_run: Any, tmp_path: Path) -> None: +def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() mock_run.side_effect = [ @@ -969,7 +969,7 @@ def test_execute_build(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: +def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -1014,9 +1014,9 @@ def test_execute_test_flake(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.nix.Path.exists, nr.nix), autospec=True, return_value=True) @patch(get_qualified_name(nr.nix.Path.mkdir, nr.nix), autospec=True) def test_execute_test_rollback( - mock_path_mkdir: Any, - mock_path_exists: Any, - mock_run: Any, + mock_path_mkdir: Mock, + mock_path_exists: Mock, + mock_run: Mock, ) -> None: def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix-env": diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index e02fc69848fb..3c6859015489 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -1,8 +1,7 @@ import platform import subprocess from pathlib import Path -from typing import Any -from unittest.mock import patch +from unittest.mock import Mock, patch from pytest import MonkeyPatch @@ -79,7 +78,9 @@ def test_flake_to_attr() -> None: @patch(get_qualified_name(platform.node), autospec=True) -def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_flake_from_arg( + mock_node: Mock, monkeypatch: MonkeyPatch, tmpdir: Path +) -> None: mock_node.return_value = "hostname" # Flake string @@ -161,7 +162,7 @@ def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) @patch(get_qualified_name(m.Path.mkdir, m), autospec=True) -def test_profile_from_arg(mock_mkdir: Any) -> None: +def test_profile_from_arg(mock_mkdir: Mock) -> None: assert m.Profile.from_arg("system") == m.Profile( "system", Path("/nix/var/nix/profiles/system"), diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 35fea00cbeef..ea937c06fcd3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -3,7 +3,7 @@ import uuid from pathlib import Path from subprocess import PIPE, CompletedProcess from typing import Any -from unittest.mock import ANY, call, patch +from unittest.mock import ANY, Mock, call, patch import pytest from pytest import MonkeyPatch @@ -20,7 +20,7 @@ from .helpers import get_qualified_name autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build(mock_run: Any) -> None: +def test_build(mock_run: Mock) -> None: assert n.build( "config.system.build.attr", m.BuildAttr("", None), @@ -52,7 +52,7 @@ def test_build(mock_run: Any) -> None: autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -79,7 +79,9 @@ def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> N @patch(get_qualified_name(n.run_wrapper, n), autospec=True) @patch(get_qualified_name(n.uuid4, n), autospec=True) -def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) -> None: +def test_build_remote( + mock_uuid4: Mock, mock_run: Mock, monkeypatch: MonkeyPatch +) -> None: build_host = m.Remote("user@host", [], None) monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") @@ -168,7 +170,7 @@ def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_build_remote_flake( - mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path + mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path ) -> None: monkeypatch.chdir(tmpdir) flake = m.Flake.parse(".#hostname") @@ -290,7 +292,7 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: +def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: # Flake flake = m.Flake.parse(f"{tmpdir}#attr") n.edit(flake, {"commit_lock_file": True}) @@ -333,7 +335,7 @@ def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: """, ), ) -def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: +def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: build_attr = m.BuildAttr("", None) assert n.get_build_image_variants(build_attr) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", @@ -396,7 +398,7 @@ def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: """, ), ) -def test_get_build_image_variants_flake(mock_run: Any) -> None: +def test_get_build_image_variants_flake(mock_run: Mock) -> None: flake = m.Flake(Path("flake.nix"), "myAttr") assert n.get_build_image_variants_flake(flake, {"eval_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", @@ -548,7 +550,7 @@ def test_get_generations_from_nix_env(tmp_path: Path) -> None: ), ], ) -def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: +def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: # Probably better to test this function in a real system, this test is # mostly to make sure it doesn't break horribly assert n.list_generations(m.Profile("system", tmp_path)) == [ @@ -574,7 +576,7 @@ def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl(mock_run: Any) -> None: +def test_repl(mock_run: Mock) -> None: n.repl("attr", m.BuildAttr("", None), {"nix_flag": True}) mock_run.assert_called_with( ["nix", "repl", "--file", "", "--nix-flag"] @@ -585,7 +587,7 @@ def test_repl(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_repl_flake(mock_run: Any) -> None: +def test_repl_flake(mock_run: Mock) -> None: n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True}) # See nixos-rebuild-ng.tests.repl for a better test, # this is mostly for sanity check @@ -593,7 +595,7 @@ def test_repl_flake(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_rollback(mock_run: Any, tmp_path: Path) -> None: +def test_rollback(mock_run: Mock, tmp_path: Path) -> None: path = tmp_path / "test" path.touch() @@ -669,7 +671,7 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_set_profile(mock_run: Any) -> None: +def test_set_profile(mock_run: Mock) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") n.set_profile( @@ -687,7 +689,7 @@ def test_set_profile(mock_run: Any) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> None: +def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") @@ -757,7 +759,7 @@ def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> Non ], ) @patch(get_qualified_name(n.Path.is_dir, n), autospec=True, return_value=True) -def test_upgrade_channels(mock_is_dir: Any, mock_glob: Any) -> None: +def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) From f2df828138846ba168ce0ba2e7eecc9fcc0d6cba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 13 Feb 2025 21:39:04 +0000 Subject: [PATCH 308/484] nixos-rebuild-ng: improve some tests --- .../nixos-rebuild-ng/src/tests/test_main.py | 60 +++++++++---------- .../nixos-rebuild-ng/src/tests/test_models.py | 1 + .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 2 +- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 249d7b059774..2e9363e2869a 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -136,34 +136,34 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) - mock_build.return_value = Path("/path") nr.reexec(argv, args, {"build": True}, {"flake": True}) - assert mock_build.call_args_list == [ - call( - "config.system.build.nixos-rebuild", - nr.models.BuildAttr(ANY, ANY), - {"build": True, "no_out_link": True}, - ) - ] + mock_build.assert_has_calls( + [ + call( + "config.system.build.nixos-rebuild", + nr.models.BuildAttr(ANY, ANY), + {"build": True, "no_out_link": True}, + ) + ] + ) # do not exec if there is no new version - assert mock_execve.call_args_list == [] + mock_execve.assert_not_called() mock_build.return_value = Path("/path/new") nr.reexec(argv, args, {}, {}) # exec in the new version successfully - assert mock_execve.call_args_list == [ - call( - Path("/path/new/bin/nixos-rebuild-ng"), - ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], - {"_NIXOS_REBUILD_REEXEC": "1"}, - ) - ] + mock_execve.assert_called_once_with( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) mock_execve.reset_mock() mock_execve.side_effect = [OSError("BOOM"), None] nr.reexec(argv, args, {}, {}) # exec in the previous version if the new version fails - assert mock_execve.call_args == call( + mock_execve.assert_any_call( Path("/path/bin/nixos-rebuild-ng"), ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"], {"_NIXOS_REBUILD_REEXEC": "1"}, @@ -182,34 +182,30 @@ def test_reexec_flake( mock_build.return_value = Path("/path") nr.reexec(argv, args, {"build": True}, {"flake": True}) - assert mock_build.call_args_list == [ - call( - "config.system.build.nixos-rebuild", - nr.models.Flake(ANY, ANY), - {"flake": True, "no_link": True}, - ) - ] + mock_build.assert_called_once_with( + "config.system.build.nixos-rebuild", + nr.models.Flake(ANY, ANY), + {"flake": True, "no_link": True}, + ) # do not exec if there is no new version - assert mock_execve.call_args_list == [] + mock_execve.assert_not_called() mock_build.return_value = Path("/path/new") nr.reexec(argv, args, {}, {}) # exec in the new version successfully - assert mock_execve.call_args_list == [ - call( - Path("/path/new/bin/nixos-rebuild-ng"), - ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], - {"_NIXOS_REBUILD_REEXEC": "1"}, - ) - ] + mock_execve.assert_called_once_with( + Path("/path/new/bin/nixos-rebuild-ng"), + ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], + {"_NIXOS_REBUILD_REEXEC": "1"}, + ) mock_execve.reset_mock() mock_execve.side_effect = [OSError("BOOM"), None] nr.reexec(argv, args, {}, {}) # exec in the previous version if the new version fails - assert mock_execve.call_args == call( + mock_execve.assert_any_call( Path("/path/bin/nixos-rebuild-ng"), ["/path/bin/nixos-rebuild-ng", "switch", "--flake"], {"_NIXOS_REBUILD_REEXEC": "1"}, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index 3c6859015489..cb318192fc2e 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -167,6 +167,7 @@ def test_profile_from_arg(mock_mkdir: Mock) -> None: "system", Path("/nix/var/nix/profiles/system"), ) + mock_mkdir.assert_not_called() assert m.Profile.from_arg("something") == m.Profile( "something", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index ea937c06fcd3..af8c0bdfd6a7 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -762,7 +762,7 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) - mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) + mock_run.assert_called_once_with(["nix-channel", "--update", "nixos"], check=False) with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(True) From 61fd9955a814bc78b147eeafcd8c2940a2e34caa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 21:51:52 +0000 Subject: [PATCH 309/484] python312Packages.pglast: 7.2 -> 7.3 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index ad8c7f1b2628..d5c2893652d4 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "7.2"; + version = "7.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wOlhmlivkyO79Rr4tUcmOPGro5FmZfC2VA5GOHgxcr4="; + hash = "sha256-jl0LSJGJlKYU1eX7y1ElDNbtkORo7grR3Bz5Ot5pabA="; }; build-system = [ setuptools ]; From 73bd2d7f2f99693308cdb8c59b8bdca2976fd109 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 23:03:04 +0100 Subject: [PATCH 310/484] python312Packages.jaxtyping: 0.2.37 -> 0.2.38 Diff: https://github.com/google/jaxtyping/compare/refs/tags/v0.2.37...v0.2.38 Changelog: https://github.com/patrick-kidger/jaxtyping/releases/tag/v0.2.38 --- pkgs/development/python-modules/jaxtyping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index f29fa882b578..35e9c56adc2d 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -23,14 +23,14 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.37"; + version = "0.2.38"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; tag = "v${version}"; - hash = "sha256-0a/9TSQW/k5kuucHoSUhLtRk9k+5ycbI/g6V1id3v28="; + hash = "sha256-AK0c4HCM8ExDBdnQ0y6qSNTHTF5rD6kC+OjiJtW5Mkg="; }; build-system = [ hatchling ]; From 04b5324d00217f80fe4fc558f8360e4cb271f13a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 13 Feb 2025 17:02:15 -0500 Subject: [PATCH 311/484] telegram-desktop: 5.10.7 -> 5.11.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.10.7...v5.11.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.11.1 --- .../telegram/telegram-desktop/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 310280934c59..d7458082b70f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "5.10.7"; + version = "5.11.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-lcU2EJQgT7vQa2z0SB8LKhWjhn22Wc+eHi92junY2PY="; + hash = "sha256-lhZ/RSHRr+yaOAec5GOM2mrU0dNQbUxd4g7w+oAF+ZY="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' From 8053a7f3c9ee8b0259bd0e35c1a86f3983a9173d Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 13 Feb 2025 15:05:34 -0700 Subject: [PATCH 312/484] harper: 0.20.0 -> 0.21.1 https://github.com/Automattic/harper/releases/tag/v0.21.1 Signed-off-by: Sumner Evans --- pkgs/by-name/ha/harper/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index ba03ff532ae3..4671e4a0d58a 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -2,22 +2,25 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-8JeF1HxsP+Y+C1g3YJ0B0+JHoRFkBjz4/T8rVr2KgGw="; + hash = "sha256-UTohTnIUMpyQGvkuOD2L7bViF3b5QnbDjRD4VSmf4lE="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-uVjDFo5mJi4Xbq0Z+XOjy5VqXqkm0a+4xu+dVnjWXCU="; + cargoHash = "sha256-wHXo4yfFc77osCamK0NidbrIYyIFMEpfBr0B6aniBmQ="; + + passthru.updateScript = nix-update-script { }; meta = { description = "Grammar Checker for Developers"; From d6f2566ca9670f67419f6bfaa8dc078073be32d0 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 9 Feb 2025 19:10:07 +0100 Subject: [PATCH 313/484] safestringlib: init at 1.2.0-unstable-2024-10-21 To fix compilation issues in bwa-mem2, an update of this library is required. Latest, unstable version compiles more easily than the last stable release. --- pkgs/by-name/sa/safestringlib/package.nix | 78 +++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 pkgs/by-name/sa/safestringlib/package.nix diff --git a/pkgs/by-name/sa/safestringlib/package.nix b/pkgs/by-name/sa/safestringlib/package.nix new file mode 100644 index 000000000000..ac049eb4a97c --- /dev/null +++ b/pkgs/by-name/sa/safestringlib/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + fetchpatch, +}: + +stdenv.mkDerivation { + pname = "safestringlib"; + # Latest release is 1.2.0 and has compilation issues + version = "1.2.0-unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "safestringlib"; + rev = "e99c03cfafdce5311c4dbf1fd3f916ccc6e300be"; + hash = "sha256-d+6YDtMtdaS2eW0eIfuwzdQRiExsoexL3fKj7C2zENM="; + }; + + outputs = [ + "out" + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_UNITTESTS" true) + ]; + + patches = [ + # https://github.com/intel/safestringlib/issues/74 + (fetchpatch { + name = "darwin-fix"; + url = "https://github.com/intel/safestringlib/pull/75/commits/3ff9c6234be7dd4ee1dd5cdc2ccbb2c7541adfec.patch"; + hash = "sha256-4HS7XyKPQSmKczaMCi1s6NxgTNzRZXTds2CXBTbpuAM="; + }) + ]; + + # see https://github.com/bwa-mem2/bwa-mem2/issues/93 + # Skip wmemset too + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i 's/memset_s/memset8_s/g' include/safe_mem_lib.h + sed -i 's/memset_s/memset8_s/g' safeclib/memset16_s.c + sed -i 's/memset_s/memset8_s/g' safeclib/memset32_s.c + sed -i 's/memset_s/memset8_s/g' safeclib/memset_s.c + sed -i 's/memset_s/memset8_s/g' safeclib/wmemset_s.c + sed -i 's/ memset_s/ memset8_s/g' unittests/*.c + sed -i 's/ wmemset_s/ wmemset8_s/g' unittests/*.c + ''; + + checkPhase = '' + runHook preCheck + cd unittests + ./safestring_test + runHook postCheck + ''; + doCheck = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp ../libsafestring_static.a $out/lib/libsafestring.a + mkdir -p $out/ + cp -r ../../include $out/ + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/intel/safestringlib"; + description = "Safer replacements for C library functions that prevent serious security vulnerabilities"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ apraga ]; + }; +} From 5bfb437d33886bc82f74a6af40c83e1b65da3bdb Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 9 Feb 2025 19:43:31 +0100 Subject: [PATCH 314/484] bwa-mem2: add apraga as maintainer --- pkgs/by-name/bw/bwa-mem2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bw/bwa-mem2/package.nix b/pkgs/by-name/bw/bwa-mem2/package.nix index ad1bc23399cd..f0f6cb7c0b8f 100644 --- a/pkgs/by-name/bw/bwa-mem2/package.nix +++ b/pkgs/by-name/bw/bwa-mem2/package.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/bwa-mem2/bwa-mem2/"; changelog = "https://github.com/bwa-mem2/bwa-mem2/blob/${finalAttrs.src.rev}/NEWS.md"; platforms = platforms.x86_64; - maintainers = with maintainers; [ alxsimon ]; + maintainers = with maintainers; [ apraga ]; }; }) From 58be5fb6310c6637b19a28479e9c49b6be7f20b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 22:33:21 +0000 Subject: [PATCH 315/484] python312Packages.microsoft-kiota-abstractions: 1.9.1 -> 1.9.2 --- .../microsoft-kiota-abstractions/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index 6e1f963599c4..1f1427974895 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-abstractions"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-abstractions-v${version}"; - hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw="; + tag = "microsoft-kiota-serialization-text-v${version}"; + hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk="; }; sourceRoot = "source/packages/abstractions/"; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstractions library for Kiota generated Python clients"; homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/abstractions/"; - changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-abstractions-v${version}"; + changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-abstractions-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From a2b9e98fabd861cc7dff797827824b4f804cb666 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Feb 2025 22:35:04 +0000 Subject: [PATCH 316/484] python312Packages.azure-eventhub: 5.13.0 -> 5.14.0 --- pkgs/development/python-modules/azure-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 08e8f2ae7cc8..42c588a78a81 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.13.0"; + version = "5.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_eventhub"; inherit version; - hash = "sha256-rqM6CrT4ycIhLkVcRRi+mobAAVymMBms/Fd4qxkHjPA="; + hash = "sha256-UTCICIQQGpalfLfFs3xksECYd0KdVMDVcDeLTwt7bTU="; }; nativeBuildInputs = [ setuptools ]; From 386d93d06d1789d1bdfbd944afbe285213cb4ce8 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sat, 8 Feb 2025 11:35:15 +0100 Subject: [PATCH 317/484] perlPackages.BioExtAlign: bug fix and add test Bug: with perl > 5.36, the compiler is more restrictive with errors. This package has implicit function definitions. The fix is to ignore the errors as vep, the main package for that, runs without issue. Also this package is no longer maintained We also add test that were missing from the package. Not all test can be run as they depends on other Perl modules in Bioper. --- .../perl-modules/Bio-Ext-Align/default.nix | 25 ++++-- .../Bio-Ext-Align/disable-other-tests.patch | 84 +++++++++++++++++++ .../perl-modules/Bio-Ext-Align/fprintf.patch | 2 +- .../Bio-Ext-Align/no-implicit-function.patch | 13 +++ 4 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch create mode 100644 pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix index dde83f2b0f23..2bbb36e2ad25 100644 --- a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix +++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix @@ -8,10 +8,7 @@ buildPerlPackage rec { pname = "BioExtAlign"; version = "1.5.1"; - outputs = [ - "out" - "dev" - ]; + outputs = [ "out" ]; src = fetchFromGitHub { owner = "bioperl"; @@ -20,7 +17,15 @@ buildPerlPackage rec { sha256 = "sha256-+0tZ6q3PFem8DWa2vq+njOLmjDvMB0JhD0FGk00lVMA="; }; - patches = [ ./fprintf.patch ]; + patches = [ + # Starting for Perl 5.6, implicit function declaration are treated as errors + # There may be an error but ensembl-vep (the main package for this dependency) + # runs + ./no-implicit-function.patch + # Tests need other parts of BioExt, disabling them + ./disable-other-tests.patch + ./fprintf.patch + ]; # Do not install other Bio-ext packages preConfigure = '' @@ -30,6 +35,15 @@ buildPerlPackage rec { # Disable tests as it requires Bio::Tools::Align which is in a different directory buildPhase = '' make + + ''; + + checkPhase = '' + runHook preCheck + + make test + + runHook postCheck ''; meta = { @@ -39,5 +53,6 @@ buildPerlPackage rec { Part of BioPerl Extensions (BioPerl-Ext) distribution, a collection of Bioperl C-compiled extensions. ''; license = with lib.licenses; [ artistic1 ]; + maintainers = with lib.maintainers; [ apraga ]; }; } diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch b/pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch new file mode 100644 index 000000000000..37a7d99ba45c --- /dev/null +++ b/pkgs/development/perl-modules/Bio-Ext-Align/disable-other-tests.patch @@ -0,0 +1,84 @@ +diff --git a/Bio/Ext/Align/test.pl b/Bio/Ext/Align/test.pl +index 72411f3..1deb77b 100755 +--- a/Bio/Ext/Align/test.pl ++++ b/Bio/Ext/Align/test.pl +@@ -8,13 +8,10 @@ my $DEBUG = $ENV{'BIOPERLDEBUG'} || 0; + BEGIN { + eval { require Test; }; + use Test; +- plan tests => 9; ++ plan tests => 4; + } + + use Bio::Ext::Align; +-use Bio::Tools::dpAlign; +-use Bio::Seq; +-use Bio::AlignIO; + + $loaded = 1; + ok(1); # modules loaded +@@ -34,64 +31,3 @@ $alb = &Bio::Ext::Align::Align_Sequences_ProteinSmithWaterman($seq1,$seq2, + $seq2->seq,15,50,STDERR) if $DEBUG; + + +-warn( "Testing Local Alignment case...\n") if $DEBUg; +- +-$alnout = new Bio::AlignIO(-format => 'pfam', -fh => \*STDERR); +-$aln = &Bio::Ext::Align::Align_DNA_Sequences("AATGCCATTGACGG", +- "CAGCCTCGCTTAG",3,-1,3,1, +- Bio::Tools::dpAlign::DPALIGN_LOCAL_MILLER_MYERS); +- +-$out = Bio::SimpleAlign->new(); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln1, +- -start => $aln->start1, +- -end => $aln->end1, +- -id => "one")); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln2, +- -start => $aln->start2, +- -end => $aln->end2, +- -id => "two")); +-$alnout->write_aln($out) if $DEBUG; +- +-$aln = &Bio::Ext::Align::Align_Protein_Sequences("WLGQRNLVSSTGGNLLNVWLKDW","WMGNRNVVNLLNVWFRDW",0, +- Bio::Tools::dpAlign::DPALIGN_LOCAL_MILLER_MYERS); +-$out = Bio::SimpleAlign->new(); +-ok($aln); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln1, +- -start => $aln->start1, +- -end => $aln->end1, +- -id => "one")); +- +-$out->add_seq(Bio::LocatableSeq->new(-seq => $aln->aln2, +- -start => $aln->start2, +- -end => $aln->end2, +- -id => "two")); +-$alnout->write_aln($out) if $DEBUG; +-ok(1); +- +-warn( "Testing Global Alignment case...\n") if $DEBUG; +- +-$factory = new Bio::Tools::dpAlign('-alg' => Bio::Tools::dpAlign::DPALIGN_GLOBAL_MILLER_MYERS); +-$s1 = new Bio::Seq(-id => "one", -seq => "AATGCCATTGACGG", -alphabet => 'dna'); +-$s2 = new Bio::Seq(-id => "two", -seq => "CAGCCTCGCTTAG", -alphabet => 'dna'); +-$aln = $factory->pairwise_alignment($s1, $s2); +-$alnout->write_aln($aln) if $DEBUG; +-$factory->align_and_show($s1, $s2) if $DEBUG; +- +-ok(1); +- +-$s1 = new Bio::Seq(-id => "one", -seq => "WLGQRNLVSSTGGNLLNVWLKDW", +- -alphabet => 'protein'); +-$s2 = new Bio::Seq(-id => "two", -seq => "WMGNRNVVNLLNVWFRDW", +- -alphabet => 'protein'); +-$aln = $factory->pairwise_alignment($s1, $s2); +-$alnout->write_aln($aln) if $DEBUG; +-$factory->align_and_show($s1, $s2) if $DEBUG; +-ok(1); +- +-$prof = $factory->sequence_profile($s1); +-warn( "Optimal Alignment Score = %d\n", $factory->pairwise_alignment_score($prof, $s2)) if $DEBUG; +- +-ok($factory->pairwise_alignment_score($prof,$s2),77); diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch b/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch index f62004a9a338..fd4d01df6df6 100644 --- a/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch +++ b/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch @@ -7,7 +7,7 @@ index 0e07b67..0eab932 100644 dpAlign_fatal(char * s) { - fprintf(stderr, s); -+ fputs(stderr, s); ++ fputs(s, stderr); exit(-1); } diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch b/pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch new file mode 100644 index 000000000000..02a6baeb1316 --- /dev/null +++ b/pkgs/development/perl-modules/Bio-Ext-Align/no-implicit-function.patch @@ -0,0 +1,13 @@ +diff --git a/Bio/Ext/Align/Makefile.PL b/Bio/Ext/Align/Makefile.PL +index cc6c343..ea5cffa 100755 +--- a/Bio/Ext/Align/Makefile.PL ++++ b/Bio/Ext/Align/Makefile.PL +@@ -5,7 +5,7 @@ WriteMakefile( + 'NAME' => 'Bio::Ext::Align', + 'VERSION' => '1.5.1', + 'LIBS' => ['-lm'], # e.g., '-lm' +- 'DEFINE' => '-DPOSIX -DNOERROR', # e.g., '-DHAVE_SOMETHING' ++ 'DEFINE' => '-DPOSIX -DNOERROR -Wno-implicit-function-declaration', # e.g., '-DHAVE_SOMETHING' + 'INC' => '-I./libs', # e.g., '-I/usr/include/other' + 'MYEXTLIB' => 'libs/libsw$(LIB_EXT)', + 'clean' => { 'FILES' => 'libs/*.o libs/*.a' } From 234ad6c854005f1d86c87dec087723daab2c375e Mon Sep 17 00:00:00 2001 From: Daniel Coonce <1077480+coonce@users.noreply.github.com> Date: Sat, 8 Feb 2025 21:16:08 -0600 Subject: [PATCH 318/484] jellyseerr: fix noBrokenSymlinks --- pkgs/by-name/je/jellyseerr/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 1783f4f7aa5c..ec60dee5694d 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -48,9 +48,15 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild + pnpm build pnpm prune --prod --ignore-scripts rm -rf .next/cache + + # Clean up broken symlinks left behind by `pnpm prune` + # https://github.com/pnpm/pnpm/issues/3645 + find node_modules -xtype l -delete + runHook postBuild ''; From ebe61cdf1f3be12630b2b6af4c84bc1943fcb7ec Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Mon, 10 Feb 2025 23:56:52 +0100 Subject: [PATCH 319/484] kent: fix for non-x86_64 cpus. --- pkgs/by-name/ke/kent/package.nix | 8 ++++---- pkgs/development/perl-modules/Bio-Ext-Align/default.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix index d7e8abd22b84..2c9d41ff6d27 100644 --- a/pkgs/by-name/ke/kent/package.nix +++ b/pkgs/by-name/ke/kent/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR export DESTBINDIR=$HOME/bin - mkdir -p $HOME/lib $HOME/bin/x86_64 + mkdir -p $HOME/lib $HOME/bin/${stdenv.hostPlatform.parsed.cpu.name} cd ./src chmod +x ./checkUmask.sh @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { cd jkOwnLib make - cp ../lib/x86_64/jkOwnLib.a $HOME/lib - cp ../lib/x86_64/jkweb.a $HOME/lib + cp ../lib/${stdenv.hostPlatform.parsed.cpu.name}/jkOwnLib.a $HOME/lib + cp ../lib/${stdenv.hostPlatform.parsed.cpu.name}/jkweb.a $HOME/lib cp -r ../inc $HOME/ cd ../utils @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/lib $out/inc cp $HOME/lib/jkOwnLib.a $out/lib cp $HOME/lib/jkweb.a $out/lib - cp $HOME/bin/x86_64/* $out/bin + cp $HOME/bin/${stdenv.hostPlatform.parsed.cpu.name}/* $out/bin cp -r $HOME/inc/* $out/inc/ runHook postInstall diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix index 2bbb36e2ad25..936148bc1ce8 100644 --- a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix +++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix @@ -35,7 +35,6 @@ buildPerlPackage rec { # Disable tests as it requires Bio::Tools::Align which is in a different directory buildPhase = '' make - ''; checkPhase = '' From c9b94e90efd85b96771eaacffba37b49d874ef87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:42:04 +0100 Subject: [PATCH 320/484] python313Packages.python-roborock: 2.11.1 -> 2.11.2 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v2.11.1...v2.11.2 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v2.11.2/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 58645e42760b..02862735359d 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.11.1"; + version = "2.11.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-uFZ+d4MehZbK7xZdmWnZrsbK2f5UsA4J/vVRLZXyI8E="; + hash = "sha256-lSVq2x4SG4MnXaJHU+6RxVnqH2H6XKcEZRNGRfsmglY="; }; postPatch = '' From 903c29e2a6abd6e3aab802012e1162a49e5aeb6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:39:54 +0100 Subject: [PATCH 321/484] python313Packages.pytenable: 1.7.1 -> 1.7.3 Diff: https://github.com/tenable/pyTenable/compare/refs/tags/1.7.1...1.7.3 Changelog: https://github.com/tenable/pyTenable/releases/tag/1.7.3 --- pkgs/development/python-modules/pytenable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 8cc45c14286d..312783923cc6 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.7.1"; + version = "1.7.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; tag = version; - hash = "sha256-IPhuxjUmj4g5UxuCZsthZytgDsFiplPt+dIsCHgfMdg="; + hash = "sha256-yOc5SUNXchmUPedudkD75XvSZNfDiXPRzLuMbseaQz8="; }; pythonRelaxDeps = [ From ca827ed60af88293382bd09bbc0e13f994311fe7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:58:11 +0100 Subject: [PATCH 322/484] checkov: migrate to pkgs/by-name --- .../analysis => by-name/ch}/checkov/flake8-compat-5.x.patch | 0 .../checkov/default.nix => by-name/ch/checkov/package.nix} | 6 ++---- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/tools/analysis => by-name/ch}/checkov/flake8-compat-5.x.patch (100%) rename pkgs/{development/tools/analysis/checkov/default.nix => by-name/ch/checkov/package.nix} (96%) diff --git a/pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch b/pkgs/by-name/ch/checkov/flake8-compat-5.x.patch similarity index 100% rename from pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch rename to pkgs/by-name/ch/checkov/flake8-compat-5.x.patch diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/by-name/ch/checkov/package.nix similarity index 96% rename from pkgs/development/tools/analysis/checkov/default.nix rename to pkgs/by-name/ch/checkov/package.nix index f25ce7248c60..07da280fe860 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -6,18 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.364"; + version = "3.2.370"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-ZmvIICAnC9RDizKl06aOD1LNEAo8WG7E1ZZB3Rero+c="; + hash = "sha256-IaE2Mg8Fk1Xb3ujPRHTY1N4ev75qM8Kj5o7IPtKuNsk="; }; - patches = [ ./flake8-compat-5.x.patch ]; - pythonRelaxDeps = [ "bc-detect-secrets" "bc-python-hcl2" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fad5c7dcd1..fb3618d837a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -287,8 +287,6 @@ with pkgs; chef-cli = callPackage ../tools/misc/chef-cli { }; - checkov = callPackage ../development/tools/analysis/checkov { }; - clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { stdenv = clangStdenv; }; From f891153cf966f661ee97eac66083a58a0efa9a58 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 13 Feb 2025 22:50:43 +0000 Subject: [PATCH 323/484] fzf: 0.59.0 -> 0.60.0 Changes: https://github.com/junegunn/fzf/releases/tag/v0.60.0 --- pkgs/by-name/fz/fzf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 8e55d4a4866c..4f5e50af85c2 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-2W4JZy7oZWLbbL9B4OheFXM7FvlWoSx7Mlnth/cOWeg="; + hash = "sha256-4SnM1i0d+MPfQNkuqvq9acOKLGX6O5/VAYpgkeMcaEY="; }; - vendorHash = "sha256-kPgfDV3HUe2j8bvsnL4cCl8Abuk+wvDmKbJ33XDQPOE="; + vendorHash = "sha256-i4ofEI4K6Pypf5KJi/OW6e/vhnCHUArMHnZKrvQ8eww="; env.CGO_ENABLED = 0; From a72a726ee18d6267c2be47bfdd56b490583172f5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 17:15:35 -0600 Subject: [PATCH 324/484] yabai: 7.1.8 -> 7.1.9 --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 9fa0a5e86093..e842f1d0bc27 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.8"; + version = "7.1.9"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-lD+n3QYI53AiCi32Ci06bNulwdyhRG7xQDVqJqlHOcs="; + hash = "sha256-x5V269Jilpv9XdSw5AtLpOBc4io8i1+duj62S4h9eXM="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-nbPs8xPh1TW6HU1yl0gStSzsj6yxsBhHUI63y1GGGW0="; + hash = "sha256-STgd51fatxGahhYyCDo35mZbhYwX5n76cdu2NnzjdDM="; }; }; From 3834b653fe0301c39147a577f0f44574891e267c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Feb 2025 00:22:06 +0100 Subject: [PATCH 325/484] checkov: 3.2.364 -> 3.2.370 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.364...3.2.370 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.370 --- pkgs/by-name/ch/checkov/package.nix | 25 ++++++++++++++++++++++--- pkgs/by-name/pi/pip-audit/package.nix | 2 +- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 07da280fe860..905fd2bfa585 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -4,6 +4,25 @@ python3, }: +let + py = python3.override { + packageOverrides = self: super: { + + # Requires 'cyclonedx-python-lib = ">=6.0.0,<8.0.0"' + cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { + version = "7.6.2"; + src = fetchFromGitHub { + owner = "CycloneDX"; + repo = "cyclonedx-python-lib"; + tag = "v${version}"; + hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI="; + }; + }); + }; + }; +in +with py.pkgs; + python3.pkgs.buildPythonApplication rec { pname = "checkov"; version = "3.2.370"; @@ -43,9 +62,9 @@ python3.pkgs.buildPythonApplication rec { "pycep-parser" ]; - build-system = with python3.pkgs; [ setuptools-scm ]; + build-system = with py.pkgs; [ setuptools-scm ]; - dependencies = with python3.pkgs; [ + dependencies = with py.pkgs; [ aiodns aiohttp aiomultiprocess @@ -88,7 +107,7 @@ python3.pkgs.buildPythonApplication rec { update-checker ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with py.pkgs; [ aioresponses distutils mock diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 0e55d55e9142..6522775d1e4e 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; version = "2.7.3"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; From 2038975272efcd2a505bddc4afedf895c7b9f6aa Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 17:29:51 -0600 Subject: [PATCH 326/484] tabby-agent: 0.23.1 -> 0.24.0 --- pkgs/by-name/ta/tabby-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 63d0eaec4660..bf546bfb7ff9 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tabby-agent"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; tag = "v${finalAttrs.version}"; - hash = "sha256-KiADf4vjdMMbD5edSEE4LPphaDP64E0nqLLJ0lVnLDE="; + hash = "sha256-8SUeqIta1CFLVtX7GxOeczSDyi50TTGgyZK2kZJsA+0="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-RMa4fuR6L1BM+QmLsZ7i42jtGAQXkVQvv1hh0lr+Ky8="; + hash = "sha256-fQnMLjVhscLN0HFyP7ArjytTryZtr1D+gxrvMT0c40k="; }; passthru.updateScript = nix-update-script { From 87eeb667b55d2aa433ee612707b273f60d8e560f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Feb 2025 21:46:47 +0100 Subject: [PATCH 327/484] python312Packages.textual-dev: add missing dependency --- .../python-modules/textual-dev/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index d1a78f756c99..45952a87842c 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -1,14 +1,19 @@ { lib, - aiohttp, buildPythonPackage, - click, fetchFromGitHub, - msgpack, + + # build-system poetry-core, - pythonOlder, + + # dependencies + aiohttp, + click, + msgpack, textual, + textual-serve, typing-extensions, + versionCheckHook, }: buildPythonPackage rec { @@ -16,8 +21,6 @@ buildPythonPackage rec { version = "1.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Textualize"; repo = "textual-dev"; @@ -32,6 +35,7 @@ buildPythonPackage rec { click msgpack textual + textual-serve typing-extensions ]; @@ -40,12 +44,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "textual_dev" ]; - meta = with lib; { + meta = { description = "Development tools for Textual"; homepage = "https://github.com/Textualize/textual-dev"; - changelog = "https://github.com/Textualize/textual-dev/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ yannip ]; + changelog = "https://github.com/Textualize/textual-dev/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yannip ]; mainProgram = "textual"; }; } From 16a84fa3298ad380ac9ecaf19c75a93a635f68be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:13:14 +0100 Subject: [PATCH 328/484] pip-audit: 2.7.3 -> 2.8.0 Diff: https://github.com/trailofbits/pip-audit/compare/refs/tags/v2.7.3...v2.8.0 Changelog: https://github.com/pypa/pip-audit/releases/tag/v2.8.0 --- pkgs/by-name/pi/pip-audit/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 6522775d1e4e..10a402a621a9 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.7.3"; - pyproject = true; + version = "2.8.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pip-audit"; tag = "v${version}"; - hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw="; + hash = "sha256-UW7pJYMcc8Myc4DmrZqAPUhAVs9J6o8/6QQb5vxskcg="; }; build-system = with python3.pkgs; [ flit-core ]; @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { packaging pip-api pip-requirements-parser + platformdirs rich toml ] @@ -62,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { description = "Tool for scanning Python environments for known vulnerabilities"; homepage = "https://github.com/trailofbits/pip-audit"; changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "pip-audit"; }; From 7d6b6003a7aa3f4576963cd5189f14d0c6960390 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:23:38 +0100 Subject: [PATCH 329/484] python313Packages.cyclonedx-python-lib: 8.7.0 -> 8.8.0 Diff: https://github.com/CycloneDX/cyclonedx-python-lib/compare/refs/tags/v8.7.0...v8.8.0 Changelog: https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v8.8.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 858d21bada1a..a4664cb718aa 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "8.7.0"; + version = "8.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-gnY8JgdxdjXzO9PE9mt57+DQCmxR00pHEL/q9sHN3+Q="; + hash = "sha256-igT1QroP260cqSAiaJv4Zrji691WIjyDLZ1p5dtPF5Y="; }; pythonRelaxDeps = [ "py-serializable" ]; From ed5b492c7e1b0ee2a7ee1c83be6a4349936022e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Feb 2025 23:35:31 +0100 Subject: [PATCH 330/484] cyclonedx-python: 4.6.0 -> 5.1.2 Diff: https://github.com/CycloneDX/cyclonedx-python/compare/refs/tags/v4.6.0...v5.1.2 Changelog: https://github.com/CycloneDX/cyclonedx-python/releases/tag/v5.1.2 --- pkgs/by-name/cy/cyclonedx-python/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index a6bbf4778cd7..96798e7eaddb 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "4.6.0"; + version = "5.1.2"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; tag = "v${version}"; - hash = "sha256-EcCxw3SppuGUgN7AIU9NhpRw7dLDhTHHT5emGOgkDFU="; + hash = "sha256-jh/7sMVBQWptC6Zi+yEwraR7leoyqYg4is83qao7gaY="; }; build-system = with python3Packages; [ poetry-core ]; From 87ef4318cd40588226dadbb0dbac3c9bc08342e6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 00:46:02 +0100 Subject: [PATCH 331/484] python312Packages.islpy: 2024.2 -> 2025.1 Diff: https://github.com/inducer/islpy/compare/refs/tags/v2024.2...v2025.1 --- pkgs/development/python-modules/islpy/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 08554808eb75..f69c15e52a2b 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,21 +20,16 @@ buildPythonPackage rec { pname = "islpy"; - version = "2024.2"; + version = "2025.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-ixw9U4WqcXBW6KGBOsUImjsxmvG5XKCv4jCbTjJ4pjg="; + hash = "sha256-njwNijl7kAbU7v6Bd6p0J9KnYzXZi9gVdqSf8qD0FXE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=42,<64;python_version<'3.12'" "setuptools>=42" - ''; - build-system = [ cmake nanobind @@ -56,7 +51,7 @@ buildPythonPackage rec { # Force resolving the package from $out to make generated ext files usable by tests preCheck = '' - mv islpy islpy.hidden + rm -rf islpy ''; nativeCheckInputs = [ pytestCheckHook ]; @@ -66,6 +61,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper around isl, an integer set library"; homepage = "https://github.com/inducer/islpy"; + changelog = "https://github.com/inducer/islpy/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; From 0256f1180cc4100c2cdbb85456f80d4080004436 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 14 Feb 2025 01:06:22 +0100 Subject: [PATCH 332/484] nixos/services.mysql: format with nixfmt-rfc-style --- nixos/modules/services/databases/mysql.nix | 323 ++++++++++++--------- 1 file changed, 185 insertions(+), 138 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 412fe4836cd3..efca1e933329 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.mysql; @@ -8,8 +13,7 @@ let # Oracle MySQL has supported "notify" service type since 8.0 hasNotify = isMariaDB || (isOracle && lib.versionAtLeast cfg.package.version "8.0"); - mysqldOptions = - "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${cfg.package}"; + mysqldOptions = "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${cfg.package}"; format = pkgs.formats.ini { listsAsDuplicateKeys = true; }; configFile = format.generate "my.cnf" cfg.settings; @@ -18,11 +22,31 @@ in { imports = [ - (lib.mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd.") - (lib.mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.") - (lib.mkRemovedOptionModule [ "services" "mysql" "extraOptions" ] "Use services.mysql.settings.mysqld instead.") - (lib.mkRemovedOptionModule [ "services" "mysql" "bind" ] "Use services.mysql.settings.mysqld.bind-address instead.") - (lib.mkRemovedOptionModule [ "services" "mysql" "port" ] "Use services.mysql.settings.mysqld.port instead.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "pidDir" + ] "Don't wait for pidfiles, describe dependencies through systemd.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "rootPassword" + ] "Use socket authentication or set the password outside of the nix store.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "extraOptions" + ] "Use services.mysql.settings.mysqld instead.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "bind" + ] "Use services.mysql.settings.mysqld.bind-address instead.") + (lib.mkRemovedOptionModule [ + "services" + "mysql" + "port" + ] "Use services.mysql.settings.mysqld.port instead.") ]; ###### interface @@ -106,7 +130,7 @@ in settings = lib.mkOption { type = format.type; - default = {}; + default = { }; description = '' MySQL configuration. Refer to , @@ -137,25 +161,27 @@ in }; initialDatabases = lib.mkOption { - type = lib.types.listOf (lib.types.submodule { - options = { - name = lib.mkOption { - type = lib.types.str; - description = '' - The name of the database to create. - ''; + type = lib.types.listOf ( + lib.types.submodule { + options = { + name = lib.mkOption { + type = lib.types.str; + description = '' + The name of the database to create. + ''; + }; + schema = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + The initial schema of the database; if null (the default), + an empty database is created. + ''; + }; }; - schema = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = '' - The initial schema of the database; if null (the default), - an empty database is created. - ''; - }; - }; - }); - default = []; + } + ); + default = [ ]; description = '' List of database names and their initial schemas that should be used to create databases on the first startup of MySQL. The schema attribute is optional: If not specified, an empty database is created. @@ -176,7 +202,7 @@ in ensureDatabases = lib.mkOption { type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; description = '' Ensures that the specified databases exist. This option will never delete existing databases, especially not when the value of this @@ -190,39 +216,41 @@ in }; ensureUsers = lib.mkOption { - type = lib.types.listOf (lib.types.submodule { - options = { - name = lib.mkOption { - type = lib.types.str; - description = '' - Name of the user to ensure. - ''; - }; - ensurePermissions = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = {}; - description = '' - Permissions to ensure for the user, specified as attribute set. - The attribute names specify the database and tables to grant the permissions for, - separated by a dot. You may use wildcards here. - The attribute values specfiy the permissions to grant. - You may specify one or multiple comma-separated SQL privileges here. + type = lib.types.listOf ( + lib.types.submodule { + options = { + name = lib.mkOption { + type = lib.types.str; + description = '' + Name of the user to ensure. + ''; + }; + ensurePermissions = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + description = '' + Permissions to ensure for the user, specified as attribute set. + The attribute names specify the database and tables to grant the permissions for, + separated by a dot. You may use wildcards here. + The attribute values specfiy the permissions to grant. + You may specify one or multiple comma-separated SQL privileges here. - For more information on how to specify the target - and on which privileges exist, see the - [GRANT syntax](https://mariadb.com/kb/en/library/grant/). - The attributes are used as `GRANT ''${attrName} ON ''${attrValue}`. - ''; - example = lib.literalExpression '' - { - "database.*" = "ALL PRIVILEGES"; - "*.*" = "SELECT, LOCK TABLES"; - } - ''; + For more information on how to specify the target + and on which privileges exist, see the + [GRANT syntax](https://mariadb.com/kb/en/library/grant/). + The attributes are used as `GRANT ''${attrName} ON ''${attrValue}`. + ''; + example = lib.literalExpression '' + { + "database.*" = "ALL PRIVILEGES"; + "*.*" = "SELECT, LOCK TABLES"; + } + ''; + }; }; - }; - }); - default = []; + } + ); + default = [ ]; description = '' Ensures that the specified users exist and have at least the ensured permissions. The MySQL users will be identified using Unix socket authentication. This authenticates the Unix user with the @@ -251,7 +279,11 @@ in replication = { role = lib.mkOption { - type = lib.types.enum [ "master" "slave" "none" ]; + type = lib.types.enum [ + "master" + "slave" + "none" + ]; default = "none"; description = "Role of the MySQL server instance."; }; @@ -292,14 +324,13 @@ in }; - ###### implementation config = lib.mkIf cfg.enable { - services.mysql.dataDir = - lib.mkDefault (if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" - else "/var/mysql"); + services.mysql.dataDir = lib.mkDefault ( + if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql" + ); services.mysql.settings.mysqld = lib.mkMerge [ { @@ -311,7 +342,11 @@ in log-bin-index = "mysql-bin-${toString cfg.replication.serverId}.index"; relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; - binlog-ignore-db = [ "information_schema" "performance_schema" "mysql" ]; + binlog-ignore-db = [ + "information_schema" + "performance_schema" + "mysql" + ]; }) (lib.mkIf (!isMariaDB) { plugin-load-add = [ "auth_socket.so" ]; @@ -355,17 +390,21 @@ in pkgs.nettools ]; - preStart = if isMariaDB then '' - if ! test -e ${cfg.dataDir}/mysql; then - ${cfg.package}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions} - touch ${cfg.dataDir}/mysql_init - fi - '' else '' - if ! test -e ${cfg.dataDir}/mysql; then - ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure - touch ${cfg.dataDir}/mysql_init - fi - ''; + preStart = + if isMariaDB then + '' + if ! test -e ${cfg.dataDir}/mysql; then + ${cfg.package}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions} + touch ${cfg.dataDir}/mysql_init + fi + '' + else + '' + if ! test -e ${cfg.dataDir}/mysql; then + ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure + touch ${cfg.dataDir}/mysql_init + fi + ''; script = '' # https://mariadb.com/kb/en/getting-started-with-mariadb-galera-cluster/#systemd-and-galera-recovery @@ -379,52 +418,55 @@ in exec ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION ''; - postStart = let - # The super user account to use on *first* run of MySQL server - superUser = if isMariaDB then cfg.user else "root"; - in '' - ${lib.optionalString (!hasNotify) '' - # Wait until the MySQL server is available for use - while [ ! -e /run/mysqld/mysqld.sock ] - do - echo "MySQL daemon not yet started. Waiting for 1 second..." - sleep 1 - done - ''} + postStart = + let + # The super user account to use on *first* run of MySQL server + superUser = if isMariaDB then cfg.user else "root"; + in + '' + ${lib.optionalString (!hasNotify) '' + # Wait until the MySQL server is available for use + while [ ! -e /run/mysqld/mysqld.sock ] + do + echo "MySQL daemon not yet started. Waiting for 1 second..." + sleep 1 + done + ''} - if [ -f ${cfg.dataDir}/mysql_init ] - then - # While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not - # Since we don't want to run this service as 'root' we need to ensure the account exists on first run - ( echo "CREATE USER IF NOT EXISTS '${cfg.user}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};" - echo "GRANT ALL PRIVILEGES ON *.* TO '${cfg.user}'@'localhost' WITH GRANT OPTION;" - ) | ${cfg.package}/bin/mysql -u ${superUser} -N + if [ -f ${cfg.dataDir}/mysql_init ] + then + # While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not + # Since we don't want to run this service as 'root' we need to ensure the account exists on first run + ( echo "CREATE USER IF NOT EXISTS '${cfg.user}'@'localhost' IDENTIFIED WITH ${ + if isMariaDB then "unix_socket" else "auth_socket" + };" + echo "GRANT ALL PRIVILEGES ON *.* TO '${cfg.user}'@'localhost' WITH GRANT OPTION;" + ) | ${cfg.package}/bin/mysql -u ${superUser} -N - ${lib.concatMapStrings (database: '' - # Create initial databases - if ! test -e "${cfg.dataDir}/${database.name}"; then - echo "Creating initial database: ${database.name}" - ( echo 'create database `${database.name}`;' + ${lib.concatMapStrings (database: '' + # Create initial databases + if ! test -e "${cfg.dataDir}/${database.name}"; then + echo "Creating initial database: ${database.name}" + ( echo 'create database `${database.name}`;' - ${lib.optionalString (database.schema != null) '' - echo 'use `${database.name}`;' + ${lib.optionalString (database.schema != null) '' + echo 'use `${database.name}`;' - # TODO: this silently falls through if database.schema does not exist, - # we should catch this somehow and exit, but can't do it here because we're in a subshell. - if [ -f "${database.schema}" ] - then - cat ${database.schema} - elif [ -d "${database.schema}" ] - then - cat ${database.schema}/mysql-databases/*.sql - fi - ''} - ) | ${cfg.package}/bin/mysql -u ${superUser} -N - fi - '') cfg.initialDatabases} + # TODO: this silently falls through if database.schema does not exist, + # we should catch this somehow and exit, but can't do it here because we're in a subshell. + if [ -f "${database.schema}" ] + then + cat ${database.schema} + elif [ -d "${database.schema}" ] + then + cat ${database.schema}/mysql-databases/*.sql + fi + ''} + ) | ${cfg.package}/bin/mysql -u ${superUser} -N + fi + '') cfg.initialDatabases} - ${lib.optionalString (cfg.replication.role == "master") - '' + ${lib.optionalString (cfg.replication.role == "master") '' # Set up the replication master ( echo "use mysql;" @@ -434,8 +476,7 @@ in ) | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - ${lib.optionalString (cfg.replication.role == "slave") - '' + ${lib.optionalString (cfg.replication.role == "slave") '' # Set up the replication slave ( echo "stop slave;" @@ -444,34 +485,36 @@ in ) | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - ${lib.optionalString (cfg.initialScript != null) - '' + ${lib.optionalString (cfg.initialScript != null) '' # Execute initial script # using toString to avoid copying the file to nix store if given as path instead of string, # as it might contain credentials cat ${toString cfg.initialScript} | ${cfg.package}/bin/mysql -u ${superUser} -N ''} - rm ${cfg.dataDir}/mysql_init - fi + rm ${cfg.dataDir}/mysql_init + fi - ${lib.optionalString (cfg.ensureDatabases != []) '' - ( - ${lib.concatMapStrings (database: '' - echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;" - '') cfg.ensureDatabases} - ) | ${cfg.package}/bin/mysql -N - ''} + ${lib.optionalString (cfg.ensureDatabases != [ ]) '' + ( + ${lib.concatMapStrings (database: '' + echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;" + '') cfg.ensureDatabases} + ) | ${cfg.package}/bin/mysql -N + ''} - ${lib.concatMapStrings (user: - '' - ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};" - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (database: permission: '' - echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';" - '') user.ensurePermissions)} + ${lib.concatMapStrings (user: '' + ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${ + if isMariaDB then "unix_socket" else "auth_socket" + };" + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (database: permission: '' + echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';" + '') user.ensurePermissions + )} ) | ${cfg.package}/bin/mysql -N '') cfg.ensureUsers} - ''; + ''; serviceConfig = lib.mkMerge [ { @@ -500,7 +543,11 @@ in ProtectKernelTunables = true; ProtectKernelModules = true; ProtectControlGroups = true; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; LockPersonality = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; From 6449da32b224cad459b15e4c0850bd2aea1155e8 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 14 Feb 2025 01:06:52 +0100 Subject: [PATCH 333/484] nixos/services.mysql: add myselfe as maintainer --- ci/OWNERS | 1 + nixos/modules/services/databases/mysql.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index 8b58e7e812ce..c64ef4208e30 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -253,6 +253,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/postgresql @NixOS/postgres # MySQL/MariaDB and related stuff +/nixos/modules/services/databases/mysql.nix @6543 /nixos/modules/services/backup/mysql-backup.nix @6543 # Hardened profile & related modules diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index efca1e933329..68ef50651f43 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -563,4 +563,6 @@ in ]; }; }; + + meta.maintainers = [ lib.maintainers._6543 ]; } From 1f2fbf2d3c68e5c48eb4bb3c7a8b6c4f06c9281f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 01:16:14 +0100 Subject: [PATCH 334/484] python312Packages.pymbolic: fix build --- .../python-modules/pymbolic/default.nix | 50 +++++++------------ 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 3f0e0bfcd54c..a74f61195b14 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -1,17 +1,21 @@ { lib, - astunparse, buildPythonPackage, - fetchpatch, - fetchPypi, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies immutabledict, + pytools, + + # optional-dependencies matchpy, numpy, + + # tests pytestCheckHook, - pythonOlder, - pytools, - setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -19,34 +23,18 @@ buildPythonPackage rec { version = "2024.2.2"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-l2zP8O0bnVrTRxzyuqDQLiMBwevtXld7LgX2M8L1P+w="; + src = fetchFromGitHub { + owner = "inducer"; + repo = "pymbolic"; + tag = "v${version}"; + hash = "sha256-07RWdEPhO+n9/FOvIWe4nm9fGekut9X6Tz4HlIkBSpo="; }; - patches = [ - (fetchpatch { - url = "https://github.com/inducer/pymbolic/commit/cb3d999e4788dad3edf053387b6064adf8b08e19.patch"; - excludes = [ ".github/workflows/ci.yml" ]; - hash = "sha256-P0YjqAo0z0LZMIUTeokwMkfP8vxBXi3TcV4BSFaO1lU="; - }) - ]; - - postPatch = '' - # pytest is a test requirement not a run-time one - substituteInPlace setup.py \ - --replace '"pytest>=2.3",' "" - ''; - - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ - astunparse immutabledict pytools - typing-extensions ]; optional-dependencies = { @@ -58,11 +46,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pymbolic" ]; - meta = with lib; { + meta = { description = "Package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From c85cb3976ccb8cb4ffd2a375db0f701b6db04091 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 13 Feb 2025 18:28:52 -0600 Subject: [PATCH 335/484] ghostty: 1.1.0 -> 1.1.2 --- pkgs/by-name/gh/ghostty/deps.nix | 19 ++++++++++++------- pkgs/by-name/gh/ghostty/package.nix | 6 ++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix index fe2a11f4eef6..3c1ca62e28a5 100644 --- a/pkgs/by-name/gh/ghostty/deps.nix +++ b/pkgs/by-name/gh/ghostty/deps.nix @@ -1,5 +1,4 @@ # generated by zon2nix (https://github.com/Cloudef/zig2nix) - { lib, linkFarm, @@ -9,10 +8,8 @@ zig, name ? "zig-packages", }: - with builtins; with lib; - let unpackZigArtifact = { @@ -207,7 +204,7 @@ linkFarm name [ name = "12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38"; path = fetchZigArtifact { name = "zig_wayland"; - url = "https://codeberg.org/ifreund/zig-wayland/archive/fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz"; + url = "https://deps.files.ghostty.org/zig-wayland-fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz"; hash = "sha256-RtAystqK/GRYIquTK1KfD7rRSCrfuzAvCD1Z9DE1ldc="; }; } @@ -227,6 +224,14 @@ linkFarm name [ hash = "sha256-QWN4jOrA91KlbqmeEHHJ4HTnCC9nmfxt8DHUXJpAzLI="; }; } + { + name = "12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d"; + path = fetchZigArtifact { + name = "gobject"; + url = "https://github.com/ianprime0509/zig-gobject/releases/download/v0.2.2/bindings-gnome47.tar.zst"; + hash = "sha256-UU97kNv/bZzQPKz1djhEDLapLguvfBpFfWVb6FthtcI="; + }; + } { name = "12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f"; path = fetchZigArtifact { @@ -252,11 +257,11 @@ linkFarm name [ }; } { - name = "12204fc99743d8232e691ac22e058519bfc6ea92de4a11c6dba59b117531c847cd6a"; + name = "12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3"; path = fetchZigArtifact { name = "iterm2_themes"; - url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/0e23daf59234fc892cba949562d7bf69204594bb.tar.gz"; - hash = "sha256-KswGCFqD1TOBkvaqtRcFOm96TbIqhqUEOg1u1ye/f0s="; + url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/db227d159adc265818f2e898da0f70ef8d7b580e.tar.gz"; + hash = "sha256-Iyf7U4rpvNkPX4AOEbYSYGte5+SjRwsWD2luOn1Hz8U="; }; } { diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index d8462622da46..bf8359959186 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -28,7 +28,6 @@ # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106 withAdwaita ? true, }: - let zig_hook = zig_0_13.hook.overrideAttrs { zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off"; @@ -41,10 +40,9 @@ let # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52 renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl"; in - stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; - version = "1.1.0"; + version = "1.1.2"; outputs = [ "out" "man" @@ -57,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ghostty-org"; repo = "ghostty"; tag = "v${finalAttrs.version}"; - hash = "sha256-a2A/mt2xS19YEQB+cTPdew/a7xCnGWNvIOdO9QNqxm0="; + hash = "sha256-HZiuxnflLT9HXU7bc0xrk5kJJHQGNTQ2QXMZS7bE2u8="; }; deps = callPackage ./deps.nix { From 91fd664d85d47c66821798f6ed2f01150a0fcf3c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 14 Feb 2025 00:48:48 +0000 Subject: [PATCH 336/484] nixos-rebuild-ng: increase timeout for REPL tests --- pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix b/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix index 1853a65bab86..1a614e8d8655 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/tests/repl.nix @@ -13,7 +13,7 @@ let escapeExpect = lib.strings.escapeNixString; expectSetup = '' - set timeout 180 + set timeout 300 proc expect_simple { pattern } { puts "Expecting: $pattern" expect { @@ -76,7 +76,7 @@ runCommand "test-nixos-rebuild-repl" expect ${writeText "test-nixos-rebuild-repl-expect" '' ${expectSetup} - spawn nixos-rebuild repl --fast + spawn nixos-rebuild repl --no-reexec expect "nix-repl> " @@ -116,7 +116,7 @@ runCommand "test-nixos-rebuild-repl" expect ${writeText "test-nixos-rebuild-repl-absolute-path-expect" '' ${expectSetup} - spawn sh -c "nixos-rebuild repl --fast --flake path:\$HOME#testconf" + spawn sh -c "nixos-rebuild repl --no-reexec --flake path:\$HOME#testconf" expect_simple "nix-repl>" @@ -146,7 +146,7 @@ runCommand "test-nixos-rebuild-repl" pushd "$HOME" expect ${writeText "test-nixos-rebuild-repl-relative-path-expect" '' ${expectSetup} - spawn sh -c "nixos-rebuild repl --fast --flake .#testconf" + spawn sh -c "nixos-rebuild repl --no-reexec --flake .#testconf" expect_simple "nix-repl>" From 58b0a792df715f67f743b647d691061e1f242eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 11 Feb 2025 01:27:48 +0100 Subject: [PATCH 337/484] pnpm_10: 10.2.1 -> 10.4.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 86d73f8db0b4..390d71445af4 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-hHIWjD4f0L/yh+aUsFP8y78gV5o/+VJrYzO+q432Wo0="; }; "10" = { - version = "10.2.1"; - hash = "sha256-+Yjw2TuH4dotjN9qx/RaAcb4Q642BrTKDy/9cTuF+XU="; + version = "10.4.0"; + hash = "sha256-5X6KVE96hCR8+nfdbZI+rlGZo3NHTlPqsfVAx5Yok4Y="; }; }; From 942907da9f4396a14a56884752f3441f896a575a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:11:37 +0000 Subject: [PATCH 338/484] ocamlPackages.visitors: 20210608 -> 20250212 --- pkgs/development/ocaml-modules/visitors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index f2115d16ee4b..b4459cfaae65 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "visitors"; - version = "20210608"; + version = "20250212"; duneVersion = "3"; @@ -20,7 +20,7 @@ buildDunePackage rec { repo = pname; rev = version; domain = "gitlab.inria.fr"; - sha256 = "1p75x5yqwbwv8yb2gz15rfl3znipy59r45d1f4vcjdghhjws6q2a"; + sha256 = "sha256-AFD4+vriwVGt6lzDyIDuIMadakcgB4j235yty5qqFgQ="; }; propagatedBuildInputs = [ From d86d3abce39dd0954895ed216a7c871bb0053b65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:23:29 +0000 Subject: [PATCH 339/484] qcad: 3.31.2.7 -> 3.32.1.0 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 9134a9e5d00c..f06bd8fe72ab 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "qcad"; - version = "3.31.2.7"; + version = "3.32.1.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-gNUmcpyDctmsqavOOaPzyghmfMp6QnZcToUtFoVgoxI="; + hash = "sha256-3P6iudD/swpNDPL4G8isJI6zxqc6/rmHAMpPnEwnuiM="; }; patches = [ From d5ed0c352a447ec58cababe15e037fd743cceec7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:32:33 +0000 Subject: [PATCH 340/484] google-authenticator: 1.10 -> 1.11 --- pkgs/by-name/go/google-authenticator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-authenticator/package.nix b/pkgs/by-name/go/google-authenticator/package.nix index 0334a252510f..3eacb27aabee 100644 --- a/pkgs/by-name/go/google-authenticator/package.nix +++ b/pkgs/by-name/go/google-authenticator/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "google"; repo = "google-authenticator-libpam"; rev = version; - hash = "sha256-KEfwQeJIuRF+S3gPn+maDb8Fu0FRXLs2/Nlbjj2d3AE="; + hash = "sha256-cLMX5SdKvyQr3annc/Hhhz6XgY+BypRHASKRh6xTdmo="; }; nativeBuildInputs = [ autoreconfHook ]; From d4884e2527600429aa275a7bdd2dcc0e1fdeac6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:39:42 +0000 Subject: [PATCH 341/484] leetcode-cli: 0.4.5 -> 0.4.6 --- pkgs/by-name/le/leetcode-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index 71c66932a942..25f05d80fb52 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "leetcode-cli"; - version = "0.4.5"; + version = "0.4.6"; src = fetchCrate { inherit pname version; - hash = "sha256-Jc0akHj2DHbkF7sjslOwdeI1piW2gnhoalBz18lpQdQ="; + hash = "sha256-AYBBW9VtdvqqqiouhkS3diPcOdaQOs8Htkw9DTRX2t4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rr/8rbgjGr1npkimJK8rpZcsRFP0ACx+a1x0ITI71G0="; + cargoHash = "sha256-o2RkhYsSQKwU+dsHQvlcxAVKUjOTqg424dqrM7JRoN8="; nativeBuildInputs = [ pkg-config From a791a7ba5637fd9cc551e427669914a984ee233c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:46:44 +0000 Subject: [PATCH 342/484] mpd-discord-rpc: 1.7.3 -> 1.8.0 --- pkgs/by-name/mp/mpd-discord-rpc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 83890dd7458b..589e27d4f32b 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "mpd-discord-rpc"; rev = "v${version}"; - hash = "sha256-WiHMXazNKyt5N7WmkftZYEHeQi+l9qoU2yr6jRHfjdE="; + hash = "sha256-RuXH0RaR0VVN7tja0pcc8QH826/JzH4tyVVCbrK7ldI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v6YQS+Te0bIzSr3q4QaEcXbUjiTCKELxCdqBlbjLI3E="; + cargoHash = "sha256-ewmg5t0JljnvxjrGDJzokRwndv7UNw9NMQ7Cx6oDWjg="; nativeBuildInputs = [ pkg-config From c4f89c65368e8fe943754762c1d10f7823e1a000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:48:21 +0000 Subject: [PATCH 343/484] cntb: 1.4.12 -> 1.5.2 --- pkgs/by-name/cn/cntb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 69622e914a10..7ae21fb9b98d 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "cntb"; - version = "1.4.12"; + version = "1.5.2"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; rev = "v${version}"; - hash = "sha256-5JOO9tWMjy81wSB9Vq/gBYZ0xfrhES0dm/cTqXP8HiI"; + hash = "sha256-ym4SYeAkxKBq/0VgyXx1uoHiM29LEXMqHl3XICdM30Y="; # docs contains two files with the same name but different cases, # this leads to a different hash on case insensitive filesystems (e.g. darwin) # https://github.com/contabo/cntb/issues/34 @@ -22,7 +22,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorHash = "sha256-IBDVHQe6OOGQ27G7uXKRtavy4tnCvIbL07j969/E9Vg="; + vendorHash = "sha256-6J93Nt9MhnTjsah8sDff0SvImzOEsSdnDHBhUADmO1k="; ldflags = [ "-X contabo.com/cli/cntb/cmd.version=${src.rev}" From 00b57c528c4e8e17cd06c2e4270c84811ea118d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 01:56:32 +0000 Subject: [PATCH 344/484] amazon-ecr-credential-helper: 0.9.0 -> 0.9.1 --- pkgs/by-name/am/amazon-ecr-credential-helper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix index bc6be8d706eb..978b8cbb1c69 100644 --- a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix +++ b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "amazon-ecr-credential-helper"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "sha256-TRYBZiddnN6wCErSLKCr9JEH/Ldxg+Oh2hA63+EwRjo="; + sha256 = "sha256-kX1I8HsOJKFogqpfTgFBedM6BObdkpYfYwx3tS2IdMo="; }; vendorHash = null; From 46e5ba73588e8bb7e2b440db3e29b06b5856a145 Mon Sep 17 00:00:00 2001 From: Jean-Francois Labonte Date: Thu, 13 Feb 2025 21:20:25 -0500 Subject: [PATCH 345/484] vscode: 1.97.1 -> 1.97.2 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index d002b3a0c34d..20608414517b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "0gr2z4vzms6fv4kcc8dzc7l3inpb5hasnzdfr1zc2n4i3nl8z8vw"; - x86_64-darwin = "1qplpjazjds5kns0kmp5qa6zfix30cqa93bl4bcpvblb2x9fh1v8"; - aarch64-linux = "1jhrmwrnxzwvhqgfrs35kyd5hhg2b7dyq3p5k88jhm8607nkds79"; - aarch64-darwin = "072lg4nvq3cdjzrwngaxnz9p952zkxsknsb39zjh55vzrij55g9x"; - armv7l-linux = "06bvh72bq4ippr2k8ifcfqhkhhh6na4vxsz1k50swr1k2kzwwr5d"; + x86_64-linux = "11a0y0zdz3mmc2xvpnlq06a7q06y6529xpp4hlhpjylj0bk06xn1"; + x86_64-darwin = "12fxhwqcz36f5pv4kvs7bblmymxyixg7pvi0gb5k0j73pkvqrr6g"; + aarch64-linux = "0g5qz7gq7k65p2f8iwz1jiy03nwsmy3v3gb18qwg9mbhm0dk59la"; + aarch64-darwin = "1g4fz8nw5m7krjlsjs43937kz1sr7lkflbphpyh8cmalwpxa8ysn"; + armv7l-linux = "09r12y9xbpqnnw9mab3k4kx0ngpfng1l6rk09n9l2q36ji20ijmy"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.97.1"; + version = "1.97.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "e249dada235c2083c83813bd65b7f4707fb97b76"; + rev = "e54c774e0add60467559eb0d1e229c6452cf8447"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "01snzahh794ygpgwh4r57c8mnisp6a4fc3v5x76cdhxw2hd9s26n"; + sha256 = "15fd401sqmlkpw48pysqpyi5rlsqx4cm55bbwakhkal4qa1qnq4m"; }; stdenv = stdenvNoCC; }; From c5d64694288f1625e50d2bad504d00b9125ca5ad Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 20:34:18 -0600 Subject: [PATCH 346/484] postman: 11.1.0 -> 11.31.0 --- pkgs/by-name/po/postman/darwin.nix | 4 ++-- pkgs/by-name/po/postman/linux.nix | 4 ++-- pkgs/by-name/po/postman/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix index 1e648396eba1..082c8d2ae46a 100644 --- a/pkgs/by-name/po/postman/darwin.nix +++ b/pkgs/by-name/po/postman/darwin.nix @@ -13,12 +13,12 @@ let { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-V+JLXl12DnwZlPF0qNs2lQqRpWbSDiPXDTtl4FGcZcM="; + sha256 = "sha256-BwHGR9xyOwOEV11KT4OGUG2khRbbyUg6qJPR8yA3gQI="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-l7J4Rrq+kUyk+0Chq5qo50K1VXC/7E3FC/hQ1DQ0PGA="; + sha256 = "sha256-ZVSIiSkPZ3W6PCV36mTMkE47IPQCJ6z+gdLgx0+HeAs="; }; } .${stdenvNoCC.hostPlatform.system} diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 591794c90ccf..cd7b563cb007 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -56,12 +56,12 @@ let { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo="; + sha256 = "sha256-c4JPemJjKM0N6XajNG4lK2zL3i5sBtsVlC9KNv4zM74="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM="; + sha256 = "sha256-y260wmU+C0Y6wpeHuHe0mXuAZZgZ38qr2pGprhZJ7sE="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index ae8c27f750b1..57f10fa0d827 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -6,7 +6,7 @@ let pname = "postman"; - version = "11.1.0"; + version = "11.31.0"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; From adddd36466b315a9aa6760209528e9f67a5b7dda Mon Sep 17 00:00:00 2001 From: useranon350 Date: Thu, 13 Feb 2025 21:36:51 -0500 Subject: [PATCH 347/484] cemu: 2.4 -> 2.5 --- pkgs/by-name/ce/cemu/0002-cemu-imgui.patch | 13 +++++++++++++ pkgs/by-name/ce/cemu/package.nix | 13 ++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/ce/cemu/0002-cemu-imgui.patch diff --git a/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch b/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch new file mode 100644 index 000000000000..96f95b9687cc --- /dev/null +++ b/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch @@ -0,0 +1,13 @@ +diff --git a/src/imgui/imgui_extension.cpp b/src/imgui/imgui_extension.cpp +index f1c072f..e3e901d 100644 +--- a/src/imgui/imgui_extension.cpp ++++ b/src/imgui/imgui_extension.cpp +@@ -129,8 +129,6 @@ void ImGui_UpdateWindowInformation(bool mainWindow) + io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; + #if BOOST_OS_WINDOWS + io.ImeWindowHandle = mainWindow ? g_window_info.window_main.hwnd : g_window_info.window_pad.hwnd; +-#else +- io.ImeWindowHandle = nullptr; + #endif + + io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX); diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 191ece85ab31..28c90ea1d828 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -34,24 +34,25 @@ wrapGAppsHook3, wxGTK32, zarchive, + bluez, }: let - # cemu doesn't build with imgui 1.90.2 or newer: - # error: 'struct ImGuiIO' has no member named 'ImeWindowHandle' + # cemu doesn't build with imgui 1.91.4 or newer: + # before v1.91.4 (2024/10/08) the default type for ImTextureID was void*. imgui' = imgui.overrideAttrs rec { - version = "1.90.1"; + version = "1.91.3"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - hash = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; + hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY="; }; }; in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "cemu-project"; @@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/cemu-project/Cemu/commit/2b0cbf7f6b6c34c748585d255ee7756ff592a502.patch"; hash = "sha256-jHB/9MWZ/oNfUgZtxtgkSN/OnRARSuGVfXFFB9ldDpI="; }) + ./0002-cemu-imgui.patch ]; nativeBuildInputs = [ @@ -106,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wxGTK32 zarchive + bluez ]; cmakeFlags = [ From 7fd769bbe905e9b27c8e95520cb655ba1e73476a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 13 Feb 2025 20:38:22 -0600 Subject: [PATCH 348/484] postman: 11.31.0 -> 11.32.2 --- pkgs/by-name/po/postman/darwin.nix | 4 ++-- pkgs/by-name/po/postman/linux.nix | 4 ++-- pkgs/by-name/po/postman/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix index 082c8d2ae46a..e14ad072e574 100644 --- a/pkgs/by-name/po/postman/darwin.nix +++ b/pkgs/by-name/po/postman/darwin.nix @@ -13,12 +13,12 @@ let { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-BwHGR9xyOwOEV11KT4OGUG2khRbbyUg6qJPR8yA3gQI="; + sha256 = "sha256-tp8qKk06HvSVY1GggOv9VYH+1Ntlirf8Pf2FY0Qhksk="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-ZVSIiSkPZ3W6PCV36mTMkE47IPQCJ6z+gdLgx0+HeAs="; + sha256 = "sha256-8hSxtLGoAcTLmUpr3Il/1wii2MgLqOJ3oAYSSPq7a1o="; }; } .${stdenvNoCC.hostPlatform.system} diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index cd7b563cb007..4549c027948a 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -56,12 +56,12 @@ let { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-c4JPemJjKM0N6XajNG4lK2zL3i5sBtsVlC9KNv4zM74="; + sha256 = "sha256-JKE6riUJXAiCwT0yp5ncoExiRAnFmuefmPkwWmvRjV4="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-y260wmU+C0Y6wpeHuHe0mXuAZZgZ38qr2pGprhZJ7sE="; + sha256 = "sha256-w7R4IsWMtW37BwGHBY9UweMR6PaZpkya401ARGeR1wY="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index 57f10fa0d827..d883696aa9da 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -6,7 +6,7 @@ let pname = "postman"; - version = "11.31.0"; + version = "11.32.2"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; From 0270af5e2e2d587871a84a9c0137840ed2e83377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 02:46:38 +0000 Subject: [PATCH 349/484] mtr-exporter: 0.4.0 -> 0.5.0 --- pkgs/by-name/mt/mtr-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix index 2425226d513a..808666c58851 100644 --- a/pkgs/by-name/mt/mtr-exporter/package.nix +++ b/pkgs/by-name/mt/mtr-exporter/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mtr-exporter"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mgumz"; repo = "mtr-exporter"; rev = version; - hash = "sha256-dMlMUjbUg05Z8FFEPwMOiHzLiHSSjV1CzKqrt/qJ6Js="; + hash = "sha256-+MomCtDMhnN9HsWguvzCKKaBl5CO0vL27OBjQfuajLI="; }; vendorHash = null; From 766c0cd16b4f9dd008b8f7f63d797455fe62b7e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 02:51:17 +0000 Subject: [PATCH 350/484] astc-encoder: 5.1.0 -> 5.2.0 --- pkgs/by-name/as/astc-encoder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix index 4ece84c89c5e..5ea47e927550 100644 --- a/pkgs/by-name/as/astc-encoder/package.nix +++ b/pkgs/by-name/as/astc-encoder/package.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-IGzH/0JLDUkwABCFRVVEJevWwcT5El3HweU6nsVQCJw="; + sha256 = "sha256-rCyi5Nla2IXsLD+rLMTN1h3B9umlNN0epZmPi/IFHPQ="; }; nativeBuildInputs = [ cmake ]; From 51792bbb1995e0ed3dfc05412245569946e2c22d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:17:16 +0000 Subject: [PATCH 351/484] nuclei: 3.3.8 -> 3.3.9 --- pkgs/by-name/nu/nuclei/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index d85ed923a2c7..788dc8ade7f7 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; tag = "v${version}"; - hash = "sha256-RL6/H1X6+rt9n1rpeRpKv+u3SloOnRX6YzMKDDQw+78="; + hash = "sha256-9P8KSuhTI/m0m51PUTZGU+qRbnT3izPbHTzsqZNbMJE="; }; - vendorHash = "sha256-k4seYTUO7BmU2HhTWweDRfNnXp+HshWM1riSc9BbYYg="; + vendorHash = "sha256-CTdB/+aVaXKqtiwHn8pgmhXjZ0mIDrmLvnKmisExi74="; proxyVendor = true; # hash mismatch between Linux and Darwin From 1af7f05b19df4b5a78b84a4e4e9c313d68a4bcd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:17:25 +0000 Subject: [PATCH 352/484] cairo-lang: 2.9.2 -> 2.9.3 --- pkgs/by-name/ca/cairo-lang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix index 7bc31286d0e3..8c0276d89b6a 100644 --- a/pkgs/by-name/ca/cairo-lang/package.nix +++ b/pkgs/by-name/ca/cairo-lang/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU="; + hash = "sha256-X6aEyo3VY0C+1w1S7ZuxVKACKDHWaxPMR98ICq6/icg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d9S8d0KLxoipH5nE0jyUaFAl/V8eSOvOwf2skrW5K5g="; + cargoHash = "sha256-yjo7nxt/oAqPRI6I3WlnFC+lfT5HiQJnsjTuijx4ekk="; # openssl crate requires perl during build process nativeBuildInputs = [ From 88b52c533c8ca3ce87f7e5dc36b1b92e354c6395 Mon Sep 17 00:00:00 2001 From: Jean-Luc Jox Date: Fri, 14 Feb 2025 13:20:06 +1000 Subject: [PATCH 353/484] upbound: 0.37.0 -> 0.37.1 --- pkgs/by-name/up/upbound/sources-stable.json | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json index cbf434da428d..f7fa7ac80671 100644 --- a/pkgs/by-name/up/upbound/sources-stable.json +++ b/pkgs/by-name/up/upbound/sources-stable.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-WuNC7E1i/Yikwe3uq1Hxf4mpAzgqe9T6tI2DFqJFYq8=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-I4pzsc8lR7w7RFuPig7nUAoLhOridrobglnGNAK//Ek=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-b5ylPJxIVkI3EDY5IFTHll/4F6KDtQLm7eq8J7eGmtA=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-PVJON0BzYMN3vBlHIAIBycfO9jvy1KRnelSnPTsJ6pg=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-jJV0SX96Isz7+E0MOQ6aq3KDwFZt4knTVuDU3iSIC+4=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-VNJ4zII+RK82ulN0TRwrl4tpbnQKICKhcKm1re4bJJY=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-Ek8xTUKFjYekaee+8rjjOKSQQ1jX3asyvVa/jATWR5c=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-L7Ar3NhsMGne3AOCJ8IWrKBlSleYqKU5Fm9DRN8DZPU=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-jDhAB0b1XMAwGgTeL1uXIIg4YoBgpgI9KBdsbyBXjF4=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-c4wqYH7AG//7uI5sHbDOwZ0LxYIgP3tXDOut9kMlR6o=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-mVS1knNDtQjbxj2FXIyx/m/HVUhUSuN2E7HNmdxgtd4=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-70ib5DXhpVBPB8FVaS1qzEtWA1M20B3soKltT4cwyZE=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-5nr+5tCbqoVel97ROn2OamV0s90O6QS9vrbSXIjhJoo=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-CRtxAO7FFPHjLTaF+MGbAoRLcTCG8GYStFuq+t8t9hM=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-MZgQlxi4MrzXG59Q4g5Bjb240E5pf5l1bHGASqSc+OU=", - "url": "https://cli.upbound.io/stable/v0.37.0/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-tA0k7DBh8cqYcqC/+8E1QeMNzRLDbE9X4sjlLnYyS08=", + "url": "https://cli.upbound.io/stable/v0.37.1/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.37.0" + "version": "0.37.1" } From c631924271809f4df9e1fb7115c820b3b6052f26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:23:37 +0000 Subject: [PATCH 354/484] tz: 0.7.0 -> 0.8.0 --- pkgs/by-name/tz/tz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tz/tz/package.nix b/pkgs/by-name/tz/tz/package.nix index 7ddeb2d399e1..7c8caa485dd0 100644 --- a/pkgs/by-name/tz/tz/package.nix +++ b/pkgs/by-name/tz/tz/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tz"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "oz"; repo = "tz"; rev = "v${version}"; - sha256 = "sha256-Mnb0GdJ9dgaUanWBP5JOo6++6MfrUgncBRp4NIbhxf0="; + sha256 = "sha256-OpftKCEoAltvQw0bB3SyFeXUDiGjVHNDrrKsdRH6zl4="; }; - vendorHash = "sha256-lcCra4LyebkmelvBs0Dd2mn6R64Q5MaUWc5AP8V9pec="; + vendorHash = "sha256-Mdp2bcqTawbeqdu06QfB4atLaPpPDoE/eisTytxCnj4="; meta = with lib; { description = "Time zone helper"; From 350a9e2d46d45b71cc6194716cfcc0a321251caa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:44:02 +0000 Subject: [PATCH 355/484] photoqt: 4.8 -> 4.8.1 --- pkgs/by-name/ph/photoqt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 6c335cf07344..776914930af4 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.8"; + version = "4.8.1"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-ccSbG5MTIyVJFqNHstaW53BfsGmN/I4ObCZfY0h22QE="; + hash = "sha256-Iq5Fc0v+EYFe1YG3ZhZKl8leXD+TpGGhaQjr800vz7Y="; }; nativeBuildInputs = [ From 37c2c17cc6e4b9719e03a924f1aa674834e814ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:45:08 +0000 Subject: [PATCH 356/484] polypane: 23.0.1 -> 23.1.0 --- pkgs/by-name/po/polypane/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polypane/package.nix b/pkgs/by-name/po/polypane/package.nix index 386afbeb5747..100b2ad52073 100644 --- a/pkgs/by-name/po/polypane/package.nix +++ b/pkgs/by-name/po/polypane/package.nix @@ -6,12 +6,12 @@ let pname = "polypane"; - version = "23.0.1"; + version = "23.1.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-phOuTka8S/aUOem6+rKx18yhRoArWLQYwxqqFF269XA="; + sha256 = "sha256-6XKosi5ukkrVtG5K6tUDgvqbOQ0RdrDHuYHhIS+Idyg="; }; appimageContents = appimageTools.extractType2 { From e82c85c3c826a6105e14aa14bb0679c9fc87f8e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:47:53 +0000 Subject: [PATCH 357/484] reader: 0.4.6 -> 0.4.7 --- pkgs/by-name/re/reader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reader/package.nix b/pkgs/by-name/re/reader/package.nix index 522b0b07d2f5..30a4c7e0b1f3 100644 --- a/pkgs/by-name/re/reader/package.nix +++ b/pkgs/by-name/re/reader/package.nix @@ -6,16 +6,16 @@ let self = buildGoModule { pname = "reader"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "mrusme"; repo = "reader"; tag = "v${self.version}"; - hash = "sha256-Z0mDRL02wZfmPRVDTDV85MqI5Ztctqen7PmOSW5Ee48="; + hash = "sha256-Xg6ndfxKOfiIz654HcnhdvBGydOSSODBp8LnYxmqb4o="; }; - vendorHash = "sha256-6k6Zmwdpc4rBsahtU9nJmTUqfDZi6EeaJGVeLFzbY34="; + vendorHash = "sha256-dr/y4BBBe5K9U24ikLzYA+B2mzTGpFuFqoj5OLXtUG4="; meta = { description = "Lightweight tool offering better readability of web pages on the CLI"; From 6173ea8e0774671f8e378dca324b1147fd1b3621 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 03:48:24 +0000 Subject: [PATCH 358/484] talosctl: 1.9.3 -> 1.9.4 --- pkgs/by-name/ta/talosctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index 3ece33feeb91..041faa531b8c 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-nI+6EzbGQzfM/pG4d5O4I5BEJ2aNaZ/sE28/EcgQmCs="; + hash = "sha256-gD9fIBILqSFExTIziNx6Hy6TpsBC90yHSfSDB9fhKwA="; }; - vendorHash = "sha256-o/PYWR7KOWCVXUhzdPY0bxRhCROXzp/UAXgFkWpggC8="; + vendorHash = "sha256-ECTR1U2RlatLK3c3UP/aHzYMkN6WxPsHuwoXUzIYsAA="; ldflags = [ "-s" From 0ef972cbd3c4dc6e59d87a65d04ba6bb59a50a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 04:17:31 +0000 Subject: [PATCH 359/484] helmfile: 0.170.1 -> 0.171.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ab8de1ab715f..e7e7bdc155a2 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.170.1"; + version = "0.171.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-qu/0l+4fZUk7H5sCZopmCNxja5hI5WwfXga90Yeuy7o="; + hash = "sha256-zZt0YxGbDqIhg2tXjQo5QnD09ASOUgFyQ1uWbGcujkc="; }; - vendorHash = "sha256-vAv/VlAvkPRWrOHDNkt4VdXXjqi65RVjYtvqSJjb8ds="; + vendorHash = "sha256-sGqnM40Y1nr9dXcSSC1lkwh1ToRLpCMiWJhyMcxxH9U="; proxyVendor = true; # darwin/linux hash mismatch From 1de88d0796202a27005c5a74474fd3cfb3069b82 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 05:48:42 +0100 Subject: [PATCH 360/484] =?UTF-8?q?ocamlPackages.seqes:=200.2=20=E2=86=92?= =?UTF-8?q?=200.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/seqes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/seqes/default.nix b/pkgs/development/ocaml-modules/seqes/default.nix index 00d68ffdbb16..77779c127e14 100644 --- a/pkgs/development/ocaml-modules/seqes/default.nix +++ b/pkgs/development/ocaml-modules/seqes/default.nix @@ -9,10 +9,10 @@ buildDunePackage rec { pname = "seqes"; - version = "0.2"; + version = "0.4"; src = fetchurl { - url = "https://gitlab.com/nomadic-labs/seqes/-/archive/${version}/seqes-${version}.tar.gz"; - sha256 = "sha256-IxLA0jaIPdX9Zn/GL8UHDJYjA1UBW6leGbZmp64YMjI="; + url = "https://gitlab.com/raphael-proust/seqes/-/archive/${version}/seqes-${version}.tar.gz"; + hash = "sha256-E4BalN68CJP7u6NSC0XBooWvUeSNqV+3KEOtoJ4g/dM="; }; minimalOCamlVersion = "4.14"; From 6d159b621e9de8871b11f16789baced48a64a3bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 04:51:34 +0000 Subject: [PATCH 361/484] python312Packages.plaid-python: 28.1.0 -> 29.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 694bca9edb1a..ef8da460c2c2 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "28.1.0"; + version = "29.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-FEw9cuCjQCU4vsZFg8/pn8i1g2XMVXno2PDZl8+iZoc="; + hash = "sha256-/HznxgYQvNxyAbYrvDK1yq8crZcd3fH5j9n2XmfGWTY="; }; build-system = [ setuptools ]; From 0001c6f4c5e10b8e198b341038e4fd6e6b9410bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 05:07:03 +0000 Subject: [PATCH 362/484] mirrord: 3.131.2 -> 3.132.1 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index ae7afac8f32b..91c0a4f9a1be 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.131.2", + "version": "3.132.1", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_x86_64", - "hash": "sha256-S5esVEqssMZJdxlR8MMVgMbsZkgewD69cNT/lI1LerE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_linux_x86_64", + "hash": "sha256-O3AoKIK1DZ4We0Bqs60Jzyr/qVhC0SglMfErtkvNvtA=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_aarch64", - "hash": "sha256-2SC/6Q43AhUjx2i3kwCLHIMEnxp23qbUuFXYKZBLin8=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_linux_aarch64", + "hash": "sha256-e+5Bd5PgAxqG5bOImA6f7L6mn42nb8AenV0MBI9HPLA=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal", - "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_mac_universal", + "hash": "sha256-4R44hKYcJc7/Q6TJRrYtwBKtrda/ykID7mbVV1FCv/k=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal", - "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_mac_universal", + "hash": "sha256-4R44hKYcJc7/Q6TJRrYtwBKtrda/ykID7mbVV1FCv/k=" } } } From 846779bc8ede0f0f21cac1b4be0b064876bc4c99 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 26 Jan 2025 11:15:23 -0800 Subject: [PATCH 363/484] nixos/yggdrasil: use exec to replace bash instance --- nixos/modules/services/networking/yggdrasil.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 0fb51400d666..ba77eb4d6d37 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -193,7 +193,7 @@ in "${binYggdrasil} -genconf") + " > /run/yggdrasil/yggdrasil.conf"} # start yggdrasil - ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs} + exec ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs} ''; serviceConfig = { From abd2bd2b7b014626e6013f9e889fb9248b8ae6ca Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 09:29:32 +0300 Subject: [PATCH 364/484] path-of-building.data: 2.50.0 -> 2.51.0 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.50.0...v2.51.0 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 1e30bcc831fe..7030784312d6 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -17,13 +17,13 @@ let data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; - version = "2.50.0"; + version = "2.51.0"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-mclbLRYFNWgn/f4CyaINJlLq06uWh0+ks82Lger4w9w="; + hash = "sha256-Rau3UaWPyaI7QBXCNVtIQSenyNsx5hh2dsd3q8jFjc4="; }; nativeBuildInputs = [ unzip ]; From dd94d40531b4687b9d152cbd51ebb3d1ea7564c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Feb 2025 08:09:36 +0100 Subject: [PATCH 365/484] python313Packages.aiowebostv: 0.6.1 -> 0.6.2 Diff: https://github.com/home-assistant-libs/aiowebostv/compare/refs/tags/v0.6.1...v0.6.2 Changelog: https://github.com/home-assistant-libs/aiowebostv/releases/tag/v0.6.2 --- pkgs/development/python-modules/aiowebostv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 25961f216096..5720666d7865 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aiowebostv"; tag = "v${version}"; - hash = "sha256-x1lpqR/e3itkRc/Cs3opXF4NzOZ17g/IcHZeGo234aM="; + hash = "sha256-H5ZhG69F5w1fZBepxqWGo29XnK3Tn6dgota64k2GJbw="; }; build-system = [ setuptools ]; From 737050544f65c02fd6c8f019492b00d222969d4e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 14 Feb 2025 08:12:01 +0100 Subject: [PATCH 366/484] android-studio: use binary to launch IDE --- pkgs/applications/editors/android-studio/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 768e572b11c9..5ac252ff941b 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -100,7 +100,7 @@ let installPhase = '' cp -r . $out - wrapProgram $out/bin/studio.sh \ + wrapProgram $out/bin/studio \ --set-default JAVA_HOME "$out/jbr" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ @@ -204,6 +204,7 @@ let ] }" ''; + meta.mainProgram = "studio"; }; desktopItem = makeDesktopItem { @@ -279,7 +280,7 @@ let unset ANDROID_HOME fi ''} - exec ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" + exec ${fhsEnv}/bin/${drvName}-fhs-env ${lib.getExe androidStudio} "$@" ''; preferLocalBuild = true; allowSubstitutes = false; From 750686e53ce362561584a3bbfdaf4fd91e672c29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 07:18:37 +0000 Subject: [PATCH 367/484] python312Packages.boto3-stubs: 1.36.18 -> 1.36.19 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 66f5c4820e3f..d65ca334a831 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.18"; + version = "1.36.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-DCTudrNZZbROqp6lsfGrpykwmKcknwKegsFcphoiF7w="; + hash = "sha256-ZE5mHF2tiCsxoGkdjVJ0yZ2415Ih0y6dfI0Hen+jiDQ="; }; build-system = [ setuptools ]; From 0d9c72fd95990d51c9e63a2a6ac0c44381447444 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 14 Feb 2025 08:36:31 +0100 Subject: [PATCH 368/484] open-webui: 0.5.11 -> 0.5.12 Diff: https://github.com/open-webui/open-webui/compare/refs/tags/v0.5.11...0.5.12 Changelog: https://github.com/open-webui/open-webui/blob/v0.5.12/CHANGELOG.md --- pkgs/by-name/op/open-webui/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index a67b263f07fc..adcb569d4f04 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-U+zY/Jgzo52x/H4xcW2/LjM52r+hdJvZ/xsIeAeJniE="; + hash = "sha256-+Hg4tyfmgfh3k/pUKMjs7IRahPV2/LRUDj1kt2g45Dw="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-bAzcNLMB8OqzYRfw9Cr0xuFFl4FIKvBQT/4M2nZP0C8="; + npmDepsHash = "sha256-pM8Ie3kkjVq9OJHKpGLQ1E/omd84B0N8lXAHKxUa8/4="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -89,8 +89,6 @@ python312.pkgs.buildPythonApplication rec { fake-useragent fastapi faster-whisper - flask - flask-cors fpdf2 ftfy gcp-storage-emulator From e0a1e676b5c82dc4356e9017ec93e9eee78b3825 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 14 Feb 2025 02:48:52 -0500 Subject: [PATCH 369/484] tailscale: 1.80.0 -> 1.80.2 Diff: https://github.com/tailscale/tailscale/compare/v1.80.0...v1.80.2 Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.80.2 --- pkgs/by-name/ta/tailscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 0379e494f924..25358df2daad 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -16,7 +16,7 @@ }: let - version = "1.80.0"; + version = "1.80.2"; in buildGo123Module { pname = "tailscale"; @@ -31,7 +31,7 @@ buildGo123Module { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-wb52Ffoh56EEVToGGK1Rzfb5DHiR2dLxDJRLcUgYhFg="; + hash = "sha256-5HGY9hVSnzqmAdXNJdQ+ZvsK/PmyZ94201UHlHclQE8="; }; patches = [ @@ -43,7 +43,7 @@ buildGo123Module { }) ]; - vendorHash = "sha256-a+d02h0AXqr2FuWRAOUACiYVSpm276onkwKxGSJTL5s="; + vendorHash = "sha256-81UOjoC5GJqhNs4vWcQ2/B9FMaDWtl0rbuFXmxbu5dI="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles From 95f49597d76febdae4c77280565616cc4e38b23c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 11:04:50 +0300 Subject: [PATCH 370/484] Revert "playwright-test: Add PLAYWRIGHT_BROWSERS_PATH to build environment" --- .../python-modules/playwright/default.nix | 16 ---------------- .../python-modules/playwright/test.py | 10 ---------- pkgs/development/web/playwright/driver.nix | 19 ------------------- pkgs/development/web/playwright/test.js | 8 -------- 4 files changed, 53 deletions(-) delete mode 100644 pkgs/development/python-modules/playwright/test.py delete mode 100644 pkgs/development/web/playwright/test.js diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index aea64bd48a2e..610e9c58b5ce 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -13,9 +13,6 @@ setuptools-scm, playwright-driver, nixosTests, - writeText, - runCommand, - pythonPackages, nodejs, }: @@ -84,16 +81,6 @@ buildPythonPackage rec { pyee ]; - setupHook = writeText "setupHook.sh" '' - addBrowsersPath () { - if [[ ! -v PLAYWRIGHT_BROWSERS_PATH ]] ; then - export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" - fi - } - - addEnvHooks "$targetOffset" addBrowsersPath - ''; - postInstall = '' ln -s ${driver} $out/${python.sitePackages}/playwright/driver ''; @@ -109,9 +96,6 @@ buildPythonPackage rec { { driver = playwright-driver; browsers = playwright-driver.browsers; - env = runCommand "playwright-env-test" { - buildInputs = [ pythonPackages.playwright ]; - } "python ${./test.py}"; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) playwright-python; diff --git a/pkgs/development/python-modules/playwright/test.py b/pkgs/development/python-modules/playwright/test.py deleted file mode 100644 index 3ef73acfdd41..000000000000 --- a/pkgs/development/python-modules/playwright/test.py +++ /dev/null @@ -1,10 +0,0 @@ -import os -import sys - -from playwright.sync_api import sync_playwright - -with sync_playwright() as p: - browser = p.chromium.launch() - context = browser.new_context() -with open(os.environ["out"], "w") as f: - f.write("OK") diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 3cbb71599b01..ab0638768a08 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -12,7 +12,6 @@ makeFontsConf, makeWrapper, runCommand, - writeText, cacert, }: let @@ -189,27 +188,9 @@ let runHook postInstall ''; - setupHook = writeText "setupHook.sh" '' - addBrowsersPath () { - if [[ ! -v PLAYWRIGHT_BROWSERS_PATH ]] ; then - export PLAYWRIGHT_BROWSERS_PATH="${playwright-core.passthru.browsers}" - fi - } - - addEnvHooks "$targetOffset" addBrowsersPath - ''; - meta = playwright.meta // { mainProgram = "playwright"; }; - - passthru.tests.env = runCommand "playwright-core-env-test" { - buildInputs = [ - nodejs - playwright-core - playwright-test - ]; - } "node ${./test.js}"; }); browsers = lib.makeOverridable ( diff --git a/pkgs/development/web/playwright/test.js b/pkgs/development/web/playwright/test.js deleted file mode 100644 index 2390bfe513b1..000000000000 --- a/pkgs/development/web/playwright/test.js +++ /dev/null @@ -1,8 +0,0 @@ -const playwright = require('playwright'); -const fs = require('fs'); -playwright.chromium.launch() - .then((browser) => { - console.log('OK'); - fs.writeFileSync(process.env.out, ''); - process.exit(0); - }); From 94307683c174357137ec99c2ea82b6ebe02c29a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Feb 2025 09:28:39 +0100 Subject: [PATCH 371/484] nixos/nextcloud: reword docs about logs a bit Originally, I only wanted to remove "The logreader application doesn't work, as it was the case before.". But then, the rest sounded a little weird, so I reworded the paragraph a bit more ;-) --- nixos/modules/services/web-apps/nextcloud.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index 9d49af27f55c..c9773f779ce7 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -253,16 +253,12 @@ This is because * the Logreader application that allows reading logs in the admin panel is enabled by default and requires logs written to a file. -The logreader application doesn't work, as it was the case before. -So nothing actionable here by default. Alternatively you can +If you want to view logs in the admin panel, +set [](#opt-services.nextcloud.settings.log_type) to "file". -* disable the logreader application to shut up the "info". - - We can't really do that by default since whether apps are enabled/disabled is part - of the application's state and tracked inside the database. - -* set [](#opt-services.nextcloud.settings.log_type) to "file" to be able to view logs - from the admin panel. +If you prefer logs in the journal, disable the logreader application to shut up the +"info". We can't really do that by default since whether apps are enabled/disabled +is part of the application's state and tracked inside the database. ## Maintainer information {#module-services-nextcloud-maintainer-info} From caade90015f0b8ddabe2eb9cfcd75077875c5074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 14 Feb 2025 08:35:14 +0000 Subject: [PATCH 372/484] Revert "devenv: disable telemetry by default" This reverts commit 1aca3c42132e5231776c7199a78d6aec184be729. Since I'm the maintainer and author of this package, I was never asked if I agree with this change and I don't. It's going to make it really hard to improve the generation without telemetry, otherwise we wouldn't have done it. --- pkgs/by-name/de/devenv/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 0153deb0433c..6e64ccf592e2 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -74,7 +74,6 @@ rustPlatform.buildRustPackage { wrapProgram $out/bin/devenv \ --prefix PATH ":" "$out/bin:${cachix}/bin" \ --set DEVENV_NIX ${devenv_nix} \ - --set-default DO_NOT_TRACK 1 \ ${setDefaultLocaleArchive} # Generate manpages From 51c0eeb414a49bf5ad5c70afb22b29787ee7994d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 12 Feb 2025 22:42:30 -0800 Subject: [PATCH 373/484] llvmPackages_20: 20.1.0-rc1 -> 20.1.0-rc2 --- .../compilers/llvm/20/llvm/orcjit.patch | 53 ------------------- .../compilers/llvm/common/default.nix | 14 +++-- .../compilers/llvm/common/libc/default.nix | 17 +----- pkgs/development/compilers/llvm/default.nix | 2 +- 4 files changed, 12 insertions(+), 74 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/20/llvm/orcjit.patch diff --git a/pkgs/development/compilers/llvm/20/llvm/orcjit.patch b/pkgs/development/compilers/llvm/20/llvm/orcjit.patch deleted file mode 100644 index c08e3f80d73b..000000000000 --- a/pkgs/development/compilers/llvm/20/llvm/orcjit.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 03d6f704d07aa3650a2f59be6f7802a8735460c3 Mon Sep 17 00:00:00 2001 -From: Lang Hames -Date: Wed, 29 Jan 2025 03:58:29 +0000 -Subject: [PATCH] [ORC][LLI] Remove redundant eh-frame registration plugin - construction from lli. - -As of d0052ebbe2e the setUpGenericLLVMIRPlatform function will automatically -add an instance of the EHFrameRegistrationPlugin (for LLJIT instances whose -object linking layers are ObjectLinkingLayers, not RTDyldObjectLinkingLayers). - -This commit removes the redundant plugin creation in the object linking -layer constructor function in lli.cpp to prevent duplicate registration of -eh-frames, which is likely the cause of recent bot failures, e.g. -https://lab.llvm.org/buildbot/#/builders/108/builds/8685. - -(cherry picked from commit 9052b37ab1aa67a039b34356f37236fecc42bac2) ---- - llvm/tools/lli/lli.cpp | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/llvm/tools/lli/lli.cpp b/tools/lli/lli.cpp -index 448660a539a0b0..19246f03941673 100644 ---- a/llvm/tools/lli/lli.cpp -+++ b/tools/lli/lli.cpp -@@ -27,9 +27,7 @@ - #include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h" - #include "llvm/ExecutionEngine/Orc/DebugUtils.h" - #include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h" --#include "llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h" - #include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h" --#include "llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h" - #include "llvm/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.h" - #include "llvm/ExecutionEngine/Orc/ExecutionUtils.h" - #include "llvm/ExecutionEngine/Orc/IRPartitionLayer.h" -@@ -1033,14 +1031,10 @@ int runOrcJIT(const char *ProgName) { - Builder.getJITTargetMachineBuilder() - ->setRelocationModel(Reloc::PIC_) - .setCodeModel(CodeModel::Small); -- Builder.setObjectLinkingLayerCreator([&P](orc::ExecutionSession &ES, -- const Triple &TT) { -- auto L = std::make_unique(ES); -- if (P != LLJITPlatform::ExecutorNative) -- L->addPlugin(std::make_unique( -- ES, ExitOnErr(orc::EPCEHFrameRegistrar::Create(ES)))); -- return L; -- }); -+ Builder.setObjectLinkingLayerCreator( -+ [&](orc::ExecutionSession &ES, const Triple &TT) { -+ return std::make_unique(ES); -+ }); - } - - auto J = ExitOnErr(Builder.create()); diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 3b657ce5bb3f..116d7c6406e4 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -501,10 +501,16 @@ let }) ] ++ - lib.optional (lib.versions.major metadata.release_version == "20") - # Fix OrcJIT - # PR: https://github.com/llvm/llvm-project/pull/125431 - (metadata.getVersionFile "llvm/orcjit.patch"); + lib.optional (lib.versionAtLeast metadata.release_version "20") + # Fix OrcJIT tests with page sizes > 16k + # PR: https://github.com/llvm/llvm-project/pull/127115 + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/415607e10b56d0e6c4661ff1ec5b9b46bf433cba.patch"; + stripLen = 1; + hash = "sha256-vBbuduJB+NnNE9qtR93k64XKrwvc7w3vowjL/aT+iEA="; + } + ); pollyPatches = [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "15") diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 900c884c72b4..f57239b7a978 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -14,7 +14,6 @@ ninja, isFullBuild ? true, linuxHeaders, - fetchpatch, }: let pname = "libc"; @@ -28,26 +27,12 @@ let ''); in stdenv.mkDerivation (finalAttrs: { - inherit pname version; + inherit pname version patches; src = src'; sourceRoot = "${finalAttrs.src.name}/runtimes"; - patches = - lib.optional (lib.versions.major version == "20") - # Removes invalid token from the LLVM version being placed in the namespace. - # Can be removed when LLVM 20 bumps to rc2. - # PR: https://github.com/llvm/llvm-project/pull/126284 - ( - fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/3a3a3230d171e11842a9940b6da0f72022b1c5b3.patch"; - stripLen = 1; - hash = "sha256-QiU1cWp+027ZZNVdvfGVwbIoRd9jqtSbftGsmaW1gig="; - } - ) - ++ patches; - nativeBuildInputs = [ cmake diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index f2ac815b4b2c..68730c5c96d9 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -30,7 +30,7 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; - "20.1.0-rc1".officialRelease.sha256 = "sha256-yOczbperlR20+iLoao9g0CR+Ml2mjTCx1cqP/9WOhME="; + "20.1.0-rc2".officialRelease.sha256 = "sha256-lBx+MWfYBM6XSJozacALMGlo0DUUWqnsBQyO8lDljSo="; "21.0.0-git".gitRelease = { rev = "c9f1d2cbf18990311ea1287cc154e3784a10a3b0"; rev-version = "21.0.0-unstable-2025-02-10"; From 4eccb53550e827dbfabcaf48ee3c1d215105189b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Feb 2025 09:42:43 +0100 Subject: [PATCH 374/484] nixos/tmpfiles: fix docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #381822 Apparently, I swapped `path` and `tmpfiles-type` in 2be50b1efee6a94bbc7397f1818468fd29f72ced. Sorry about that 🫠 Also giving `systemd.tmpfiles.settings....type` a better default in the manual than `‹name›`, i.e. `‹tmpfiles-type›` so that it corresponds to the placeholders in the attribute path. --- nixos/modules/system/boot/systemd/tmpfiles.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index 5e35e63e96c1..8e2166785e9f 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -29,10 +29,11 @@ let }; }; default = {}; - type = attrsWith' "config-name" (attrsWith' "tmpfiles-type" (attrsWith' "path" (types.submodule ({ name, config, ... }: { + type = attrsWith' "config-name" (attrsWith' "path" (attrsWith' "tmpfiles-type" (types.submodule ({ name, config, ... }: { options.type = mkOption { type = types.str; default = name; + defaultText = "‹tmpfiles-type›"; example = "d"; description = '' The type of operation to perform on the file. From 47b0fc2bbe4f551bcf588f232736a93c337a8b12 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 11:45:50 +0300 Subject: [PATCH 375/484] mangohud: fix crash --- pkgs/tools/graphics/mangohud/default.nix | 5 +++ pkgs/tools/graphics/mangohud/fix-crash.patch | 40 ++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/graphics/mangohud/fix-crash.patch diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 15ebc4ea4fe6..8844acdb11c9 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -128,6 +128,11 @@ stdenv.mkDerivation (finalAttrs: { libdbus = dbus.lib; inherit hwdata; }) + + # Fix crash when starting hidden + # Upstream PR: https://github.com/flightlessmango/MangoHud/pull/1570 + # FIXME: remove when merged + ./fix-crash.patch ]; postPatch = '' diff --git a/pkgs/tools/graphics/mangohud/fix-crash.patch b/pkgs/tools/graphics/mangohud/fix-crash.patch new file mode 100644 index 000000000000..e25d953f300d --- /dev/null +++ b/pkgs/tools/graphics/mangohud/fix-crash.patch @@ -0,0 +1,40 @@ +From f0d7e4f4b2d362d90bb81d0b10ef5c505b9661ea Mon Sep 17 00:00:00 2001 +From: K900 +Date: Fri, 14 Feb 2025 11:41:09 +0300 +Subject: [PATCH] mangoapp: don't crash if gpus is not initialized yet + +This seems to happen on startup on Steam Deck style gamescope-session setups. +Just check for gpus = null before trying to access it. +--- + src/app/main.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/app/main.cpp b/src/app/main.cpp +index 0c7c13e07e..4d1d3b1277 100644 +--- a/src/app/main.cpp ++++ b/src/app/main.cpp +@@ -369,8 +369,9 @@ int main(int, char**) + XSync(x11_display, 0); + mangoapp_paused = false; + // resume all GPU threads +- for (auto gpu : gpus->available_gpus) +- gpu->resume(); ++ if (gpus) ++ for (auto gpu : gpus->available_gpus) ++ gpu->resume(); + } + { + std::unique_lock lk(mangoapp_m); +@@ -409,8 +410,9 @@ int main(int, char**) + XSync(x11_display, 0); + mangoapp_paused = true; + // pause all GPUs threads +- for (auto gpu : gpus->available_gpus) +- gpu->pause(); ++ if (gpus) ++ for (auto gpu : gpus->available_gpus) ++ gpu->pause(); + + // If mangoapp is hidden, using mangoapp_cv.wait() causes a hang. + // Because of this hang, we can't detect if the user presses R_SHIFT + F12, + From 2a46ccca6815efc9b7c87bc3918a18a89af557ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 08:47:12 +0000 Subject: [PATCH 376/484] hyprprop: 0.1-unstable-2025-01-29 -> 0.1-unstable-2025-02-13 --- pkgs/by-name/hy/hyprprop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index a4f2c5dc0ede..8c9bee6d7e72 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "hyprprop"; - version = "0.1-unstable-2025-01-29"; + version = "0.1-unstable-2025-02-13"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "d449f6e1fc31084437ebc0c45057ee656f593efd"; - hash = "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg="; + rev = "59178a657b7e09ddf82b9e79681f482b6c2f378b"; + hash = "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo="; }; sourceRoot = "${finalAttrs.src.name}/hyprprop"; From 651d386da86edb5caf96cd67ac015331771f90a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 08:49:38 +0000 Subject: [PATCH 377/484] descent3-unwrapped: 1.5.0-beta-unstable-2025-01-01 -> 1.5.0-beta-unstable-2025-02-13 --- pkgs/by-name/de/descent3-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix index a8a994e29d68..766f28fe4bae 100644 --- a/pkgs/by-name/de/descent3-unwrapped/package.nix +++ b/pkgs/by-name/de/descent3-unwrapped/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { # the wrapped version of Descent 3. Once there’s a stable version of Descent # 3 that supports the -additionaldir command-line option, we can stop using # an unstable version of Descent 3. - version = "1.5.0-beta-unstable-2025-01-01"; + version = "1.5.0-beta-unstable-2025-02-13"; src = fetchFromGitHub { owner = "DescentDevelopers"; repo = "Descent3"; - rev = "11f93221e71201d51a71650a3b190017328cd721"; + rev = "10a20d7cb769a08010e7887b4701a0ecfb142492"; fetchSubmodules = true; leaveDotGit = true; # Descent 3 is supposed to display its Git commit hash in the bottom right @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt rm -r .git ''; - hash = "sha256-L+Y8Eum9SjGpbbLnBH25uUI4UgCGDwrgE5op19GOAtQ="; + hash = "sha256-Ufu6oHLUn0eI6OTp8cfHRLYpx+tZ3QwX4qz3KpTbQ68="; }; hardeningDisable = [ "format" ]; From 7ae79977623904fe16fb6643a534fdae0cff456d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 09:02:17 +0000 Subject: [PATCH 378/484] protoc-gen-go: 1.36.4 -> 1.36.5 --- pkgs/by-name/pr/protoc-gen-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index 90e748ccf96c..97b8995aa8dd 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.4"; + version = "1.36.5"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-lDhg72i/5J4PMsdMPBthEpV3gFqr+ds3O4+rj6AZoMs="; + hash = "sha256-fotgvzHRRCDWRyGM9nP+BFhE0vN5/0jQlb5moOhDAWc="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; From 4012dc66c0812a87d53aa2c4962c16977fd15f9c Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Fri, 14 Feb 2025 07:06:08 +0400 Subject: [PATCH 379/484] volta: 1.0.1 -> 2.0.2 Fixes: #381910 Signed-off-by: Brian McGillion --- pkgs/by-name/vo/volta/Cargo.lock | 1918 ----------------------------- pkgs/by-name/vo/volta/package.nix | 16 +- 2 files changed, 5 insertions(+), 1929 deletions(-) delete mode 100644 pkgs/by-name/vo/volta/Cargo.lock diff --git a/pkgs/by-name/vo/volta/Cargo.lock b/pkgs/by-name/vo/volta/Cargo.lock deleted file mode 100644 index 0925a8cc91fd..000000000000 --- a/pkgs/by-name/vo/volta/Cargo.lock +++ /dev/null @@ -1,1918 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "archive" -version = "0.1.0" -dependencies = [ - "attohttpc", - "cfg-if 1.0.0", - "flate2", - "fs-utils", - "hyperx", - "progress-read", - "tar", - "tee", - "thiserror", - "verbatim", - "zip", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "attohttpc" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85f766c20e6ae766956f7a2fcc4e0931e79a7e1f48b29132b5d647021114914" -dependencies = [ - "flate2", - "http", - "log", - "rustls", - "rustls-native-certs", - "serde", - "serde_json", - "url", - "webpki", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "bzip2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chain-map" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc076b92c3d763b90697600bf9833c204b517ff911f64dcfb58221b0663d3ee9" - -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "ci_info" -version = "0.14.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a62f39080c8c83e899dff6abd46c4fac05c1cf8dafece96ad8238e79addbf8" -dependencies = [ - "envmnt", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cmdline_words_parser" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d8078f03daf673d8bd34a1ef48c680ea4a895204882ce5f0ccfb2487b2bd29" - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.42.0", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "ctrlc" -version = "3.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71" -dependencies = [ - "nix", - "windows-sys 0.42.0", -] - -[[package]] -name = "detect-indent" -version = "0.1.0" -source = "git+https://github.com/stefanpenner/detect-indent-rs?branch=master#f645bcc81bfb1f9745c4a4dec7c7f6faf3f84ec5" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "digest" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" -dependencies = [ - "generic-array", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "encode_unicode" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd" - -[[package]] -name = "envmnt" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbb2fcaad9e6c9e3388dfcc1b44ae5508ae864b7af36f163a8a7c1a48796eee" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "envoy" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb34b6240ca977e7ab7dff6f060f9cb9a8f92c7745fe9e292b9443944d1aa768" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fastrand" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "winapi", -] - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "fs-utils" -version = "0.1.0" - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "fsio" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e87827efaf94c7a44b562ff57de06930712fe21b530c3797cdede26e6377eb" -dependencies = [ - "dunce", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "hamcrest2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f837c62de05dc9cc71ff6486cd85de8856a330395ae338a04bfcefe5e91075" -dependencies = [ - "num", - "regex", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.1", -] - -[[package]] -name = "httparse" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" - -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - -[[package]] -name = "hyperx" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c" -dependencies = [ - "base64", - "bytes", - "http", - "httpdate", - "language-tags", - "mime", - "percent-encoding", - "unicase", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5528d9c2817db4e10cc78f8d4c8228906e5854f389ff6b076cee3572a09d35" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg 1.0.0", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "itoa" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.138" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "maplit" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "mime" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" -dependencies = [ - "unicase", -] - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "mockito" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f9fece9bd97ab74339fe19f4bcaf52b76dcc18e5364c7977c1838f76b38de9" -dependencies = [ - "assert-json-diff", - "colored", - "httparse", - "lazy_static", - "log", - "rand", - "regex", - "serde_json", - "serde_urlencoded", - "similar", -] - -[[package]] -name = "msdos_time" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" -dependencies = [ - "time", - "winapi", -] - -[[package]] -name = "nix" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "static_assertions", -] - -[[package]] -name = "num" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a" -dependencies = [ - "autocfg 0.1.4", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" -dependencies = [ - "autocfg 0.1.4", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -dependencies = [ - "autocfg 0.1.4", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" -dependencies = [ - "autocfg 0.1.4", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" -dependencies = [ - "autocfg 0.1.4", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -dependencies = [ - "autocfg 0.1.4", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "opaque-debug" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "os_info" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2 0.4.30", - "quote 0.6.12", - "syn 0.15.36", -] - -[[package]] -name = "pest_meta" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d" -dependencies = [ - "maplit", - "pest", - "sha-1", -] - -[[package]] -name = "podio" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" - -[[package]] -name = "portable-atomic" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" - -[[package]] -name = "ppv-lite86" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "progress-read" -version = "0.1.0" - -[[package]] -name = "quote" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -dependencies = [ - "proc-macro2 1.0.47", -] - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - -[[package]] -name = "readext" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abdc58f5f18bcf347b55cebb34ed4618b0feff9a9223160f5902adbc1f6a72a6" - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom", - "redox_syscall", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -dependencies = [ - "winapi", -] - -[[package]] -name = "retry" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4" -dependencies = [ - "rand", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustls" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" - -[[package]] -name = "same-file" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "git+https://github.com/mikrostew/semver?branch=new-parser#7583eb352dc181ccd09978fd2b16461c1b1669c1" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.0" -source = "git+https://github.com/mikrostew/semver-parser?branch=rewrite#f5c74268a09eef16a289a667ca7b4925e690fe13" -dependencies = [ - "pest", - "pest_derive", -] - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "indexmap", - "itoa 1.0.1", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa 0.4.4", - "ryu", - "serde", -] - -[[package]] -name = "sha-1" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "similar" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" - -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "smawk" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" -dependencies = [ - "clap", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" -dependencies = [ - "heck", - "proc-macro2 0.4.30", - "quote 0.6.12", - "syn 0.15.36", -] - -[[package]] -name = "syn" -version = "0.15.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.12", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "unicode-ident", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tee" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da" - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "test-support" -version = "0.1.0" -dependencies = [ - "archive", - "hamcrest2", - "serde_json", - "thiserror", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi", - "winapi", -] - -[[package]] -name = "typenum" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" - -[[package]] -name = "ucd-trie" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-linebreak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown", - "regex", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "validate-npm-package-name" -version = "0.1.0" -dependencies = [ - "lazy_static", - "percent-encoding", - "regex", -] - -[[package]] -name = "vec_map" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" - -[[package]] -name = "verbatim" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbad0679079b451226e954019b2efac46bafa8f7b1418b953861e864072a97c6" - -[[package]] -name = "version_check" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" - -[[package]] -name = "volta" -version = "1.1.1" -dependencies = [ - "atty", - "cfg-if 1.0.0", - "ci_info", - "dirs", - "envoy", - "hamcrest2", - "hyperx", - "lazy_static", - "log", - "mockito", - "semver", - "serde", - "serde_json", - "structopt", - "test-support", - "textwrap 0.16.0", - "volta-core", - "volta-migrate", - "which", - "winreg", -] - -[[package]] -name = "volta-core" -version = "0.1.0" -dependencies = [ - "archive", - "attohttpc", - "atty", - "cfg-if 1.0.0", - "chain-map", - "chrono", - "ci_info", - "cmdline_words_parser", - "console", - "ctrlc", - "detect-indent", - "dirs", - "dunce", - "envoy", - "fs-utils", - "fs2", - "hyperx", - "indexmap", - "indicatif", - "lazy_static", - "lazycell", - "log", - "mockito", - "once_cell", - "os_info", - "readext", - "regex", - "retry", - "semver", - "serde", - "serde_json", - "tempfile", - "term_size", - "textwrap 0.16.0", - "validate-npm-package-name", - "volta-layout", - "walkdir", - "winreg", -] - -[[package]] -name = "volta-layout" -version = "0.1.1" -dependencies = [ - "volta-layout-macro", -] - -[[package]] -name = "volta-layout-macro" -version = "0.1.0" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "volta-migrate" -version = "0.1.0" -dependencies = [ - "log", - "semver", - "serde", - "serde_json", - "tempfile", - "volta-core", - "volta-layout", - "walkdir", -] - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasm-bindgen" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote 1.0.2", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "web-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "xattr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" -dependencies = [ - "libc", -] - -[[package]] -name = "zip" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7341988e4535c60882d5e5f0b7ad0a9a56b080ade8bdb5527cb512f7b2180e0" -dependencies = [ - "bzip2", - "flate2", - "msdos_time", - "podio", - "time", -] diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index fd9b22836f55..84ca9c358e21 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -9,23 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "volta"; - version = "1.1.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "volta-cli"; repo = "volta"; - rev = "v${version}"; - hash = "sha256-+j3WRpunV+3YfZnyuKA/CsiKr+gOaP2NbmnyoGMN+Mg="; + tag = "v${version}"; + hash = "sha256-ZI+3/Xbkg/JaZMLhrJEjaSwjs44fOaiRReM2DUTnkkc="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "detect-indent-0.1.0" = "sha256-qtPkPaBiyuT8GhpEFdU7IkAgKnCbTES0FB2CvNKWqic="; - "semver-0.9.0" = "sha256-nw1somkZe9Qi36vjfWlTcDqHAIbaJj72KBTfmucVxXs="; - "semver-parser-0.10.0" = "sha256-iTGnKSddsriF6JS6lvJNjp9aDzGtfjrHEiCijeie3uE="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-xlqsubkaX2A6d5MIcGf9E0b11Gzneksgku0jvW+UdbE="; buildInputs = [ installShellFiles ] From de1b2782c95760818dcefc461f73264eb98300c7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 08:48:06 +0100 Subject: [PATCH 380/484] ocamlPackages.arg-complete: init at 0.2.1 --- .../ocaml-modules/arg-complete/default.nix | 31 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/arg-complete/default.nix diff --git a/pkgs/development/ocaml-modules/arg-complete/default.nix b/pkgs/development/ocaml-modules/arg-complete/default.nix new file mode 100644 index 000000000000..341971b35e88 --- /dev/null +++ b/pkgs/development/ocaml-modules/arg-complete/default.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchurl, + ocaml, + buildDunePackage, + cppo, + ounit2, +}: + +buildDunePackage rec { + pname = "arg-complete"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/sim642/ocaml-arg-complete/releases/download/${version}/arg-complete-${version}.tbz"; + hash = "sha256-SZvLaeeqY3j2LUvqxGs0Vw57JnnpdvAk1jnE3pk27QU="; + }; + + nativeBuildInputs = [ cppo ]; + + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit2 ]; + + meta = { + description = "Bash completion support for OCaml Stdlib.Arg"; + homepage = "https://sim642.github.io/ocaml-arg-complete/"; + changelog = "https://raw.githubusercontent.com/sim642/ocaml-arg-complete/refs/tags/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 09bda1d9cebe..10651337cb3e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -38,6 +38,8 @@ let apron = callPackage ../development/ocaml-modules/apron { }; + arg-complete = callPackage ../development/ocaml-modules/arg-complete { }; + arp = callPackage ../development/ocaml-modules/arp { }; asai = callPackage ../development/ocaml-modules/asai { }; From 9c1f15d84574fbf20cfc4e766523c5a2a9a060a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 08:48:26 +0100 Subject: [PATCH 381/484] =?UTF-8?q?ocamlPackages.mopsa:=201.0=20=E2=86=92?= =?UTF-8?q?=201.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mopsa/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix index 8f084ef9618d..456a7e85a663 100644 --- a/pkgs/development/ocaml-modules/mopsa/default.nix +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -11,6 +11,7 @@ ocaml, menhir, apron, + arg-complete, camlidl, yojson, zarith, @@ -18,15 +19,15 @@ buildDunePackage rec { pname = "mopsa"; - version = "1.0"; + version = "1.1"; - minimalOCamlVersion = "4.12"; + minimalOCamlVersion = "4.13"; src = fetchFromGitLab { owner = "mopsa"; repo = "mopsa-analyzer"; - rev = "v${version}"; - hash = "sha256-nGnWwV7g3SYgShbXGUMooyOdFwXFrQHnQvlc8x9TAS4="; + tag = "v${version}"; + hash = "sha256-lO5dtGAl1dq8oJco/hPXrAbN05rKc62Zrci/8CLrQ0c="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildDunePackage rec { ]; buildInputs = [ + arg-complete camlidl flint libclang From 6d15f89453891d4b8d02cce521b35a8b09c834b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 12:00:53 +0300 Subject: [PATCH 382/484] hawkeye: switch to fetchCargoVendor --- pkgs/by-name/ha/hawkeye/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix index 36d883ccdc56..6ffc0cc3f428 100644 --- a/pkgs/by-name/ha/hawkeye/package.nix +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -16,7 +16,8 @@ rustPackages.rustPlatform.buildRustPackage rec { hash = "sha256-VfJWj9BwNVR7RVUW+CjFuaniyiEath1U0F/7QJcA3r4="; }; - cargoHash = "sha256-tTXoxWjcTtEcRcuSs0ewCN1VJYmTIKRgL3s7QSYt7sk="; + useFetchCargoVendor = true; + cargoHash = "sha256-SJEl5QsO4KYRv+5xDPHy1Q53qcL89IJ9JTXtzubO5fk="; nativeBuildInputs = [ pkg-config From 8c76cbea6a534bae8a5c9ebfa830c714ef319725 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 12:01:41 +0300 Subject: [PATCH 383/484] llvmPackages.libc: rename shim .so to .tpl This makes it not get deleted with cleanSource. --- pkgs/development/compilers/llvm/common/libc/default.nix | 2 +- .../compilers/llvm/common/libc/{libc-shim.so => libc-shim.tpl} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/compilers/llvm/common/libc/{libc-shim.so => libc-shim.tpl} (100%) diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index f57239b7a978..2ba098da2814 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = lib.optionalString (!isFullBuild) '' - substituteAll ${./libc-shim.so} $out/lib/libc.so + substituteAll ${./libc-shim.tpl} $out/lib/libc.so ''; libc = if (!isFullBuild) then stdenv.cc.libc else null; diff --git a/pkgs/development/compilers/llvm/common/libc/libc-shim.so b/pkgs/development/compilers/llvm/common/libc/libc-shim.tpl similarity index 100% rename from pkgs/development/compilers/llvm/common/libc/libc-shim.so rename to pkgs/development/compilers/llvm/common/libc/libc-shim.tpl From 0141b8e1af43116e0a9d7cfbd0419a31aa62b4f2 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 14 Feb 2025 18:38:36 +0900 Subject: [PATCH 384/484] deno: 2.1.9 -> 2.1.10 --- pkgs/by-name/de/deno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 85eb410a4404..103b7f928761 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${version}"; - hash = "sha256-a3oMEZIs9RkD0T4saeaCuQh0VrdNXciKwPJaHO7/Y3I="; + hash = "sha256-1NqBNrTYHhsG6O2qsgANM15FOxx3xheE9T3nYDDH1D0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UqjkO3k77nUGnV8V4TDC3BbA+jR6/h2wGkgSLus0yVA="; + cargoHash = "sha256-D7dt9RdlTmR2C1dwOl5vZKUlLUnTkdudtZ4FQpr9ddU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From a98bc598fbd9accdad41aff1d7a2adf716014452 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 14 Feb 2025 10:43:59 +0100 Subject: [PATCH 385/484] npth.meta.mainProgram: remove non-existent npth hasn't come with any executables since 1.7. Fixes: f44a9f89a9eb ("npth: 1.6 -> 1.7") --- pkgs/by-name/np/npth/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/np/npth/package.nix b/pkgs/by-name/np/npth/package.nix index 16e386e72143..646102b031a0 100644 --- a/pkgs/by-name/np/npth/package.nix +++ b/pkgs/by-name/np/npth/package.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New GNU Portable Threads Library"; - mainProgram = "npth-config"; longDescription = '' This is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. From 30d2e2d796847a98ad0cf638bcf9a5695abad1e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 09:49:15 +0000 Subject: [PATCH 386/484] minio-warp: 1.0.8 -> 1.1.0 --- pkgs/by-name/mi/minio-warp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index 6b5ad34ee504..123bc96b7e3e 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "minio-warp"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "minio"; repo = "warp"; rev = "v${version}"; - hash = "sha256-kME4yafNZtHDF/EAIG8qR4PH6HlokIfdBAJH+ibl5ro="; + hash = "sha256-8GQ0rSy+bzji1IZu6vHEXjYVVuQSLlSCwWmzjLE9a+A="; }; - vendorHash = "sha256-073ssCOh0CiiJaatwzhNrwpe2QO21iC6GSkwVtsmYjs="; + vendorHash = "sha256-Qyb8ivuZplbOIxoS2cC+2FSZbW7CnChv1jaIKkCzgN4="; # See .goreleaser.yml ldflags = [ From 6a8151a2aa578595f1ffd6969e7b3b9af6beef53 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 11:02:58 +0100 Subject: [PATCH 387/484] volta: cleanup --- pkgs/by-name/vo/volta/package.nix | 56 ++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index 84ca9c358e21..baf2030aa164 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -1,11 +1,13 @@ { lib, - rustPlatform, - libiconv, stdenv, - installShellFiles, - darwin, + rustPlatform, fetchFromGitHub, + installShellFiles, + buildPackages, + writableTmpDirAsHomeHook, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "volta"; @@ -21,22 +23,35 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-xlqsubkaX2A6d5MIcGf9E0b11Gzneksgku0jvW+UdbE="; - buildInputs = - [ installShellFiles ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - libiconv - ]; + buildInputs = [ installShellFiles ]; - HOME = "$TMPDIR"; + postInstall = + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd volta \ + --bash <(${emulator} $out/bin/volta completions bash) \ + --fish <(${emulator} $out/bin/volta completions fish) \ + --zsh <(${emulator} $out/bin/volta completions zsh) + ''; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd volta \ - --bash <($out/bin/volta completions bash) \ - --fish <($out/bin/volta completions fish) \ - --zsh <($out/bin/volta completions zsh) - ''; - meta = with lib; { + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + # Tries to create /var/empty/.volta as $HOME is not writable + doInstallCheck = !stdenv.hostPlatform.isDarwin; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Hassle-Free JavaScript Tool Manager"; longDescription = '' With Volta, you can select a Node engine once and then stop worrying @@ -50,7 +65,8 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://volta.sh/"; changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md"; - license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ fbrs ]; + license = with lib.licenses; [ bsd2 ]; + maintainers = with lib.maintainers; [ fbrs ]; + mainProgram = "volta"; }; } From e1584ee86752a5dd3f673c83715698be1187d70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 13 Feb 2025 15:29:20 +0100 Subject: [PATCH 388/484] dbeaver-bin: fix with noBrokenSymlinks --- pkgs/by-name/db/dbeaver-bin/package.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 88eafe1938d8..e543b159ad78 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -60,6 +60,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { --replace-fail '-Xmx1024m' '-Xmx${override_xmx}' ''; + preInstall = '' + # most directories are for different architectures, only keep what we need + shopt -s extglob + pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ + rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ + popd + ''; + installPhase = if !stdenvNoCC.hostPlatform.isDarwin then '' @@ -81,7 +89,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { }" mkdir -p $out/share/icons/hicolor/256x256/apps - ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png + # for some reason it's missing from the aarch64 build + if [ -e $out/opt/dbeaver/dbeaver.png ]; then + ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png + fi mkdir -p $out/share/applications ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop @@ -107,14 +118,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - preFixup = '' - # most directories are for different architectures, only keep what we need - shopt -s extglob - pushd $out/opt/dbeaver/plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ - rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ - popd - ''; - passthru.updateScript = ./update.sh; meta = { From 705197828d78a5973940cb6d30d0ea27ad893068 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Fri, 14 Feb 2025 18:23:27 +0800 Subject: [PATCH 389/484] affine: cleaning --- pkgs/by-name/af/affine/package.nix | 390 ++++++++++++++--------------- 1 file changed, 194 insertions(+), 196 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 5b6e9caa9e79..0c8211f10b52 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -1,23 +1,24 @@ { - cacert, - cargo, - copyDesktopItems, - fetchFromGitHub, - fetchurl, - findutils, - jq, lib, - makeDesktopItem, - makeWrapper, - rsync, - rustPlatform, - rustc, stdenv, stdenvNoCC, - yarn-berry, - zip, + fetchFromGitHub, + rustPlatform, electron_33, nodejs_20, + yarn-berry, + cacert, + writableTmpDirAsHomeHook, + cargo, + rustc, + findutils, + zip, + rsync, + jq, + copyDesktopItems, + makeWrapper, + makeDesktopItem, + nix-update-script, buildType ? "stable", commandLineArgs ? "", }: @@ -34,213 +35,210 @@ let electron = electron_33; nodejs = nodejs_20; yarn = yarn-berry.override { inherit nodejs; }; + productName = if buildType != "stable" then "AFFiNE-${buildType}" else "AFFiNE"; + binName = lib.toLower productName; in -stdenv.mkDerivation ( - finalAttrs: - ( - { - productName = if buildType == "stable" then "AFFiNE" else "AFFiNE-" + buildType; - binName = lib.toLower finalAttrs.productName; - pname = finalAttrs.binName; +stdenv.mkDerivation (finalAttrs: { + pname = binName; - # https://github.com/toeverything/AFFiNE/releases/tag/v0.18.1 - version = "0.18.1"; - GITHUB_SHA = "8b066a4b398aace25a20508a8e3c1a381721971f"; - src = fetchFromGitHub { - owner = "toeverything"; - repo = "AFFiNE"; - rev = finalAttrs.GITHUB_SHA; - hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; - }; + version = "0.18.1"; + src = fetchFromGitHub { + owner = "toeverything"; + repo = "AFFiNE"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; + }; - meta = - { - description = "Workspace with fully merged docs, whiteboards and databases"; - longDescription = '' - AFFiNE is an open-source, all-in-one workspace and an operating - system for all the building blocks that assemble your knowledge - base and much more -- wiki, knowledge management, presentation - and digital assets - ''; - homepage = "https://affine.pro/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xiaoxiangmoe ]; - platforms = [ - "aarch64-darwin" - "aarch64-linux" - "x86_64-darwin" - "x86_64-linux" - ]; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - } - // lib.optionalAttrs hostPlatform.isLinux { - mainProgram = finalAttrs.binName; - }; - - env = { - BUILD_TYPE = buildType; - }; - cargoDeps = rustPlatform.fetchCargoVendor { - src = finalAttrs.src; - hash = "sha256-5s/X9CD/H9rSn7SqMHioLg1KRP7y9fsozdFRY3hNiP8="; - }; - yarnOfflineCache = stdenvNoCC.mkDerivation { - name = "yarn-offline-cache"; - src = finalAttrs.src; - nativeBuildInputs = [ - yarn - cacert - ]; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-5s/X9CD/H9rSn7SqMHioLg1KRP7y9fsozdFRY3hNiP8="; + }; + yarnOfflineCache = stdenvNoCC.mkDerivation { + name = "yarn-offline-cache"; + inherit (finalAttrs) src; + nativeBuildInputs = [ + yarn + cacert + writableTmpDirAsHomeHook + ]; + # force yarn install run in CI mode + env.CI = "1"; + buildPhase = + let supportedArchitectures = builtins.toJSON { os = [ "darwin" "linux" ]; cpu = [ - "arm64" "x64" + "ia32" + "arm64" ]; libc = [ "glibc" "musl" ]; }; - buildPhase = '' - export HOME="$NIX_BUILD_TOP" - export CI=1 - - mkdir -p $out - yarn config set enableTelemetry false - yarn config set cacheFolder $out - yarn config set enableGlobalCache false - yarn config set supportedArchitectures --json "$supportedArchitectures" - - yarn install --immutable --mode=skip-build - ''; - dontInstall = true; - outputHashMode = "recursive"; - outputHash = "sha256-HueTia+1ApfvbBK/b+iE84TB1DCWIDLoQ9XhjYlGCUs="; - }; - nativeBuildInputs = - [ - nodejs - yarn - cargo - rustc - findutils - zip - jq - rsync - ] - ++ lib.optionals hostPlatform.isLinux [ - copyDesktopItems - makeWrapper - ]; - - patchPhase = '' - runHook prePatchPhase - - sed -i '/packagerConfig/a \ electronZipDir: process.env.ELECTRON_FORGE_ELECTRON_ZIP_DIR,' packages/frontend/apps/electron/forge.config.mjs - - runHook postPatchPhase - ''; - - configurePhase = - let - electronContentPath = - electron + (if hostPlatform.isLinux then "/libexec/electron/" else "/Applications/"); - in - '' - runHook preConfigurePhase - - export HOME="$NIX_BUILD_TOP" - export CI=1 - - # cargo config - mkdir -p .cargo - cat $cargoDeps/.cargo/config.toml >> .cargo/config.toml - ln -s $cargoDeps @vendor@ - - # yarn config - yarn config set enableTelemetry false - yarn config set enableGlobalCache false - yarn config set cacheFolder $yarnOfflineCache - - # electron config - ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2) - rsync --archive --chmod=u+w ${electronContentPath} $HOME/.electron-prebuilt-zip-tmp - export ELECTRON_FORGE_ELECTRON_ZIP_DIR=$PWD/.electron_zip_dir - mkdir -p $ELECTRON_FORGE_ELECTRON_ZIP_DIR - (cd $HOME/.electron-prebuilt-zip-tmp && zip --recurse-paths - .) > $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - - runHook postConfigurePhase - ''; - buildPhase = '' + in + '' runHook preBuild - # first build - yarn workspaces focus @affine/electron @affine/monorepo - CARGO_NET_OFFLINE=true yarn workspace @affine/native build - BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn workspace @affine/electron generate-assets + mkdir -p $out + yarn config set enableTelemetry false + yarn config set cacheFolder $out + yarn config set enableGlobalCache false + yarn config set supportedArchitectures --json '${supportedArchitectures}' - # second build - yarn config set nmMode classic - yarn config set nmHoistingLimits workspaces - find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + - yarn workspaces focus @affine/electron @affine/monorepo - BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn workspace @affine/electron make + yarn install --immutable --mode=skip-build runHook postBuild ''; - installPhase = - let - inherit (finalAttrs) binName productName; - in - if hostPlatform.isDarwin then - '' - runHook preInstall + dontInstall = true; + outputHashMode = "recursive"; + outputHash = "sha256-HueTia+1ApfvbBK/b+iE84TB1DCWIDLoQ9XhjYlGCUs="; + }; + nativeBuildInputs = + [ + nodejs + yarn + cargo + rustc + findutils + zip + jq + rsync + writableTmpDirAsHomeHook + ] + ++ lib.optionals hostPlatform.isLinux [ + copyDesktopItems + makeWrapper + ]; - mkdir -p $out/Applications - mv packages/frontend/apps/electron/out/${buildType}/${productName}-darwin-${nodeArch}/${productName}.app $out/Applications + # force yarn install run in CI mode + env.CI = "1"; - runHook postInstall - '' - else - '' - runHook preInstall + # Remove code under The AFFiNE Enterprise Edition (EE) license. + # Keep file package.json for `yarn install --immutable` lockfile check. + postPatch = '' + BACKEND_SERVER_PACKAGE_JSON="$(jq 'del(.scripts.postinstall)' packages/backend/server/package.json)" + rm -rf packages/backend/server/{.*,*} + echo "$BACKEND_SERVER_PACKAGE_JSON" > packages/backend/server/package.json + ''; + patchPhase = '' + runHook prePatchPhase - mkdir --parents $out/lib/${binName}/ - mv packages/frontend/apps/electron/out/${buildType}/${productName}-linux-${nodeArch}/{resources,LICENSE*} $out/lib/${binName}/ - install -Dm644 packages/frontend/apps/electron/resources/icons/icon_${buildType}_64x64.png $out/share/icons/hicolor/64x64/apps/${binName}.png + sed -i '/packagerConfig/a \ electronZipDir: process.env.ELECTRON_FORGE_ELECTRON_ZIP_DIR,' packages/frontend/apps/electron/forge.config.mjs - makeWrapper "${electron}/bin/electron" $out/bin/${binName} \ - --inherit-argv0 \ - --add-flags $out/lib/${binName}/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} + runHook postPatchPhase + ''; - runHook postInstall - ''; - } - // (lib.optionalAttrs hostPlatform.isLinux { - desktopItems = - let - inherit (finalAttrs) binName productName; - in - [ - (makeDesktopItem { - name = binName; - desktopName = productName; - comment = "AFFiNE Desktop App"; - exec = "${binName} %U"; - terminal = false; - icon = binName; - startupWMClass = binName; - categories = [ "Utility" ]; - mimeTypes = [ "x-scheme-handler/${binName}" ]; - }) - ]; + configurePhase = '' + runHook preConfigurePhase + + # cargo config + mkdir -p .cargo + cat $cargoDeps/.cargo/config.toml >> .cargo/config.toml + ln -s $cargoDeps @vendor@ + + # yarn config + yarn config set enableTelemetry false + yarn config set enableGlobalCache false + yarn config set cacheFolder $yarnOfflineCache + + # electron config + ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2) + rsync --archive --chmod=u+w "${electron.dist}/" $HOME/.electron-prebuilt-zip-tmp + export ELECTRON_FORGE_ELECTRON_ZIP_DIR=$PWD/.electron_zip_dir + mkdir -p $ELECTRON_FORGE_ELECTRON_ZIP_DIR + (cd $HOME/.electron-prebuilt-zip-tmp && zip --recurse-paths - .) > $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + + runHook postConfigurePhase + ''; + + buildPhase = '' + runHook preBuild + + # first build + yarn workspaces focus @affine/electron @affine/monorepo + CARGO_NET_OFFLINE=true yarn workspace @affine/native build + GITHUB_SHA=ffffffffffffffffffffffffffffffffffffffff BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn workspace @affine/electron generate-assets + + # second build + yarn config set nmMode classic + yarn config set nmHoistingLimits workspaces + find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + + yarn workspaces focus @affine/electron @affine/monorepo + BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn workspace @affine/electron make + + runHook postBuild + ''; + + installPhase = + if hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/Applications + mv packages/frontend/apps/electron/out/${buildType}/${productName}-darwin-${nodeArch}/${productName}.app $out/Applications + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir --parents $out/lib/${binName}/ + mv packages/frontend/apps/electron/out/${buildType}/${productName}-linux-${nodeArch}/{resources,LICENSE*} $out/lib/${binName}/ + install -Dm644 packages/frontend/apps/electron/resources/icons/icon_${buildType}_64x64.png $out/share/icons/hicolor/64x64/apps/${binName}.png + + makeWrapper "${lib.getExe electron}" $out/bin/${binName} \ + --inherit-argv0 \ + --add-flags $out/lib/${binName}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = binName; + desktopName = productName; + comment = "AFFiNE Desktop App"; + exec = "${binName} %U"; + terminal = false; + icon = binName; + startupWMClass = binName; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/${binName}" ]; }) - ) -) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; + + meta = { + description = "Workspace with fully merged docs, whiteboards and databases"; + longDescription = '' + AFFiNE is an open-source, all-in-one workspace and an operating + system for all the building blocks that assemble your knowledge + base and much more -- wiki, knowledge management, presentation + and digital assets + ''; + homepage = "https://affine.pro/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +}) From a40c55f88f8ec53b308e5e84a297ce185e4468fd Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Tue, 4 Feb 2025 01:44:23 +0800 Subject: [PATCH 390/484] affine: 0.18.1 -> 0.19.6 --- pkgs/by-name/af/affine/package.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 0c8211f10b52..2d4b018bc060 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -41,17 +41,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.18.1"; + version = "0.19.6"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; + hash = "sha256-BydTNE36oRIxr2lTnc2+EY0lvMXn4NTLB4EjqzhdjGk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-5s/X9CD/H9rSn7SqMHioLg1KRP7y9fsozdFRY3hNiP8="; + hash = "sha256-racjpf0VgNod6OxWKSaCbKS9fEkInpDyhVbAHfYWIDo="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-HueTia+1ApfvbBK/b+iE84TB1DCWIDLoQ9XhjYlGCUs="; + outputHash = "sha256-E9l5zjOOfyDBzYJOU94VrRvt7Hi4XkRTDav9bVlXvlQ="; }; nativeBuildInputs = [ @@ -125,13 +125,6 @@ stdenv.mkDerivation (finalAttrs: { rm -rf packages/backend/server/{.*,*} echo "$BACKEND_SERVER_PACKAGE_JSON" > packages/backend/server/package.json ''; - patchPhase = '' - runHook prePatchPhase - - sed -i '/packagerConfig/a \ electronZipDir: process.env.ELECTRON_FORGE_ELECTRON_ZIP_DIR,' packages/frontend/apps/electron/forge.config.mjs - - runHook postPatchPhase - ''; configurePhase = '' runHook preConfigurePhase @@ -161,16 +154,16 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild # first build - yarn workspaces focus @affine/electron @affine/monorepo - CARGO_NET_OFFLINE=true yarn workspace @affine/native build - GITHUB_SHA=ffffffffffffffffffffffffffffffffffffffff BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn workspace @affine/electron generate-assets + yarn install + CARGO_NET_OFFLINE=true yarn affine @affine/native build + GITHUB_SHA=ffffffffffffffffffffffffffffffffffffffff BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn affine @affine/electron generate-assets # second build yarn config set nmMode classic yarn config set nmHoistingLimits workspaces find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + - yarn workspaces focus @affine/electron @affine/monorepo - BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn workspace @affine/electron make + yarn install + BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn affine @affine/electron make runHook postBuild ''; From c66126fd7b62903abaac5a9d7bff4da84cf40da5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 11:25:44 +0100 Subject: [PATCH 391/484] python312Packages.pandera: skip failing tests --- .../python-modules/pandera/default.nix | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix index a3d1995717df..3ec853572a6c 100644 --- a/pkgs/development/python-modules/pandera/default.nix +++ b/pkgs/development/python-modules/pandera/default.nix @@ -1,9 +1,13 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + + # dependencies multimethod, numpy, packaging, @@ -12,12 +16,8 @@ typeguard, typing-inspect, wrapt, - # test - joblib, - pyarrow, - pytestCheckHook, - pytest-asyncio, - # optional dependencies + + # optional-dependencies black, dask, fastapi, @@ -28,6 +28,13 @@ pyyaml, scipy, shapely, + + # tests + joblib, + pyarrow, + pytestCheckHook, + pytest-asyncio, + pythonAtLeast, }: buildPythonPackage rec { @@ -99,6 +106,12 @@ buildPythonPackage rec { pyarrow ] ++ optional-dependencies.all; + pytestFlagsArray = [ + # KeyError: 'dask' + "--deselect=tests/dask/test_dask.py::test_series_schema" + "--deselect=tests/dask/test_dask_accessor.py::test_dataframe_series_add_schema" + ]; + disabledTestPaths = [ "tests/fastapi/test_app.py" # tries to access network "tests/core/test_docs_setting_column_widths.py" # tests doc generation, requires sphinx @@ -107,12 +120,17 @@ buildPythonPackage rec { "tests/pyspark" # requires spark ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # OOM error on ofborg: - "test_engine_geometry_coerce_crs" - # pandera.errors.SchemaError: Error while coercing 'geometry' to type geometry - "test_schema_dtype_crs_with_coerce" - ]; + disabledTests = + lib.optionals stdenv.hostPlatform.isDarwin [ + # OOM error on ofborg: + "test_engine_geometry_coerce_crs" + # pandera.errors.SchemaError: Error while coercing 'geometry' to type geometry + "test_schema_dtype_crs_with_coerce" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # AssertionError: assert DataType(Sparse[float64, nan]) == DataType(Sparse[float64, nan]) + "test_legacy_default_pandas_extension_dtype" + ]; pythonImportsCheck = [ "pandera" @@ -125,7 +143,7 @@ buildPythonPackage rec { meta = { description = "Light-weight, flexible, and expressive statistical data testing library"; homepage = "https://pandera.readthedocs.io"; - changelog = "https://github.com/unionai-oss/pandera/releases/tag/${src.tag}"; + changelog = "https://github.com/unionai-oss/pandera/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; From 9dc66d61ba7f464d20948ba6751c58a98a34a6e8 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 14 Oct 2024 13:49:13 +0200 Subject: [PATCH 392/484] qt6Packages.libqglviewer: init at 2.9.1 --- pkgs/top-level/qt6-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 237a4757afb3..bacde47aff79 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -56,6 +56,8 @@ makeScopeWithSplicing' { kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { }; + libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; libquotient = callPackage ../development/libraries/libquotient { }; From 7cb04b0d9b34d0ef3d16c2369ce332b6e3c32c1d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:02:52 +0100 Subject: [PATCH 393/484] python312Packages.textual: skip flaky tests also on linux --- .../python-modules/textual/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index ec4513f5e7d2..d730ddc3f23c 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -59,15 +59,14 @@ buildPythonPackage rec { tree-sitter ]; - disabledTestPaths = - [ - # Snapshot tests require syrupy<4 - "tests/snapshot_tests/test_snapshots.py" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # RuntimeError: There is no current event loop in thread 'MainThread'. - "tests/test_focus.py" - ]; + disabledTestPaths = [ + # Snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + + # Flaky + # RuntimeError: There is no current event loop in thread 'MainThread'. + "tests/test_focus.py" + ]; disabledTests = [ From 4dcb3055bc93fa73d94c055a6ef1a8497ac1ed10 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 14 Oct 2024 13:54:43 +0200 Subject: [PATCH 394/484] libqglviewer: clean Co-authored-by: Niklas Korz <590517+niklaskorz@users.noreply.github.com> --- .../libraries/libqglviewer/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index ec2234bb9a28..6b8457f2a60c 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, libGLU, AGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libqglviewer"; version = "2.9.1"; - src = fetchurl { - url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "sha256-J4+DKgstPvvg1pUhGd+8YFh5C3oPGHaQmDfLZzzkP/M="; + src = fetchFromGitHub { + owner = "GillesDebunne"; + repo = "libQGLViewer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-T8KAcw3cXbp0FZm53OjlQBnUvLRFdoj80dIQzQY0/yw="; }; nativeBuildInputs = [ qmake ]; @@ -19,10 +21,10 @@ stdenv.mkDerivation rec { cd QGLViewer ''; - meta = with lib; { + meta = { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; - homepage = "http://libqglviewer.com"; - license = licenses.gpl2; - platforms = platforms.all; + homepage = "https://github.com/GillesDebunne/libQGLViewer"; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; -} +}) From 280c2bf8b6236d0790ec24c2394d643aab5b09ae Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 14 Oct 2024 14:40:17 +0200 Subject: [PATCH 395/484] libqglviewer: fix #348484 remove use of absolute path on darwin --- .../libraries/libqglviewer/default.nix | 18 ++++++++++++++---- pkgs/top-level/qt5-packages.nix | 4 +--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 6b8457f2a60c..92446cf8a138 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, libGLU, AGL }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, libGLU }: stdenv.mkDerivation (finalAttrs: { pname = "libqglviewer"; @@ -12,12 +12,22 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase libGLU ] - ++ lib.optional stdenv.hostPlatform.isDarwin AGL; + buildInputs = [ qtbase libGLU ]; dontWrapQtApps = true; - postPatch = '' + # Fix build on darwin, and install dylib instead of framework + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace QGLViewer/QGLViewer.pro \ + --replace-fail \ + "LIB_DIR_ = /Library/Frameworks" \ + "LIB_DIR_ = \$\$""{PREFIX_}/lib" \ + --replace-fail \ + "!staticlib: CONFIG *= lib_bundle" \ + "" + ''; + + preConfigure = '' cd QGLViewer ''; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 0c80734993fb..38b63a2a9683 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -164,9 +164,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; }; - libqglviewer = callPackage ../development/libraries/libqglviewer { - inherit (pkgs.darwin.apple_sdk.frameworks) AGL; - }; + libqglviewer = callPackage ../development/libraries/libqglviewer { }; libqofono = callPackage ../development/libraries/libqofono { }; From 09c67a9eb2ebc6568fbaec3975f6fb0fb69184fe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:03:00 +0100 Subject: [PATCH 396/484] python312Packages.textual: cleanup --- .../python-modules/textual/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index d730ddc3f23c..7f70b2b6b5bd 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -1,22 +1,29 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - jinja2, + + # build-system + poetry-core, + + # dependencies markdown-it-py, platformdirs, - poetry-core, + rich, + typing-extensions, + + # optional-dependencies + tree-sitter, + tree-sitter-languages, + + # tests + jinja2, pytest-aiohttp, pytest-xdist, pytestCheckHook, - pythonAtLeast, - rich, syrupy, time-machine, - tree-sitter, - tree-sitter-languages, - typing-extensions, + pythonAtLeast, }: buildPythonPackage rec { @@ -35,8 +42,8 @@ buildPythonPackage rec { dependencies = [ - platformdirs markdown-it-py + platformdirs rich typing-extensions ] @@ -63,7 +70,7 @@ buildPythonPackage rec { # Snapshot tests require syrupy<4 "tests/snapshot_tests/test_snapshots.py" - # Flaky + # Flaky: https://github.com/Textualize/textual/issues/5511 # RuntimeError: There is no current event loop in thread 'MainThread'. "tests/test_focus.py" ]; From ef183ce7b5b1efc8ae8142adbb4cf77e610a15ab Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:11:02 +0100 Subject: [PATCH 397/484] python312Packages.textual: add gepbird as maintainer --- pkgs/development/python-modules/textual/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 7f70b2b6b5bd..288d4d1e297f 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -107,6 +107,6 @@ buildPythonPackage rec { homepage = "https://github.com/Textualize/textual"; changelog = "https://github.com/Textualize/textual/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ gepbird ]; }; } From 71bc331784284db170f3b3ecc50cd38a5ed8e2d0 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Fri, 14 Feb 2025 19:14:38 +0800 Subject: [PATCH 398/484] affine: fix yarn outputHash --- pkgs/by-name/af/affine/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 2d4b018bc060..2a1fca94b6fb 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-E9l5zjOOfyDBzYJOU94VrRvt7Hi4XkRTDav9bVlXvlQ="; + outputHash = "sha256-OuBxx0nrZ/KVFD1JinjBBXiQUcePWx5zRACld1CoHX0="; }; nativeBuildInputs = [ From 25d3e5cb4919baf5d47ef85d5ccbbb10cd5766b0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:23:16 +0100 Subject: [PATCH 399/484] pcl: move to by-name --- .../pc/pcl/package.nix} | 33 ++++++------------- pkgs/top-level/all-packages.nix | 4 --- 2 files changed, 10 insertions(+), 27 deletions(-) rename pkgs/{development/libraries/pcl/default.nix => by-name/pc/pcl/package.nix} (72%) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/by-name/pc/pcl/package.nix similarity index 72% rename from pkgs/development/libraries/pcl/default.nix rename to pkgs/by-name/pc/pcl/package.nix index 7f2b0e9f1c9e..ed3b851cbc0d 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - wrapQtAppsHook, cmake, qhull, flann, @@ -10,15 +9,12 @@ vtk, eigen, pkg-config, - qtbase, + libsForQt5, libusb1, libpcap, libtiff, libXt, libpng, - Cocoa, - AGL, - OpenGL, config, cudaSupport ? config.cudaSupport, cudaPackages, @@ -44,21 +40,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = - [ - eigen - libusb1 - libpcap - qtbase - libXt - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - AGL - ]; + buildInputs = [ + eigen + libusb1 + libpcap + libsForQt5.qtbase + libXt + ]; propagatedBuildInputs = [ boost @@ -69,11 +60,7 @@ stdenv.mkDerivation rec { vtk ]; - cmakeFlags = - lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - ] - ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; + cmakeFlags = lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; meta = { homepage = "https://pointclouds.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3618d837a1..fb3d2a8a54f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10214,10 +10214,6 @@ with pkgs; buildPythonPackage buildPythonApplication setuptools pycsdr pydigiham; }; - pcl = libsForQt5.callPackage ../development/libraries/pcl { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL; - }; - pcre = callPackage ../development/libraries/pcre { }; pcre16 = res.pcre.override { variant = "pcre16"; }; # pcre32 seems unused From 18ad364f55eff8f310780e618fa99013246af02b Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:25:01 +0100 Subject: [PATCH 400/484] lpcnetfreedv: remove unnecessary rec --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 50860d1335cd..37d40ebada4e 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -14,7 +14,7 @@ let sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lpcnetfreedv"; version = "unstable-2022-08-22"; From 9e1a6426bf2fcdeaf0cf28be2c3279860cac81c2 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:25:43 +0100 Subject: [PATCH 401/484] lpcnetfreedv: remove use of with lib; --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 37d40ebada4e..a4c37279f2ee 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation { extraArgs = [ "--version=branch" ]; }; - meta = with lib; { + meta = { homepage = "https://freedv.org/"; description = "Experimental Neural Net speech coding for FreeDV"; - license = licenses.bsd3; - maintainers = with maintainers; [ mvs ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mvs ]; + platforms = lib.platforms.all; }; } From 7e8cf0e3fdaf4fdd49cbcbf1742e1c96e8c0d53a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:27:26 +0100 Subject: [PATCH 402/484] lpcnetfreedv: unstable-2022-08-22 -> 0.5-unstable-2025-01-19 --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index a4c37279f2ee..3a6ed87b37da 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation { pname = "lpcnetfreedv"; - version = "unstable-2022-08-22"; + version = "0.5-unstable-2025-01-19"; src = fetchFromGitHub { owner = "drowe67"; repo = "LPCNet"; - rev = "67a6eb74d0c07faddcdce199856862cc45779d25"; - sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk="; + rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246"; + sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA="; }; nativeBuildInputs = [ cmake ]; From c59049bc04fbb564371a6bbfe27af6302358082d Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:34:22 +0100 Subject: [PATCH 403/484] freedv: use finalAttrs pattern --- pkgs/by-name/fr/freedv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 91bfa5a71c0b..57e325b268d0 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -20,14 +20,14 @@ pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freedv"; version = "1.9.9.2"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "freedv"; }; -} +}) From 9a52b65360026b3e4496378fa40a7000cf5e01f2 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:35:06 +0100 Subject: [PATCH 404/484] freedv: provide update script --- pkgs/by-name/fr/freedv/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 57e325b268d0..7a01ca62e4c6 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -18,6 +18,7 @@ wxGTK32, sioclient, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -75,6 +76,14 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + # avoid pre‐releases + "--version-regex" + ''^v(\d\.\d\.\d(\.\d)?)$'' + ]; + }; + meta = { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; From 4d714e967db191e1d947bce4c53f1082595872c5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Feb 2025 20:50:07 +0900 Subject: [PATCH 405/484] terraform-providers.sakuracloud: init at 2.26.1 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 870de8c0b5ba..da2363af3bda 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1092,6 +1092,15 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "sakuracloud": { + "hash": "sha256-KrzqIAK6ImUW22Iik97R4HARoXN4lG6AquitLjCqS/A=", + "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", + "owner": "sacloud", + "repo": "terraform-provider-sakuracloud", + "rev": "v2.26.1", + "spdx": "Apache-2.0", + "vendorHash": "sha256-Ry791h5AuYP03nex9nM8X5Mk6PeL7hNDbFyVRvVPJNE=" + }, "scaleway": { "hash": "sha256-8aESalFQaA6Qwod4rDeUzrKe80rbHfVJZIKtLliKUME=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", From 62172c1d3a55eb82a277908f045ebac7db272e9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 00:42:38 +0000 Subject: [PATCH 406/484] ocamlPackages.qcheck-core: 0.22 -> 0.23 --- pkgs/development/ocaml-modules/qcheck/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index a2e5d8910dc1..1e90ac725bee 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.22"; + version = "0.23"; minimalOCamlVersion = "4.08"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = "v${version}"; - hash = "sha256-JXnrfce/V7Bdu8uH98ZJCLjIHZoONiQ02ltFx6Fbvhg="; + hash = "sha256-tH7NFpAFKOb0jXxLK+zNOIZS9TSORKXe8FuwY13iEUY="; }; meta = { From 6fa6f314bb652ea2ba9931ab89a63e75b47c1453 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 31 Jan 2025 14:32:14 +0100 Subject: [PATCH 407/484] python313Packages.pgpy-dtc: init at 0.1.1 --- .../python-modules/pgpy-dtc/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pgpy-dtc/default.nix diff --git a/pkgs/development/python-modules/pgpy-dtc/default.nix b/pkgs/development/python-modules/pgpy-dtc/default.nix new file mode 100644 index 000000000000..f59c3b01c949 --- /dev/null +++ b/pkgs/development/python-modules/pgpy-dtc/default.nix @@ -0,0 +1,44 @@ +{ + lib, + pythonOlder, + fetchFromGitHub, + buildPythonPackage, + setuptools, + pyasn1, + cryptography, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pgpy-dtc"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "DigitalTrustCenter"; + repo = "PGPy_dtc"; + tag = version; + hash = "sha256-0zv2gtgp/iGDQescaDpng1gqbgjv7iXFvtwEt3YIPy4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyasn1 + cryptography + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pgpy_dtc" ]; + + meta = { + homepage = "https://github.com/DigitalTrustCenter/PGPy_dtc"; + changelog = "https://github.com/DigitalTrustCenter/PGPy_dtc/releases/tag/${src.tag}"; + description = "Pretty Good Privacy for Python"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ networkexception ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a00e9a101d49..121f532055c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10277,6 +10277,8 @@ self: super: with self; { pgpy = callPackage ../development/python-modules/pgpy { }; + pgpy-dtc = callPackage ../development/python-modules/pgpy-dtc { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; pgspecial = callPackage ../development/python-modules/pgspecial { }; From 34e43a34d4e61e07ead911adb313fc4884bb25ed Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 31 Jan 2025 14:33:43 +0100 Subject: [PATCH 408/484] python313Packages.sectxt: init at 0.9.6 --- .../python-modules/sectxt/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/sectxt/default.nix diff --git a/pkgs/development/python-modules/sectxt/default.nix b/pkgs/development/python-modules/sectxt/default.nix new file mode 100644 index 000000000000..186ffe143690 --- /dev/null +++ b/pkgs/development/python-modules/sectxt/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + requests, + python-dateutil, + langcodes, + pgpy-dtc, + validators, + requests-mock, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "sectxt"; + version = "0.9.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "DigitalTrustCenter"; + repo = "sectxt"; + tag = version; + hash = "sha256-49YxhcOpi1wofKMRuNxt8esBtfaSoBrGu+yBCRFWZYY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + python-dateutil + langcodes + pgpy-dtc + validators + ]; + + pythonRelaxDeps = [ + "requests" + "langcodes" + "pgpy-dtc" + "validators" + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "sectxt" ]; + + meta = { + homepage = "https://github.com/DigitalTrustCenter/sectxt"; + changelog = "https://github.com/DigitalTrustCenter/sectxt/releases/tag/${src.tag}"; + description = "security.txt parser and validator"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ networkexception ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 121f532055c8..67f371aaf081 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14650,6 +14650,8 @@ self: super: with self; { sectools = callPackage ../development/python-modules/sectools { }; + sectxt = callPackage ../development/python-modules/sectxt { }; + seedir = callPackage ../development/python-modules/seedir { }; seekpath = callPackage ../development/python-modules/seekpath { }; From cee8169987839f8975a720af3108dc7f92683db2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 11:39:57 +0100 Subject: [PATCH 409/484] python312Packages.dscribe: fix build --- .../python-modules/dscribe/default.nix | 66 +++++++++++++++---- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix index 33229ab03075..c2644b3da134 100644 --- a/pkgs/development/python-modules/dscribe/default.nix +++ b/pkgs/development/python-modules/dscribe/default.nix @@ -1,47 +1,85 @@ { - buildPythonPackage, lib, + stdenv, + buildPythonPackage, fetchFromGitHub, - numpy, - scipy, + + # build-system + pybind11, + setuptools, + + # dependencies ase, joblib, - sparse, - pybind11, + numpy, scikit-learn, + scipy, + sparse, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "dscribe"; version = "2.1.1"; + pyproject = true; + src = fetchFromGitHub { owner = "singroup"; repo = "dscribe"; - rev = "v${version}"; + tag = "v${version}"; fetchSubmodules = true; # Bundles a specific version of Eigen hash = "sha256-2JY24cR2ie4+4svVWC4rm3Iy6Wfg0n2vkINz032kPWc="; }; - pyproject = true; - build-system = [ pybind11 + setuptools ]; dependencies = [ - numpy - scipy ase joblib - sparse + numpy scikit-learn + scipy + sparse ]; - meta = with lib; { + pythonImportsCheck = [ + "dscribe" + "dscribe.ext" + ]; + + # Prevents python from loading dscribe from the current working directory instead of using $out + preCheck = '' + rm -rf dscribe + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = + [ + # AttributeError: module 'numpy' has no attribute 'product' + "test_extended_system" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError on a numerical test + "test_cell_list" + + # Fatal Python error: Aborted + # matplotlib/backend_bases.py", line 2654 in create_with_canvas + "test_examples" + ]; + + meta = { description = "Machine learning descriptors for atomistic systems"; homepage = "https://github.com/SINGROUP/dscribe"; - license = licenses.asl20; - maintainers = [ maintainers.sheepforce ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sheepforce ]; }; } From 0521237635b870be3e11704287180ecdb61b4cc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:32:24 +0000 Subject: [PATCH 410/484] vscode-extensions.marus25.cortex-debug: 1.6.10 -> 1.12.1 --- .../vscode/extensions/marus25.cortex-debug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix index e0fcee449198..19fa9e22929e 100644 --- a/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix +++ b/pkgs/applications/editors/vscode/extensions/marus25.cortex-debug/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cortex-debug"; publisher = "marus25"; - version = "1.6.10"; - hash = "sha256-6b3JDkX6Xd91VE1h7gYyeukxLsBkn/nNzDQgBm0axRA="; + version = "1.12.1"; + hash = "sha256-ioK6gwtkaAcfxn11lqpwhrpILSfft/byeEqoEtJIfM0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/marus25.cortex-debug/changelog"; From 1d8d6005ee57d72c4812648f809010dc3ae8574e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 13:32:33 +0100 Subject: [PATCH 411/484] truecrack: fix cuda --- pkgs/by-name/tr/truecrack/package.nix | 17 ++++++---- .../tr/truecrack/remove-opencc-options.patch | 26 +++++++++++++++ .../by-name/tr/truecrack/set-cuda-archs.patch | 32 +++++++++++++++++++ 3 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/tr/truecrack/remove-opencc-options.patch create mode 100644 pkgs/by-name/tr/truecrack/set-cuda-archs.patch diff --git a/pkgs/by-name/tr/truecrack/package.nix b/pkgs/by-name/tr/truecrack/package.nix index 5c952f5ed409..888ede92cd7d 100644 --- a/pkgs/by-name/tr/truecrack/package.nix +++ b/pkgs/by-name/tr/truecrack/package.nix @@ -1,15 +1,18 @@ { lib, gccStdenv, + cudaPackages, fetchFromGitLab, - cudatoolkit, config, cudaSupport ? config.cudaSupport, pkg-config, versionCheckHook, }: -gccStdenv.mkDerivation rec { +let + stdenv = if cudaSupport then cudaPackages.backendStdenv else gccStdenv; +in +stdenv.mkDerivation rec { pname = "truecrack"; version = "3.6"; @@ -22,12 +25,14 @@ gccStdenv.mkDerivation rec { patches = [ ./fix-empty-return.patch + ./remove-opencc-options.patch + ./set-cuda-archs.patch ]; configureFlags = ( if cudaSupport then [ - "--with-cuda=${cudatoolkit}" + "--with-cuda=${cudaPackages.cudatoolkit}" ] else [ @@ -40,7 +45,8 @@ gccStdenv.mkDerivation rec { ]; buildInputs = lib.optionals cudaSupport [ - cudatoolkit + cudaPackages.cudatoolkit + cudaPackages.cuda_cudart ]; env.NIX_CFLAGS_COMPILE = toString ([ @@ -61,7 +67,7 @@ gccStdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - doInstallCheck = true; + doInstallCheck = !cudaSupport; installCheckPhase = '' runHook preInstallCheck @@ -88,7 +94,6 @@ gccStdenv.mkDerivation rec { description = "Brute-force password cracker for TrueCrypt volumes, optimized for Nvidia Cuda technology"; mainProgram = "truecrack"; homepage = "https://gitlab.com/kalilinux/packages/truecrack"; - broken = cudaSupport; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; diff --git a/pkgs/by-name/tr/truecrack/remove-opencc-options.patch b/pkgs/by-name/tr/truecrack/remove-opencc-options.patch new file mode 100644 index 000000000000..e9b2ef6024c7 --- /dev/null +++ b/pkgs/by-name/tr/truecrack/remove-opencc-options.patch @@ -0,0 +1,26 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index e4cac89..50d9b02 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -56,7 +56,7 @@ $(OBJ_CUDA): + cat Cuda/Sha2.cu >> Cuda.cu + cat Cuda/Whirlpool.cu >> Cuda.cu + +- $(COMPILER) -c Cuda.cu $(CFLAGS) --opencc-options -OPT:Olimit=0 $< -o $@ ++ $(COMPILER) -c Cuda.cu $(CFLAGS) $< -o $@ + + $(OBJS_COMMON): %.o: Common/%.c + $(COMPILER) -c $(CFLAGS) $< -o $@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 86f76ad..7a5c77b 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -435,7 +435,7 @@ $(OBJ_CUDA): + cat Cuda/Sha2.cu >> Cuda.cu + cat Cuda/Whirlpool.cu >> Cuda.cu + +- $(COMPILER) -c Cuda.cu $(CFLAGS) --opencc-options -OPT:Olimit=0 $< -o $@ ++ $(COMPILER) -c Cuda.cu $(CFLAGS) $< -o $@ + + $(OBJS_COMMON): %.o: Common/%.c + $(COMPILER) -c $(CFLAGS) $< -o $@ diff --git a/pkgs/by-name/tr/truecrack/set-cuda-archs.patch b/pkgs/by-name/tr/truecrack/set-cuda-archs.patch new file mode 100644 index 000000000000..f46980d58db2 --- /dev/null +++ b/pkgs/by-name/tr/truecrack/set-cuda-archs.patch @@ -0,0 +1,32 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index e4cac89..599b7a3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -30,10 +30,7 @@ OBJ_CUDA=Cuda.o + CFLAGS += -D_GPU_ + COMPILER=$(NVCC) + # CUDA code generation flags +-GENCODE_SM10= -gencode arch=compute_10,code=sm_10 +-GENCODE_SM20= -gencode arch=compute_20,code=sm_20 +-GENCODE_SM30= -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35 +-GENCODE_FLAGS= $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30) ++GENCODE_FLAGS= -gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_89,code=sm_89 -gencode arch=compute_90,code=sm_90 -gencode arch=compute_90a,code=sm_90a + CFLAGS += $(GENCODE_FLAGS) -ftz=true -use_fast_math + endif + +diff --git a/src/Makefile.in b/src/Makefile.in +index 86f76ad..123255b 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -181,10 +181,7 @@ LFLAGS = -lm -O3 + @ENABLE_CPU_TRUE@COMPILER = $(CC) + @ENABLE_CPU_FALSE@OBJ_CUDA = Cuda.o + # CUDA code generation flags +-@ENABLE_CPU_FALSE@GENCODE_SM10 = -gencode arch=compute_10,code=sm_10 +-@ENABLE_CPU_FALSE@GENCODE_SM20 = -gencode arch=compute_20,code=sm_20 +-@ENABLE_CPU_FALSE@GENCODE_SM30 = -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35 +-@ENABLE_CPU_FALSE@GENCODE_FLAGS = $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30) ++@ENABLE_CPU_FALSE@GENCODE_FLAGS = -gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_89,code=sm_89 -gencode arch=compute_90,code=sm_90 -gencode arch=compute_90a,code=sm_90a + truecrack_SOURCES = + truecrack_CFLAGS = $(CUDA_CFLAGS) + truecrack_LDADD = $(CUDA_LIBS) From 00399cdd47b58bcb36bddd0fba851fda870df951 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:34:44 +0000 Subject: [PATCH 412/484] gworkspace: 1.0.0 -> 1.1.0 --- pkgs/by-name/gw/gworkspace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gw/gworkspace/package.nix b/pkgs/by-name/gw/gworkspace/package.nix index 0f12f00838b6..14ee2c6b694e 100644 --- a/pkgs/by-name/gw/gworkspace/package.nix +++ b/pkgs/by-name/gw/gworkspace/package.nix @@ -9,11 +9,11 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "gworkspace"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-M7dV7RVatw8gdYHQlRi5wNBd6MGT9GqW04R/DoKNu6I="; + sha256 = "sha256-zjBOtVgQAILI5EozTzyO5pKglG2BBrwaZqVJCxT/Pzw="; }; # additional dependencies: From 09eec57ad12da10666dad2252f127c663a74d2f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:40:34 +0100 Subject: [PATCH 413/484] lpcnetfreedv: fix darwin build --- pkgs/by-name/lp/lpcnetfreedv/darwin.patch | 13 +++++++++++++ pkgs/by-name/lp/lpcnetfreedv/package.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/lp/lpcnetfreedv/darwin.patch diff --git a/pkgs/by-name/lp/lpcnetfreedv/darwin.patch b/pkgs/by-name/lp/lpcnetfreedv/darwin.patch new file mode 100644 index 000000000000..a82ac9b330d5 --- /dev/null +++ b/pkgs/by-name/lp/lpcnetfreedv/darwin.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1600871..1536c55 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ elseif(${SSE} AND (${SSE_PRESENT} OR ${SSE_PRESENT} GREATER 0)) + # AVX and AVX2 machines will also match on SSE + message(STATUS "sse processor flags found or enabled.") + set(LPCNET_C_PROC_FLAGS -msse4.1) +-elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0)) ++elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0) AND NOT APPLE) + # RPi / ARM 32bit + message(STATUS "neon processor flags found or enabled.") + set(LPCNET_C_PROC_FLAGS -mfpu=neon -march=armv8-a -mtune=cortex-a53) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 3a6ed87b37da..bfc773ad47cd 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; + patches = [ + # extracted from https://github.com/drowe67/LPCNet/pull/59 + ./darwin.patch + ]; + postPatch = '' mkdir build ln -s ${data} build/lpcnet_${dataVersion}.tgz From 0d69c495bf911c409c0a148c008a42a47ae584c2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:29:21 +0100 Subject: [PATCH 414/484] pcl: cleanup --- pkgs/by-name/pc/pcl/package.nix | 60 +++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index ed3b851cbc0d..32c31cae9785 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -1,34 +1,43 @@ { lib, stdenv, - fetchFromGitHub, - cmake, - qhull, - flann, - boost, - vtk, - eigen, - pkg-config, - libsForQt5, - libusb1, - libpcap, - libtiff, - libXt, - libpng, config, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + libsForQt5, + pkg-config, + + # buildInputs + eigen, + libXt, + libpcap, + libusb1, + + # nativeBuildInputs + boost, + flann, + libpng, + libtiff, + qhull, + vtk, + + gitUpdater, + cudaSupport ? config.cudaSupport, cudaPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcl"; version = "1.13.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; - rev = "${pname}-${version}"; - sha256 = "sha256-JDiDAmdpwUR3Sff63ehyvetIFXAgGOrI+HEaZ5lURps="; + tag = "pcl-${finalAttrs.version}"; + hash = "sha256-T/zvev1x4w87j6Zn9dpqwIQfmfg2MsHt2Xto8Z1vhuQ="; }; # remove attempt to prevent (x86/x87-specific) extended precision use @@ -38,17 +47,17 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkg-config cmake libsForQt5.wrapQtAppsHook + pkg-config ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; buildInputs = [ eigen - libusb1 + libXt libpcap libsForQt5.qtbase - libXt + libusb1 ]; propagatedBuildInputs = [ @@ -60,13 +69,20 @@ stdenv.mkDerivation rec { vtk ]; - cmakeFlags = lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; + cmakeFlags = lib.optionals cudaSupport [ + (lib.cmakeBool "WITH_CUDA" true) + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "pcl-"; }; + }; meta = { homepage = "https://pointclouds.org/"; description = "Open project for 2D/3D image and point cloud processing"; + changelog = "https://github.com/PointCloudLibrary/pcl/blob/pcl-${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd3; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) From 02cf64767c938de70e1defa07e9773e083fc81e5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:30:17 +0100 Subject: [PATCH 415/484] pcl: 1.13.0 -> 1.15.0-rc1 Diff: https://github.com/PointCloudLibrary/pcl/compare/refs/tags/pcl-1.13.0...pcl-1.15.0-rc1 Changelog: https://github.com/PointCloudLibrary/pcl/blob/pcl-1.15.0-rc1/CHANGES.md --- pkgs/by-name/pc/pcl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index 32c31cae9785..c3e954c034e5 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -16,7 +16,7 @@ libusb1, # nativeBuildInputs - boost, + boost186, flann, libpng, libtiff, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pcl"; - version = "1.13.0"; + version = "1.15.0-rc1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - boost + boost186 flann libpng libtiff From dd356dbd4587d596cdd0ca4bcd43f43fdcff6946 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 13:14:37 +0100 Subject: [PATCH 416/484] pcl: add GaetanLepage as maintainer --- pkgs/by-name/pc/pcl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index c3e954c034e5..c8e2372e994b 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open project for 2D/3D image and point cloud processing"; changelog = "https://github.com/PointCloudLibrary/pcl/blob/pcl-${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = with lib.platforms; linux ++ darwin; }; }) From 40f5f68c88c6a9c81dbb04138528a0517bd2eb3f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 13:53:44 +0100 Subject: [PATCH 417/484] pcl: mark as broken on darwin /nix/store/8z1vw2lkj3d5333lppbgbl9fbkk0n65p-eigen-3.4.0/include/eigen3/Eigen/Core:70:10: fatal error: 'omp.h' file not found --- pkgs/by-name/pc/pcl/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index c8e2372e994b..b96bdbb24a39 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -84,5 +84,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = with lib.platforms; linux ++ darwin; + badPlatforms = [ + # fatal error: 'omp.h' file not found + lib.systems.inspect.patterns.isDarwin + ]; }; }) From ab58e267e35e3653777722e05bbcd3fbef5b870f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:04:46 +0000 Subject: [PATCH 418/484] evolve-core: 1.6 -> 1.7 --- pkgs/by-name/ev/evolve-core/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ev/evolve-core/package.nix b/pkgs/by-name/ev/evolve-core/package.nix index f9da5c20318c..6f6d0e8c0e03 100644 --- a/pkgs/by-name/ev/evolve-core/package.nix +++ b/pkgs/by-name/ev/evolve-core/package.nix @@ -9,13 +9,13 @@ flutter327.buildFlutterApplication rec { pname = "evolve-core"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "arcnations-united"; repo = "evolve-core"; tag = "v${version}"; - hash = "sha256-W8KpGQ81wjv/tAl09ax/a4Any5PNhhl1DIABhWgAwdc="; + hash = "sha256-U5qMJ3aquD2EzWXwTKw0GJPdaCmK68v8DLdJMAwKrzs="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; From cee1dfaec651086b5a2ac4bb35922afee62f8a2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:56:36 +0000 Subject: [PATCH 419/484] gpscorrelate: 2.2 -> 2.3 --- pkgs/by-name/gp/gpscorrelate/package.nix | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/gp/gpscorrelate/package.nix b/pkgs/by-name/gp/gpscorrelate/package.nix index c03d9204a765..5d9107343c26 100644 --- a/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/pkgs/by-name/gp/gpscorrelate/package.nix @@ -14,15 +14,15 @@ desktopToDarwinBundle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpscorrelate"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "dfandrich"; repo = "gpscorrelate"; - rev = version; - hash = "sha256-H1kqOzL79/Y1kHVEQ5y9JRWTDCBMbtEPo75drm8+7Qo="; + tag = finalAttrs.version; + hash = "sha256-7uNYwnMkW9jlt3kBrNqkhJsDoVkUFbCmqt0lQv8bRE0="; }; nativeBuildInputs = [ @@ -55,14 +55,14 @@ stdenv.mkDerivation rec { "install-desktop-file" ]; - meta = with lib; { + meta = { description = "GPS photo correlation tool, to add EXIF geotags"; longDescription = '' - Digital cameras are cool. So is GPS. And, EXIF tags are really + Digital cameras are cool. So is GPS. And, EXIF tags are really cool too. - What happens when you merge the three? You end up with a set of + What happens when you merge the three? You end up with a set of photos taken with a digital camera that are "stamped" with the location at which they were taken. @@ -70,14 +70,15 @@ stdenv.mkDerivation rec { A variety of programs exist around the place to match GPS data with digital camera photos, but most of them are Windows or - MacOS only. Which doesn't really suit me that much. Also, each + MacOS only. Which doesn't really suit me that much. Also, each one takes the GPS data in a different format. ''; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://dfandrich.github.io/gpscorrelate/"; - changelog = "https://github.com/dfandrich/gpscorrelate/releases/tag/${src.rev}"; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + changelog = "https://github.com/dfandrich/gpscorrelate/releases/tag/${finalAttrs.version}"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sikmir ]; + mainProgram = "gpscorrelate"; }; -} +}) From c7e6aa5a9db1f4ef78cd699cfb1f7b695c56ef97 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:00:49 +0100 Subject: [PATCH 420/484] rtabmap: move to by-name --- .../rtabmap/default.nix => by-name/rt/rtabmap/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{applications/video/rtabmap/default.nix => by-name/rt/rtabmap/package.nix} (95%) diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/by-name/rt/rtabmap/package.nix similarity index 95% rename from pkgs/applications/video/rtabmap/default.nix rename to pkgs/by-name/rt/rtabmap/package.nix index fc22d8988eae..fed1babcb608 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -8,8 +8,6 @@ pcl, libusb1, eigen, - wrapQtAppsHook, - qtbase, g2o, ceres-solver, zed-open-capture, @@ -17,6 +15,7 @@ octomap, freenect, libdc1394, + libsForQt5, libGL, libGLU, vtkWithQt5, @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { freenect libdc1394 # librealsense - missing includedir - qtbase + libsForQt5.qtbase libGL libGLU vtkWithQt5 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3d2a8a54f9..f20d87d0fe1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,7 +4780,7 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; - rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { + rtabmap = callPackage ../by-name/rt/rtabmap/package.nix { pcl = pcl.override { vtk = vtkWithQt5; }; }; From e5102e873de18e4aa9374bc365c7b8d75c3f3edb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:03:59 +0100 Subject: [PATCH 421/484] rtabmap: cleanup --- pkgs/by-name/rt/rtabmap/package.nix | 43 +++++++++++++++++++---------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index fed1babcb608..c3e5f9d5814e 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -2,45 +2,53 @@ lib, stdenv, fetchFromGitHub, - pkg-config, + + # nativeBuildInputs cmake, + libsForQt5, + pkg-config, + wrapGAppsHook3, + + # buildInputs opencv, pcl, + liblapack, + xorg, libusb1, eigen, g2o, ceres-solver, - zed-open-capture, - hidapi, octomap, freenect, libdc1394, - libsForQt5, libGL, libGLU, vtkWithQt5, - wrapGAppsHook3, - liblapack, - xorg, + zed-open-capture, + hidapi, + + # passthru + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtabmap"; version = "0.21.4.1"; src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk="; }; nativeBuildInputs = [ cmake - pkg-config libsForQt5.wrapQtAppsHook + pkg-config wrapGAppsHook3 ]; + buildInputs = [ ## Required opencv @@ -71,11 +79,16 @@ stdenv.mkDerivation rec { # Disable warnings that are irrelevant to us as packagers cmakeFlags = [ "-Wno-dev" ]; - meta = with lib; { + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { description = "Real-Time Appearance-Based 3D Mapping"; homepage = "https://introlab.github.io/rtabmap/"; - license = licenses.bsd3; - maintainers = with maintainers; [ marius851000 ]; - platforms = with platforms; linux; + changelog = "https://github.com/introlab/rtabmap/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ marius851000 ]; + platforms = with lib.platforms; linux; }; -} +}) From 744e64b561bf82a0023028bdf7d56cc98a419d21 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 14:04:49 +0100 Subject: [PATCH 422/484] rtabmap: mark as broken --- pkgs/by-name/rt/rtabmap/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index c3e5f9d5814e..bfa968d43e2e 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -90,5 +90,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ marius851000 ]; platforms = with lib.platforms; linux; + # pcl/io/io.h: No such file or directory + broken = true; }; }) From c407726f4fbbe6a6c88a78a532ecb47fd9f10e88 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 14 Feb 2025 10:10:52 +0100 Subject: [PATCH 423/484] coqPackages.mathcomp: remove Stdlib dependency Adapting to https://github.com/math-comp/math-comp/pull/1343 --- pkgs/development/coq-modules/autosubst/default.nix | 3 ++- pkgs/development/coq-modules/coq-bits/default.nix | 4 +++- pkgs/development/coq-modules/coq-elpi/default.nix | 11 +++++++++-- pkgs/development/coq-modules/coquelicot/default.nix | 3 ++- pkgs/development/coq-modules/deriving/default.nix | 3 ++- pkgs/development/coq-modules/fourcolor/default.nix | 2 ++ pkgs/development/coq-modules/gaia/default.nix | 2 ++ pkgs/development/coq-modules/graph-theory/default.nix | 2 ++ .../coq-modules/mathcomp-finmap/default.nix | 3 ++- .../coq-modules/mathcomp-real-closed/default.nix | 2 ++ .../coq-modules/mathcomp-tarjan/default.nix | 2 ++ .../development/coq-modules/mathcomp-zify/default.nix | 2 ++ pkgs/development/coq-modules/mathcomp/default.nix | 11 +++++++++-- pkgs/development/coq-modules/odd-order/default.nix | 2 ++ pkgs/development/coq-modules/reglang/default.nix | 3 ++- 15 files changed, 45 insertions(+), 10 deletions(-) diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index ce28e4a0d911..415756ad2dcb 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp-ssreflect, + stdlib, version ? null, }: @@ -33,7 +34,7 @@ mkCoqDerivation { } ] null; - propagatedBuildInputs = [ mathcomp-ssreflect ]; + propagatedBuildInputs = [ mathcomp-ssreflect stdlib ]; meta = with lib; { homepage = "https://www.ps.uni-saarland.de/autosubst/"; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 6754ba4d66a7..bdf4e0714f26 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -3,6 +3,8 @@ mkCoqDerivation, coq, mathcomp, + mathcomp-algebra-tactics, + stdlib, version ? null, }: @@ -35,7 +37,7 @@ mkCoqDerivation { release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp-algebra-tactics stdlib ]; meta = with lib; { description = "Formalization of bitset operations in Coq"; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 927f9d282131..5c0f9d2a6e9e 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -27,7 +27,6 @@ default-elpi-version = if elpi-version != null then elpi-version else ( elpi = coq.ocamlPackages.elpi.override { version = default-elpi-version; }; propagatedBuildInputs_wo_elpi = [ coq.ocamlPackages.findlib - stdlib ]; derivation = mkCoqDerivation { pname = "elpi"; @@ -120,4 +119,12 @@ patched-derivation2 = patched-derivation1.overrideAttrs propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ]; } ); -in patched-derivation2 +patched-derivation3 = patched-derivation2.overrideAttrs + ( + o: + lib.optionalAttrs (o.version != null && o.version == "2.4.0") + { + propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; + } + ); +in patched-derivation3 diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 806d7d1304b9..c26fc70c7ba3 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, autoconf, coq, + stdlib, ssreflect, version ? null, }: @@ -56,7 +57,7 @@ mkCoqDerivation { releaseRev = v: "coquelicot-${v}"; nativeBuildInputs = [ autoconf ]; - propagatedBuildInputs = [ ssreflect ]; + propagatedBuildInputs = [ stdlib ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; meta = with lib; { diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 259cf724c316..aa9a802b4bf5 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -4,6 +4,7 @@ coq, version ? null, ssreflect, + stdlib, }: mkCoqDerivation { @@ -47,7 +48,7 @@ mkCoqDerivation { release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh"; - propagatedBuildInputs = [ ssreflect ]; + propagatedBuildInputs = [ ssreflect stdlib ]; mlPlugin = true; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 39f6b75135eb..6b3b169f8d2b 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp, + stdlib, version ? null, }: @@ -67,6 +68,7 @@ mkCoqDerivation { mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 05079005b6c0..6110407c94e7 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp, + stdlib, version ? null, }: @@ -52,6 +53,7 @@ mkCoqDerivation { mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 6ef59a006de5..1f0b0eb41f28 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -4,6 +4,7 @@ coq, mathcomp, mathcomp-finmap, + mathcomp-algebra-tactics, fourcolor, hierarchy-builder, version ? null, @@ -68,6 +69,7 @@ mkCoqDerivation { mathcomp.algebra mathcomp-finmap mathcomp.fingroup + mathcomp-algebra-tactics fourcolor hierarchy-builder ]; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index fe408966797b..db0a28594d8c 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -2,6 +2,7 @@ coq, mkCoqDerivation, mathcomp, + stdlib, lib, version ? null, }: @@ -107,7 +108,7 @@ mkCoqDerivation { "1.0.0".sha256 = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; }; - propagatedBuildInputs = [ mathcomp.ssreflect ]; + propagatedBuildInputs = [ mathcomp.ssreflect stdlib ]; meta = { description = "Finset and finmap library"; diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 7654c47abf08..722df10efe7b 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, mathcomp, mathcomp-bigenough, + stdlib, lib, version ? null, }: @@ -115,6 +116,7 @@ mkCoqDerivation { mathcomp.fingroup mathcomp.solvable mathcomp-bigenough + stdlib ]; meta = { diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 9246a0b0682e..a681e9fb2347 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup, + stdlib, lib, version ? null, }@args: @@ -52,6 +53,7 @@ mkCoqDerivation { propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-fingroup + stdlib ]; meta = { diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index ec0c7cdcaa95..fe2535af6cf9 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -5,6 +5,7 @@ mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, + stdlib, version ? null, }: @@ -56,6 +57,7 @@ mkCoqDerivation rec { mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup + stdlib ]; meta = { diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index c4442ba1283c..5bc97ccade5f 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -136,13 +136,20 @@ let installFlags = o.installFlags ++ [ "-f Makefile.coq" ]; } ); - patched-derivation = patched-derivation2.overrideAttrs (o: + patched-derivation3 = patched-derivation2.overrideAttrs (o: lib.optionalAttrs (o.version != null && (o.version == "dev" || lib.versions.isGe "2.0.0" o.version)) { propagatedBuildInputs = o.propagatedBuildInputs ++ [ hierarchy-builder ]; } ); - in patched-derivation; + patched-derivation4 = patched-derivation3.overrideAttrs (o: + lib.optionalAttrs (o.version != null + && lib.versions.isLe "2.3.0" o.version) + { + propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; + } + ); + in patched-derivation4; in mathcomp_ (if single then "single" else "all") diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 1e4e044ae558..76a09f6d2bc1 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -2,6 +2,7 @@ lib, mkCoqDerivation, mathcomp, + stdlib, version ? null, }: @@ -45,6 +46,7 @@ mkCoqDerivation { mathcomp.solvable mathcomp.field mathcomp.all + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index cd0513a6e02a..9b4fd8efea59 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, coq, mathcomp, + stdlib, version ? null, }: @@ -46,7 +47,7 @@ mkCoqDerivation { ] null; - propagatedBuildInputs = [ mathcomp.ssreflect ]; + propagatedBuildInputs = [ mathcomp.ssreflect stdlib ]; meta = with lib; { description = "Regular Language Representations in Coq"; From 7be289122c258603e7b6912a48e568347fb0bd12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:24:17 +0000 Subject: [PATCH 424/484] istioctl: 1.24.2 -> 1.24.3 --- pkgs/by-name/is/istioctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 183d130cd051..4a8ab59fc285 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.24.2"; + version = "1.24.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-JJ/zLW6ri53qSTmbGZS2FhY2AJ1h3L/hk0rnj0swml4="; + hash = "sha256-/ABy0zZF/+rxYkpS5H6EAXZVYZxt7I4SCjLtrtkacGw="; }; - vendorHash = "sha256-0sUxqOW3PeMXZvlTmMBvs6vnc3pSLzSISfUSo9YdToQ="; + vendorHash = "sha256-B4MxvOzKxsQJmc9dKQFt1CGi1PnElOt8H72H2JVaZUU="; nativeBuildInputs = [ installShellFiles ]; From b169aae532c58fb37ab906326fe5cd43d1b66a5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:27:58 +0000 Subject: [PATCH 425/484] typos-lsp: 0.1.33 -> 0.1.34 --- pkgs/by-name/ty/typos-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 212d9ef86092..ef55209fb3b3 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.33"; + version = "0.1.34"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${version}"; - hash = "sha256-FunbE4HxDmugLmR2XwFFAjvNBTVbLAhiHtacxuPXMVE="; + hash = "sha256-WqICNpheCJJAmmbj5QIejFeUIW/7ghrhQRP73PLLMJ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JFsDq9FaOvQmCCO2He2BIUJO6E8x5aMTBQy0B5kY4lQ="; + cargoHash = "sha256-tmBRUoBsNQlJY0JYtDknD5xeeFnokTE9cnHzktMIiBU="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 From c71264034d52bdf794c716c9dde7bd5202ad6222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:38:47 +0000 Subject: [PATCH 426/484] libdatachannel: 0.22.4 -> 0.22.5 --- pkgs/by-name/li/libdatachannel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index a24fc8380f0c..7139b7d0c087 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.22.4"; + version = "0.22.5"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-mnBB2UyeQ73NckE3uF91RhezJDKMQeoOKn8515ygrU0="; + hash = "sha256-6oJf7yHI47VOZtE2AKan+3GrcAgMMxJaZziNsSe7pdg="; }; outputs = [ From 9d6fdd0c179540f268952ba59eaa4f5cd229b84b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 14:58:29 +0100 Subject: [PATCH 427/484] python3Packages.boxx: fix build - fn dependency is no longer required - run tests only on Linux because xvfb is not available on other platforms --- pkgs/development/python-modules/boxx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 1a0821f7d5fb..2a3cba0cda64 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, python, @@ -10,7 +11,6 @@ pandas, imageio, snakeviz, - fn, pyopengl, seaborn, torch, @@ -37,7 +37,6 @@ buildPythonPackage rec { pandas imageio snakeviz - fn pyopengl seaborn ]; @@ -50,6 +49,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "boxx" ]; + doCheck = stdenv.hostPlatform.isLinux; + checkPhase = '' xvfb-run ${python.interpreter} -m unittest ''; From 9a02ca1c76e67805cdd780b0e45dff89c87b2fdf Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 16 Dec 2024 21:42:25 +0100 Subject: [PATCH 428/484] amazon-ec2-metadata-mock: init at 1.13.0 --- .../am/amazon-ec2-metadata-mock/package.nix | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix diff --git a/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix b/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix new file mode 100644 index 000000000000..e69614c4ee15 --- /dev/null +++ b/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule rec { + pname = "amazon-ec2-metadata-mock"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-ec2-metadata-mock"; + tag = "v${version}"; + hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8="; + }; + + vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU="; + + subPackages = [ "cmd/ec2-metadata-mock" ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgram = "${builtins.placeholder "out"}/bin/ec2-metadata-mock"; + + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Tool to simulate Amazon EC2 instance metadata"; + homepage = "https://github.com/aws/amazon-ec2-metadata-mock"; + license = lib.licenses.asl20; + mainProgram = "ec2-metadata-mock"; + maintainers = with lib.maintainers; [ arianvp ]; + }; +} From c9dfe44a7da08a3384f3589e05ded6a312fbb70d Mon Sep 17 00:00:00 2001 From: Sean Behan Date: Fri, 14 Feb 2025 08:39:27 -0500 Subject: [PATCH 429/484] foundry: 0.3.0 -> 1.0.0 --- pkgs/by-name/fo/foundry/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index e4165faabc7e..ff494616db3c 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "foundry"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "foundry-rs"; repo = "foundry"; tag = "v${version}"; - hash = "sha256-SdxcNbe8/dNZ4JcxKksWmDBAvQorpC8ePvQgnyeKgxU="; + hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5URvuHnpaceRbMqzTA+NRvpp/WLdf+zfmYhIMPiOhNk="; + cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; From 46de81e809539503a8f69fcc835b9b0d61879491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:03:59 +0000 Subject: [PATCH 430/484] apk-tools: 2.14.9 -> 2.14.10 --- pkgs/tools/package-management/apk-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index a05efc5e6f6d..fee68c48e21c 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.9"; + version = "2.14.10"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-EYTchTfkMqREBQ1kAeQDP6LUhEfJKeEs1DjlE8RsvMg="; + sha256 = "sha256-9TSkcJe7FVdTtfcCmwp+IWMYa/OL9OXJwPcKLyj5AAA="; }; nativeBuildInputs = [ pkg-config scdoc ] From 6ae1e543d0b6dcaa3f972625c35763713473df82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:06:59 +0000 Subject: [PATCH 431/484] cargo-tarpaulin: 0.31.5 -> 0.32.0 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 9e5d4f009b32..644b14f3cbda 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.31.5"; + version = "0.32.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-7RSwRKLfNEZQczMriaeXH8uMMqR5Drdmtc68RCO2xTA="; + hash = "sha256-ghmsglKQrHa1nyUAj4oXry8GR0u0qdeY+fmWTh+S64M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z89LPoXsJKoKm+Aqi7PHtRn4iI77hAJQPVjKWNTgm8U="; + cargoHash = "sha256-niwQi6spvul1jIYsjwAVksuHo/cTm2QoROuaPv8vuNs="; nativeBuildInputs = [ pkg-config From b99fa6e0290e4d50d491e037930bd8d469655bc1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 13 Feb 2025 12:28:48 +0700 Subject: [PATCH 432/484] python312Packages: dash-bootstrap-templates: init at 1.3.0 This introduces a collection of 52 Plotly figure templates with a Bootstrap theme. Two theme switch components. Stylesheet to apply Bootstrap themes to Plotly Dash components. It is the last 1.x version. The recently released 2.x version is only compatible with Plotly 6, while everything in nixpkgs currently still uses Plotly 5. --- .../dash-bootstrap-templates/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/dash-bootstrap-templates/default.nix diff --git a/pkgs/development/python-modules/dash-bootstrap-templates/default.nix b/pkgs/development/python-modules/dash-bootstrap-templates/default.nix new file mode 100644 index 000000000000..29457bf57494 --- /dev/null +++ b/pkgs/development/python-modules/dash-bootstrap-templates/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + dash, + dash-bootstrap-components, + numpy, +}: + +buildPythonPackage rec { + pname = "dash-bootstrap-templates"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AnnMarieW"; + repo = "dash-bootstrap-templates"; + rev = "V${version}"; + hash = "sha256-dbXqqncxfIZ6traVQ2a/2E1Co4MVdoiU8ox6nBnqviE="; + }; + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + dash + dash-bootstrap-components + numpy + ]; + + pythonImportsCheck = [ "dash_bootstrap_templates" ]; + + # There are no tests. + doCheck = false; + + meta = { + description = "A collection of 52 Plotly figure templates with a Bootstrap theme"; + homepage = "https://github.com/AnnMarieW/dash-bootstrap-templates"; + changelog = "https://github.com/AnnMarieW/dash-bootstrap-templates/releases/tag/V${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b98d245a8297..284cd9cfa267 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2949,6 +2949,8 @@ self: super: with self; { dash-bootstrap-components = callPackage ../development/python-modules/dash-bootstrap-components { }; + dash-bootstrap-templates = callPackage ../development/python-modules/dash-bootstrap-templates { }; + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; dash-html-components = callPackage ../development/python-modules/dash-html-components { }; From 7a5b52d0af20d488ff401643e4837a54dab64b6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:10:17 +0000 Subject: [PATCH 433/484] prometheus-postfix-exporter: 0.7.0 -> 0.8.0 --- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 14487935f6ac..8bbfcc9e8fe3 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "postfix_exporter"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Hsn723"; repo = "postfix_exporter"; tag = "v${version}"; - sha256 = "sha256-Bu8Y0UgB9D8psfRg/TRZqWqP5bj1+dWtAihLwCL+cTQ="; + sha256 = "sha256-g/Y+amX3vyyhkxvJAxPimFDgFdpcA5+zWTu2Mhq3Dyw="; }; - vendorHash = "sha256-GkEHFcclILMst1je/1N7NNnO6F/LMv+e5Abq3uqtH+k="; + vendorHash = "sha256-hcS7BBs54RmBu1d2EXedc9bU2eXmB9bQ4yAyYgp85xY="; ldflags = [ "-s" From 144ab8d5c4a21a89cbcf913e0e9dc350fe606acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 14 Feb 2025 15:12:47 +0100 Subject: [PATCH 434/484] ansible: consolidate setuptools replace --- .../development/python-modules/ansible/core.nix | 3 +-- pkgs/top-level/all-packages.nix | 17 ----------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 3be6d5c6a68a..5f67400c5a39 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -49,8 +49,7 @@ buildPythonPackage rec { patchShebangs --build packaging/cli-doc/build.py - substituteInPlace pyproject.toml \ - --replace-fail "setuptools >= 66.1.0, <= 75.6.0" setuptools + sed -E 's|"setuptools[0-9 <>=.,]+"|"setuptools"|g' -i pyproject.toml ''; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74a0806edebc..182af4fb4401 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7465,16 +7465,6 @@ with pkgs; inherit version; hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc="; }; - - postPatch = '' - substituteInPlace lib/ansible/executor/task_executor.py \ - --replace "[python," "[" - - patchShebangs --build packaging/cli-doc/build.py - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools >= 66.1.0, <= 75.8.0" setuptools - ''; })); ansible_2_16 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.16.8"; @@ -7482,13 +7472,6 @@ with pkgs; inherit version; hash = "sha256-WeSqQO1azbTvm789BYkY//k/ZqFJNz2BWciilgRBC9o="; }; - - postPatch = '' - substituteInPlace lib/ansible/executor/task_executor.py \ - --replace "[python," "[" - - patchShebangs --build packaging/cli-doc/build.py - ''; })); ansible-builder = with python3Packages; toPythonApplication ansible-builder; From e50930826bfbac5613198684ec56dba664ccbafb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 15:16:27 +0100 Subject: [PATCH 435/484] python3Packages.boxx: remove tests since they are broken on all platforms --- .../python-modules/boxx/default.nix | 32 ++++--------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 2a3cba0cda64..de23a4934ce0 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -1,21 +1,15 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, - python, - xvfb-run, + imageio, matplotlib, - scikit-image, numpy, pandas, - imageio, - snakeviz, pyopengl, + scikit-image, seaborn, - torch, - pythonOlder, - torchvision, + snakeviz, }: buildPythonPackage rec { @@ -23,38 +17,24 @@ buildPythonPackage rec { version = "0.10.14"; format = "setuptools"; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-unGnmPksEuqFXHTWJkj9Gv2G/qPDgT6AZXYiG2gtkEA="; }; propagatedBuildInputs = [ + imageio matplotlib - scikit-image numpy pandas - imageio - snakeviz pyopengl + scikit-image seaborn - ]; - - nativeCheckInputs = [ - xvfb-run - torch - torchvision + snakeviz ]; pythonImportsCheck = [ "boxx" ]; - doCheck = stdenv.hostPlatform.isLinux; - - checkPhase = '' - xvfb-run ${python.interpreter} -m unittest - ''; - meta = with lib; { description = "Tool-box for efficient build and debug for Scientific Computing and Computer Vision"; homepage = "https://github.com/DIYer22/boxx"; From abcfab4cf157eab6850b07a9bfdbcdbf47abed98 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Feb 2025 15:16:47 +0100 Subject: [PATCH 436/484] python3Packages.bpycv: unbreak on aarch64 --- pkgs/development/python-modules/bpycv/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 923c4d0ced49..5e7da42a9713 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -57,7 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/DIYer22/bpycv"; license = licenses.mit; maintainers = [ maintainers.lucasew ]; - broken = stdenv.hostPlatform.isAarch64; inherit (blender.meta) platforms; }; } From 429299c5705e21f18ce7d12145c86675dc130de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 14 Feb 2025 15:36:24 +0100 Subject: [PATCH 437/484] ansible*: fail if setuptools pattern not found --- pkgs/development/python-modules/ansible/core.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 5f67400c5a39..08648dd7b42d 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -49,7 +49,14 @@ buildPythonPackage rec { patchShebangs --build packaging/cli-doc/build.py - sed -E 's|"setuptools[0-9 <>=.,]+"|"setuptools"|g' -i pyproject.toml + SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"' + PYPROJECT=$(cat pyproject.toml) + if [[ "$PYPROJECT" =~ $SETUPTOOLS_PATTERN ]]; then + echo "setuptools replace: ''${BASH_REMATCH[0]}" + echo "''${PYPROJECT//''${BASH_REMATCH[0]}/'"setuptools"'}" > pyproject.toml + else + exit 2 + fi ''; nativeBuildInputs = [ From 4ab80660c4bdae89aa5c8331248da505adb7608e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:37:28 +0000 Subject: [PATCH 438/484] nix-search-tv: 1.0.0 -> 2.0.0 --- pkgs/by-name/ni/nix-search-tv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index a1e4c7299c4f..b880fef48987 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nix-search-tv"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "3timeslazy"; repo = "nix-search-tv"; tag = "v${version}"; - hash = "sha256-SKLvN67GHLHGj0bUYdFutiLzRVCCtxNokWP0z3Za9UU="; + hash = "sha256-C8RTUwTkMgROipLgoDrm3L5aTBwOJ+cVr38xx1+sJCQ="; }; - vendorHash = "sha256-uzNDhkovlXx0tIgSJ3E08d0TNmktSrlOOe8Iwi4ZfmU="; + vendorHash = "sha256-0spLr6Qn2eQZC5Wwe6d+0o6B3r9CIgJt2X5/E/UMvg8="; subPackages = [ "cmd/nix-search-tv" ]; From c7032bb4d4028c63115c3a2d6c4f49a032a7d900 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:31:49 +0100 Subject: [PATCH 439/484] python312Packages.ale-py: 0.10.1 -> 0.10.2 Diff: https://github.com/Farama-Foundation/Arcade-Learning-Environment/compare/refs/tags/v0.10.1...v0.10.2 Changelog: https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v0.10.2 --- .../python-modules/ale-py/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 8eebc721928e..73798537809a 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -1,7 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -19,25 +19,22 @@ importlib-resources, numpy, typing-extensions, - importlib-metadata, - # checks + # tests gymnasium, pytestCheckHook, - - stdenv, }: buildPythonPackage rec { pname = "ale-py"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; tag = "v${version}"; - hash = "sha256-MDMCYnyLZYbQXwyr5VuPeVEop825nD++yQ7hhsW4BX8="; + hash = "sha256-CGUlQFQoQZqs+Jd3IU/o50VwX+tEHrs3KHrcVWahEpo="; }; build-system = [ @@ -57,7 +54,7 @@ buildPythonPackage rec { importlib-resources numpy typing-extensions - ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + ]; postPatch = # Relax the pybind11 version @@ -75,10 +72,13 @@ buildPythonPackage rec { pytestCheckHook ]; - # test_atari_env.py::test_check_env fails on the majority of the environments because the ROM are missing. - # The user is expected to manually download the roms: - # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else - disabledTests = [ "test_check_env" ]; + disabledTests = [ + # test_atari_env.py tests fail on the majority of the environments because the ROM are missing. + # The user is expected to manually download the roms: + # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else + "test_check_env" + "test_sound_obs" + ]; meta = { description = "Simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games"; @@ -87,6 +87,9 @@ buildPythonPackage rec { changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ billhuang ]; - broken = stdenv.hostPlatform.isDarwin; # fails to link with missing library + badPlatforms = [ + # fails to link with missing library + lib.systems.inspect.patterns.isDarwin + ]; }; } From 0102b4d6ca96a1afa2aed446ee300e8070a54a2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:37:41 +0000 Subject: [PATCH 440/484] tippecanoe: 2.75.0 -> 2.75.1 --- pkgs/by-name/ti/tippecanoe/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 3e55a2fa7159..e298a641dc70 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.75.0"; + version = "2.75.1"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; - rev = finalAttrs.version; - hash = "sha256-0ayEGmIUw5jI5utp689oxlFR15TeQ1gbLJIos4AXdd4="; + tag = finalAttrs.version; + hash = "sha256-rBuk34lOrp9aW7yK0LOTRqFJg3J8IogR01kcFhgK12Y="; }; buildInputs = [ @@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { version = "v${finalAttrs.version}"; }; - meta = with lib; { + meta = { description = "Build vector tilesets from large collections of GeoJSON features"; homepage = "https://github.com/felt/tippecanoe"; - license = licenses.bsd2; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; mainProgram = "tippecanoe"; }; }) From 26014d3455751e9e304d71ceb3996a8bb18c3566 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 14 Feb 2025 09:59:12 -0600 Subject: [PATCH 441/484] yabai: 7.1.9 -> 7.1.10 --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index e842f1d0bc27..71f473315ff7 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.9"; + version = "7.1.10"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-x5V269Jilpv9XdSw5AtLpOBc4io8i1+duj62S4h9eXM="; + hash = "sha256-mWN59BfexCmaahADzUP+B1xGQK8TNyrKOBKKJ00D7tg="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-STgd51fatxGahhYyCDo35mZbhYwX5n76cdu2NnzjdDM="; + hash = "sha256-4OYB+RlAUD8LcRcUNIEXWfFFedTmQFzcTgqd1g/tdWc="; }; }; From 0de36a55a07b92f3577ad62e9642caac497fe5f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 16:17:08 +0000 Subject: [PATCH 442/484] weaviate: 1.28.4 -> 1.28.5 --- pkgs/by-name/we/weaviate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index b5417d5bc1c4..063475fe0b09 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.28.4"; + version = "1.28.5"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-nHvN+VSk+kw4jmniKXmUJEf4cRDH7s5yMOL/asXkTNM="; + hash = "sha256-avFO+FrhTWGxt5FGEIczu+3qL29WroqJFaYfNDP1gpI="; }; - vendorHash = "sha256-OYLHHIOZWmkAxVethJNJfJOz3kDIXefu/aAUJ/rvxeQ="; + vendorHash = "sha256-4JM+MGrlZLCWGcOG5bAuVO/Z+VUB09pvyv/T9r6z/qo="; subPackages = [ "cmd/weaviate-server" ]; From 4ff952cca3e4c1b954e867bb587f029a98af6e15 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Fri, 14 Feb 2025 17:23:59 +0100 Subject: [PATCH 443/484] netbootxyz-efi: add maintainer --- pkgs/by-name/ne/netbootxyz-efi/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/netbootxyz-efi/package.nix b/pkgs/by-name/ne/netbootxyz-efi/package.nix index bd2fc9fa09d1..63ce75a494cb 100644 --- a/pkgs/by-name/ne/netbootxyz-efi/package.nix +++ b/pkgs/by-name/ne/netbootxyz-efi/package.nix @@ -17,7 +17,7 @@ fetchurl { homepage = "https://netboot.xyz/"; description = "Tool to boot OS installers and utilities over the network, to be run from a bootloader"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ pinpox ]; platforms = platforms.linux; }; } From b58df7fc9d5f02c269091f2b0b81a6e06fc859bb Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 14 Feb 2025 17:30:35 +0100 Subject: [PATCH 444/484] linuxPackages.nvidiaPackages.vulkan_beta: 550.40.83 -> 550.40.85 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d87a45fa6e7b..7f62b99c1da9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -106,11 +106,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.83"; + version = "550.40.85"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-2zfiVA7H4erkdbqyNH+2MHexclT+ZF2PifYkD5Dmo7M="; - openSha256 = "sha256-Tqj8g/KUOtUc815tZo1wOrj7XMbDp7JL7oq7t3h1r+I="; + sha256_64bit = "sha256-2LYrpW5/l5HnAWXehiu6fAM7fqr2kHsh55aAx99MWPU="; + openSha256 = "sha256-waGF6tH5f+0frcyqOJA0MHiB9BM0r5oF75rkLzxo3Js="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; From acdaaa59bde5c2a6f21f1d73a67f2d00a1e421b8 Mon Sep 17 00:00:00 2001 From: rein Date: Fri, 14 Feb 2025 16:43:46 +0000 Subject: [PATCH 445/484] tabby: v0.23.1 -> v0.24.0 --- pkgs/by-name/ta/tabby/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 85893b378fe7..223e779790eb 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -31,7 +31,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.23.1"; + version = "0.24.0"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -120,7 +120,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; tag = "v${version}"; - hash = "sha256-8eQFsLiAHF/9gD1SdtsbDwHm0WjQ3Db6QIyxMF2dIM0="; + hash = "sha256-poWUfPp/7w6dNjh6yoP5oTbaP4lL91hb1+zQG8tjUDE="; fetchSubmodules = true; }; From 6825d6f9f634a9fee82d980b2ef1672c6011e01c Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Fri, 14 Feb 2025 19:03:45 +0200 Subject: [PATCH 446/484] martian-mono: fix build Upstream changed the released zip files so the hash changed Closes #382089 --- pkgs/by-name/ma/martian-mono/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/martian-mono/package.nix b/pkgs/by-name/ma/martian-mono/package.nix index 223b22009c3e..3b42445e2f2d 100644 --- a/pkgs/by-name/ma/martian-mono/package.nix +++ b/pkgs/by-name/ma/martian-mono/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip"; - sha256 = "sha256-L+T9XxTH7+yFJwhZ8UXAlq3rAkPFn/8dRBoGfbiHuGA="; + sha256 = "sha256-W6ewNtFDS1O1fwoAe27tIgNZn7AAKo965dWkZYzsg+o="; stripRoot = false; }; From adbf994b8612d66422ca9d27bf403eb27d287e7c Mon Sep 17 00:00:00 2001 From: Fazzi Date: Fri, 14 Feb 2025 17:06:24 +0000 Subject: [PATCH 447/484] obs-studio-plugins.obs-pipewire-audio-capture: 1.1.5 -> 1.2.0 --- .../plugins/obs-pipewire-audio-capture.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index dc03e00a192e..fefdefc8eb4f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -8,16 +8,15 @@ pipewire, pkg-config, }: - stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-qYHU0m+jz/mQmjleITnzxNkTio5ir8dFkHKfmY4l0Es="; + sha256 = "sha256-nkd/AoMsEUUxQQH5CjbnPbNwAwkd1y6j2nCa1GIAFPs="; }; nativeBuildInputs = [ @@ -31,13 +30,17 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=/lib" + "-DCMAKE_INSTALL_LIBDIR=./lib" + "-DCMAKE_INSTALL_DATADIR=./usr" ]; meta = with lib; { description = "Audio device and application capture for OBS Studio using PipeWire"; homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; - maintainers = with maintainers; [ Elinvention ]; + maintainers = with maintainers; [ + Elinvention + fazzi + ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" From 19c429fdf98a3f9c3db5595420c9090261e7a2e6 Mon Sep 17 00:00:00 2001 From: Fazzi Date: Fri, 14 Feb 2025 17:07:16 +0000 Subject: [PATCH 448/484] maintainers: add fazzi to maintainer list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8aea451f3a0a..5648f2654386 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7390,6 +7390,12 @@ name = "A Frederick Christensen"; keys = [ { fingerprint = "5A49 F4F9 3EDC 21E9 B7CC 4E94 9EEF 4142 5355 8AC4"; } ]; }; + fazzi = { + email = "faaris.ansari@proton.me"; + github = "fxzzi"; + githubId = 18248986; + name = "Faaris Ansari"; + }; fbeffa = { email = "beffa@fbengineering.ch"; github = "fedeinthemix"; From 0080181fc63c5eab6767fbca18a41390620325da Mon Sep 17 00:00:00 2001 From: rein Date: Fri, 14 Feb 2025 17:17:16 +0000 Subject: [PATCH 449/484] tabby: use useFetchCargoVendor --- pkgs/by-name/ta/tabby/Cargo.lock | 7316 ----------------------------- pkgs/by-name/ta/tabby/package.nix | 49 +- 2 files changed, 16 insertions(+), 7349 deletions(-) delete mode 100644 pkgs/by-name/ta/tabby/Cargo.lock diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock deleted file mode 100644 index 450526e04694..000000000000 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ /dev/null @@ -1,7316 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom 0.2.15", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "aim-downloader" -version = "0.23.1" -dependencies = [ - "async-stream", - "clap", - "custom_error", - "dotenvy", - "futures-util", - "home", - "indicatif", - "netrc", - "regex", - "reqwest", - "serial_test 2.0.0", - "sha2", - "strfmt", - "tokio", - "tokio-util", - "url-parse", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "argon2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" -dependencies = [ - "base64ct", - "blake2", - "cpufeatures", - "password-hash", -] - -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "async-convert" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" -dependencies = [ - "async-trait", -] - -[[package]] -name = "async-openai" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" -dependencies = [ - "async-convert", - "backoff", - "base64 0.22.1", - "bytes", - "derive_builder", - "futures", - "rand 0.8.5", - "reqwest", - "reqwest-eventsource", - "secrecy 0.8.0", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "auto_enums" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" -dependencies = [ - "derive_utils", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "axum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" -dependencies = [ - "async-trait", - "axum-core", - "base64 0.21.7", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "itoa 1.0.11", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper 1.0.1", - "tokio", - "tokio-tungstenite", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 0.1.2", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-extra" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" -dependencies = [ - "axum", - "axum-core", - "bytes", - "futures-util", - "headers", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "serde", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-prometheus" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683cbc43010e9a3d72c2f31ca464155ff4f95819e88a32924b0f47a43898978" -dependencies = [ - "axum", - "bytes", - "futures", - "futures-core", - "http 1.1.0", - "http-body 1.0.0", - "matchit", - "metrics", - "metrics-exporter-prometheus", - "once_cell", - "pin-project", - "tokio", - "tower 0.4.13", - "tower-http 0.5.2", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.15", - "instant", - "pin-project-lite", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "bitpacking" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" -dependencies = [ - "crunchy", -] - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata 0.4.6", - "serde", -] - -[[package]] -name = "build-target" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cached" -version = "0.49.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8e463fceca5674287f32d252fb1d94083758b8709c160efae66d263e5f4eba" -dependencies = [ - "ahash", - "async-trait", - "cached_proc_macro", - "cached_proc_macro_types", - "futures", - "hashbrown 0.14.5", - "instant", - "once_cell", - "thiserror", - "tokio", -] - -[[package]] -name = "cached_proc_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cached_proc_macro_types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "census" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.5", -] - -[[package]] -name = "chumsky" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" -dependencies = [ - "hashbrown 0.14.5", - "stacker", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_derive" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "clocksource" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129026dd5a8a9592d96916258f3a5379589e513ea5e86aeb0bd2530286e44e9e" -dependencies = [ - "libc", - "time", - "winapi", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cron" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "custom_error" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.66", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core 0.20.9", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derive_builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" -dependencies = [ - "derive_builder_core", - "syn 2.0.66", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "derive_utils" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "either" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" -dependencies = [ - "serde", -] - -[[package]] -name = "email-encoding" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" -dependencies = [ - "base64 0.22.1", - "memchr", -] - -[[package]] -name = "email_address" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoder" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f6928ad5c6efcdae42eb068dff8a555ef2f057c92bbd491ddf5610f6444987" -dependencies = [ - "encoder-ryu", - "indexmap 2.2.6", - "serde_json", - "simd-json", -] - -[[package]] -name = "encoder-ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e27addc39f5f73c85604bfe21b59fe93717f9765194015d92bde1db11e8ccef" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encoding_rs_io" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" -dependencies = [ - "encoding_rs", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "eventsource-stream" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" -dependencies = [ - "futures-core", - "nom", - "pin-project-lite", -] - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastdivide" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fid-rs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28658c0c3420305705adde833a0d2d614207507d013a5f25707553fb2ae2cd" -dependencies = [ - "rayon", -] - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs4" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" -dependencies = [ - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.6.0", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "gitlab" -version = "0.1700.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f36adc608cffeec1cc08ecf1977c038cbb1af9184b2174ca006ebeb817991c" -dependencies = [ - "async-trait", - "base64 0.22.1", - "bytes", - "chrono", - "cron", - "derive_builder", - "futures-util", - "graphql_client", - "http 1.1.0", - "itertools 0.12.1", - "log", - "percent-encoding", - "reqwest", - "serde", - "serde_json", - "serde_urlencoded", - "thiserror", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "graphql-introspection-query" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" -dependencies = [ - "serde", -] - -[[package]] -name = "graphql-parser" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" -dependencies = [ - "combine", - "thiserror", -] - -[[package]] -name = "graphql_client" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50cfdc7f34b7f01909d55c2dcb71d4c13cbcbb4a1605d6c8bd760d654c1144b" -dependencies = [ - "graphql_query_derive", - "serde", - "serde_json", -] - -[[package]] -name = "graphql_client_codegen" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e27ed0c2cf0c0cc52c6bcf3b45c907f433015e580879d14005386251842fb0a" -dependencies = [ - "graphql-introspection-query", - "graphql-parser", - "heck 0.4.1", - "lazy_static", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.109", -] - -[[package]] -name = "graphql_query_derive" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" -dependencies = [ - "graphql_client_codegen", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "grep" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2b024ec1e686cb64d78beb852030b0e632af93817f1ed25be0173af0e94939" -dependencies = [ - "grep-cli", - "grep-matcher", - "grep-printer", - "grep-regex", - "grep-searcher", -] - -[[package]] -name = "grep-cli" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea40788c059ab8b622c4d074732750bfb3bd2912e2dd58eabc11798a4d5ad725" -dependencies = [ - "bstr", - "globset", - "libc", - "log", - "termcolor", - "winapi-util", -] - -[[package]] -name = "grep-matcher" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" -dependencies = [ - "memchr", -] - -[[package]] -name = "grep-printer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743c12a03c8aee38b6e5bd0168d8ebb09345751323df4a01c56e792b1f38ceb2" -dependencies = [ - "bstr", - "grep-matcher", - "grep-searcher", - "log", - "serde", - "serde_json", - "termcolor", -] - -[[package]] -name = "grep-regex" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" -dependencies = [ - "bstr", - "grep-matcher", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "grep-searcher" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" -dependencies = [ - "bstr", - "encoding_rs", - "encoding_rs_io", - "grep-matcher", - "log", - "memchr", - "memmap2", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "halfbrown" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" -dependencies = [ - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "hash-ids" -version = "0.23.1" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "headers" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http 1.1.0", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" -dependencies = [ - "http 1.1.0", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "hostname" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" -dependencies = [ - "cfg-if", - "libc", - "windows 0.52.0", -] - -[[package]] -name = "htmd" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fff09744b11deed5946dd1b61c806bb9a94ded93cf28da819935599b69b987" -dependencies = [ - "html5ever 0.27.0", - "markup5ever_rcdom", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "html5ever" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" -dependencies = [ - "log", - "mac", - "markup5ever 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "htmlescape" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http-api-bindings" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-stream", - "async-trait", - "futures", - "leaky-bucket", - "ollama-api-bindings", - "reqwest", - "reqwest-eventsource", - "serde", - "serde_json", - "tabby-common", - "tabby-inference", - "tokio", - "tracing", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http 1.1.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa 1.0.11", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http 1.1.0", - "http-body 1.0.0", - "httparse", - "httpdate", - "itoa 1.0.11", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.3.1", - "hyper-util", - "rustls 0.22.4", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.25.0", - "tower-service", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.3.1", - "hyper-util", - "log", - "rustls 0.23.20", - "rustls-native-certs 0.8.1", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.1", - "tower-service", -] - -[[package]] -name = "hyper-timeout" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" -dependencies = [ - "hyper 1.3.1", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", - "pin-project-lite", - "socket2", - "tokio", - "tower 0.4.13", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.6", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "insta" -version = "1.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "pest", - "pest_derive", - "serde", - "similar", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "iri-string" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f5f6c2df22c009ac44f6f1499308e7a3ac7ba42cd2378475cc691510e1eef1b" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonwebtoken" -version = "9.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" -dependencies = [ - "base64 0.21.7", - "js-sys", - "pem", - "ring 0.17.8", - "serde", - "serde_json", - "simple_asn1", -] - -[[package]] -name = "juniper" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943306315b1a7a03d27af9dfb0c288d9f4da8830c17df4bceb7d50a47da0982c" -dependencies = [ - "async-trait", - "auto_enums", - "chrono", - "fnv", - "futures", - "graphql-parser", - "indexmap 2.2.6", - "juniper_codegen", - "serde", - "smartstring", - "static_assertions", - "void", -] - -[[package]] -name = "juniper_axum" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f81e883bc6ffb2e5a3cc7276bfe9519c49108bdc1330d5aab1b79cb088f2f26" -dependencies = [ - "axum", - "bytes", - "futures", - "juniper", - "juniper_graphql_ws", - "serde", - "serde_json", -] - -[[package]] -name = "juniper_codegen" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760dbe46660494d469023d661e8d268f413b2cb68c999975dcc237407096a693" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "url", -] - -[[package]] -name = "juniper_graphql_ws" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709eb11c716072f5c9fcbfa705dd684bd3c070943102f9fc56ccb812a36ba017" -dependencies = [ - "juniper", - "juniper_subscriptions", - "serde", - "tokio", -] - -[[package]] -name = "juniper_subscriptions" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6208a839bd4ca2131924a238311d088d6604ea267c0917903392bad7b70a92c" -dependencies = [ - "futures", - "juniper", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever 0.25.2", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "leaky-bucket" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a396bb213c2d09ed6c5495fd082c991b6ab39c9daf4fff59e6727f85c73e4c5" -dependencies = [ - "parking_lot", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "lettre" -version = "0.11.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" -dependencies = [ - "async-trait", - "base64 0.22.1", - "chumsky", - "email-encoding", - "email_address", - "fastrand", - "futures-io", - "futures-util", - "hostname", - "httpdate", - "idna", - "mime", - "native-tls", - "nom", - "percent-encoding", - "quoted_printable", - "socket2", - "tokio", - "tokio-native-tls", - "url", -] - -[[package]] -name = "levenshtein_automata" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.169" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" - -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "llama-cpp-server" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-trait", - "cmake", - "futures", - "http-api-bindings", - "omnicopy_to_output", - "reqwest", - "serde", - "serdeconv", - "tabby-common", - "tabby-inference", - "tokio", - "tracing", - "which", -] - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "logkit" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b517d00135d2ea552dc1f6cbc5da9d8953f895c91db680c288d53c50ca309767" -dependencies = [ - "backtrace", - "chrono", - "encoder", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "pin-utils", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "louds-rs" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16a91fb20f74b6d9a758a0103a2884af525a2fa34fbfe19f4b3c5482a4a54e9" -dependencies = [ - "fid-rs", -] - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "lz4_flex" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" -dependencies = [ - "log", - "phf 0.11.2", - "phf_codegen 0.11.2", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" -dependencies = [ - "html5ever 0.27.0", - "markup5ever 0.12.1", - "tendril", - "xml5ever", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "measure_time" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" -dependencies = [ - "instant", - "log", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "metrics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" -dependencies = [ - "ahash", - "portable-atomic", -] - -[[package]] -name = "metrics-exporter-prometheus" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" -dependencies = [ - "base64 0.21.7", - "hyper 0.14.28", - "indexmap 2.2.6", - "ipnet", - "metrics", - "metrics-util", - "quanta", - "thiserror", - "tokio", -] - -[[package]] -name = "metrics-util" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.14.5", - "metrics", - "num_cpus", - "quanta", - "sketches-ddsketch", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "murmurhash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework 2.11.0", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "netrc" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "nucleo" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" -dependencies = [ - "nucleo-matcher", - "parking_lot", - "rayon", -] - -[[package]] -name = "nucleo-matcher" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" -dependencies = [ - "memchr", - "unicode-segmentation", -] - -[[package]] -name = "num-bigint" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "nvml-wrapper" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" -dependencies = [ - "bitflags 1.3.2", - "libloading", - "nvml-wrapper-sys", - "static_assertions", - "thiserror", - "wrapcenum-derive", -] - -[[package]] -name = "nvml-wrapper-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" -dependencies = [ - "libloading", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "octocrab" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b97f949a7cb04608441c2ddb28e15a377e8b5142c2d1835ad2686d434de8558" -dependencies = [ - "arc-swap", - "async-trait", - "base64 0.22.1", - "bytes", - "cfg-if", - "chrono", - "either", - "futures", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-rustls 0.27.3", - "hyper-timeout", - "hyper-util", - "jsonwebtoken", - "once_cell", - "percent-encoding", - "pin-project", - "secrecy 0.10.3", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "snafu", - "tokio", - "tower 0.5.2", - "tower-http 0.6.2", - "tracing", - "url", - "web-time", -] - -[[package]] -name = "ollama-api-bindings" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "futures", - "ollama-rs", - "tabby-common", - "tabby-inference", - "tracing", -] - -[[package]] -name = "ollama-rs" -version = "0.1.9" -source = "git+https://github.com/pepperoni21/ollama-rs.git?rev=56e8157d98d4185bc171fe9468d3d09bc56e9dd3#56e8157d98d4185bc171fe9468d3d09bc56e9dd3" -dependencies = [ - "reqwest", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "url", -] - -[[package]] -name = "omnicopy_to_output" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10aff4d07c3656c416a997301d51ed83be62cbb256b421f86b014931217f2393" -dependencies = [ - "anyhow", - "build-target", - "fs_extra", - "project-root", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oneshot" -version = "0.1.6" -source = "git+https://github.com/fulmicoton/oneshot.git?rev=b208f49#b208f493e505f5f37e180b5cdec4c22b6f99abaa" -dependencies = [ - "loom", -] - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.3.0+3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk 0.18.0", -] - -[[package]] -name = "opentelemetry" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "pin-project-lite", - "thiserror", - "tracing", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76" -dependencies = [ - "async-trait", - "futures-core", - "http 1.1.0", - "opentelemetry 0.27.1", - "opentelemetry-proto", - "opentelemetry_sdk 0.27.1", - "prost", - "thiserror", - "tokio", - "tonic", - "tracing", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6" -dependencies = [ - "opentelemetry 0.27.1", - "opentelemetry_sdk 0.27.1", - "prost", - "tonic", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc1b6902ff63b32ef6c489e8048c5e253e2e4a803ea3ea7e783914536eb15c52" - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "percent-encoding", - "rand 0.8.5", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8" -dependencies = [ - "async-trait", - "futures-channel", - "futures-executor", - "futures-util", - "glob", - "opentelemetry 0.27.1", - "percent-encoding", - "rand 0.8.5", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "ownedbytes" -version = "0.7.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.1", - "smallvec", - "windows-targets 0.52.5", -] - -[[package]] -name = "parse-git-url" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd626725d3855a68fdede6483fae43429129bf246f42d8db598911c8036cf47" -dependencies = [ - "tracing", - "url", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pem" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64 0.22.1", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "pest_meta" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "project-root" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" - -[[package]] -name = "prost" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" -dependencies = [ - "anyhow", - "itertools 0.13.0", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "quanta" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - -[[package]] -name = "querystring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9318ead08c799aad12a55a3e78b82e0b6167271ffd1f627b758891282f739187" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "quoted_printable" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "ratelimit" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea961700fd7260e7fa3701c8287d901b2172c51f9c1421fa0f21d7f7e184b7" -dependencies = [ - "clocksource", - "parking_lot", - "thiserror", -] - -[[package]] -name = "raw-cpuid" -version = "11.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "readable-readability" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17015928a25bff296b0471dfa7a784e406664e1d091781db66e885b18708a8d" -dependencies = [ - "html5ever 0.25.2", - "kuchiki", - "lazy_static", - "log", - "regex", - "url", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "ref-cast" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "reqwest" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-rustls 0.26.0", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.22.4", - "rustls-native-certs 0.7.0", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.25.0", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "reqwest-eventsource" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632c55746dbb44275691640e7b40c907c16a2dc1a5842aa98aaec90da6ec6bde" -dependencies = [ - "eventsource-stream", - "futures-core", - "futures-timer", - "mime", - "nom", - "pin-project-lite", - "reqwest", - "thiserror", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rust-embed" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.66", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" -dependencies = [ - "sha2", - "walkdir", -] - -[[package]] -name = "rust-stemmers" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls" -version = "0.23.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" -dependencies = [ - "log", - "once_cell", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework 2.11.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework 3.0.1", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.1", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scc" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" -dependencies = [ - "sdd", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "sdd" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" - -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "serde", - "zeroize", -] - -[[package]] -name = "secrecy" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a" -dependencies = [ - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-jsonlines" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e228faf5f94badfe42723177b62cfb9b187351994cb4e852cd4a6a4c96dbeea8" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "itoa 1.0.11", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa 1.0.11", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.11", - "ryu", - "serde", -] - -[[package]] -name = "serdeconv" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8897696def1d25e554294b168e0e8e77c860483666eeb8d3d33ae58b06f47221" -dependencies = [ - "rmp-serde", - "serde", - "serde_json", - "toml", - "trackable", -] - -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive 2.0.0", -] - -[[package]] -name = "serial_test" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" -dependencies = [ - "fslock", - "futures", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive 3.1.1", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serial_test_derive" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - -[[package]] -name = "simd-json" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" -dependencies = [ - "getrandom 0.2.15", - "halfbrown", - "lexical-core", - "ref-cast", - "serde", - "serde_json", - "simdutf8", - "value-trait", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "similar" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" - -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "sketches-ddsketch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" -dependencies = [ - "serde", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "snafu" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418b8136fec49956eba89be7da2847ec1909df92a9ae4178b5ff0ff092c8d95e" -dependencies = [ - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4812a669da00d17d8266a0439eddcacbc88b17f732f927e52eeb9d196f7fb5" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spinners" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ef947f358b9c238923f764c72a4a9d42f2d637c46e059dbd319d6e7cfb4f82" -dependencies = [ - "lazy_static", - "maplit", - "strum 0.24.1", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sql_query_builder" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85dbaf3c8d08abe8a95a51860550236a07bd6fc097e2bff054ad8c2bf9a0df5" - -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools 0.12.1", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "ahash", - "atoi", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.2.6", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-migrate-validate" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-trait", - "sqlx", - "sqlx-rt", - "thiserror", - "tokio", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "bytes", - "chrono", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa 1.0.11", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa 1.0.11", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-rt" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.23.4", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.4" -source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "urlencoding", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strfmt" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -dependencies = [ - "strum_macros 0.26.2", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.66", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "sysinfo" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46" -dependencies = [ - "core-foundation-sys", - "libc", - "memchr", - "ntapi", - "rayon", - "windows 0.57.0", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tabby" -version = "0.23.1" -dependencies = [ - "anyhow", - "assert-json-diff", - "async-openai", - "async-stream", - "async-trait", - "axum", - "axum-extra", - "axum-prometheus", - "chrono", - "clap", - "color-eyre", - "futures", - "http-api-bindings", - "hyper 1.3.1", - "insta", - "lazy_static", - "llama-cpp-server", - "nvml-wrapper", - "openssl", - "opentelemetry 0.27.1", - "opentelemetry-otlp", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk 0.27.1", - "regex", - "reqwest", - "reqwest-eventsource", - "serde", - "serde-jsonlines", - "serde_json", - "serdeconv", - "serial_test 3.1.1", - "spinners", - "strfmt", - "strum 0.24.1", - "sysinfo", - "tabby-common", - "tabby-download", - "tabby-inference", - "tabby-webserver", - "tantivy", - "thiserror", - "tokio", - "tower-http 0.5.2", - "tracing", - "tracing-opentelemetry 0.28.0", - "tracing-subscriber", - "utoipa", - "utoipa-swagger-ui", - "uuid", - "vergen", -] - -[[package]] -name = "tabby-common" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "axum-extra", - "chrono", - "derive_builder", - "hash-ids", - "home", - "lazy_static", - "parse-git-url", - "reqwest", - "serde", - "serde_json", - "serdeconv", - "tantivy", - "temp_testdir", - "thiserror", - "tokio", - "tracing", - "url", - "utoipa", - "uuid", -] - -[[package]] -name = "tabby-crawler" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-stream", - "futures", - "htmd", - "logkit", - "readable-readability", - "regex", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-test", - "url", -] - -[[package]] -name = "tabby-db" -version = "0.23.1" -dependencies = [ - "anyhow", - "assert_matches", - "cached", - "chrono", - "hash-ids", - "lazy_static", - "serde", - "sql_query_builder", - "sqlx", - "sqlx-migrate-validate", - "tabby-db-macros", - "tokio", - "uuid", -] - -[[package]] -name = "tabby-db-macros" -version = "0.23.1" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tabby-download" -version = "0.23.1" -dependencies = [ - "aim-downloader", - "anyhow", - "serial_test 3.1.1", - "tabby-common", - "tokio-retry", - "tracing", -] - -[[package]] -name = "tabby-git" -version = "0.23.1" -dependencies = [ - "anyhow", - "assert_matches", - "async-stream", - "axum", - "futures", - "git2", - "grep", - "ignore", - "mime_guess", - "nucleo", - "serde", - "serde_json", - "temp_testdir", - "tokio", - "tracing", -] - -[[package]] -name = "tabby-index" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "chrono", - "futures", - "git2", - "ignore", - "insta", - "lazy_static", - "logkit", - "serde", - "serde_json", - "serial_test 3.1.1", - "tabby-common", - "tabby-inference", - "tantivy", - "temp_testdir", - "text-splitter", - "tokio", - "tracing", - "tracing-subscriber", - "tracing-test", - "tree-sitter-c", - "tree-sitter-c-sharp", - "tree-sitter-cpp", - "tree-sitter-elixir", - "tree-sitter-go", - "tree-sitter-java", - "tree-sitter-kotlin", - "tree-sitter-lua", - "tree-sitter-python", - "tree-sitter-ruby", - "tree-sitter-rust", - "tree-sitter-solidity", - "tree-sitter-tags", - "tree-sitter-typescript", -] - -[[package]] -name = "tabby-index-cli" -version = "0.23.1" -dependencies = [ - "anyhow", - "clap", - "serde", - "serde_json", - "tabby-common", - "tantivy", -] - -[[package]] -name = "tabby-inference" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-stream", - "async-trait", - "dashmap", - "derive_builder", - "futures", - "reqwest", - "secrecy 0.8.0", - "tabby-common", - "tracing", - "trie-rs", -] - -[[package]] -name = "tabby-schema" -version = "0.23.1" -dependencies = [ - "anyhow", - "async-openai", - "async-trait", - "axum", - "base64 0.22.1", - "chrono", - "futures", - "hash-ids", - "juniper", - "lazy_static", - "regex", - "serde", - "strum 0.24.1", - "tabby-common", - "tabby-db", - "tabby-inference", - "thiserror", - "tokio", - "tracing", - "url", - "validator", -] - -[[package]] -name = "tabby-webserver" -version = "0.23.1" -dependencies = [ - "anyhow", - "argon2", - "assert_matches", - "async-openai", - "async-stream", - "async-trait", - "axum", - "axum-extra", - "bincode", - "cached", - "chrono", - "cron", - "fs_extra", - "futures", - "gitlab", - "hyper 1.3.1", - "insta", - "jsonwebtoken", - "juniper", - "juniper_axum", - "juniper_graphql_ws", - "lazy_static", - "lettre", - "logkit", - "mime_guess", - "octocrab", - "pin-project", - "querystring", - "ratelimit", - "reqwest", - "rust-embed", - "serde", - "serde_json", - "serial_test 3.1.1", - "strum 0.24.1", - "tabby-common", - "tabby-crawler", - "tabby-db", - "tabby-git", - "tabby-index", - "tabby-inference", - "tabby-schema", - "tarpc", - "temp_testdir", - "thiserror", - "tokio", - "tokio-tungstenite", - "tracing", - "url", - "urlencoding", - "uuid", -] - -[[package]] -name = "tantivy" -version = "0.23.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "aho-corasick", - "arc-swap", - "base64 0.22.1", - "bitpacking", - "byteorder", - "census", - "crc32fast", - "crossbeam-channel", - "downcast-rs", - "fastdivide", - "fnv", - "fs4", - "htmlescape", - "itertools 0.13.0", - "levenshtein_automata", - "log", - "lru", - "lz4_flex", - "measure_time", - "memmap2", - "once_cell", - "oneshot", - "rayon", - "regex", - "rust-stemmers", - "rustc-hash", - "serde", - "serde_json", - "sketches-ddsketch", - "smallvec", - "tantivy-bitpacker", - "tantivy-columnar", - "tantivy-common", - "tantivy-fst", - "tantivy-query-grammar", - "tantivy-stacker", - "tantivy-tokenizer-api", - "tempfile", - "thiserror", - "time", - "uuid", - "winapi", -] - -[[package]] -name = "tantivy-bitpacker" -version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "bitpacking", -] - -[[package]] -name = "tantivy-columnar" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "downcast-rs", - "fastdivide", - "itertools 0.13.0", - "serde", - "tantivy-bitpacker", - "tantivy-common", - "tantivy-sstable", - "tantivy-stacker", -] - -[[package]] -name = "tantivy-common" -version = "0.7.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "async-trait", - "byteorder", - "ownedbytes", - "serde", - "time", -] - -[[package]] -name = "tantivy-fst" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" -dependencies = [ - "byteorder", - "regex-syntax 0.8.3", - "utf8-ranges", -] - -[[package]] -name = "tantivy-query-grammar" -version = "0.22.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "nom", -] - -[[package]] -name = "tantivy-sstable" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "tantivy-bitpacker", - "tantivy-common", - "tantivy-fst", - "zstd", -] - -[[package]] -name = "tantivy-stacker" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "murmurhash32", - "rand_distr", - "tantivy-common", -] - -[[package]] -name = "tantivy-tokenizer-api" -version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" -dependencies = [ - "serde", -] - -[[package]] -name = "tarpc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f41bce44d290df0598ae4b9cd6ea7f58f651fd3aa4af1b26060c4fa32b08af7" -dependencies = [ - "anyhow", - "fnv", - "futures", - "humantime", - "opentelemetry 0.18.0", - "pin-project", - "rand 0.8.5", - "serde", - "static_assertions", - "tarpc-plugins", - "thiserror", - "tokio", - "tokio-serde", - "tokio-util", - "tracing", - "tracing-opentelemetry 0.18.0", -] - -[[package]] -name = "tarpc-plugins" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "temp_testdir" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921f1e9c427802414907a48b21a6504ff6b3a15a1a3cf37e699590949ad9befc" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "text-splitter" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab9dc04b7cf08eb01c07c272bf699fa55679a326ddf7dd075e14094efc80fb9" -dependencies = [ - "ahash", - "auto_enums", - "either", - "itertools 0.13.0", - "once_cell", - "regex", - "strum 0.26.2", - "thiserror", - "tree-sitter", - "unicode-segmentation", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa 1.0.11", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" -dependencies = [ - "pin-project", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" -dependencies = [ - "rustls 0.23.20", - "tokio", -] - -[[package]] -name = "tokio-serde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project", -] - -[[package]] -name = "tokio-stream" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown 0.14.5", - "pin-project-lite", - "slab", - "tokio", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tonic" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.22.1", - "bytes", - "h2", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.3.1", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "prost", - "socket2", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper 1.0.1", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-http" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "iri-string", - "pin-project-lite", - "tower 0.5.2", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" -dependencies = [ - "once_cell", - "opentelemetry 0.18.0", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry 0.27.1", - "opentelemetry_sdk 0.27.1", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "web-time", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-test" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" -dependencies = [ - "lazy_static", - "tracing-core", - "tracing-subscriber", - "tracing-test-macro", -] - -[[package]] -name = "tracing-test-macro" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" -dependencies = [ - "lazy_static", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "trackable" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15bd114abb99ef8cee977e517c8f37aee63f184f2d08e3e6ceca092373369ae" -dependencies = [ - "trackable_derive", -] - -[[package]] -name = "trackable_derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-c" -version = "0.21.3" -source = "git+https://github.com/tree-sitter/tree-sitter-c/?rev=00ed08f#00ed08f1a6c18141bfd7a81638e4d239a0bb55cc" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-c-sharp" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff899037068a1ffbb891891b7e94db1400ddf12c3d934b85b8c9e30be5cd18da" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.22.1" -source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=d29fbff#d29fbff09a8c9ff4f3074de2595dfca12cb33da9" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-elixir" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-go" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb318be5ccf75f44e054acf6898a5c95d59b53443eed578e16be0cd7ec037f" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-java" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33bc21adf831a773c075d9d00107ab43965e6a6ea7607b47fd9ec6f3db4b481b" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-kotlin" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88dfbb22333118a5d5c5c10b19f93d115a6fa3c8a69dd0e6a260a64f9f5a79b" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-lua" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9fe6fc87bd480e1943fc1fcb02453fb2da050e4e8ce0daa67d801544046856" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-python" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ruby" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0031f687c0772f2dad7b77104c43428611099a1804c81244ada21560f41f0b1" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-solidity" -version = "1.2.6" -source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=0e86ae647bda22c9bee00ec59752df7b3d3b000b#0e86ae647bda22c9bee00ec59752df7b3d3b000b" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-tags" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34380416097ab36d1b4cd83f887d9e150ea4feaeb6ee9a5ecfe53d26839acc69" -dependencies = [ - "memchr", - "regex", - "thiserror", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-typescript" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07523e51e3b88529360a89038c0cca7ee877db40a40141514eece8b4cddcbb4" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "trie-rs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5096c019d49566aff57593a06e401c7f588da84e9a575d0ed2ac0913f51928c0" -dependencies = [ - "louds-rs", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "url-parse" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865ece61c15cae30f180636ae551daa25c318c181938da07f3ab3ed06750bdd2" -dependencies = [ - "regex", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "utoipa" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_json", - "utoipa-gen", -] - -[[package]] -name = "utoipa-gen" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "regex", - "syn 2.0.66", -] - -[[package]] -name = "utoipa-swagger-ui" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da" -dependencies = [ - "axum", - "mime_guess", - "regex", - "rust-embed", - "serde", - "serde_json", - "utoipa", - "zip", -] - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "getrandom 0.2.15", - "rand 0.8.5", - "serde", - "uuid-macro-internal", -] - -[[package]] -name = "uuid-macro-internal" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "validator" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" -dependencies = [ - "idna", - "once_cell", - "regex", - "serde", - "serde_derive", - "serde_json", - "url", - "validator_derive", -] - -[[package]] -name = "validator_derive" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" -dependencies = [ - "darling 0.20.9", - "once_cell", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-trait" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" -dependencies = [ - "float-cmp", - "halfbrown", - "itoa 1.0.11", - "ryu", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vergen" -version = "8.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" -dependencies = [ - "anyhow", - "cfg-if", - "rustversion", - "time", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.66", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "which" -version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" -dependencies = [ - "either", - "home", - "rustix", - "winsafe", -] - -[[package]] -name = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall 0.4.1", - "wasite", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" - -[[package]] -name = "wrapcenum-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "xml5ever" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c376f76ed09df711203e20c3ef5ce556f0166fa03d39590016c0fd625437fad" -dependencies = [ - "log", - "mac", - "markup5ever 0.12.1", -] - -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", - "flate2", -] - -[[package]] -name = "zstd" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 223e779790eb..987d08c8efaa 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -10,6 +10,7 @@ openssl, pkg-config, protobuf, + cmake, llama-cpp, @@ -124,37 +125,18 @@ rustPlatform.buildRustPackage { fetchSubmodules = true; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "ollama-rs-0.1.9" = "sha256-d6sKUxc8VQbRkVqMOeNFqDdKesq5k32AQShK67y2ssg="; - "oneshot-0.1.6" = "sha256-PmYuHuNTqToMyMHPRFDUaHUvFkVftx9ZCOBwXj+4Hc4="; - "ownedbytes-0.7.0" = "sha256-p0+ohtW0VLmfDTZw/LfwX2gYfuYuoOBcE+JsguK7Wn8="; - "sqlx-0.7.4" = "sha256-tcISzoSfOZ0jjNgGpuPPxjMxmBUPw/5FVDoALZEAHKY="; - "tree-sitter-c-0.21.3" = "sha256-ucbHLS2xyGo1uyKZv/K1HNXuMo4GpTY327cgdVS9F3c="; - "tree-sitter-cpp-0.22.1" = "sha256-3akSuQltFMF6I32HwRU08+Hcl9ojxPGk2ZuOX3gAObw="; - "tree-sitter-solidity-1.2.6" = "sha256-S00hdzMoIccPYBEvE092/RIMnG8YEnDGk6GJhXlr4ng="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-CTn/b42FI+Y6qy3MKVESIbIlsXmIkZBlxUXnRtHWZcc="; - # https://github.com/TabbyML/tabby/blob/v0.7.0/.github/workflows/release.yml#L39 - cargoBuildFlags = - [ - # Don't need to build llama-cpp-server (included in default build) - "--no-default-features" - "--features" - "ee" - "--package" - "tabby" - ] - ++ optionals enableRocm [ - "--features" - "rocm" - ] - ++ optionals enableCuda [ - "--features" - "cuda" - ]; + # Don't need to build llama-cpp-server (included in default build) + # We also don't add CUDA features here since we're using the overridden llama-cpp package + cargoBuildFlags = [ + "--no-default-features" + "--features" + "ee" + "--package" + "tabby" + ]; nativeInstallCheckInputs = [ versionCheckHook @@ -167,6 +149,7 @@ rustPlatform.buildRustPackage { git pkg-config protobuf + cmake ] ++ optionals enableCuda [ autoAddDriverRunpath @@ -199,13 +182,13 @@ rustPlatform.buildRustPackage { ]; }; - meta = with lib; { + meta = { homepage = "https://github.com/TabbyML/tabby"; changelog = "https://github.com/TabbyML/tabby/releases/tag/v${version}"; description = "Self-hosted AI coding assistant"; mainProgram = "tabby"; - license = licenses.asl20; - maintainers = [ maintainers.ghthor ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ghthor ]; broken = stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64; }; } From de8b060c2c522026298808b490eb49c9cbb12c33 Mon Sep 17 00:00:00 2001 From: hot burger <33610620+hotburger@users.noreply.github.com> Date: Wed, 12 Feb 2025 18:04:47 -0800 Subject: [PATCH 450/484] nixos/conduwuit: block mistakenly allowed syscalls Copied directly from the upstream service file instead of doing any unnecessary translating. --- nixos/modules/services/matrix/conduwuit.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/matrix/conduwuit.nix b/nixos/modules/services/matrix/conduwuit.nix index e887c55f42e6..b4d9fdd1c95e 100644 --- a/nixos/modules/services/matrix/conduwuit.nix +++ b/nixos/modules/services/matrix/conduwuit.nix @@ -246,22 +246,8 @@ in RestrictRealtime = true; SystemCallArchitectures = "native"; SystemCallFilter = [ - "@system-service" - "@resources" - "~@clock" - "@debug" - "@module" - "@mount" - "@reboot" - "@swap" - "@cpu-emulation" - "@obsolete" - "@timer" - "@chown" - "@setuid" - "@privileged" - "@keyring" - "@ipc" + "@system-service @resources" + "~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc" ]; SystemCallErrorNumber = "EPERM"; From e8832afeb3c33557d5db59a11eed3e41909b1732 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Feb 2025 20:23:23 -0500 Subject: [PATCH 451/484] scry: drop --- pkgs/development/tools/scry/default.nix | 55 ------------------------- pkgs/development/tools/scry/shards.nix | 14 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/development/tools/scry/default.nix delete mode 100644 pkgs/development/tools/scry/shards.nix diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix deleted file mode 100644 index e1982a96df90..000000000000 --- a/pkgs/development/tools/scry/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - fetchFromGitHub, - crystal, - coreutils, - makeWrapper, - bash, -}: - -crystal.buildCrystalPackage rec { - pname = "scry"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "crystal-lang-tools"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-hqyG1aKY3M8q8lZEKzpUUKl9jS7NF+VMsma6+C0sCbg="; - }; - - # a bunch of tests fail when built in the sandbox while perfectly fine outside - postPatch = '' - rm spec/scry/{client,completion_provider,context,executable}_spec.cr - ''; - - format = "shards"; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ bash ]; - - shardsFile = ./shards.nix; - - postFixup = '' - wrapProgram $out/bin/scry \ - --prefix PATH : ${ - lib.makeBinPath [ - crystal - coreutils - ] - } - ''; - - # the binary doesn't take any arguments, so this will hang - doInstallCheck = false; - - meta = with lib; { - description = "Code analysis server for the Crystal programming language"; - homepage = "https://github.com/crystal-lang-tools/scry"; - license = licenses.mit; - maintainers = with maintainers; [ - peterhoeg - Br1ght0ne - ]; - }; -} diff --git a/pkgs/development/tools/scry/shards.nix b/pkgs/development/tools/scry/shards.nix deleted file mode 100644 index df3d0848471a..000000000000 --- a/pkgs/development/tools/scry/shards.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - json_mapping = { - owner = "crystal-lang"; - repo = "json_mapping.cr"; - rev = "v0.1.0"; - sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55"; - }; - lsp = { - owner = "crystal-lang-tools"; - repo = "lsp"; - rev = "v0.2.0"; - sha256 = "1lnviqrywh0w05mx67mzw7d1qz328p52z4k69pcqw66gs44i7b5c"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 006911d444a7..c5cb1be5ddf5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1261,6 +1261,7 @@ mapAliases { schildichat-desktop = schildichat-web; schildichat-desktop-wayland = schildichat-web; scitoken-cpp = scitokens-cpp; # Added 2024-02-12 + scry = "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44dd93183688..bf6aea87e193 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5760,8 +5760,6 @@ with pkgs; llvmPackages = crystal.llvmPackages; }; - scry = callPackage ../development/tools/scry { crystal = crystal_1_2; }; - devpi-client = python3Packages.callPackage ../development/tools/devpi-client { }; devpi-server = python3Packages.callPackage ../development/tools/devpi-server { }; From d5b260a837ba7ae84e76a5f9b5a02997da11d2e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 17:43:23 +0000 Subject: [PATCH 452/484] netatalk: 4.1.1 -> 4.1.2 --- pkgs/by-name/ne/netatalk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix index d39fb5fe6810..9832c80527c5 100644 --- a/pkgs/by-name/ne/netatalk/package.nix +++ b/pkgs/by-name/ne/netatalk/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; - hash = "sha256-LI0xIkWzmotzSsmo60URC8A94wiJKOV0MQqZDTuAAkE="; + hash = "sha256-qCX2/37+2wm7nKdXJ6tDEmeXAA+Jd123LI2VIL9IHpw="; }; nativeBuildInputs = [ From 140858cd719da8b0725ce8a5ff5904c5d342e0a5 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Fri, 14 Feb 2025 15:32:18 +0100 Subject: [PATCH 453/484] fractal: 10 -> 10.1 --- pkgs/by-name/fr/fractal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 91a0bebe73e5..5f5def674258 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "10"; + version = "10.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = version; - hash = "sha256-dXmdoEBvHhOoICIDCpi2JTPo7j/kQzlv+Q/S/7LNyv0="; + hash = "sha256-61xiHVzmLMbLNZlobH6JVcvuO9eoFwqBZBo1rVtPYOc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-qRxJvlorS5S3Wj3HjfvvR2nM/ZWzefz4x791UeSXm0w="; + hash = "sha256-e3IW8D4aLU6d36ErUHDUDiXF1lN4HCn5OCX6GwaT3iQ="; }; # Dirty approach to add patches after cargoSetupPostUnpackHook From 7a0aff7a8a05caa18d7373a9b42634a5c892e402 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Fri, 14 Feb 2025 18:58:57 +0100 Subject: [PATCH 454/484] oxlint: build oxc_language_server binary --- pkgs/by-name/ox/oxlint/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index b5ef568ecff4..bc05238d8f0b 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { env.OXC_VERSION = version; - cargoBuildFlags = [ "--bin=oxlint" ]; + cargoBuildFlags = [ "--bin=oxlint" "--bin=oxc_language_server" ]; cargoTestFlags = cargoBuildFlags; meta = with lib; { From b60e5490ec9de74024535fddcc4bf0517e319bf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 18:17:05 +0000 Subject: [PATCH 455/484] bosh-cli: 7.8.6 -> 7.9.2 --- pkgs/by-name/bo/bosh-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index b5ec1b059286..72e2fcd5cc79 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.8.6"; + version = "7.9.2"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rrYB8W1Zq9rCRgVyAPFZ5i37uEKXvV83hpkLaB7N9zQ="; + sha256 = "sha256-+t1gJJMp2x+V5Wrbt/HnygFa1LlDQWB1NPTKi399HhA="; }; vendorHash = null; From d59655560f925fd983ae1f83e68d43c6817a51db Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 14 Feb 2025 13:22:06 -0500 Subject: [PATCH 456/484] zed-editor: 0.173.8 -> 0.173.9 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 8f91dab205a0..07cee8c62c41 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.173.8"; + version = "0.173.9"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-xAmPfCRzgsH5305GTJj9000Jd8AQVyFzI3jVAcTGfYo="; + hash = "sha256-zCzMjULJLZCoi2v8eJHWDkUM3I8me/AQrkuT41SdaUU="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-4MIfIU4z/Ot6XczmnCXKhE+DiR4vSguStgZLImXQ6Cg="; + cargoHash = "sha256-TJiXWHhKmY2z6Mk2xOfMfGIUnqr1sbf/6HB5Gn1kitg="; nativeBuildInputs = [ From fefeb81dd41f0b12975bd5f5f5d298b4f6221128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 18:40:55 +0000 Subject: [PATCH 457/484] python312Packages.google-cloud-dataproc: 5.16.0 -> 5.17.0 --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 039d89b18faa..e5e343f3e4fb 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.16.0"; + version = "5.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-I7LYrk9kjgG2b+0KvqEUtgDTNj2VW4VYx2Rak/KNbjw="; + hash = "sha256-2CLpaitrhHOSL+5DLiHc81312qEs4v2JXwWWospGBEA="; }; build-system = [ setuptools ]; From 4252194be61c4e2249f5b7590f148fc341286160 Mon Sep 17 00:00:00 2001 From: drainpixie <121581793+drainpixie@users.noreply.github.com> Date: Fri, 14 Feb 2025 19:43:18 +0100 Subject: [PATCH 458/484] proselint: 0.13.0 -> 0.14.0 (#381194) * proselint: 0.13.0 -> 0.14.0 * fix: omitted lib from replaceStrings * chore: format --- pkgs/tools/text/proselint/default.nix | 27 +++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index a5bb06bc5b75..f78e46f6a2b0 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -1,33 +1,36 @@ { lib, + python3Packages, fetchurl, buildPythonApplication, click, - future, - six, }: - buildPythonApplication rec { pname = "proselint"; - version = "0.13.0"; + version = "0.14.0"; doCheck = false; # fails to pass because it tries to run in home directory + format = "pyproject"; src = fetchurl { url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; - sha256 = "7dd2b63cc2aa390877c4144fcd3c80706817e860b017f04882fbcd2ab0852a58"; + sha256 = "YklkJyvqFHZ+XfJWHYfdMHZ5OMjLUvsjWFvDdYBoDoY="; }; - propagatedBuildInputs = [ - click - future - six - ]; + nativeBuildInputs = [ python3Packages.poetry-core ]; + propagatedBuildInputs = [ click ]; meta = with lib; { - description = "Linter for prose"; + description = "A linter for prose."; mainProgram = "proselint"; - homepage = "http://proselint.com"; + + homepage = "https://github.com/amperser/proselint"; + changelog = "https://github.com/amperser/proselint/blob/main/CHANGELOG.md#proselint${ + lib.replaceStrings [ "." ] [ "" ] version + }"; + + downloadPage = "https://pypi.org/project/proselint/${version}/#files"; + license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf6aea87e193..111a1449b895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10283,7 +10283,7 @@ with pkgs; proselint = callPackage ../tools/text/proselint { inherit (python3Packages) - buildPythonApplication click future six; + buildPythonApplication click; }; prospector = callPackage ../development/tools/prospector { }; From ecd8ad91c25ff26a2af0383fa74d5f3e66112c6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:08:11 +0000 Subject: [PATCH 459/484] dotnet-ef: 9.0.1 -> 9.0.2 --- pkgs/by-name/do/dotnet-ef/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index d6db19a3c784..07584ad7db11 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "9.0.1"; + version = "9.0.2"; - nugetHash = "sha256-b1dxnBDnsn4kWvcy95eQj3qrL4ucAqw/pXvU3aFpPk8="; + nugetHash = "sha256-aevR1w8IDXrRLnrR5ax2BaAjGpjOWuBKJ9TzI43p7mc="; meta = { description = "The Entity Framework Core tools help with design-time development tasks."; From 584bfab2efbe16240298e8d29fc5f4076690b8a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:08:21 +0000 Subject: [PATCH 460/484] phpExtensions.openswoole: 22.1.2 -> 25.2.0 --- pkgs/development/php-packages/openswoole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index 0a56b3f0e774..c7b8b5e2a94d 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -9,7 +9,7 @@ }: let - version = "22.1.2"; + version = "25.2.0"; in buildPecl { inherit version; @@ -19,7 +19,7 @@ buildPecl { owner = "openswoole"; repo = "swoole-src"; rev = "v${version}"; - hash = "sha256-Z26E1PdKypB/MImCHFgA3rJW5LvVaLZsQUxRv0RcFuo="; + hash = "sha256-1Bq/relLhjPRROikpCzSzzrelxW3AiMA5G17Ln2lg34="; }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; From fc8665b70f0246039f707a4d756a1bc88ec80d07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:20:01 +0000 Subject: [PATCH 461/484] phpPackages.phpstan: 2.1.2 -> 2.1.5 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 63ff80082b05..5fc971fe3d90 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.2"; + version = "2.1.5"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-Wh0dBO5tokAJXxndL5QsgWUiYh0cE4B4EDmHKGC6uFk="; + hash = "sha256-mhptuyX3tp0ABo8MEp+jL+P7jV6BiQhNPaxVlWggfjs="; }; - vendorHash = "sha256-rkrJ36jugPyZ0v92bPSm4/77POLGqncOGo1PBQQdsds="; + vendorHash = "sha256-WILu0qPmN4O6qiu9CF1R6Y2N8fNbdqWBbbS6lwdzo7k="; composerStrictValidation = false; meta = { From f10bc7af57a0142a6ed8d737056bf3038286bb70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:35:21 +0000 Subject: [PATCH 462/484] phpExtensions.swoole: 6.0.0 -> 6.0.1 --- pkgs/development/php-packages/swoole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index b821906095c7..2ecf5bde03e2 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -9,7 +9,7 @@ }: let - version = "6.0.0"; + version = "6.0.1"; in buildPecl { inherit version; @@ -19,7 +19,7 @@ buildPecl { owner = "swoole"; repo = "swoole-src"; rev = "v${version}"; - hash = "sha256-h49TMwtEaaRfQO69Z9sAPsCqLYt/w/6Vx9ZVBajAU5U="; + hash = "sha256-WeTl+/OVcXFl39qfYoYRk2MQ7PYKlbjHxddp/kFov6g="; }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; From 6fc6d7e8ed57bd9df9390846b6e0c38e7e5c6fc8 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 9 Feb 2025 19:43:31 +0100 Subject: [PATCH 463/484] bwa-mem2: fix compilation isssue On latest unstable, there are several implicit function declaration. in safestrlib, which was not a seperate package but simply a submodule. It is now a separate package (see previous commit) and using latest unstable for this libary fixes the issue. --- pkgs/by-name/bw/bwa-mem2/no-submodule.patch | 42 +++++++++++++++++ pkgs/by-name/bw/bwa-mem2/package.nix | 52 +++++++++++++++------ 2 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 pkgs/by-name/bw/bwa-mem2/no-submodule.patch diff --git a/pkgs/by-name/bw/bwa-mem2/no-submodule.patch b/pkgs/by-name/bw/bwa-mem2/no-submodule.patch new file mode 100644 index 000000000000..07785cb89edc --- /dev/null +++ b/pkgs/by-name/bw/bwa-mem2/no-submodule.patch @@ -0,0 +1,42 @@ +diff --git a/Makefile b/Makefile +index 359585f..13ec279 100644 +--- a/Makefile ++++ b/Makefile +@@ -49,7 +49,6 @@ OBJS= src/fastmap.o src/bwtindex.o src/utils.o src/memcpy_bwamem.o src/kthread. + src/FMI_search.o src/read_index_ele.o src/bwamem_pair.o src/kswv.o src/bwa.o \ + src/bwamem_extra.o src/kopen.o + BWA_LIB= libbwa.a +-SAFE_STR_LIB= ext/safestringlib/libsafestring.a + + ifeq ($(arch),sse41) + ifeq ($(CXX), icpc) +@@ -101,16 +100,6 @@ CXXFLAGS+= -g -O3 -fpermissive $(ARCH_FLAGS) #-Wall ##-xSSE2 + all:$(EXE) + + multi: +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=sse41 EXE=bwa-mem2.sse41 CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=sse42 EXE=bwa-mem2.sse42 CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=avx EXE=bwa-mem2.avx CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=avx2 EXE=bwa-mem2.avx2 CXX=$(CXX) all +- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean; +- $(MAKE) arch=avx512 EXE=bwa-mem2.avx512bw CXX=$(CXX) all + $(CXX) -Wall -O3 src/runsimd.cpp -Iext/safestringlib/include -Lext/safestringlib/ -lsafestring $(STATIC_GCC) -o bwa-mem2 + + +@@ -120,12 +109,8 @@ $(EXE):$(BWA_LIB) $(SAFE_STR_LIB) src/main.o + $(BWA_LIB):$(OBJS) + ar rcs $(BWA_LIB) $(OBJS) + +-$(SAFE_STR_LIB): +- cd ext/safestringlib/ && $(MAKE) clean && $(MAKE) CC=$(CC) directories libsafestring.a +- + clean: + rm -fr src/*.o $(BWA_LIB) $(EXE) bwa-mem2.sse41 bwa-mem2.sse42 bwa-mem2.avx bwa-mem2.avx2 bwa-mem2.avx512bw +- cd ext/safestringlib/ && $(MAKE) clean + + depend: + (LC_ALL=C; export LC_ALL; makedepend -Y -- $(CXXFLAGS) $(CPPFLAGS) -I. -- src/*.cpp) diff --git a/pkgs/by-name/bw/bwa-mem2/package.nix b/pkgs/by-name/bw/bwa-mem2/package.nix index f0f6cb7c0b8f..97e902dbb562 100644 --- a/pkgs/by-name/bw/bwa-mem2/package.nix +++ b/pkgs/by-name/bw/bwa-mem2/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + safestringlib, zlib, }: @@ -13,21 +14,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "bwa-mem2"; repo = "bwa-mem2"; rev = "cf4306a47dac35e7e79a9e75398a35f33900cfd0"; - fetchSubmodules = true; - hash = "sha256-1AYSn7nBrDwbX7oSrdEoa1d3t6xzwKnA0S87Y/XeXJg="; + hash = "sha256-hY8nLRFWt0GAElhDIcYdUX6cJrzOE3NlYRQr0tC3on4="; }; buildInputs = [ zlib ]; - # see https://github.com/bwa-mem2/bwa-mem2/issues/93 - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/include/safe_mem_lib.h - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset16_s.c - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset32_s.c - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset_s.c - sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/wmemset_s.c - ''; - buildFlags = [ ( if stdenv.hostPlatform.sse4_2Support then @@ -43,14 +34,45 @@ stdenv.mkDerivation (finalAttrs: { ) ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = toString [ + patches = [ + ./no-submodule.patch + ]; + + # Also, patch the tests + postPatch = + # Force path to static link, otherwise, it fails at runtime to + # find the shared library + '' + substituteInPlace Makefile \ + --replace-fail "-Iext/safestringlib/include" "-I${safestringlib}/include" \ + --replace-fail "-Lext/safestringlib" "-L${safestringlib}/lib" + '' + # Make test compile by changing the compiler and path to library + # Remove xeonbsw test that fails to compile due to missing _rdsc + # also, not portable + + '' + substituteInPlace test/Makefile \ + --replace-fail "icpc" "g++" \ + --replace-fail "../ext/safestringlib/libsafestring.a" \ + "${safestringlib}/lib/libsafestring.a" \ + --replace-fail \ + "fmi_test smem2_test bwt_seed_strategy_test sa2ref_test xeonbsw" \ + "fmi_test smem2_test bwt_seed_strategy_test sa2ref_test" + ''; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=register" "-Wno-error=implicit-function-declaration" - ]; - }; + ] + ); + + nativeBuildInputs = [ + safestringlib + ]; enableParallelBuilding = true; + installPhase = '' runHook preInstall From 1e132c67b25a6404e988171c5acdfd12242f7af6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 19:55:31 +0000 Subject: [PATCH 464/484] phpExtensions.relay: 0.10.0 -> 0.10.1 --- .../php-packages/relay/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 2dba7c619475..c4d7d4e2cea9 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -15,36 +15,36 @@ }: let - version = "0.10.0"; + version = "0.10.1"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.1" = "sha256-aEuYKo31dKV7TSOeKt4BSShstNxfS4EdibJ2279XTbg="; - "8.2" = "sha256-tjE+bAiVWYh6od8rW7flZ6ajMGxMJszw7H055VtDJsc="; - "8.3" = "1czi5sfic13068hj8x1fgzkwsykbrr1g5ifc53zxds5vqywa74d7"; - "8.4" = "sha256-QUryARS5omADR3kEykCnoK4IFau1RpTQKDcCJ+lN/SY="; - "8.5" = "0k33qfrlxb9v0d15mdzzqsgdcik8z65nv1q9spn7ibdxg6clzykj"; + "8.1" = "sha256-0p24kOzj4l0wBPzmjAzTv1a0EUa4In1pjWHhNhrmsyM="; + "8.2" = "sha256-mgRjWEmtCFg7711RgC2lpSDs5cCcs+ZPqks/uj1mAJo="; + "8.3" = "16nESEzMRDIiVfwjXsGhJsK9UG5UKgfSunHPeyNnyz0="; + "8.4" = "sha256-g8H4vRb1XTnFQo2Db1qvzsENqPYg89/0HSxsW2tDLQQ="; + "8.5" = "6NAzMBqBV0BUI4/KlIbnyz0kcD/hucO4tzbuwPSptig="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.1" = "sha256-Aq4jZyo5JzVtJM96HzzsnSnx8jOCAmHB6f3eo1922gs="; - "8.2" = "sha256-Yd1bWEsRXuG30aDE9lCgLa/qlnXyeMehR3ROF0uAVTY="; - "8.3" = "sha256-j6qhr04zQDi+mQh968nVxlTGEnhQobI7kG8DK35sCiM="; - "8.4" = "0av8g5n4h3g2r4jbv3v1bwyx256z58wyygnd5jk4jzpx0ik2c1vv"; - "8.5" = "1aav4lh29d507av5ydxjvgm20fljl5lwdljdyq3038g3gi06yjaj"; + "8.1" = "sha256-E6GDFgRgm5I1acqLYFs9kw3TAuHq5aq7TatLnPHJseA="; + "8.2" = "sha256-59Un0hAidN/Diu9utUnOgMIdt5ZtOcBFtWrLdHkdME4="; + "8.3" = "sha256-ssqZ85KrQG69fZ39RKceEJPXyGfxxLPI21tnPXtPZDE="; + "8.4" = "JhFUplu9zMgXX2k2RArWWf0pFweAV+1+/T3yUwblJ2A="; + "8.5" = "Ii2bsG4AMMwAKopyOz/qX1RxMaGcstO8kYgup8Vb50w="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.1" = "sha256-306YMQr/UCJ+LOgEdzmqAPVBvbq2TDXnvSxdh4u6Nbc="; - "8.2" = "sha256-tapNth0vqNlCh1c3HryIYOs+V9jadTV1rMvoz+tVbeI="; - "8.3" = "sha256-f0eKpHcdiOHM55VuPYq+AJnbIwnBDLaECv+hYMBh0dw="; - "8.4" = "05h2ikl0ymd2xmqifvv700xazhllsm234s41ipdgfwdj7zyxv58s"; - "8.5" = "0frnd7y3zvj8vq10r4479lx04lj606xzd3hjg61lg5mq65i6xih0"; + "8.1" = "sha256-MmRAfRDcG1qV8FrZmhME3UtmXe7Mapk2vSrtE/fQRcE="; + "8.2" = "sha256-2ZRxJJhQaIkWQJX7bdti6+UFk7zY9yCJ9KWTtE3uGAE="; + "8.3" = "sha256-QlUk6q5LQuhWbuqWgb8/JdRfO8V+M6GcTu7rjRqJeiI="; + "8.4" = "V+tl7jTrq8PWEAXXu9IsqIlFiQcZBtMBDTlltWSO9CI="; + "8.5" = "w4Ba1Oh4JDsuZc5nrYH8lITP6Gk4/0i1wwOHmr4BO44="; }; }; }; From 4c1177576b66694b861a3c03c59aab21924defc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 20:05:40 +0000 Subject: [PATCH 465/484] google-alloydb-auth-proxy: 1.12.1 -> 1.12.2 --- pkgs/by-name/go/google-alloydb-auth-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index 13c822cd88e2..2e7a9d8a89b8 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-alloydb-auth-proxy"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${version}"; - hash = "sha256-FnYVkZxdWFxY0aIUbHTSDLJ+AgYE2L03vNya1K2e3SI="; + hash = "sha256-3zJAwkl+fqiiGvrXWzTwFHmAOYOw1NVb/JUok5qZxNs="; }; subPackages = [ "." ]; - vendorHash = "sha256-0VksnkdN7E6VEzzxSIc6AfOvxlPm67vEj+HVR6N+BqA="; + vendorHash = "sha256-cGrJIbo4qEKIc7/XBwZtK5OrqE4t/Cmp54YKJMst8h8="; checkFlags = [ "-short" From 3952142b9363829730ee9dd51fb9186d75671139 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 14 Feb 2025 16:00:00 -0500 Subject: [PATCH 466/484] python3Packages.moviepy: increase test timeout to 60s Fix https://github.com/NixOS/nixpkgs/issues/381908. --- pkgs/development/python-modules/moviepy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 81b45f7fdeff..16fb3111c608 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -71,7 +71,8 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pytestFlagsArray = [ "--timeout=30" ]; + # See https://github.com/NixOS/nixpkgs/issues/381908. + pytestFlagsArray = [ "--timeout=60" ]; pythonImportsCheck = [ "moviepy" ]; From db9bc910a059df8f7effbf1a59e4124c70d1daed Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 14 Feb 2025 12:55:22 -0800 Subject: [PATCH 467/484] widevine-cdm: fix eval outside unsupported platforms --- pkgs/by-name/wi/widevine-cdm/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/widevine-cdm/package.nix b/pkgs/by-name/wi/widevine-cdm/package.nix index f4e0d12fbe49..bae718940d20 100644 --- a/pkgs/by-name/wi/widevine-cdm/package.nix +++ b/pkgs/by-name/wi/widevine-cdm/package.nix @@ -1,3 +1,13 @@ -{ stdenv, callPackage }: +{ + lib, + stdenv, + callPackage, +}: -callPackage (./. + "/${stdenv.hostPlatform.system}.nix") { inherit stdenv; } +let + targets = lib.genAttrs [ + "aarch64-linux" + "x86_64-linux" + ] (name: ./. + "/${name}.nix"); +in +callPackage (targets."${stdenv.hostPlatform.system}" or targets.x86_64-linux) { inherit stdenv; } From 857374c887a37944b73bdaf1f84d8abb83489820 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 17:23:11 +0100 Subject: [PATCH 468/484] python312Packages.optuna: 4.2.0 -> 4.2.1 Diff: https://github.com/optuna/optuna/compare/refs/tags/v4.2.0...v4.2.1 Changelog: https://github.com/optuna/optuna/releases/tag/4.2.1 --- .../python-modules/optuna/default.nix | 94 +++++++++++++------ 1 file changed, 65 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index aff26527574f..86ea64441f97 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -1,48 +1,56 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pythonOlder, + + # build-system + setuptools, + + # dependencies alembic, + colorlog, + numpy, + packaging, + sqlalchemy, + tqdm, + pyyaml, + + # optional-dependencies boto3, cmaes, - colorlog, - fakeredis, fvcore, google-cloud-storage, grpcio, - kaleido, matplotlib, - moto, - numpy, - packaging, pandas, plotly, protobuf, - pytest-xdist, - pyyaml, redis, scikit-learn, scipy, - setuptools, - sqlalchemy, + + # tests + addBinToPathHook, + fakeredis, + kaleido, + moto, + pytest-xdist, + pytestCheckHook, torch, - tqdm, + versionCheckHook, }: buildPythonPackage rec { pname = "optuna"; - version = "4.2.0"; + version = "4.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "optuna"; repo = "optuna"; tag = "v${version}"; - hash = "sha256-NNlwrVrGg2WvkC42nmW7K/mRktE3B97GaL8GaSOKF1Y="; + hash = "sha256-WLrdHrdfCtCZMW2J375N8vmod7FcKCMwQPGKicRA878="; }; build-system = [ @@ -76,40 +84,68 @@ buildPythonPackage rec { ]; }; + # grpc tests are racy preCheck = '' - export PATH=$out/bin:$PATH - - # grpc tests are racy sed -i '/"grpc",/d' optuna/testing/storages.py ''; nativeCheckInputs = [ + addBinToPathHook fakeredis kaleido moto pytest-xdist pytestCheckHook torch + versionCheckHook ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; + versionCheckProgramArg = [ "--version" ]; - disabledTests = [ - # ValueError: Transform failed with error code 525: error creating static canvas/context for image server - "test_get_pareto_front_plot" - # too narrow time limit - "test_get_timeline_plot_with_killed_running_trials" - ]; + disabledTests = + [ + # ValueError: Transform failed with error code 525: error creating static canvas/context for image server + "test_get_pareto_front_plot" + # too narrow time limit + "test_get_timeline_plot_with_killed_running_trials" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ValueError: Failed to start Kaleido subprocess. Error stream + # kaleido/executable/kaleido: line 5: 5956 Illegal instruction: 4 ./bin/kaleido $@ + "test_get_optimization_history_plot" + "test_plot_intermediate_values" + "test_plot_rank" + "test_plot_terminator_improvement" + + # Fatal Python error: Aborted + # matplotlib/backend_bases.py", line 2654 in create_with_canvas + "test_edf_plot_no_trials" + "test_get_timeline_plot" + "test_plot_contour" + "test_plot_contour_customized_target_name" + "test_plot_edf_with_multiple_studies" + "test_plot_edf_with_target" + "test_plot_parallel_coordinate" + "test_plot_parallel_coordinate_customized_target_name" + "test_plot_param_importances" + "test_plot_param_importances_customized_target_name" + "test_plot_param_importances_multiobjective_all_objectives_displayed" + "test_plot_slice" + "test_plot_slice_customized_target_name" + "test_target_is_none_and_study_is_multi_obj" + "test_visualizations_with_single_objectives" + ]; pythonImportsCheck = [ "optuna" ]; - meta = with lib; { + meta = { description = "Hyperparameter optimization framework"; homepage = "https://optuna.org/"; changelog = "https://github.com/optuna/optuna/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "optuna"; }; } From 6d79b0b9f33c6c3346f964f4598eaa89ecd9a5fd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 20:49:13 +0100 Subject: [PATCH 469/484] python312Packages.librosa: mark as broken on aarch64-linux --- pkgs/development/python-modules/librosa/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 2e3ea5640e19..2479c885aaee 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -32,12 +32,13 @@ pytestCheckHook, resampy, samplerate, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "librosa"; version = "0.10.2.post1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "librosa"; @@ -94,12 +95,9 @@ buildPythonPackage rec { pytestCheckHook resampy samplerate + writableTmpDirAsHomeHook ] ++ optional-dependencies.matplotlib; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTests = [ # requires network access @@ -137,5 +135,10 @@ buildPythonPackage rec { changelog = "https://github.com/librosa/librosa/releases/tag/${version}"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ GuillaumeDesforges ]; + badPlatforms = [ + # Several non-deterministic occurances of "Fatal Python error: Segmentation fault", both in + # numpy's and in this package's code. + "aarch64-linux" + ]; }; } From 4840ab7258c81090e40e3332ed1d9d5523ae7001 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 21:55:56 +0100 Subject: [PATCH 470/484] python312Packages.librosa: disable on python3.13 --- pkgs/development/python-modules/librosa/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 2479c885aaee..c8489e4a97e8 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + pythonAtLeast, fetchFromGitHub, fetchpatch2, @@ -40,6 +41,8 @@ buildPythonPackage rec { version = "0.10.2.post1"; pyproject = true; + disabled = pythonAtLeast "3.13"; + src = fetchFromGitHub { owner = "librosa"; repo = "librosa"; From ec6a3fdebbea68f250ee716d363f87c0f3dde575 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:29:30 +0100 Subject: [PATCH 471/484] python312Packages.asn1tools: skip failing tests https://github.com/eerimoq/asn1tools/issues/191 --- .../python-modules/asn1tools/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 0d1cab628056..57f797c72614 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -1,15 +1,23 @@ { lib, - bitstruct, buildPythonPackage, - diskcache, fetchFromGitHub, - prompt-toolkit, + + # build-system + setuptools, + + # dependencies + bitstruct, pyparsing, + + # optional-dependencies + prompt-toolkit, + diskcache, + + # tests pytest-xdist, pytestCheckHook, - pythonOlder, - setuptools, + versionCheckHook, }: buildPythonPackage rec { @@ -17,8 +25,6 @@ buildPythonPackage rec { version = "0.167.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "eerimoq"; repo = "asn1tools"; @@ -41,7 +47,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-xdist pytestCheckHook + versionCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + versionCheckProgramArg = [ "--version" ]; pythonImportsCheck = [ "asn1tools" ]; @@ -49,13 +57,23 @@ buildPythonPackage rec { # assert exact error message of pyparsing which changed and no longer matches # https://github.com/eerimoq/asn1tools/issues/167 "test_parse_error" + + # IndexError: string index out of range + # https://github.com/eerimoq/asn1tools/issues/191 + "test_c_source" + "test_command_line_generate_c_source_oer" + "test_missing_parameterized_value" + "test_parse_parameterization" + # SystemExit: error: string index out of range + "test_command_line_generate_c_source_uper" + "test_command_line_generate_rust_source_uper" ]; - meta = with lib; { + meta = { description = "ASN.1 parsing, encoding and decoding"; homepage = "https://github.com/eerimoq/asn1tools"; changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "asn1tools"; }; From 31f600f01400298f6ca022de44f4968c6c785bf2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:48:12 +0100 Subject: [PATCH 472/484] python312Packages.eth-account: 0.13.4 -> 0.13.5 Diff: https://github.com/ethereum/eth-account/compare/refs/tags/v0.13.4...v0.13.5 Changelog: https://github.com/ethereum/eth-account/blob/v0.13.5/docs/release_notes.rst --- .../python-modules/eth-account/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 918100ec7f57..be26789c0623 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -2,7 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + # dependencies bitarray, ckzg, @@ -14,7 +17,8 @@ hexbytes, rlp, websockets, - # nativeCheckInputs + + # tests hypothesis, pydantic, pytestCheckHook, @@ -23,14 +27,14 @@ buildPythonPackage rec { pname = "eth-account"; - version = "0.13.4"; + version = "0.13.5"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; tag = "v${version}"; - hash = "sha256-Y55WCgWJd2AaDNKbyBe9oi1soT19RdUjQWy5884Pcq8="; + hash = "sha256-CBD0vJLYA+3FreOTsVXJlDJhRvPbDUn4X55o6EF+uBA="; }; build-system = [ setuptools ]; @@ -60,8 +64,12 @@ buildPythonPackage rec { "test_messages_where_all_3_sigs_match" "test_messages_where_eth_account_matches_ethers_but_not_metamask" "test_messages_where_eth_account_matches_metamask_but_not_ethers" + # disable flaky fuzzing test "test_compatibility" + + # Attempts at installing the wheel + "test_install_local_wheel" ]; pythonImportsCheck = [ "eth_account" ]; From 05d5ff4d55a0307007f18ae50ea6eb5afe6b0e29 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 15:41:58 +0100 Subject: [PATCH 473/484] python312Packages.web3: 7.6.1 -> 7.8.0 Diff: https://github.com/ethereum/web3.py/compare/refs/tags/v7.6.1...v7.8.0 --- .../python-modules/web3/default.nix | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index df894986b3ed..282de6e5824a 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -2,7 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + # dependencies aiohttp, eth-abi, @@ -11,7 +14,6 @@ eth-typing, eth-utils, hexbytes, - ipfshttpclient, jsonschema, lru-dict, protobuf, @@ -19,37 +21,40 @@ requests, types-requests, websockets, - # nativeCheckInputs + + # optional-dependencies + ipfshttpclient, + + # tests eth-tester, flaky, hypothesis, py-evm, pytest-asyncio_0_21, - pytestCheckHook, pytest-mock, pytest-xdist, + pytestCheckHook, pyunormalize, }: buildPythonPackage rec { pname = "web3"; - version = "7.6.1"; + version = "7.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "web3.py"; tag = "v${version}"; - hash = "sha256-rpXSkQtqUZiCLMF2XlElbsjFjJmX+3j/NdAU2oaPU54="; - }; - - # Note: to reflect the extra_requires in main/setup.py. - optional-dependencies = { - ipfs = [ ipfshttpclient ]; + hash = "sha256-Rk12QZK47oF0ri1+kCquW4vaqPPPO5UPYOhq4StR1+U="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "websockets" + ]; + dependencies = [ aiohttp @@ -71,39 +76,53 @@ buildPythonPackage rec { websockets ]; + # Note: to reflect the extra_requires in main/setup.py. + optional-dependencies = { + ipfs = [ ipfshttpclient ]; + }; + nativeCheckInputs = [ eth-tester flaky hypothesis py-evm pytest-asyncio_0_21 - pytestCheckHook pytest-mock pytest-xdist + pytestCheckHook pyunormalize ]; disabledTests = [ # side-effect: runs pip online check and is blocked by sandbox "test_install_local_wheel" + # not sure why they fail - "test_init_multiple_contracts_performance" "test_async_init_multiple_contracts_performance" + "test_init_multiple_contracts_performance" + + # AssertionError: assert '/build/geth.ipc' == '/tmp/geth.ipc + "test_get_dev_ipc_path" + + # Require network access + "test_websocket_provider_timeout" ]; disabledTestPaths = [ # requires geth library and binaries "tests/integration/go_ethereum" + # requires local running beacon node "tests/beacon" ]; pythonImportsCheck = [ "web3" ]; - meta = with lib; { + meta = { description = "Python interface for interacting with the Ethereum blockchain and ecosystem"; homepage = "https://web3py.readthedocs.io/"; - license = licenses.mit; - maintainers = with maintainers; [ hellwolf ]; + changelog = "https://web3py.readthedocs.io/en/stable/release_notes.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } From 0c87981c32d0ada22c1cd910e06d61236b70ed43 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 16:08:44 +0100 Subject: [PATCH 474/484] python312Packages.blis: fallback to generic architecure when needed --- .../python-modules/blis/default.nix | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 91a41aaf54d8..c17823eb0717 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -1,13 +1,19 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, cython, - hypothesis, numpy, + + # tests + hypothesis, pytestCheckHook, - pythonOlder, + + # passthru blis, numpy_1, gitUpdater, @@ -18,8 +24,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "explosion"; repo = "cython-blis"; @@ -27,25 +31,41 @@ buildPythonPackage rec { hash = "sha256-krUqAEPxJXdlolSbV5R0ZqrWaFuXh7IxSeFTsCr6iss="; }; - preCheck = '' - # remove src module, so tests use the installed module instead - rm -rf ./blis - ''; - build-system = [ setuptools cython numpy ]; + env = + # Fallback to generic architectures when necessary: + # https://github.com/explosion/cython-blis?tab=readme-ov-file#building-blis-for-alternative-architectures + lib.optionalAttrs + ( + # error: [Errno 2] No such file or directory: '/build/source/blis/_src/make/linux-cortexa57.jsonl' + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) + + # clang: error: unknown argument '-mavx512pf'; did you mean '-mavx512f'? + # Patching blis/_src/config/knl/make_defs.mk to remove the said flag does not work + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) + ) + { + BLIS_ARCH = "generic"; + }; + dependencies = [ numpy ]; + pythonImportsCheck = [ "blis" ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; - pythonImportsCheck = [ "blis" ]; + # remove src module, so tests use the installed module instead + preCheck = '' + rm -rf ./blis + ''; passthru = { tests = { @@ -58,11 +78,11 @@ buildPythonPackage rec { }; }; - meta = with lib; { - changelog = "https://github.com/explosion/cython-blis/releases/tag/release-${src.tag}"; + meta = { + changelog = "https://github.com/explosion/cython-blis/releases/tag/release-${version}"; description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; - license = licenses.bsd3; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nickcao ]; }; } From c6afce43c2c16765b7bc48b69fc16a855f8041ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 17:11:18 +0100 Subject: [PATCH 475/484] python312Packages.textnets: fix build on darwin --- .../python-modules/textnets/default.nix | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 00b1ea7b6244..2db378b5a0f5 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -1,24 +1,30 @@ { lib, + stdenv, buildPythonPackage, - cairocffi, - cython, - en_core_web_sm, fetchFromGitHub, + + # build-system + cython, + poetry-core, + setuptools, + + # dependencies + cairocffi, igraph, leidenalg, pandas, - poetry-core, pyarrow, - pytestCheckHook, - pythonOlder, scipy, - setuptools, - spacy-lookups-data, spacy, + spacy-lookups-data, toolz, tqdm, wasabi, + + # tests + en_core_web_sm, + pytestCheckHook, }: buildPythonPackage rec { @@ -26,8 +32,6 @@ buildPythonPackage rec { version = "0.9.5"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jboynyc"; repo = "textnets"; @@ -63,8 +67,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook en_core_web_sm + pytestCheckHook ]; pythonImportsCheck = [ "textnets" ]; @@ -74,16 +78,25 @@ buildPythonPackage rec { rm -r textnets ''; - disabledTests = [ - # Test fails: Throws a UserWarning asking the user to install `textnets[fca]`. - "test_context" - ]; + disabledTests = + [ + # Test fails: Throws a UserWarning asking the user to install `textnets[fca]`. + "test_context" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1) + "test_plot_backbone" + "test_plot_filtered" + "test_plot_layout" + "test_plot_projected" + "test_plot_scaled" + ]; - meta = with lib; { + meta = { description = "Text analysis with networks"; homepage = "https://textnets.readthedocs.io"; changelog = "https://github.com/jboynyc/textnets/blob/v${version}/HISTORY.rst"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ jboy ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ jboy ]; }; } From a253bad5e91c8d74ce5be438d4b40175aea58606 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:39:14 +0100 Subject: [PATCH 476/484] python313Packages.hass-nabucasa: 0.90.0 -> 0.92.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.92.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 5a60e8a71fff..930cdc526631 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.90.0"; + version = "0.92.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-OP+KUh0WsE6I0hKUvUBHhzrLCKM7jc5GhO++9OrLh4s="; + hash = "sha256-OwU3HxUj8M3/3Xv+9WPNbV8sVVR8S9u9U3mSK/P+4o8="; }; pythonRelaxDeps = [ "acme" ]; From 1ce18a7278d31e6d1d119295dcc94ee2563bde39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:42:48 +0100 Subject: [PATCH 477/484] python313Packages.py-synologydsm-api: 2.6.2 -> 2.6.3 https://github.com/mib1185/py-synologydsm-api/releases/tag/v2.6.3 --- .../development/python-modules/py-synologydsm-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 2d5b39a48fc2..f269875ec423 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; tag = "v${version}"; - hash = "sha256-mkwHw10IzVWtuLGbpY/v7yCJgI6TBIJEo1XSB/NlZKs="; + hash = "sha256-BkkI2dhzf58vBoT6UhBsn6MyS7KvYo70C80ZLGOJG08="; }; build-system = [ setuptools ]; From 2379040e8c247f18a04370f162442ea0cf2bbd90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:43:05 +0100 Subject: [PATCH 478/484] python313Packages.pyseventeentrack: 1.0.1 -> 1.0.2 https://github.com/shaiu/pyseventeentrack/releases/tag/v1.0.2 --- pkgs/development/python-modules/pyseventeentrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyseventeentrack/default.nix b/pkgs/development/python-modules/pyseventeentrack/default.nix index 55fba001214c..0fcad12ddb9d 100644 --- a/pkgs/development/python-modules/pyseventeentrack/default.nix +++ b/pkgs/development/python-modules/pyseventeentrack/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyseventeentrack"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "shaiu"; repo = "pyseventeentrack"; tag = "v${version}"; - hash = "sha256-AHFJu2z3UWBR6BzwdxAKl3wpqBnsyj8pn16z1rgFVpw="; + hash = "sha256-B/p+7wuXMtdOlIOySGQdtiiErcVD8DaVJPvSX4lPnos="; }; build-system = [ poetry-core ]; From 2fa9ad136b224ce6767cb5a9711a89bae918cfd2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:43:33 +0100 Subject: [PATCH 479/484] python313Packages.zha-quirks: 0.0.132 -> 0.0.133 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.133 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 27e070a78790..af1b3ccd7599 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.132"; + version = "0.0.133"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-T5A6XIYdV0SxEj3Rw/zOAE74B1ans2FDyuWD5Hnbd5k="; + hash = "sha256-9nw9eEUzIIp679LSMRmO5kW5Qvz3vcL3AEXHdhNFtG8="; }; postPatch = '' From 6aeaa71ff594b93e661c75042d81ff0ca2d22022 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:47:39 +0100 Subject: [PATCH 480/484] python313Packages.zha: 0.0.48 -> 0.0.49 https://github.com/zigpy/zha/releases/tag/0.0.49 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 70e0c5d08d60..ecae00d4942b 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.48"; + version = "0.0.49"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-qPqFmFfvCR6gk4qmZNrkC/DcdOUzyLv7KALv35R6oNw="; + hash = "sha256-QW/FrmZIRr2xt+a6Se9nEp4ttfhNJx79/qV9A+hmNSU="; }; postPatch = '' From d00446c603f820a609dbc46c51ff404d664fccea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 21:47:48 +0100 Subject: [PATCH 481/484] home-assistant: 2025.2.3 -> 2025.2.4 https://github.com/home-assistant/core/releases/tag/2025.2.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dce16055ac29..d62cbf943f9a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.2.3"; + version = "2025.2.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a0a24e45fc1c..806473fdde53 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -369,7 +369,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.2.3"; + hassVersion = "2025.2.4"; in python.pkgs.buildPythonApplication rec { @@ -390,13 +390,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-1hCNkBIqRg3YDQn6TSytugxkQwve4/Z7p1/BY4Zwcv0="; + hash = "sha256-Zrr4keJwY1q/PrHZEVUphxhA3dAOkyE5vCEa3Msr9Yk="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-4LojranZ9xLR3kpBvvzZ/XJchbgr9ZVYydntNoBkCVE="; + hash = "sha256-24AOIyC00U6J1Abg1zj4BbSLsRik2tQZSFaoAu7w85M="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b9a0224adc46..1ca6e8574c99 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20250210.0"; + version = "20250214.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Pm9lnD+3ywHtLWPbuIm7brWzY+804+V84pH6g561LAU="; + hash = "sha256-dIV0P/9GsHV4xN84+HGe/I7ay1FM3jLw9F60WpxaEIM="; }; # there is nothing to strip in this package From 0345b336c2cc3c1b42a7742f89252819aad04384 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 23:51:58 +0100 Subject: [PATCH 482/484] python312Packages.islpy: 2025.1 -> 2025.1.1 Diff: https://github.com/inducer/islpy/compare/refs/tags/v2025.1...v2025.1.1 Changelog: https://github.com/inducer/islpy/releases/tag/v2025.1.1 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index f69c15e52a2b..8a4a5b2ef4d4 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "islpy"; - version = "2025.1"; + version = "2025.1.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-njwNijl7kAbU7v6Bd6p0J9KnYzXZi9gVdqSf8qD0FXE="; + hash = "sha256-SCrEHz5gMPSfrgyPQcTf4k2YlzVs7WWdhgnw7U0Tv30="; }; build-system = [ From f36ffa86463ade1cd13e24cc0f35ba0d9b8a6fb7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Feb 2025 20:17:37 +0900 Subject: [PATCH 483/484] apprun-cli: init at 0.0.2 --- pkgs/by-name/ap/apprun-cli/package.nix | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ap/apprun-cli/package.nix diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix new file mode 100644 index 000000000000..1f2d7f5ced4e --- /dev/null +++ b/pkgs/by-name/ap/apprun-cli/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "apprun-cli"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "fujiwara"; + repo = "apprun-cli"; + tag = "v${version}"; + hash = "sha256-SvFShjAHjIKhz/YolgmFeaAxflh3FRPEZDx57+AtXeQ="; + }; + + vendorHash = "sha256-pz97Eihc/6b2J+JuEZJQoqBkKtf1J5XbSFMQa1CJrRo="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI for sakura AppRun"; + homepage = "https://github.com/fujiwara/apprun-cli"; + changelog = "https://github.com/fujiwara/apprun-cli/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "apprun-cli"; + }; +} From 7ef96705d3a6135f60581bc9d8fd55bbc5446c92 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Feb 2025 22:43:39 +0900 Subject: [PATCH 484/484] usacloud: init at 1.14.1 --- pkgs/by-name/us/usacloud/package.nix | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/us/usacloud/package.nix diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix new file mode 100644 index 000000000000..670c3f1e8b66 --- /dev/null +++ b/pkgs/by-name/us/usacloud/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "usacloud"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "sacloud"; + repo = "usacloud"; + tag = "v${version}"; + hash = "sha256-bIVC0pa+54a/OpGKOM3LH7IMZnuYDvfGOMxcIwhHI7U="; + }; + + vendorHash = "sha256-m89iw5nk34KkCh8vlnKcwoPQXprUKzETYQNzi2CtX4c="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/sacloud/usacloud/pkg/version.Revision=${src.rev}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI client for the Sakura Cloud"; + homepage = "https://github.com/sacloud/usacloud"; + changelog = "https://github.com/sacloud/usacloud/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "usacloud"; + }; +}