From 8c3a2b0a104fe7af24901c7bc7970c606c9abbae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 9 Dec 2023 23:42:41 +0100 Subject: [PATCH 01/93] nixos/portunus: add note about allowed characters to id --- nixos/modules/services/misc/portunus.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index ab78479c96cd..61eb8f0b10c3 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -98,6 +98,10 @@ in The OIDC secret must be set as the `DEX_CLIENT_''${id}` environment variable in the [](#opt-services.dex.environmentFile) setting. + + ::: {.note} + Make sure the id only contains characters that are allowed in an environment variable name, e.g. no -. + ::: ''; }; From e4de1c0b19fd9a968b306a5bab27f2245773e57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 28 Apr 2024 18:18:18 +0200 Subject: [PATCH 02/93] nixos/bitwarden-directory-connector-cli: add wants network-online.target This fixes the following warning: trace: warning: bitwarden-directory-connector-cli.timer is ordered after 'network-online.target' but doesn't depend on it --- .../services/security/bitwarden-directory-connector-cli.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix index d21322caf4c3..fef4a8864897 100644 --- a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix +++ b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix @@ -260,6 +260,7 @@ in { description = "Sync timer for Bitwarden Directory Connector"; wantedBy = ["timers.target"]; after = ["network-online.target"]; + wants = ["network-online.target"]; timerConfig = { OnCalendar = cfg.interval; Unit = "bitwarden-directory-connector-cli.service"; From fa232f0a93620de50e14724c5f13b71ff2df4eb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 06:50:29 +0000 Subject: [PATCH 03/93] matio: 1.5.26 -> 1.5.27 --- pkgs/development/libraries/matio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index aebd14780636..bf4c1f724e16 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "matio"; - version = "1.5.26"; + version = "1.5.27"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-i0fCn1jkaNunpVVTccanKtTGqosV9FmysLZaMDwGOTM="; + sha256 = "sha256-CmqgCxjEUStjqNJ5BrB5yMbtQdSyhE96SuWY4Y0i07M="; }; meta = with lib; { From 068981b87b1de8dc60911bf1f857d91e13f77abe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 11:34:47 +0000 Subject: [PATCH 04/93] libpkgconf: 2.1.1 -> 2.2.0 --- pkgs/by-name/li/libpkgconf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpkgconf/package.nix b/pkgs/by-name/li/libpkgconf/package.nix index bfa79f3c2532..ffeb136862df 100644 --- a/pkgs/by-name/li/libpkgconf/package.nix +++ b/pkgs/by-name/li/libpkgconf/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkgconf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz"; - hash = "sha256-OiJPKszwkbd6V4Exbie57juoLAg8wuU54IlAtopE/sU="; + hash = "sha256-sG/2OoNTaqjC9kIvqArUXkgz9ZAmb+sU6t3+HUyFPGk="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; From fcab5d3e0afebe7a9a8b338decbe86b45f38c4af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 May 2024 01:21:56 +0000 Subject: [PATCH 05/93] gdcm: 3.0.23 -> 3.0.24 --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 9d6db6fca684..18058af21cb1 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.23"; + version = "3.0.24"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "refs/tags/v${version}"; - hash = "sha256-zwIPWcjTrfbdNBzAqwV6lU2l6sx+e4Yi7dprdem6AeE="; + hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE="; }; cmakeFlags = [ From 8e729c70a1192691fc4eb93017415de88d791883 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 09:40:42 +0000 Subject: [PATCH 06/93] enet: 1.3.17 -> 1.3.18 --- pkgs/development/libraries/enet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 53aec96fe705..cb57f5a2f07e 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "enet"; - version = "1.3.17"; + version = "1.3.18"; src = fetchurl { url = "http://enet.bespin.org/download/${pname}-${version}.tar.gz"; - sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3"; + sha256 = "sha256-KooMU2DWi7T80R8uTEfGmXbo0shbEJ3X1gsRgaT4XTY="; }; meta = { From f96a90834c5e2fb1fd9cebfba862c6d5a01f7601 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 03:09:12 +0000 Subject: [PATCH 07/93] secp256k1: 0.4.1 -> 0.5.0 --- pkgs/tools/security/secp256k1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 5494f8f26c24..335d9c5c18a5 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-atq34GnWkSkWTWxZP4PCSF3hIjGFhQ534E+WUtLRkiM="; + sha256 = "sha256-XcxBzOJngrm1szs48bBS6pcH2yaLfLKPUtyQ51eItaw="; }; nativeBuildInputs = [ autoreconfHook ]; From 24d453186792290a2188343c289d6504daecc5aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 09:08:22 +0000 Subject: [PATCH 08/93] python311Packages.minio: 7.2.6 -> 7.2.7 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index de84597491c8..f1321bb53bc3 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.6"; + version = "7.2.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-zK+D2DNgh1cASdA2gstNW0ODUu7Dn6vMY01mcrdSSo0="; + hash = "sha256-Qb3KPwSODtIqwS4FfR+DHphx4duPsNdMlHt2rpdV2+Y="; }; postPatch = '' From 7a2be5b7d6a28def87520629f25b8ae5fd167a4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 00:43:19 +0000 Subject: [PATCH 09/93] miniupnpc: 2.2.6 -> 2.2.7 --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index f1a639b72060..f9b8f0c536fa 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "miniupnpc"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-N/zZGVNQjD5i1pZLuP+8XUfz4TSB+lTmIU/MaHBMZvE="; + sha256 = "sha256-sMOicFaED9DskyilqbrD3F4OxtLoczNJz1d7CqHnCsE="; }; nativeBuildInputs = [ cmake ]; From 8eea66b3f69ad1cd47c5359271d2833d40f5de65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:25:33 +0000 Subject: [PATCH 10/93] goperf: 0-unstable-2023-11-08 -> 0-unstable-2024-05-10 --- pkgs/development/tools/goperf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index ffb644aaea40..b4147456711d 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2023-11-08"; + version = "0-unstable-2024-05-10"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "cb71e802ccb878a069712546879bf26489f0f300"; - hash = "sha256-1NvrelLsy9lrepttXXnggc0oycC6EgJgU80iXDu3IoI="; + rev = "bedb9135df6d63a551db71a3fa872a2816e90cf2"; + hash = "sha256-e2dr/eeKoc0Vpxx29bmxhfYsj13oEFs9h1/mBmDbWM4="; }; - vendorHash = "sha256-dJQHqIR6v0yYbxplytkdA98IHtdxnsvi9X6kIESCsB8="; + vendorHash = "sha256-MtDvOn+cjlEtObzmYnsQa2BkgIeKr/j18wk5QK3JDuk="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf From 0062a1d3305118b17c3854e92db78b464313b799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A9=20Dupuis?= Date: Thu, 16 May 2024 16:44:30 -0700 Subject: [PATCH 11/93] rexml: 3.2.6 -> 3.2.8 --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 0528d45bef84..18819de3029c 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -3127,10 +3127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "sha256-CQioY4HZ+XOCRoDfTgp1QidmJy8DscDknbfnnCPbETU="; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; rmagick = { dependencies = ["observer" "pkg-config"]; From 010c4a334eaf96112bc812bd4ed70818376b889a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:27:17 +0000 Subject: [PATCH 12/93] intune-portal: 1.2404.23-jammy -> 1.2404.25-jammy --- pkgs/by-name/in/intune-portal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index c51771824446..48b945c833c3 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2404.23-jammy"; + version = "1.2404.25-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-zAH35iF+3YpDNGo3UhmzL4pRJXlEhG1PaT71qnRtpAg="; + hash = "sha256-ZRJdhhDwXeOjIx7Ml4VvPUOotnJQ9f73nsYzgm6SQC8="; }; nativeBuildInputs = [ dpkg ]; From 78ef0a386ec264bf2c6f2389a9da21e74c674d84 Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Tue, 21 May 2024 22:10:54 +0200 Subject: [PATCH 13/93] python312Packages.webssh: fix test case --- .../python-modules/webssh/default.nix | 9 ++++----- .../webssh/remove-typo-in-test-case.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 4681b186c9ca..0bfa6a525d31 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-mRestRJukaf7ti3vIs/MM/R+zpGmK551j5HAM2chBsE="; }; + patches = [ + ./remove-typo-in-test-case.patch + ]; + propagatedBuildInputs = [ paramiko tornado @@ -30,11 +34,6 @@ buildPythonPackage rec { "webssh" ]; - disabledTests = [ - # Test fails with AttributeError (possibly related to paramiko update) - "test_app_with_bad_host_key" - ]; - meta = with lib; { description = "Web based SSH client"; mainProgram = "wssh"; diff --git a/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch b/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch new file mode 100644 index 000000000000..ac7bd94e5b39 --- /dev/null +++ b/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch @@ -0,0 +1,18 @@ +--- + tests/test_handler.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_handler.py b/tests/test_handler.py +index a9ad924..950e672 100644 +--- a/tests/test_handler.py ++++ b/tests/test_handler.py +@@ -336,5 +336,5 @@ class TestIndexHandler(unittest.TestCase): + ssh.exec_command.return_value = (stdin, stdout, stderr) + + encoding = IndexHandler.get_default_encoding(handler, ssh) +- self.assertEquals("utf-8", encoding) ++ self.assertEqual("utf-8", encoding) + +-- +2.44.0 + From 7d5d4ed7f02ecf257ca6f9a9fed6e72940f2a46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 22 May 2024 08:09:56 +0300 Subject: [PATCH 14/93] inotify-info: v0.0.1 -> v0.0.2 --- pkgs/by-name/in/inotify-info/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inotify-info/package.nix b/pkgs/by-name/in/inotify-info/package.nix index ea7235917caf..0405400b7f6d 100644 --- a/pkgs/by-name/in/inotify-info/package.nix +++ b/pkgs/by-name/in/inotify-info/package.nix @@ -5,15 +5,17 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "inotify-info"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "mikesart"; repo = "inotify-info"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fsUvIXWnP6Iy9Db0wDG+ntSw6mUt0MQOTJA5vFxhH+U="; + hash = "sha256-6EY2cyFWfMy1hPDdDGwIzSE92VkAPo0p5ZCG+B1wVYY="; }; + buildFlags = ["INOTIFYINFO_VERSION=v${finalAttrs.version}"]; + installPhase = '' runHook preInstall install -Dm755 _release/inotify-info $out/bin/inotify-info From bc7d0ea6060100b3f9eb95dc6d7efb5b9862d746 Mon Sep 17 00:00:00 2001 From: NixOS Date: Wed, 22 May 2024 11:47:39 +0200 Subject: [PATCH 15/93] tart: 2.10.0 -> 2.11.0 --- pkgs/applications/virtualization/tart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 921a8b7e3dbc..7615c3da26b4 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-9spBDqNm47nUZEGCCOfISjNpGx/22OtPPheB7iJTq1A="; + hash = "sha256-Wf6JfEOUkCpUB0qsAGqh5v/sTV+iQ2NUmXKLyLgxgV0="; }; sourceRoot = "."; From a773a85c193e5277c20ef637c0e95314f679a37c Mon Sep 17 00:00:00 2001 From: David Wolff Date: Wed, 22 May 2024 12:00:39 +0200 Subject: [PATCH 16/93] stylance-cli: 0.3.0 -> 0.5.0 --- pkgs/by-name/st/stylance-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index 767d7370b766..5b6e426943a3 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -4,14 +4,14 @@ }: rustPlatform.buildRustPackage rec { pname = "stylance-cli"; - version = "0.3.0"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-YQYYZxLypD5Nz8kllIaBFDoV8L2c9wzJwmszqPpjpmg="; + hash = "sha256-nwvlce1a5Qerh1wa/lAtkl60fpjMV6WQuEzNLfmCK7k="; }; - cargoHash = "sha256-ZzdLbsHRBgprdzmPVzywJx+wMMqRBsLeT84UIDMJbQM="; + cargoHash = "sha256-e8lu839kthncvCVlg13ZWNUwYGgGVgXZWJlHufubNA8="; meta = with lib; { description = "A library and cli tool for working with scoped CSS in rust"; From 7bda925dacb26d2207c5e3c4b23f7e12d6f4e497 Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 19:59:09 +0100 Subject: [PATCH 17/93] maintainers: add greaka --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 67e7bc89adda..2c0604630eed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7725,6 +7725,14 @@ fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; + greaka = { + email = "git@greaka.de"; + github = "greaka"; + githubId = 2805834; + name = "Greaka"; + keys = + [{ fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; }]; + }; greg = { email = "greg.hellings@gmail.com"; github = "greg-hellings"; From 8d6f8c9ed75a8900b6bd91b2a54c305c38b4cf40 Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 20:00:05 +0100 Subject: [PATCH 18/93] maintainers: add lpostula --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2c0604630eed..b96386e5a549 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11916,6 +11916,14 @@ githubId = 10626; name = "Andreas Wagner"; }; + lpostula = { + email = "lois@postu.la"; + github = "loispostula"; + githubId = 1423612; + name = "Loïs Postula"; + keys = + [{ fingerprint = "0B4A E7C7 D3B7 53F5 3B3D 774C 3819 3C6A 09C3 9ED1"; }]; + }; lrewega = { email = "lrewega@c32.ca"; github = "lrewega"; From 0e5f44658ee645b05322c221f0e00b840991a8d2 Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 20:02:40 +0100 Subject: [PATCH 19/93] maintainers/team-list: add fslabs --- maintainers/team-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index e0c1629a6f23..b2539cf31c82 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -345,6 +345,16 @@ with lib.maintainers; { shortName = "freedesktop.org packaging"; }; + fslabs = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + greaka + lpostula + ]; + scope = "Group registration for packages maintained by Foresight Spatial Labs."; + shortName = "Foresight Spatial Labs employees"; + }; + gcc = { members = [ synthetica From 0864c89be75e51c2343b9bb39d2fdd524a999de0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 16:53:13 +0000 Subject: [PATCH 20/93] corectrl: 1.4.0 -> 1.4.1 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index a7397da8d7cf..9240635aa542 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-zTH7iSPN7VIhXvWFndOulvGnfUZ+uGWnW53WcnSW+e4="; + sha256 = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; }; patches = [ ./polkit-dir.patch From 4474e40f3b10e9e7f5978cd64bd3c7e356443684 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 19:35:03 +0000 Subject: [PATCH 21/93] svtplay-dl: 4.73 -> 4.79 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5abdb5bba60d..6b540fac7ffd 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose3 cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.73"; + version = "4.79"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-e8ewsx2mx62JTUnpMoSRL44EGDllQuk/k9gRztOkWMc="; + hash = "sha256-m5lIiWOROzNUONAVRoD6vdE7+1TeI6L0tNw+afYtNZA="; }; pythonPaths = [ cryptography pyyaml requests ]; From f40d6fcb1574cfaa4d5155429b7181abba3c10f0 Mon Sep 17 00:00:00 2001 From: Sven Mattsen Date: Wed, 22 May 2024 22:15:34 +0200 Subject: [PATCH 22/93] kubectl-klock: 0.6.1 -> 0.7.0 Diff: https://github.com/applejag/kubectl-klock/compare/v0.6.1...v0.7.0 Changelog: https://github.com/applejag/kubectl-klock/releases/tag/v0.7.0 --- .../networking/cluster/kubectl-klock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix index 06ede90ffb67..7bb18112e772 100644 --- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubectl-klock"; - version = "0.6.1"; + version = "0.7.0"; nativeBuildInputs = [ makeWrapper ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "applejag"; repo = pname; rev = "v${version}"; - hash = "sha256-QzleoHRQ/A5ImMl43kze5ppUdiLa4n/VT02lMnaXVkg="; + hash = "sha256-MmsHxB15gCz2W2QLC6E7Ao+9iLyVaYJatUgPcMuL79M="; }; - vendorHash = "sha256-smE8mdyZ8xJOevgHs4+ozS6VOlko+Whhs/37B+hIbxo="; + vendorHash = "sha256-lhawUcjB2EULpAFjBM4tdmDo08za2DfyZUvEPo4+LXE="; postInstall = '' makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete From e5217101fd79e3e4d5261fca7046449e8ac0f7a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 20:51:25 +0000 Subject: [PATCH 23/93] traefik: 3.0.0 -> 3.0.1 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 3e429e3595f7..ff27da98ad5c 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "3.0.0"; + version = "3.0.1"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-OX9VJpO+SWIsocaSu+BhF3HT+zrhhgxb5NBvaRTadIY="; + hash = "sha256-FoKmoestbPu95E4dzBdG2rB0zEYocD/16yt9Je4M3GU="; stripRoot = false; }; - vendorHash = "sha256-GRVSZB4GojXv2xAdx8Y5RSuhF/3paRhhq7HOWLRmmHE="; + vendorHash = "sha256-nEPcq4lUvs/hTobciIZAQKQ13MgKMLjYUkyYMd3EHms="; subPackages = [ "cmd/traefik" ]; From 50c8f5e46df089d77f13e26ce03e606c050eb8b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 22:11:16 +0000 Subject: [PATCH 24/93] limine: 7.5.1 -> 7.5.2 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 1a004b42f210..464c57dce72e 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.5.1"; + version = "7.5.2"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-aWzhUwW4799v0qZDpzzztb2LnfRYwjPXWM2dgpqwYIo="; + sha256 = "sha256-l9ax89rNbQs8eNyuljdEXCvY5GRXsN9qzIDrsi76iEg="; }; nativeBuildInputs = [ From d679ddfcab7ffe85f66f81d70ffd64e6e0951b1e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 23 May 2024 06:06:57 +0800 Subject: [PATCH 25/93] nixos/kanata: add a configFile option This brings two benefits. For one thing, it exposes the generated config file which users can build separately to validate it. For another, it allows users to provide their own config file. --- nixos/modules/services/hardware/kanata.nix | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index 46af3e36b985..60fb33881f25 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -7,7 +7,7 @@ let upstreamDoc = "See [the upstream documentation](https://github.com/jtroo/kanata/blob/main/docs/config.adoc) and [example config files](https://github.com/jtroo/kanata/tree/main/cfg_samples) for more information."; - keyboard = { + keyboard = { name, config, ... }: { options = { devices = mkOption { type = types.listOf types.str; @@ -48,6 +48,21 @@ let ${upstreamDoc} ''; }; + configFile = mkOption { + type = types.path; + default = mkConfig name config; + defaultText = + "A config file generated by values from other kanata module options."; + description = '' + The config file. + + By default, it is generated by values from other kanata + module options. + + You can also set it to your own full config file which + overrides all other kanata module options. ${upstreamDoc} + ''; + }; extraArgs = mkOption { type = types.listOf types.str; default = [ ]; @@ -85,6 +100,10 @@ let ${keyboard.config} ''; + # Only the config file generated by this module is checked. A + # user-provided one is not checked because it may not be available + # at build time. I think this is a good balance between module + # complexity and functionality. checkPhase = '' ${getExe cfg.package} --cfg "$target" --check --debug ''; @@ -96,7 +115,7 @@ let Type = "notify"; ExecStart = '' ${getExe cfg.package} \ - --cfg ${mkConfig name keyboard} \ + --cfg ${keyboard.configFile} \ --symlink-path ''${RUNTIME_DIRECTORY}/${name} \ ${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ ${utils.escapeSystemdExecArgs keyboard.extraArgs} From 7fa3c4caff9c0852085528e90c0e9da990c7693c Mon Sep 17 00:00:00 2001 From: cjshearer Date: Mon, 6 May 2024 10:08:51 -0400 Subject: [PATCH 26/93] maintainers: add cjshearer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 96cee3a89273..75ab1517e779 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3762,6 +3762,12 @@ githubId = 136485; name = "Chad Jablonski"; }; + cjshearer = { + email = "cjshearer@live.com"; + github = "cjshearer"; + githubId = 7173077; + name = "Cody Shearer"; + }; ck3d = { email = "ck3d@gmx.de"; github = "ck3d"; From 51de558f5634bf7865974a2b4635b1ccb7c5d667 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 5 May 2024 11:55:35 -0400 Subject: [PATCH 27/93] maintainers: add rconybea --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 37dfd12c2df6..dc5f5a7f0529 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16859,6 +16859,15 @@ githubId = 52847440; name = "Ryan Burns"; }; + rconybea = { + email = "n1xpkgs@hushmail.com"; + github = "rconybea"; + githubId = 8570969; + name = "Roland Conybeare"; + keys = [{ + fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; + }]; + }; rdnetto = { email = "rdnetto@gmail.com"; github = "rdnetto"; From 1fde38bc6fb558e1cba5a61d56710b25996b6dde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 00:11:28 +0000 Subject: [PATCH 28/93] cargo-ndk: 3.5.5 -> 3.5.6 --- pkgs/development/tools/rust/cargo-ndk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index 1c80788aebbd..b1068127483b 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-ndk"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "bbqsrc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2nL+NE4ntZbm2DdPZEoJLDeMAxaPXgrSSIvwAThlLlA="; + sha256 = "sha256-piNKtmDssDeB+DznLl0uufT5BFiVCMmYGuRmBUr5QWQ="; }; - cargoHash = "sha256-Fa1pkHdjngJx7FwfvSQ76D61NPYC88jXqYnjWx6K2f8="; + cargoHash = "sha256-sIKan8LnGv4sGVrGOUOKSD3R4fNRu5yBFATm5MWDTSU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreGraphics From 4a2f2c7754ff61bafaa235d6ba78e0a3ecfbf8ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 01:27:23 +0000 Subject: [PATCH 29/93] c2patool: 0.9.0 -> 0.9.1 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index a334b857acc5..470aac119c11 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yR6VepMZquURDb2SDwx+xE55jo3MTzh6ntSrQln1Xxs="; + sha256 = "sha256-+Nnvg1VzVhyrOG1/yIbeKhELzTL5j3cYFb8+P4P0qxA="; }; - cargoHash = "sha256-Z4Q/33CwbJXlMZBq4WRT2k78PvaHpNm4pQkiAehCImI="; + cargoHash = "sha256-guV1n3Gx00ODOyNuosAeRw1NPumjdkC2dFJFuwFBheg="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; From 2ae9dea1d92ad6966df0c282e9629a4cefd4001b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 01:36:11 +0000 Subject: [PATCH 30/93] lsp-plugins: 1.2.15 -> 1.2.16 --- pkgs/applications/audio/lsp-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 89cd9b6ff329..56b508df7f6f 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.15"; + version = "1.2.16"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-krku+jFGOvLwixNGd+0jBzE/17k/OU0zAePLhnxd864="; + sha256 = "sha256-w2BUIF44z78syLroQk2asVXA5bt9P9POiuwxpnlkc8o="; }; outputs = [ "out" "dev" "doc" ]; From e8553da1b1014f8e1525fb2cb7ff1ba129dce17d Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 11:50:39 +0800 Subject: [PATCH 31/93] python312Packages.ds4drv: fix build --- pkgs/development/python-modules/ds4drv/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index 0eca163928fa..d4ebc468f9ef 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -5,12 +5,15 @@ evdev, pyudev, bluez, + setuptools, }: buildPythonPackage rec { pname = "ds4drv"; version = "0.5.1"; - format = "setuptools"; + + pyproject = true; + build-system = [ setuptools ]; # PyPi only carries py3 wheel src = fetchFromGitHub { @@ -20,7 +23,12 @@ buildPythonPackage rec { sha256 = "0vinpla0apizzykcyfis79mrm1i6fhns83nkzw85svypdhkx2g8v"; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace ds4drv/config.py \ + --replace-fail SafeConfigParser ConfigParser + ''; + + dependencies = [ evdev pyudev ]; From 1e4ff676da0f936e057d86153deeeb0c54b8d009 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 13:34:31 +0800 Subject: [PATCH 32/93] nezha-agent: 0.16.8 -> 0.16.9 changelog: https://github.com/nezhahq/agent/releases/tag/v0.16.9 --- pkgs/by-name/ne/nezha-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 2f80dc2ded43..d470290b8cae 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.16.8"; + version = "0.16.9"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "v${version}"; - hash = "sha256-s3l6sI+gQcy5Qxjzg+l9t9e8WWYppiMljX7o1rSXFIs="; + hash = "sha256-WK9aTKRSpBrqEKje168Gmn6ROLFxE/fuYp10Ywtr4ks="; }; - vendorHash = "sha256-Qx0XAlWLDqN1CZTmf1yVc8yFmz9/5bz/HVqN/korJzE="; + vendorHash = "sha256-L6QdodI8Ur1H6Zc24KSTYAHfzvW2aq9SYwCVgjvSDII="; ldflags = [ "-s" From 724e4680a8c3c2fb6ecc0fd7a8682fbd9e59a9ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:04:35 +0000 Subject: [PATCH 33/93] tmux-mem-cpu-load: 3.8.0 -> 3.8.1 --- pkgs/tools/misc/tmux-mem-cpu-load/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 1e197ef162ea..012a18911d40 100644 --- a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "sha256-dRHV2XF3NFzd4HT9SbRnEn8U40QTnAUJDsM51NA9fEk="; + sha256 = "sha256-8QUcEbgk3DSsWt9TRHHtDhQ7a1hkK8RZEX+0d3h/c0w="; }; nativeBuildInputs = [ cmake ]; From a7094f7697b1fcf7b345fa027fc1d2ae98da9368 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:07:37 +0000 Subject: [PATCH 34/93] swego: 1.0 -> 1.1 --- pkgs/servers/swego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index eb4bcccbbf9d..4e42ea33f97b 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-OlaNDXKaIim5n0niqYIpRliVo7lse76vNxPKF6B6yF0="; + sha256 = "sha256-O/wczHyaMev0CpAXoDxiN7TtHDsthG+jaH31SPMEB34="; }; - vendorHash = "sha256-N4HDngQFNCzQ74W52R0khetN6+J7npvBC/bYZBAgLB4="; + vendorHash = "sha256-mJWJdwbZq042//hM3WWp2rnLC1GebckUnsIopbF858Q="; postInstall = '' mv $out/bin/src $out/bin/$pname From 3ee89bd08e219a5b950322c5366dd2f2e5044d7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:23:40 +0000 Subject: [PATCH 35/93] atmos: 1.72.0 -> 1.73.0 --- pkgs/applications/networking/cluster/atmos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 2163adf6d5b2..9e5dc34dcef3 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.72.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d4TgVSXTqrzgTdpGl1uXIdEvwb0EIgzqiEjOaWYAZgk="; + sha256 = "sha256-rJGhDFVvlVtQboqts8+c6JYTRHC0IwrOm5BYVA20yrY="; }; - vendorHash = "sha256-T3FvJfyGseW5vwN/mMCFEjpcpW90MG8QPkmaXJafD4s="; + vendorHash = "sha256-11r4ph0i05lHXKNy8iMNKqCVzeQbPtHwNPiQU7759rQ="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; From 2de3b0044aa34973abb88356788ce0f22d09f962 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:27:53 +0000 Subject: [PATCH 36/93] cargo-component: 0.12.0 -> 0.13.0 --- pkgs/development/tools/rust/cargo-component/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index eb216bbab11d..12e88a77b4bd 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-SYmKxcU2CxvIFLWoNWBjhJBxIfhZqO2LTyv8WUbuyAY="; + hash = "sha256-e1oticOXOimLXwymRbZ/eQEiqmvqWKgvPuBkdYarkxI="; }; - cargoHash = "sha256-ZbvZBdJ14fQxdVYvPQjCkT5o0Ip9AJyhATGLRAwFfp4="; + cargoHash = "sha256-pn4johqO1K9FKtitH2wNDtf1QUcGlJMvC0WTwG9myD0="; nativeBuildInputs = [ pkg-config From 3c985ee7da83e6e15fecafb2ebd3630bdca3107d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:37:31 +0000 Subject: [PATCH 37/93] myks: 4.1.1 -> 4.1.2 --- pkgs/by-name/my/myks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 0205401138f9..630a473fdc5b 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "myks"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-IJlSryyNQFubjBQJ59Gl5Wn3eniwZ0svbGAxLKIrCt4="; + hash = "sha256-ZRbirNhTEGqr6OCE0K873NJ5vI2Phe5z9XJGZUALISo="; }; vendorHash = "sha256-u9dNmgFMn6OMkKgTwNSqizUHJwvRk+S1xKZDozWjbps="; From d28cf9c00b552a9630649c6032a4018dc4c45ff6 Mon Sep 17 00:00:00 2001 From: Stanislav Asunkin <1353637+stasjok@users.noreply.github.com> Date: Thu, 23 May 2024 09:49:25 +0300 Subject: [PATCH 38/93] neovim-unwrapped: fix markdown_inline tree-sitter parser Closes #312763. --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index eaf637c88e64..4f714e5463b0 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -89,7 +89,7 @@ in { inherit lua; treesitter-parsers = treesitter-parsers // { markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } // - { markdown-inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } + { markdown_inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } ; buildInputs = [ From e1ba82b92b347939d25168867d9ed5021cc348f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:35:33 +0200 Subject: [PATCH 39/93] python312Packages.bluetooth-sensor-state-data: 1.6.2 -> 1.7.0 Diff: https://github.com/Bluetooth-Devices/bluetooth-sensor-state-data/compare/v1.6.2...v1.7.0 --- .../python-modules/bluetooth-sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index c242f7d8d5cc..d0820d57fff7 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.6.2"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-NC0l3wbQKz4MVM0kHbXBAUol74ir7V/JQgeYCVuyRs4="; + hash = "sha256-phiK+2tULBE78d1X/TsaT2kLRHxiCiuLMkaI7S6tqJ8="; }; nativeBuildInputs = [ poetry-core ]; From 980e77541f9d6b7468bfab23d4b811ea85841110 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:37:26 +0200 Subject: [PATCH 40/93] python312Packages.bluetooth-sensor-state-data: refactor --- .../bluetooth-sensor-state-data/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index d0820d57fff7..d3e3a36ff885 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -12,37 +12,38 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; version = "1.7.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; - rev = "v${version}"; + repo = "bluetooth-sensor-state-data"; + rev = "refs/tags/v${version}"; hash = "sha256-phiK+2tULBE78d1X/TsaT2kLRHxiCiuLMkaI7S6tqJ8="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" + ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ home-assistant-bluetooth sensor-state-data ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "bluetooth_sensor_state_data" ]; meta = with lib; { description = "Models for storing and converting Bluetooth Sensor State Data"; homepage = "https://github.com/bluetooth-devices/bluetooth-sensor-state-data"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-sensor-state-data/releases/tag/v${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From e5bb012796cd740bef1850d848ad4ab1026093b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 07:48:58 +0000 Subject: [PATCH 41/93] namespace-cli: 0.0.371 -> 0.0.372 --- pkgs/by-name/na/namespace-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 30812bd5ad16..c3e2c2f53065 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.371"; + version = "0.0.372"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-5cP5Z2VDxpBneDX+jhciaNrtDGi8XDm7DhhRBKh6ACU="; + hash = "sha256-rAu/kVaIBc50yDlsCIjcyy4pD6MYuagoF2fEte/+iQw="; }; vendorHash = "sha256-72cHswoTZszo42NOrPNuokDlqoJ3/YEhGe+rQSKvgAw="; From 1ee4219782a5d7108461c6e318473212cac63ab3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:50:59 +0200 Subject: [PATCH 42/93] checkov: 3.2.92 -> 3.2.106 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.106 --- pkgs/development/tools/analysis/checkov/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9cf0dc6653b4..911e51ed6ca9 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.92"; + version = "3.2.106"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-v1StSo9j0Psr3om3qbcE+Ha9Wz7t6EfGzbyAe34M2qY="; + hash = "sha256-N62tdVnrgOLHi4k/OpKrAfJ7sBu5Xf8lUAmEqatEAGo="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { "pycep-parser" "rustworkx" "termcolor" + "urllib3" ]; pythonRemoveDeps = [ From 1349027dbc4f7fe5752b7c5172b0df77c92aa672 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:55:19 +0200 Subject: [PATCH 43/93] python312Packages.aioquic: 0.9.25 -> 1.0.0 --- .../python-modules/aioquic/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 4b909ecb4aca..f3191a7f8ddf 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -4,7 +4,6 @@ certifi, cryptography, fetchPypi, - fetchpatch, openssl, pylsqpack, pyopenssl, @@ -16,26 +15,19 @@ buildPythonPackage rec { pname = "aioquic"; - version = "0.9.25"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM="; + hash = "sha256-7THCta+pjFtsr6TzYUnerx3/bFppcB6t0nFnQV+fFmA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/e899593805e0b31325a1d347504eb8e6100fe87d.diff"; - hash = "sha256-TTpIIWX/R4k2KxhsN17O9cRW/dN0AARYnju8JTht3D8="; - }) - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ certifi cryptography pylsqpack From ea1a3f4b3ac7253558354a8c6e5601a74009bdf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:20:49 +0200 Subject: [PATCH 44/93] python312Packages.boto3-stubs: 1.34.110 -> 1.34.111 --- 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 6a6dc2ee0ef5..185c8f6a80c8 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.110"; + version = "1.34.111"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-S1Xvok7jS1T/5QaJnwvfqMqEMfbUuSItY0fdkOabpzU="; + hash = "sha256-6uJopdcNK4gLgHoVOWAvLInUCQ3m3bAuP+wURmC8H9E="; }; build-system = [ setuptools ]; From 254dbdcc6296ba83381e218bf755b939c91a7f8e Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 20:03:51 +0100 Subject: [PATCH 45/93] grafanaPlugins.grafana-oncall-app: init at 1.5.1 --- .../grafana/plugins/grafana-oncall-app/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix new file mode 100644 index 000000000000..6f475f49cfa7 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin { + pname = "grafana-oncall-app"; + version = "1.5.1"; + zipHash = "sha256-3mC4TJ9ACM9e3e6UKI5vaDwXuW6RjbsOQFJU5v0wjk8="; + meta = with lib; { + description = "Developer-friendly incident response for Grafana"; + license = licenses.agpl3Only; + maintainers = lib.teams.fslabs.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 8bbd738f7ab9..bd1e775243f7 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -8,6 +8,7 @@ grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; + grafana-oncall-app = callPackage ./grafana-oncall-app { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; From ed907ddac82fceb5701ee82eb36835de44dddfa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:32:11 +0200 Subject: [PATCH 46/93] dyndnsc: refactor --- .../networking/dyndns/dyndnsc/default.nix | 57 +++++++++++++------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 6a9a57d67c3b..1e4e3fde1e39 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -1,33 +1,57 @@ -{ lib, python3Packages, fetchPypi, stdenv }: +{ lib +, stdenv +, python3Packages +, fetchPypi +}: python3Packages.buildPythonApplication rec { pname = "dyndnsc"; version = "0.6.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4"; + hash = "sha256-EweNKe6i+aTKAfBWdsMwnq1eNB2rBH4NUcRvI9S3+7Q="; }; postPatch = '' - substituteInPlace setup.py --replace "bottle==" "bottle>=" + substituteInPlace setup.py \ + --replace-fail '"pytest-runner"' "" ''; - nativeBuildInputs = with python3Packages; [ pytest-runner ]; - propagatedBuildInputs = with python3Packages; [ - daemonocle - dnspython - netifaces - requests - json-logging + pythonRelaxDeps = [ + "bottle" + ]; + + build-system = with python3Packages; [ setuptools ]; - nativeCheckInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; + + nativeBuildInputs = with python3Packages; [ + pythonRelaxDepsHook + ]; + + dependencies = with python3Packages; [ + daemonocle + dnspython + json-logging + netifaces + requests + setuptools + ]; + + nativeCheckInputs = with python3Packages; [ + bottle + pytest-console-scripts + pytestCheckHook + ]; disabledTests = [ # dnswanip connects to an external server to discover the # machine's IP address. "dnswanip" + # AssertionError + "test_null_dummy" ] ++ lib.optionals stdenv.isDarwin [ # The tests that spawn a server using Bottle cannot be run on # macOS or Windows as the default multiprocessing start method @@ -42,20 +66,21 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Dynamic DNS update client with support for multiple protocols"; - mainProgram = "dyndnsc"; longDescription = '' Dyndnsc is a command line client for sending updates to Dynamic - DNS (DDNS, DynDNS) services. It supports multiple protocols and - services, and it has native support for IPv6. The configuration - file allows using foreign, but compatible services. Dyndnsc + DNS (DDNS, DynDNS) services. It supports multiple protocols and + services, and it has native support for IPv6. The configuration + file allows using foreign, but compatible services. Dyndnsc ships many different IP detection mechanisms, support for configuring multiple services in one place and it has a daemon - mode for running unattended. It has a plugin system to provide + mode for running unattended. It has a plugin system to provide external notification services. ''; homepage = "https://github.com/infothrill/python-dyndnsc"; + changelog = "https://github.com/infothrill/python-dyndnsc/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ AluisioASG ]; + mainProgram = "dyndnsc"; platforms = platforms.unix; }; } From a3b69628898f5389f57142b4343ed8e602029c8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:32:35 +0200 Subject: [PATCH 47/93] dyndnsc: format with nixfmt --- .../networking/dyndns/dyndnsc/default.nix | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 1e4e3fde1e39..930fc3460319 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -1,7 +1,8 @@ -{ lib -, stdenv -, python3Packages -, fetchPypi +{ + lib, + stdenv, + python3Packages, + fetchPypi, }: python3Packages.buildPythonApplication rec { @@ -19,17 +20,11 @@ python3Packages.buildPythonApplication rec { --replace-fail '"pytest-runner"' "" ''; - pythonRelaxDeps = [ - "bottle" - ]; + pythonRelaxDeps = [ "bottle" ]; - build-system = with python3Packages; [ - setuptools - ]; + build-system = with python3Packages; [ setuptools ]; - nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; dependencies = with python3Packages; [ daemonocle @@ -46,21 +41,23 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - disabledTests = [ - # dnswanip connects to an external server to discover the - # machine's IP address. - "dnswanip" - # AssertionError - "test_null_dummy" - ] ++ lib.optionals stdenv.isDarwin [ - # The tests that spawn a server using Bottle cannot be run on - # macOS or Windows as the default multiprocessing start method - # on those platforms is 'spawn', which requires the code to be - # run to be picklable, which this code isn't. - # Additionaly, other start methods are unsafe and prone to failure - # on macOS; see https://bugs.python.org/issue33725. - "BottleServer" - ]; + disabledTests = + [ + # dnswanip connects to an external server to discover the + # machine's IP address. + "dnswanip" + # AssertionError + "test_null_dummy" + ] + ++ lib.optionals stdenv.isDarwin [ + # The tests that spawn a server using Bottle cannot be run on + # macOS or Windows as the default multiprocessing start method + # on those platforms is 'spawn', which requires the code to be + # run to be picklable, which this code isn't. + # Additionaly, other start methods are unsafe and prone to failure + # on macOS; see https://bugs.python.org/issue33725. + "BottleServer" + ]; # Allow tests that bind or connect to localhost on macOS. __darwinAllowLocalNetworking = true; From 7721a54cc1d4d422f1ed3e1e8384fd2597ff0107 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 11:18:56 +0800 Subject: [PATCH 48/93] python312Packages.datashape: fix build --- .../python-modules/datashape/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 6f6651a6c617..64d0afae90c1 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -7,6 +7,8 @@ numpy, multipledispatch, python-dateutil, + setuptools, + versioneer, }: let @@ -29,18 +31,28 @@ in buildPythonPackage rec { pname = "datashape"; version = "0.5.4"; - format = "setuptools"; + + pyproject = true; + build-system = [ + setuptools + versioneer + ]; src = fetcher { inherit pname version; sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf"; }; + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + nativeCheckInputs = [ pytest mock ]; - propagatedBuildInputs = [ + dependencies = [ numpy multipledispatch python-dateutil From 310727880651a6f954400c58d808871ee60103cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:45:09 +0200 Subject: [PATCH 49/93] python312Packages.aiocache: disable performance tests --- pkgs/development/python-modules/aiocache/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 17e60970e4fa..54a2bfb88ef7 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -58,10 +58,15 @@ buildPythonPackage rec { ]; disabledTests = [ - # calls apache benchmark and fails, no usable output + # Test calls apache benchmark and fails, no usable output "test_concurrency_error_rates" ]; + disabledTestPaths = [ + # Benchmark and performance tests are not relevant for Nixpkgs + "tests/performance/" + ]; + preCheck = '' ${lib.getBin pkgs.redis}/bin/redis-server & REDIS_PID=$! @@ -83,7 +88,7 @@ buildPythonPackage rec { description = "Python API Rate Limit Decorator"; homepage = "https://github.com/aio-libs/aiocache"; changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; } From 6abca390a18180719047fdb5f3a106bdfbf0a140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:47:16 +0200 Subject: [PATCH 50/93] wapiti: refactor --- pkgs/tools/security/wapiti/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 13a7e55cc3ec..d87f3b45cf61 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -6,30 +6,32 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; version = "3.1.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "wapiti-scanner"; - repo = pname; + repo = "wapiti"; rev = "refs/tags/${version}"; hash = "sha256-2ssbczUa4pTA5Fai+sK1hES8skJMIHxa/R2hNIiEVLs="; }; postPatch = '' - # Ignore pinned versions - sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" pyproject.toml - # Remove code coverage checking substituteInPlace pyproject.toml \ --replace "--cov --cov-report=xml" "" ''; - nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDeps = true; + + build-system = with python3.pkgs; [ setuptools - wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + + dependencies = with python3.pkgs; [ aiocache aiohttp aiosqlite @@ -154,7 +156,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://wapiti-scanner.github.io/"; changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti"; - license = with licenses; [ gpl2Only ]; + license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; } From aa7a7a91eda0c9923ff5bb0cf04c97dec7cdbfda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:47:39 +0200 Subject: [PATCH 51/93] wapiti: format with nixfmt --- pkgs/tools/security/wapiti/default.nix | 68 +++++++++++++------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index d87f3b45cf61..1ddfbb703b96 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -23,37 +24,36 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - dependencies = with python3.pkgs; [ - aiocache - aiohttp - aiosqlite - arsenic - beautifulsoup4 - browser-cookie3 - dnspython - h11 - httpcore - httpx - httpx-ntlm - loguru - mako - markupsafe - mitmproxy - pyasn1 - six - sqlalchemy - tld - yaswfp - ] ++ httpx.optional-dependencies.brotli - ++ httpx.optional-dependencies.socks; + dependencies = + with python3.pkgs; + [ + aiocache + aiohttp + aiosqlite + arsenic + beautifulsoup4 + browser-cookie3 + dnspython + h11 + httpcore + httpx + httpx-ntlm + loguru + mako + markupsafe + mitmproxy + pyasn1 + six + sqlalchemy + tld + yaswfp + ] + ++ httpx.optional-dependencies.brotli + ++ httpx.optional-dependencies.socks; __darwinAllowLocalNetworking = true; @@ -140,9 +140,7 @@ python3.pkgs.buildPythonApplication rec { "tests/attack/test_mod_ssl.py" ]; - pythonImportsCheck = [ - "wapitiCore" - ]; + pythonImportsCheck = [ "wapitiCore" ]; meta = with lib; { description = "Web application vulnerability scanner"; From e05e1737b39e6dcb35b25e1795bd58ec7d597a2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 11:19:45 +0200 Subject: [PATCH 52/93] python312Packages.strawberry-graphql: refactor --- .../strawberry-graphql/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 92658dce5086..a791d1e6ebf6 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; version = "0.219.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -62,22 +62,16 @@ buildPythonPackage rec { url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; }) - (fetchpatch { - # https://github.com/strawberry-graphql/strawberry/pull/3255 - name = "fix-tests-with-pydantic_2.patch"; - url = "https://github.com/strawberry-graphql/strawberry/commit/0a0dc284ee6d31d4e82ac7ff1ed9fea4dff39fa6.patch"; - hash = "sha256-LACWD7XA6YL/apJwhpx3LPCKxKUfa+XWyTLK+Zkxlaw="; - }) ]; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--emoji --mypy-ini-file=mypy.ini" "" \ + --replace-fail "--emoji --mypy-ini-file=mypy.ini" "" \ ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ graphql-core python-dateutil typing-extensions @@ -169,16 +163,17 @@ buildPythonPackage rec { "tests/test_dataloaders.py" "tests/utils/test_pretty_print.py" "tests/websockets/test_graphql_transport_ws.py" + "tests/litestar/" ]; __darwinAllowLocalNetworking = true; meta = with lib; { description = "A GraphQL library for Python that leverages type annotations"; - mainProgram = "strawberry"; homepage = "https://strawberry.rocks"; changelog = "https://github.com/strawberry-graphql/strawberry/blob/${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ izorkin ]; + mainProgram = "strawberry"; }; } From 15a381be44ce630f086a1e3cc14ba94935db931b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 11:22:00 +0200 Subject: [PATCH 53/93] python312Packages.strawberry-graphql: 0.219.2 -> 0.230.0 Diff: https://github.com/strawberry-graphql/strawberry/compare/refs/tags/0.219.2...0.230.0 Changelog: https://github.com/strawberry-graphql/strawberry/blob/0.230.0/CHANGELOG.md --- .../python-modules/strawberry-graphql/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index a791d1e6ebf6..86d9b8e49045 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -43,16 +43,16 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.219.2"; + version = "0.230.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-uIUETjzuDnlQp6wM7uxyLRSMT5uyrXFrI9NilcjP0BU="; + hash = "sha256-jhInHoOvPGIEoSddv8+30gY38L6XR5OEATUTdrHbNpA="; }; patches = [ @@ -129,9 +129,8 @@ buildPythonPackage rec { rich libcst ]; - # starlite = [ - # starlite - # ]; + # starlite = [ starlite ]; + # litestar = [ litestar ]; pyinstrument = [ pyinstrument ]; }; From f1dfd96632a5e7d83abd8eee3771159f7c1b0a43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 11:53:38 +0200 Subject: [PATCH 54/93] python312Packages.aiosasl: fix broken tests on Python 3.12 https://github.com/horazont/aiosasl/issues/28 --- pkgs/development/python-modules/aiosasl/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiosasl/default.nix b/pkgs/development/python-modules/aiosasl/default.nix index 81f96c4d1b1b..fe977cc1bbec 100644 --- a/pkgs/development/python-modules/aiosasl/default.nix +++ b/pkgs/development/python-modules/aiosasl/default.nix @@ -5,13 +5,16 @@ fetchpatch, pyopenssl, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiosasl"; version = "0.5.0"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "horazont"; @@ -28,6 +31,14 @@ buildPythonPackage rec { }) ]; + postPatch = '' + # https://github.com/horazont/aiosasl/issues/28 + substituteInPlace tests/test_aiosasl.py \ + --replace-fail "assertRaisesRegexp" "assertRaisesRegex" + ''; + + build-system = [ setuptools ]; + nativeCheckInputs = [ pyopenssl pytestCheckHook From dc0118692a7c47c24cb920f0c121bf8cf317775e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:01:31 +0200 Subject: [PATCH 55/93] swego: refactor --- pkgs/servers/swego/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 4e42ea33f97b..e2bf1056b030 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -1,7 +1,7 @@ -{ buildGoModule -, fetchFromGitHub -, lib +{ lib , stdenv +, buildGoModule +, fetchFromGitHub }: buildGoModule rec { @@ -11,8 +11,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; - rev = "v${version}"; - sha256 = "sha256-O/wczHyaMev0CpAXoDxiN7TtHDsthG+jaH31SPMEB34="; + rev = "refs/tags/v${version}"; + hash = "sha256-O/wczHyaMev0CpAXoDxiN7TtHDsthG+jaH31SPMEB34="; }; vendorHash = "sha256-mJWJdwbZq042//hM3WWp2rnLC1GebckUnsIopbF858Q="; @@ -21,8 +21,13 @@ buildGoModule rec { mv $out/bin/src $out/bin/$pname ''; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { - description = "Simple Webserver in Golang"; + description = "Simple Webserver"; longDescription = '' Swiss army knife Webserver in Golang. Similar to the Python SimpleHTTPServer but with many features. From 51c39ac7acc44d4130041bad773c0e618400109a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:01:46 +0200 Subject: [PATCH 56/93] swego: format with nixfmt --- pkgs/servers/swego/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index e2bf1056b030..b8362d2d8675 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -1,7 +1,8 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { From 7c2e833237c200a999a012154bde9308e61783ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:06:26 +0200 Subject: [PATCH 57/93] metasploit: 6.4.9 -> 6.4.10 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 104 +++++++------ pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 160 +++++++++----------- 4 files changed, 129 insertions(+), 141 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index ae2b6975af12..e583a22e6a06 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.9" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.10" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index bfb943356101..4ea9806710a4 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: eac2a919309b9ec735cae13ceead0f4aa0e412e8 - ref: refs/tags/6.4.9 + revision: 19234871c7edcc534f2bd34505ec08a1f33319b0 + ref: refs/tags/6.4.10 specs: - metasploit-framework (6.4.9) + metasploit-framework (6.4.10) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -105,26 +105,26 @@ GIT GEM remote: https://rubygems.org/ specs: - Ascii85 (1.1.0) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + Ascii85 (1.1.1) + actionpack (7.0.8.3) + actionview (= 7.0.8.3) + activesupport (= 7.0.8.3) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.3) + activesupport (= 7.0.8.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) - activesupport (7.0.8.1) + activemodel (7.0.8.3) + activesupport (= 7.0.8.3) + activerecord (7.0.8.3) + activemodel (= 7.0.8.3) + activesupport (= 7.0.8.3) + activesupport (7.0.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -135,37 +135,37 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.3.0) - aws-partitions (1.916.0) - aws-sdk-core (3.192.1) + aws-partitions (1.933.0) + aws-sdk-core (3.196.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.450.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ec2 (1.457.1) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2instanceconnect (1.38.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ec2instanceconnect (1.40.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.96.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-iam (1.98.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.79.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.82.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.147.0) - aws-sdk-core (~> 3, >= 3.192.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) - aws-sdk-ssm (1.166.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ssm (1.169.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) - bcrypt_pbkdf (1.1.0) - bigdecimal (3.1.7) + bcrypt_pbkdf (1.1.1) + bigdecimal (3.1.8) bindata (2.4.15) bootsnap (1.18.3) msgpack (~> 1.2) @@ -219,7 +219,7 @@ GEM domain_name (~> 0.5) http_parser.rb (0.8.0) httpclient (2.8.3) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) irb (1.7.4) @@ -269,14 +269,14 @@ GEM metasploit_payloads-mettle (1.0.26) method_source (1.1.0) mini_portile2 (2.8.6) - minitest (5.22.3) + minitest (5.23.1) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.4.10) + net-imap (0.4.11) date net-protocol net-ldap (0.19.0) @@ -287,7 +287,7 @@ GEM net-ssh (7.2.3) network_interface (0.0.4) nexpose (7.3.0) - nio4r (2.7.1) + nio4r (2.7.3) nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -302,7 +302,7 @@ GEM packetfu (2.0.0) pcaprub (~> 0.13.1) patch_finder (1.0.2) - pcaprub (0.13.1) + pcaprub (0.13.2) pdf-reader (2.12.0) Ascii85 (~> 1.0) afm (~> 0.2.1) @@ -313,7 +313,7 @@ GEM public_suffix (5.0.5) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-protection (3.2.0) base64 (>= 0.1.0) @@ -327,9 +327,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.3) + actionpack (= 7.0.8.3) + activesupport (= 7.0.8.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -341,7 +341,7 @@ GEM recog (3.1.5) nokogiri redcarpet (3.6.0) - reline (0.5.2) + reline (0.5.7) io-console (~> 0.5) rex-arch (0.1.15) rex-text @@ -351,7 +351,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.31) + rex-core (0.1.32) rex-encoder (0.1.7) metasm rex-arch @@ -374,7 +374,7 @@ GEM rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.11) + rex-random_identifier (0.1.12) rex-text rex-registry (0.1.5) rex-rop_builder (0.1.5) @@ -388,16 +388,17 @@ GEM rex-socket rex-text rex-struct2 (0.1.4) - rex-text (0.2.57) + rex-text (0.2.58) rex-zip (0.1.5) rex-text - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rkelly-remix (0.0.7) ruby-macho (4.0.1) ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.3.5) + ruby_smb (3.3.8) bindata (= 2.4.15) openssl-ccm openssl-cmac @@ -408,8 +409,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - simpleidn (0.2.1) - unf (~> 0.1.4) + simpleidn (0.2.3) sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) @@ -419,6 +419,7 @@ GEM mini_portile2 (~> 2.8.0) sshkey (3.0.0) strptime (0.2.5) + strscan (3.1.0) swagger-blocks (3.0.0) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) @@ -433,9 +434,6 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) unix-crypt (1.3.1) warden (1.2.9) rack (>= 2.0.9) @@ -459,7 +457,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.3) webrick - zeitwerk (2.6.13) + zeitwerk (2.6.14) PLATFORMS ruby @@ -468,4 +466,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.5.9 + 2.4.13 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 7779f954b619..76be725c6362 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.9"; + version = "6.4.10"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-0f7kpzeOY6EbFb7LRZc/J5lFYcf21HC6H6q0+qtTcao="; + hash = "sha256-RocCo0InffP2Dn0kZB4vEgct95dJbdDSxBND8UyuUGU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 901b70c29cc2..a60daf4c5e82 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; + sha256 = "11c5pm65m46wlqd25glmwpkji1jn1v2n918jmklxp4w9rr43dzi6"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; + sha256 = "0p0w1rl3f5k7m39j9gnyw5wqz6ym18bhcacisqq4zng2k6jf4893"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; + sha256 = "0y8w73rdd7x1m1gwswjhpqfbjr95hh7hcnkjqk1wz8x9gjk9njb6"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; + sha256 = "03pqj57md528dgwwplr234hq628allla71i1pxys2inbpp7s7vn8"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; + sha256 = "1ybapgiiysxgcjyzifn34ksbwjdjzslbvbcd7v83wiry1qmiyg93"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; addressable = { groups = ["default"]; @@ -84,10 +84,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw"; + sha256 = "1c62cx96r0v265mywnlik43qx0wf6bjbzl54qa47x6dzjg861mvk"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; aws-eventstream = { groups = ["default"]; @@ -104,80 +104,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gilrh9fb1576xm2ah0l6d33qkiabz55zpq004qqia9xavl43ylz"; + sha256 = "1axv3iicp4as5dxhmwrxf3rc7389ba94gk11yilw3vwv4hch87yx"; type = "gem"; }; - version = "1.916.0"; + version = "1.933.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp8rxk9wl3kmb7xabcz5hbcv7kzsvsx0wyib2fsg9d42kz149n0"; + sha256 = "0f44kp3g9g8v60f7xw769r734b7w6n774jj2njn42444ip3zwsz3"; type = "gem"; }; - version = "3.192.1"; + version = "3.196.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101jjqf912jwca119v86i4inlkf2gldmmhgdm2rdk5hqrwl4yrf4"; + sha256 = "114xd77sb1wzxv1ys2dg7adzyfbfzy3k2x885slgbdwh6q9nby0f"; type = "gem"; }; - version = "1.450.0"; + version = "1.457.1"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mhqk2s8klp8djibrhgmh9lz9nr4rh1yy7y6c86if55r07i1912c"; + sha256 = "1sjjyp90hhgbxmiw9sdscyfgjpy86m10dbr1dmxw3dmq244p3ilq"; type = "gem"; }; - version = "1.38.0"; + version = "1.40.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zcvkal9ahwr84pz1cb3y9ylx3f74m4kgs4n160dfzf51b8m917l"; + sha256 = "0a2kir61jwjpwwk5nld3daxkbc38ivszrxyjs9v320cq6hk6g80v"; type = "gem"; }; - version = "1.96.0"; + version = "1.98.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cb0006xf5isq5drdwkvd6xz20886x3rzcj5qyly7g8gql5lc8aw"; + sha256 = "0j6wlmn9h8l571ll7pamqxk5b3mg5ms65b85w0r1qjs3v1i5xfcd"; type = "gem"; }; - version = "1.79.0"; + version = "1.82.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ibw2v56k8v2sw92cyliprq1xxfyavnd60yl6ach3f4qbp156xrn"; + sha256 = "023h9xx65dd91z1sk9znhfwp4wr48imnnhdhvczv64m17r7ych4y"; type = "gem"; }; - version = "1.147.0"; + version = "1.151.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drad0zka0kjayiy971vcl5dfp6j37wgga4xncya8w8xsrknh9s8"; + sha256 = "1liyqnj8hjyrix96kbbqflr4bh3hg07jjcx5x6bsiiqsixblq4md"; type = "gem"; }; - version = "1.166.0"; + version = "1.169.0"; }; aws-sigv4 = { groups = ["default"]; @@ -214,20 +214,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; + sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; bigdecimal = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; bindata = { groups = ["default"]; @@ -554,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; io-console = { groups = ["default"]; @@ -674,12 +674,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "eac2a919309b9ec735cae13ceead0f4aa0e412e8"; - sha256 = "1akiafmzmd5a3yx71m7nqxhlb6977yblbjxy2lds2qwf6yky9zni"; + rev = "19234871c7edcc534f2bd34505ec08a1f33319b0"; + sha256 = "0rahmr6g2hqkqk9d0va9jzvjs1qj5wg6893x1vvg6z978aih51s6"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.9"; + version = "6.4.10"; }; metasploit-model = { groups = ["default"]; @@ -746,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i"; type = "gem"; }; - version = "5.22.3"; + version = "5.23.1"; }; mqtt = { groups = ["default"]; @@ -806,10 +806,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zn7j2w0hc622ig0rslk4iy6yp3937dy9ibhyr1mwwx39n7paxaj"; + sha256 = "1y0pzapcasfjayk4nydy04hnx11xmsv8jl8myizxhbpkdmrl10dc"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; net-ldap = { groups = ["default"]; @@ -876,10 +876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15iwbiij52x6jhdbl0rkcldnhfndmsy0sbnsygkr9vhskfqrp72m"; + sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -967,10 +967,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy"; + sha256 = "0bwhm5b7f0ncazffxzlyql83khcgydx2ncav9k241gab4knkhb7l"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.2"; }; pdf-reader = { groups = ["default"]; @@ -1017,10 +1017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rack = { groups = ["default"]; @@ -1077,10 +1077,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; + sha256 = "0sxki005rl1315mp78csayvfdx5zxjvwv8xmcfyjksgq27cimk5r"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; rake = { groups = ["default"]; @@ -1137,10 +1137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xwf7i2kvgaxbpdqqkncv9dpfhlj55shig4sdzgy7kgbfj09mm03"; + sha256 = "06rlp3wjcbwbgw3xlawclzzmj6ryn6ap65nh54x5yzgx0c3jlqqz"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.7"; }; rex-arch = { groups = ["default"]; @@ -1167,10 +1167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5fz1fipk2x9grd8rj7n09wfmq78kdhw9fvrmgr9z52zi640xzs"; + sha256 = "0468gxcwhzp5y7lahkf0cg4vyy01wb2fk6w1rx4fgh1l9330a64b"; type = "gem"; }; - version = "0.1.31"; + version = "0.1.32"; }; rex-encoder = { groups = ["default"]; @@ -1247,10 +1247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc05f0xvradyp50vz8s1h9lzgh9c31nz8yq7r22bph03v71f0c"; + sha256 = "02709z33zcbq2i3ca66b94n3aqbd8r6ib1dgb2fby1vk5nrg18p9"; type = "gem"; }; - version = "0.1.11"; + version = "0.1.12"; }; rex-registry = { groups = ["default"]; @@ -1307,10 +1307,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08wrqy8sgncsn6kcplw7bl6c2bmyj9fza7x77wrlwh1gza7pcjk4"; + sha256 = "04icj61kn5bnd939km6y49ylv8sbkqb96jld91nbrijahawcf5yz"; type = "gem"; }; - version = "0.2.57"; + version = "0.2.58"; }; rex-zip = { groups = ["default"]; @@ -1327,10 +1327,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "0d8ivcirrrxpkpjc1c835wknc9s2fl54xpw08s177yfrh5ish209"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; rkelly-remix = { groups = ["default"]; @@ -1387,10 +1387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fwk5hqaph37apa5zf1mg2n2wd5lkz3sgwl0f4ndhkv1vfxbb2ys"; + sha256 = "1hw3hj2q0xkqr90snzrpiqfa7lsc5k4w6bgdj624vxkh7q0nnfw7"; type = "gem"; }; - version = "3.3.5"; + version = "3.3.8"; }; rubyntlm = { groups = ["default"]; @@ -1427,10 +1427,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m"; + sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.3"; }; sinatra = { groups = ["default"]; @@ -1472,6 +1472,16 @@ }; version = "0.2.5"; }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; swagger-blocks = { groups = ["default"]; platforms = []; @@ -1552,26 +1562,6 @@ }; version = "1.2024.1"; }; - unf = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; - type = "gem"; - }; - version = "0.0.9.1"; - }; unix-crypt = { groups = ["default"]; platforms = []; @@ -1677,9 +1667,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; + sha256 = "0ayraiqfhhjzpyr4yxp035002lq78ip1zhr0ix87rn3rqpnsrn3h"; type = "gem"; }; - version = "2.6.13"; + version = "2.6.14"; }; } From c4bfea54cad62dcb50741caa609dd06d0d584802 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:13:05 +0200 Subject: [PATCH 58/93] python311Packages.aioxmpp: refactor --- .../python-modules/aioxmpp/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index 1608a234e721..bb101d56d918 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -1,27 +1,31 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - aiosasl, aioopenssl, + aiosasl, babel, + buildPythonPackage, dnspython, + fetchFromGitHub, lxml, multidict, - pyasn1, pyasn1-modules, + pyasn1, pyopenssl, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, pytz, + setuptools, sortedcollections, tzlocal, - pytestCheckHook, }: buildPythonPackage rec { pname = "aioxmpp"; version = "0.13.3"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "horazont"; @@ -30,7 +34,15 @@ buildPythonPackage rec { hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "lxml" + ]; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ aiosasl aioopenssl babel @@ -63,9 +75,9 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; description = "Pure-python XMPP library for asyncio"; homepage = "https://github.com/horazont/aioxmpp"; + changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; From 79cba4fa1985e287bf63eca4a8d9632d159d29af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:19:34 +0200 Subject: [PATCH 59/93] python312Packages.aioxmpp: disable failing tests on Python 3.12 Upstream is archived --- pkgs/development/python-modules/aioxmpp/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index bb101d56d918..9e770ae06522 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -12,6 +12,7 @@ pyasn1, pyopenssl, pytestCheckHook, + pythonAtLeast, pythonOlder, pythonRelaxDepsHook, pytz, @@ -72,6 +73,17 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize' "test_convert_field_datetime_default_locale" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # asyncio issues + "test_is_abstract" + "Testbackground" + "TestCapturingXSO" + "Testcheck_x509" + "TestClient" + "TestIntegerType" + "TestStanzaStream" + "TestStanzaToken" + "TestXMLStream" ]; meta = { From 2db20f930c231c6e0ef4f340bfef30ff1fe7cfed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 10:43:05 +0000 Subject: [PATCH 60/93] python311Packages.pyenvisalink: 4.6 -> 4.7 --- pkgs/development/python-modules/pyenvisalink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix index 54195b8eba57..84167f4ae58d 100644 --- a/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyenvisalink"; - version = "4.6"; + version = "4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CQvomHYNMrf0oQjNCcLyisxIV2+3TOgEPzA9seZYsOs="; + hash = "sha256-b5v/7+B/yyCnKrWCs0scAuIgV1wSLk6cVa57n+HncUw="; }; propagatedBuildInputs = [ From e69199ed303799ab67b9065860066d7bb2f0ebe3 Mon Sep 17 00:00:00 2001 From: daru Date: Thu, 23 May 2024 13:01:44 +0200 Subject: [PATCH 61/93] hmcl: 3.5.7 -> 3.5.8 --- pkgs/games/hmcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index 9426b611f3a6..2ff06a19219d 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -18,7 +18,7 @@ }: let - version = "3.5.7"; + version = "3.5.8"; icon = fetchurl { url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; - hash = "sha256-ziqcauetWoFn58kBJ0KnqX5CPNC/Sn7DD/Buxdi977I="; + hash = "sha256-HRTXJhKtRB+pANMAZ9R1kNsSbl/Rr6a8wMhfaPeD/40="; }; dontUnpack = true; From 97e008283acb1e5bbcccc8187c3d18cb8eaed8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 May 2024 13:49:28 +0200 Subject: [PATCH 62/93] level-zero: 1.16.15 -> 1.17.2, add key packages to passthru.tests Diff: https://github.com/oneapi-src/level-zero/compare/refs/tags/v1.16.15...v1.17.2 Changelog: https://github.com/oneapi-src/level-zero/blob/v1.17.2/CHANGELOG.md --- pkgs/development/libraries/level-zero/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index a098a0ea5b6b..c59822a32308 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -3,6 +3,8 @@ , cmake , fetchFromGitHub , fmt_9 +, intel-compute-runtime +, openvino , spdlog , stdenv , substituteAll @@ -10,13 +12,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.16.15"; + version = "1.17.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-J+XIqaV1ThD0RqqcyIkzvTWCkIztjkHzGzUbj0qojJs="; + hash = "sha256-ha/xpp+scLau+cTIyixwo8TgAJrb2DVboGDPWibxb08="; }; patches = [ @@ -34,6 +36,10 @@ stdenv.mkDerivation rec { addOpenGLRunpath $out/lib/libze_loader.so ''; + passthru.tests = { + inherit intel-compute-runtime openvino; + }; + meta = with lib; { description = "oneAPI Level Zero Specification Headers and Loader"; homepage = "https://github.com/oneapi-src/level-zero"; From eb042e727abff5ea1c192c47cdddc8e5c823b5fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 12:14:38 +0000 Subject: [PATCH 63/93] python311Packages.manifestoo-core: 1.5 -> 1.6 --- pkgs/development/python-modules/manifestoo-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index ce3cd3a6ef28..3b74218301a3 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.5"; + version = "1.6"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-a3v2WfJ42bh2LlAsH9ekpLFsAlOiTTLGNknTW2mTxCI="; + hash = "sha256-gOWu01Z1lxhMJELyxvU5A5AskVEqCoLV/auydM5/QCE="; }; nativeBuildInputs = [ hatch-vcs ]; From ddfeae5217ab2e052547ac254d26a8ea2ede4528 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 23 May 2024 15:04:22 +0200 Subject: [PATCH 64/93] pythonPackages: remove unused fetchpath arguments --- pkgs/development/python-modules/aioitertools/default.nix | 1 - pkgs/development/python-modules/aiorecollect/default.nix | 1 - pkgs/development/python-modules/argh/default.nix | 1 - pkgs/development/python-modules/autopep8/default.nix | 1 - pkgs/development/python-modules/bash-kernel/default.nix | 1 - pkgs/development/python-modules/broadbean/default.nix | 1 - pkgs/development/python-modules/camelot/default.nix | 2 -- pkgs/development/python-modules/cartopy/default.nix | 1 - pkgs/development/python-modules/cnvkit/default.nix | 1 - pkgs/development/python-modules/datasets/default.nix | 1 - .../development/python-modules/django-cryptography/default.nix | 1 - pkgs/development/python-modules/django-js-reverse/default.nix | 1 - .../python-modules/django-pattern-library/default.nix | 1 - pkgs/development/python-modules/django-silk/default.nix | 1 - pkgs/development/python-modules/django/5.nix | 1 - pkgs/development/python-modules/dot2tex/default.nix | 1 - pkgs/development/python-modules/ed25519/default.nix | 1 - pkgs/development/python-modules/elkm1-lib/default.nix | 1 - pkgs/development/python-modules/envisage/default.nix | 1 - pkgs/development/python-modules/envoy-reader/default.nix | 1 - pkgs/development/python-modules/flask-babel/default.nix | 1 - pkgs/development/python-modules/fontbakery/default.nix | 1 - pkgs/development/python-modules/fontfeatures/default.nix | 1 - pkgs/development/python-modules/hdbscan/default.nix | 1 - .../python-modules/insteon-frontend-home-assistant/default.nix | 1 - pkgs/development/python-modules/kivy/default.nix | 1 - pkgs/development/python-modules/ledgerwallet/default.nix | 1 - pkgs/development/python-modules/mahotas/default.nix | 1 - .../python-modules/mdx-truly-sane-lists/default.nix | 1 - pkgs/development/python-modules/mpi4py/default.nix | 1 - pkgs/development/python-modules/opensfm/default.nix | 1 - pkgs/development/python-modules/parso/default.nix | 1 - pkgs/development/python-modules/plux/default.nix | 1 - pkgs/development/python-modules/plyer/default.nix | 1 - pkgs/development/python-modules/proxy-py/default.nix | 1 - .../development/python-modules/py-sr25519-bindings/default.nix | 1 - pkgs/development/python-modules/pyahocorasick/default.nix | 1 - pkgs/development/python-modules/pyfireservicerota/default.nix | 1 - pkgs/development/python-modules/pyinfra/default.nix | 1 - pkgs/development/python-modules/pyiqvia/default.nix | 1 - pkgs/development/python-modules/pymongo-inmemory/default.nix | 1 - pkgs/development/python-modules/pyopencl/default.nix | 2 -- pkgs/development/python-modules/pyregion/default.nix | 1 - pkgs/development/python-modules/pyrtlsdr/default.nix | 1 - pkgs/development/python-modules/pysigma/default.nix | 1 - .../python-modules/pytest-astropy-header/default.nix | 2 -- pkgs/development/python-modules/python-daemon/default.nix | 2 -- pkgs/development/python-modules/python-mapnik/default.nix | 1 - .../python-modules/python-u2flib-server/default.nix | 1 - pkgs/development/python-modules/pythran/default.nix | 1 - pkgs/development/python-modules/pyvis/default.nix | 1 - pkgs/development/python-modules/pyvo/default.nix | 1 - pkgs/development/python-modules/qiskit-aer/default.nix | 3 --- pkgs/development/python-modules/requests/default.nix | 1 - pkgs/development/python-modules/riscv-config/default.nix | 1 - pkgs/development/python-modules/rollbar/default.nix | 1 - pkgs/development/python-modules/rpy2/default.nix | 1 - pkgs/development/python-modules/ruyaml/default.nix | 1 - pkgs/development/python-modules/sanic/default.nix | 1 - pkgs/development/python-modules/scalene/default.nix | 1 - pkgs/development/python-modules/scikit-misc/default.nix | 1 - pkgs/development/python-modules/single-version/default.nix | 1 - pkgs/development/python-modules/slicer/default.nix | 1 - .../python-modules/sphinxcontrib-openapi/default.nix | 1 - pkgs/development/python-modules/sqlalchemy-utils/default.nix | 1 - pkgs/development/python-modules/sqlite-utils/default.nix | 1 - pkgs/development/python-modules/tololib/default.nix | 1 - pkgs/development/python-modules/uarray/default.nix | 1 - pkgs/development/python-modules/urwid-mitmproxy/default.nix | 3 --- pkgs/development/python-modules/vllm/default.nix | 1 - pkgs/development/python-modules/watchdog/default.nix | 1 - pkgs/development/python-modules/xdis/default.nix | 2 -- 72 files changed, 81 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 3f4870df41ad..6d59d99d14c8 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, pythonOlder, diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 9cb3cca5d666..57a59497bbc6 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -4,7 +4,6 @@ aresponses, buildPythonPackage, fetchFromGitHub, - fetchpatch, freezegun, poetry-core, pytest-asyncio, diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 145682871993..ee3a26f91ee0 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, flit-core, iocapture, mock, diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 316d9edc1a1d..005e97875c14 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, glibcLocales, pycodestyle, pytestCheckHook, diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index 8ed6a8c79cfe..0df270f8a2b7 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, flit-core, ipykernel, python, diff --git a/pkgs/development/python-modules/broadbean/default.nix b/pkgs/development/python-modules/broadbean/default.nix index 50bc96bdea6d..e1c47cea6d31 100644 --- a/pkgs/development/python-modules/broadbean/default.nix +++ b/pkgs/development/python-modules/broadbean/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonOlder, setuptools, versioningit, diff --git a/pkgs/development/python-modules/camelot/default.nix b/pkgs/development/python-modules/camelot/default.nix index 4331d564b716..08b73672bcae 100644 --- a/pkgs/development/python-modules/camelot/default.nix +++ b/pkgs/development/python-modules/camelot/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, buildPythonPackage, chardet, openpyxl, charset-normalizer, fetchPypi, - fetchpatch, pythonOlder, pandas, tabulate, diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 9df147a45c5f..d37818d00be7 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - fetchpatch, cython, setuptools-scm, geos, diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 4769bd2e57c6..1667a010a40e 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, rPackages, buildPythonPackage, biopython, diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 4ba7b08c0fb0..76f53b224e16 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, dill, fetchFromGitHub, - fetchpatch, fsspec, huggingface-hub, importlib-metadata, diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix index 74ede8be539e..d5849498ecfd 100644 --- a/pkgs/development/python-modules/django-cryptography/default.nix +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -4,7 +4,6 @@ django, django-appconf, fetchFromGitHub, - fetchpatch, lib, python, pythonOlder, diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index 9fedef235c11..3e344f881395 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonAtLeast, - fetchpatch, fetchFromGitHub, python, django, diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 79fb13d7fa18..0aaa35f940dc 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchFromGitHub, - fetchpatch, lib, # build-system diff --git a/pkgs/development/python-modules/django-silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix index a5cbf8e8aa2a..796e07c93a3e 100644 --- a/pkgs/development/python-modules/django-silk/default.nix +++ b/pkgs/development/python-modules/django-silk/default.nix @@ -5,7 +5,6 @@ django, factory-boy, fetchFromGitHub, - fetchpatch, freezegun, gprof2dot, jinja2, diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index ba599684fd71..233fa7532235 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonAtLeast, pythonOlder, substituteAll, diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 5fbe44c98d55..acd9bbc34a1f 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, substituteAll, pyparsing, diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index ca34e5dcfeb9..1f10b9be005d 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, setuptools, versioneer, diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index cf8c39c308dd..a1c04262a5bb 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -3,7 +3,6 @@ async-timeout, buildPythonPackage, fetchFromGitHub, - fetchpatch, poetry-core, pyserial-asyncio-fast, pytest-asyncio, diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 5eab0a1a3dda..94964c9a581a 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -3,7 +3,6 @@ apptools, buildPythonPackage, fetchPypi, - fetchpatch, ipython, pytestCheckHook, pythonAtLeast, diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index 53d67fba4506..3f91c0c69e6a 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, envoy-utils, fetchFromGitHub, - fetchpatch, httpx, pyjwt, pytest-asyncio, diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index f1e911f0e321..dfeda89807aa 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system poetry-core, diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 89de0dbe6831..d98575536419 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, callPackage, - fetchpatch, fetchPypi, axisregistry, babelfont, diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix index 8902a962a910..b6a4482b4ba4 100644 --- a/pkgs/development/python-modules/fontfeatures/default.nix +++ b/pkgs/development/python-modules/fontfeatures/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, beziers, fonttools, fs, diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 99194c06e2ee..2fedf4792c64 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, cython, numpy, pytestCheckHook, diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 29420769833e..e52ce4a2ea18 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, pythonOlder, setuptools, diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index 9b39aa1fd058..a4a5da1640a6 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pkg-config, cython_0, docutils, diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index b24d831b1e8f..ebf686427df3 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, buildPythonPackage, cryptography, click, diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 419c1c572de1..144aae89c79d 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchFromGitHub, - fetchpatch, pillow, scipy, numpy, diff --git a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix index 07dc9f00277c..61e7408c96ad 100644 --- a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix +++ b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, markdown, python, }: diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 1c3d0a2f850f..43c4040fba72 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,7 +1,6 @@ { lib, fetchPypi, - fetchpatch, python, buildPythonPackage, mpi, diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index dc7f6d4163a8..bd5b97ab2852 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, cmake, opencv4, ceres-solver, diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index bb0bf239d95a..2030f7969790 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonAtLeast, pythonOlder, pytestCheckHook, diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 5c0d6d1fb28c..c88994374800 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, setuptools, stevedore, diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index 1bc2ff92675e..6a77e4a56005 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, keyring, mock, pytestCheckHook, diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 384dd6c1ec08..6a09b16a5cd9 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -4,7 +4,6 @@ bash, buildPythonPackage, fetchFromGitHub, - fetchpatch, gnumake, h2, hpack, diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 04a037cd9a9b..51915de513a7 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, buildPythonPackage, pythonOlder, pytestCheckHook, diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index 9ae189019fcb..51ec19016c77 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index 741b11edfcff..4042c0a235c5 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - fetchpatch2, pdm-backend, pytz, oauthlib, diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 4bea65f82511..80b1d43ef6ed 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -6,7 +6,6 @@ configparser, distro, fetchFromGitHub, - fetchpatch, gevent, jinja2, paramiko, diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 2af120b22c2e..dbc41c1c7851 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -6,7 +6,6 @@ backoff, certifi, fetchFromGitHub, - fetchpatch, poetry-core, pytest-aiohttp, pytest-asyncio, diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index da76c5d01df3..2b9d9b924369 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, poetry-core, pymongo, pytestCheckHook, diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index d0a3ffba5c71..ffce3a97b0c6 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -3,7 +3,6 @@ stdenv, fetchPypi, buildPythonPackage, - fetchpatch, appdirs, cffi, decorator, @@ -15,7 +14,6 @@ opencl-headers, platformdirs, pybind11, - pytest, pytestCheckHook, pytools, setuptools, diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 50d66c8e7319..d096a5d0c7b8 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # needed to build cython, oldest-supported-numpy, diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index 4097cfddbdfe..21a3b1b4bd1a 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, rtl-sdr, setuptools, pythonOlder, diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 5816b43926ac..e089421eb7ad 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, jinja2, packaging, poetry-core, diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index edaa756b7870..8b87d4422b57 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pytest, - pytest-cov, pytestCheckHook, numpy, setuptools-scm, diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 802abf87d086..bb6cf5d94ea1 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -8,9 +8,7 @@ testscenarios, testtools, twine, - python, pythonOlder, - fetchpatch, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index a68a618ccd46..c93adc9f09db 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, substituteAll, isPyPy, python, diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix index d64370a3e095..e1b44777dfee 100644 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ b/pkgs/development/python-modules/python-u2flib-server/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # propagates cryptography, diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index dbf1f0f50527..e99283bc49ae 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -3,7 +3,6 @@ python, buildPythonPackage, fetchFromGitHub, - fetchpatch, isPy3k, substituteAll, diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index d7bc582a551c..ae152c2286ac 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, buildPythonPackage, setuptools, networkx, diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 382877c477d8..dd6e670e7823 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, astropy, pillow, pythonOlder, diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 7106f74578a3..18bd47bf5bf7 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, pythonOlder, buildPythonPackage, fetchFromGitHub, - fetchpatch, # C Inputs blas, catch2, @@ -26,7 +24,6 @@ fixtures, pytest-timeout, qiskit-terra, - setuptools, testtools, }: diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 3c4be1f8c1f6..ef4526a70918 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -7,7 +7,6 @@ chardet, charset-normalizer, fetchPypi, - fetchpatch, idna, pysocks, pytest-mock, diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix index dbbf8f7b29d6..120f9fd5c537 100644 --- a/pkgs/development/python-modules/riscv-config/default.nix +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, cerberus, fetchFromGitHub, - fetchpatch, pythonOlder, pyyaml, ruamel-yaml, diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index 323f123377e6..40e97073c7bc 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -4,7 +4,6 @@ blinker, buildPythonPackage, fetchPypi, - fetchpatch, httpx, mock, pytestCheckHook, diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 65ae9652cd06..ba1c265afe42 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, isPyPy, R, rWrapper, diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index 6256f3556107..0bcd0dd7a71d 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, distro, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, setuptools-scm, diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 33779a6f6191..939d68c5f3fe 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonAtLeast, # build-system diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 2abf29f66205..1d635edbedd9 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, hypothesis, - fetchpatch, fetchPypi, setuptools, setuptools-scm, diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index 483acaa5de96..5b6e9f347b3c 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, cython, gfortran, git, diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index 72f1c003f99e..e08878e89f58 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, poetry-core, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index 8f7a27e31c53..79e514f7ee9b 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, dos2unix, - fetchpatch, fetchPypi, pytestCheckHook, pythonOlder, diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index eebc7ed12ba0..1076db106fcb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, deepmerge, fetchPypi, - fetchpatch, isPy27, setuptools-scm, jsonschema, diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 36f8b3ad9c92..e4865cd091af 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonOlder, # runtime diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 4719a7d71417..99800ceadbcf 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonOlder, click, click-default-group, diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 2ab0dbd7c89a..03bb2f2ea81e 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitLab, - fetchpatch, pytestCheckHook, pythonOlder, setuptools-scm, diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 57dbc81c632d..731da3b75fbe 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, setuptools-scm, matchpy, diff --git a/pkgs/development/python-modules/urwid-mitmproxy/default.nix b/pkgs/development/python-modules/urwid-mitmproxy/default.nix index f830a9906617..09e28d283963 100644 --- a/pkgs/development/python-modules/urwid-mitmproxy/default.nix +++ b/pkgs/development/python-modules/urwid-mitmproxy/default.nix @@ -2,10 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, - glibcLocales, pythonOlder, - unittestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 8b06a66c1d01..e2bbe12c639c 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, which, ninja, packaging, diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index f7879285e19f..16be1cf5b48c 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, CoreServices, eventlet, - fetchpatch, fetchPypi, flaky, pytest-timeout, diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 20169ea57e7a..ebbad75f8408 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -3,9 +3,7 @@ buildPythonPackage, click, fetchFromGitHub, - fetchpatch, pytestCheckHook, - pythonAtLeast, pythonOlder, six, }: From cc68d49224ce61ed8b0c1925248d6246a0f28352 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 13:31:00 +0000 Subject: [PATCH 65/93] cloud-nuke: 0.35.0 -> 0.36.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 122a9826d664..b402de727cf6 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mSkQW4fSpylbOS8x/o/578NV+SU4ao/yqB81Ifb7LFQ="; + hash = "sha256-OFfcr8BXkTEB6lxImwHVFxnvursGcg83dVWsjegKf4w="; }; - vendorHash = "sha256-Fmfr9feTibAjiZaakJalGTS7X2RhGz6engMNhy48Zus="; + vendorHash = "sha256-ealTxDNG6uJc0Lb20e8W3zv0azgpwI2kBn92d0lWaoc="; nativeBuildInputs = [ makeBinaryWrapper From 2ba59d41ddd852a2701dbd0e72fd9a5bbf002281 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 13:40:34 +0000 Subject: [PATCH 66/93] eksctl: 0.177.0 -> 0.178.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index e012e298dbe0..f8be0d794e85 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.177.0"; + version = "0.178.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-rNs7Ko+NNO2/zqPRu4j+y7KJ62lvfTEndZEnBSi8K5I="; + hash = "sha256-4L2BYQw0hticbPUdqJwOGNUYFBc8whnBW+1xut3Mp5Y="; }; - vendorHash = "sha256-0ZEVOsfb4FBGhNk7CoP7KDhApPTLBz4l5kwcRRBIq5g="; + vendorHash = "sha256-M/OiHXsvPAaYVNw7Q9LiDbH7B7QhBQxmK0H8TNWcu74="; doCheck = false; From cd71793bb2e146b673329269c4e40ad5ee310daa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:30:37 +0200 Subject: [PATCH 67/93] python312Packages.faraday-agent-parameters-types: 1.5.1 -> 1.6.0 Changelog: https://github.com/infobyte/faraday_agent_parameters_types/blob/1.6.0/CHANGELOG.md --- .../python-modules/faraday-agent-parameters-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 4970f246fab9..f21f66dc0680 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.5.1"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-Bh1s0IeUEa4EnGElQn5ruBxFSbcOqsrDqbw1nVjdi5s="; + hash = "sha256-yw4u1xhfY9WYLSf9CNAsiDpY7y2Llf8j4gDoNZjACw0="; }; postPatch = '' From f3b254dae286f477ec7cee9841af86f274392240 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:31:29 +0200 Subject: [PATCH 68/93] python312Packages.faraday-agent-parameters-types: refactor --- .../faraday-agent-parameters-types/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index f21f66dc0680..ac88fb2249be 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { --replace-warn '"pytest-runner",' "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ marshmallow packaging ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Collection of Faraday agent parameters types"; homepage = "https://github.com/infobyte/faraday_agent_parameters_types"; changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${version}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus ]; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; } From 2864759231ca861b876bda3a083788b784cefad3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:32:04 +0200 Subject: [PATCH 69/93] python312Packages.faraday-plugins: 1.17.0 -> 1.18.0 Diff: https://github.com/infobyte/faraday_plugins/compare/refs/tags/1.17.0...1.18.0 Changelog: https://github.com/infobyte/faraday_plugins/releases/tag/1.18.0 --- pkgs/development/python-modules/faraday-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index ec509ea3841b..187fefb9124b 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-EE61RPantD1u9NNhyPRjoRkBifM3u16b0BC2aQC8UBA="; + hash = "sha256-oYE7Iik0+CbOfxF9IeeZotpGqV8TTz15MxJEC4VBrhk="; }; postPatch = '' From 1c64a2fb1102be96303282a17f613ad7caeb72b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:33:44 +0200 Subject: [PATCH 70/93] python312Packages.faraday-plugins: refactor --- .../python-modules/faraday-plugins/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 187fefb9124b..7668dd48da54 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -34,12 +34,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace-warn "version=version," "version='${version}'," + --replace-fail "version=version," "version='${version}'," ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 click colorama @@ -73,10 +73,10 @@ buildPythonPackage rec { meta = with lib; { description = "Security tools report parsers for Faraday"; - mainProgram = "faraday-plugins"; homepage = "https://github.com/infobyte/faraday_plugins"; changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "faraday-plugins"; }; } From c48dd1b43abf0a25936991d4685c5592e040a372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 14:41:59 +0000 Subject: [PATCH 71/93] goimports-reviser: 3.6.4 -> 3.6.5 --- pkgs/development/tools/goimports-reviser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/development/tools/goimports-reviser/default.nix index 437b27ce8435..b7bdf8632164 100644 --- a/pkgs/development/tools/goimports-reviser/default.nix +++ b/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-+GVC/qJnqWm5tsn2Y5BPafapp7ct9kqHWlDNxukEZsM="; + hash = "sha256-46s6A1sGqoJR3XihaCkVCxTpManl330mMcJ8hv66zDc="; }; vendorHash = "sha256-z+FeAXPXKi653im2X2WOP1R9gRl/x7UBnndoEXoxdwA="; From 143e613bee6b3ec4a34bda043577279d4c054e80 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 May 2024 16:42:57 +0200 Subject: [PATCH 72/93] python311Packages.qgrid: fix python 3.12 compatibility --- .../python-modules/qgrid/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix index 5fa79708ffa7..d385c2943704 100644 --- a/pkgs/development/python-modules/qgrid/default.nix +++ b/pkgs/development/python-modules/qgrid/default.nix @@ -4,6 +4,7 @@ fetchpatch, fetchPypi, ipywidgets, + looseversion, notebook, pandas, pytestCheckHook, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "qgrid"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -28,8 +29,14 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace qgrid/grid.py \ + --replace-fail "from distutils.version import LooseVersion" "from looseversion import LooseVersion" + ''; + + dependencies = [ ipywidgets + looseversion notebook pandas ]; @@ -48,10 +55,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "qgrid" ]; - meta = with lib; { + meta = { description = "An interactive grid for sorting, filtering, and editing DataFrames in Jupyter notebooks"; homepage = "https://github.com/quantopian/qgrid"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From d9fae5e20dbb3017973cba1fa8d58318e2cb1d30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:44:51 +0200 Subject: [PATCH 73/93] python312Packages.pyedimax: refactor --- .../python-modules/pyedimax/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyedimax/default.nix b/pkgs/development/python-modules/pyedimax/default.nix index 350525b40286..dff8a0ffa899 100644 --- a/pkgs/development/python-modules/pyedimax/default.nix +++ b/pkgs/development/python-modules/pyedimax/default.nix @@ -3,28 +3,35 @@ buildPythonPackage, fetchPypi, requests, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyedimax"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1i3gr5vygqh2ryg67sl13aaql7nvf3nbybrg54628r4g7911b5rk"; + hash = "sha256-M5cVQjqPZCQMKS8vv+xw2x6KlRqB6mOezwLi53fJb8Q="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; - # Project has no tests + dependencies = [ requests ]; + + # Module has no tests doCheck = false; + pythonImportsCheck = [ "pyedimax" ]; meta = with lib; { description = "Python library for interfacing with the Edimax smart plugs"; homepage = "https://github.com/andreipop2005/pyedimax"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 1f5606f6adef7cfe72869d507554e317719f9c06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:49:39 +0200 Subject: [PATCH 74/93] python312Packages.pyecowitt: refactor --- .../python-modules/pyecowitt/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyecowitt/default.nix b/pkgs/development/python-modules/pyecowitt/default.nix index e39c70baca79..0786f87c7e29 100644 --- a/pkgs/development/python-modules/pyecowitt/default.nix +++ b/pkgs/development/python-modules/pyecowitt/default.nix @@ -4,23 +4,26 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyecowitt"; version = "0.21"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "garbled1"; - repo = pname; - rev = version; - sha256 = "5VdVo6j2HZXSCWU4NvfWzyS/KJfVb7N1KSMeu8TvWaQ="; + repo = "pyecowitt"; + rev = "refs/tags/${version}"; + hash = "sha256-5VdVo6j2HZXSCWU4NvfWzyS/KJfVb7N1KSMeu8TvWaQ="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project thas no tests doCheck = false; @@ -30,7 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the EcoWitt Protocol"; homepage = "https://github.com/garbled1/pyecowitt"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/garbled1/pyecowitt/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From afffe11b2e264c52ea8334188e3947192ad86c8b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 May 2024 16:56:25 +0200 Subject: [PATCH 75/93] python311Packages.svgelements: fix tests --- .../python-modules/svgelements/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/svgelements/default.nix b/pkgs/development/python-modules/svgelements/default.nix index 239b7db7f67a..7e4709ff5a08 100644 --- a/pkgs/development/python-modules/svgelements/default.nix +++ b/pkgs/development/python-modules/svgelements/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, wheel, anyio, @@ -25,7 +26,15 @@ buildPythonPackage rec { hash = "sha256-nx2sGXeeh8S17TfRDFifQbdSxc4YGsDNnrPSSbxv7S4="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch { + name = "fix-assert-tests"; + url = "https://github.com/meerk40t/svgelements/commit/23da98941a94cf1afed39c10750222ccfee73c9f.patch"; + hash = "sha256-/53w4eWlaSNEQxuoAxPrN2HciZ3Az2A2SKcIAlNgKAs="; + }) + ]; + + build-system = [ setuptools wheel ]; @@ -42,10 +51,10 @@ buildPythonPackage rec { scipy ]; - meta = with lib; { + meta = { description = "SVG Parsing for Elements, Paths, and other SVG Objects"; homepage = "https://github.com/meerk40t/svgelements"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 7496ea87763ae3d91f45da42805e4d7b10219849 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 15:17:39 +0000 Subject: [PATCH 76/93] hyprlang: 0.5.1 -> 0.5.2 --- pkgs/by-name/hy/hyprlang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 8cb98c4e79cf..729a4284b395 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlang"; rev = "v${finalAttrs.version}"; - hash = "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0="; + hash = "sha256-Jq9hHYFL5nMHArWgJIcrDHGnzs/MjDi95cyB7cUZIJ4="; }; nativeBuildInputs = [ From 3b70ff975de01550f80860184d3d3deae997bbba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 15:55:06 +0000 Subject: [PATCH 77/93] bazel-buildtools: 7.1.1 -> 7.1.2 --- .../tools/build-managers/bazel/buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 65574129ab93..f5b3e03f8609 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "7.1.1"; + version = "7.1.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-funwP4D8ck7RT+0z+42MVud/3Da6HvVhFLTqQIucHrQ="; + hash = "sha256-Ax7UKkClYsoqxaR+tsQnTv6BFafl9SkY7MC4kYJNmwY="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; From cddbd427672e9e99bb9a8bf02b42ff59ee064bf3 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 23 May 2024 17:29:00 +0100 Subject: [PATCH 78/93] google-chrome: 125.0.6422.60 -> 125.0.6422.76 --- pkgs/by-name/go/google-chrome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index bd0a31aadf3b..4d3ece104a78 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "125.0.6422.60"; + version = "125.0.6422.76"; 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-Q0QMPthJLVquJp7fm6QN+lDb0quZsT7hv6KRXfdBMl4="; + hash = "sha256-hLGEwaTx11tqiS7skoNVwCEw+1GZ0pNHpfe11IFjTFc="; }; nativeBuildInputs = [ patchelf makeWrapper ]; From 197d6261ebf862d7375d61b9973dfa4e10606103 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 5 May 2024 01:26:40 -0400 Subject: [PATCH 79/93] python311Packages.sphinxcontrib-ditaa: init at 1.0.2 Co-authored-by: OTABI Tomoya --- .../sphinxcontrib-ditaa/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix new file mode 100644 index 000000000000..db263eab0f5b --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + unittestCheckHook, + setuptools, + sphinx, + ditaa, +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-ditaa"; + version = "1.0.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-V/LhOwWbOP3olYC+ypFqxsp0VrLXBsPd6p3UiQ5fW9M="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + sphinx + ditaa + ]; + + # no tests provided + doCheck = false; + + # ? needs docutils exported as runtime dep + #pythonImportsCheck = [ "sphinxcontrib.ditaa" ]; + + pythonNamespaces = [ "sphinxcontrib" ]; + + meta = { + description = "Sphinx ditaa extension"; + homepage = "https://pypi.org/project/sphinxcontrib-ditaa"; + maintainers = with lib.maintainers; [ rconybea ]; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5e00ae23405..c4937b1a30dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14283,6 +14283,8 @@ self: super: with self; { sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; + sphinxcontrib-ditaa = callPackage ../development/python-modules/sphinxcontrib-ditaa { }; + sphinxcontrib-excel-table = callPackage ../development/python-modules/sphinxcontrib-excel-table { }; sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; From 72d5d19b5789b5dd92c31fbe4cf6dd26704f62db Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 23 May 2024 18:54:49 +0200 Subject: [PATCH 80/93] stalwart-mail: 0.8.0 -> 0.8.1 --- pkgs/by-name/st/stalwart-mail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 8fb02098f0b5..d021afe01f64 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -22,7 +22,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.8.0"; + version = "0.8.1"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -32,11 +32,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-V6Gl59938AplFW7pbrbGWB42+zRQBEaTUSW0+TMBo8I="; + hash = "sha256-al2+/+HPbjJ30rju2ih/yFZgmTdO2bQ6jDv+dtoIqsc="; fetchSubmodules = true; }; - cargoHash = "sha256-LWA08GNCrDlSwcSAlAi58OkoLs41fL6J5DPCsacozsM="; + cargoHash = "sha256-ek9vPo/M4peDcDkfzjXoKlJ+gFZUiREwNflOKEJNaWQ="; nativeBuildInputs = [ pkg-config From c64e560c86276d33f141703e9125a91fb817dbb8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 23 May 2024 19:25:12 +0200 Subject: [PATCH 81/93] nixos/hydra: fix typo in hydra init script --- nixos/modules/services/continuous-integration/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 23f07eb64b92..b516c3d6192c 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -335,7 +335,7 @@ in mkdir -m 0700 -p ${baseDir}/queue-runner mkdir -m 0750 -p ${baseDir}/build-logs mkdir -m 0750 -p ${baseDir}/runcommand-logs - chown hydra-queue-runner.hydra \ + chown hydra-queue-runner:hydra \ ${baseDir}/queue-runner \ ${baseDir}/build-logs \ ${baseDir}/runcommand-logs From 7ebf5ff345cbc90245b23336378cb9e98047e17b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 17:26:57 +0000 Subject: [PATCH 82/93] govulncheck: 1.1.0 -> 1.1.1 --- pkgs/tools/security/govulncheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index 166e6dd53963..1151ee52bd5b 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "govulncheck"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; rev = "refs/tags/v${version}"; - hash = "sha256-sS58HyrwyRv3zYi8OgiDYnKSbyu2i3KVoSX/0wQbqGw="; + hash = "sha256-aDt4TCbs5yBeJu/Fr95uI3BvPBaclnQMuJYPUXT7S+I="; }; patches = [ @@ -23,7 +23,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-ZHf//khvBGG+gRBKoKZo4NKoIJCQsbQfe2uT7cAHDcM="; + vendorHash = "sha256-YsZ9CchThybwgUjBg6hDQZ0bEEO18lidbGf9CIfzICc="; subPackages = [ "cmd/govulncheck" From cfafdab46c101dc901981863504d7e1c5c13cb22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 17:28:17 +0000 Subject: [PATCH 83/93] nextdns: 1.43.3 -> 1.43.4 --- pkgs/applications/networking/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 0661a3f9db2c..fe39929ce7b8 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.43.3"; + version = "1.43.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-sltTvjEfUZsmXDEyN+Zyck7oqZ+Xu8xScNnitt/0eic="; + sha256 = "sha256-nL+6pIH/tI/V14aKrQfwI+JJhCc/YD18U/J0SXnA9NE="; }; vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY="; From d4a518318044dbb3c842905ca4ab42f6ed544c5b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Apr 2024 19:26:47 +0200 Subject: [PATCH 84/93] ayatana-indicator-display: init at 24.5.0 --- nixos/tests/ayatana-indicators.nix | 3 +- .../ay/ayatana-indicator-display/package.nix | 124 ++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ay/ayatana-indicator-display/package.nix diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 1ca3e1dda3d3..cfd4d8099d11 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -28,6 +28,7 @@ in { enable = true; packages = with pkgs; [ ayatana-indicator-datetime + ayatana-indicator-display ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session @@ -95,7 +96,7 @@ in { # Now check if all indicators were brought up successfully, and kill them for later '' + (runCommandOverAyatanaIndicators (service: let serviceExec = builtins.replaceStrings [ "." ] [ "-" ] service; in '' - machine.succeed("pgrep -u ${user} -f ${serviceExec}") + machine.wait_until_succeeds("pgrep -u ${user} -f ${serviceExec}") machine.succeed("pkill -f ${serviceExec}") '')) + '' diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix new file mode 100644 index 000000000000..8c5e5c9e5160 --- /dev/null +++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix @@ -0,0 +1,124 @@ +{ stdenv +, lib +, gitUpdater +, fetchFromGitHub +, nixosTests +, accountsservice +, cmake +, cppcheck +, dbus +, geoclue2 +, glib +, gsettings-desktop-schemas +, gtest +, intltool +, libayatana-common +, libgudev +, libqtdbusmock +, libqtdbustest +, libsForQt5 +, lomiri +, mate +, pkg-config +, properties-cpp +, python3 +, systemd +, wrapGAppsHook3 +, xsct +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ayatana-indicator-display"; + version = "24.5.0"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "ayatana-indicator-display"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-ZEmJJtVK1dHIrY0C6pqVu1N5PmQtYqX0K5v5LvzNfFA="; + }; + + postPatch = '' + # Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc + substituteInPlace data/CMakeLists.txt \ + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail 'DESTINATION "/etc' 'DESTINATION "''${CMAKE_INSTALL_FULL_SYSCONFDIR}' + + # Hardcode xsct path + substituteInPlace src/service.cpp \ + --replace-fail 'sCommand = g_strdup_printf ("xsct' 'sCommand = g_strdup_printf ("${lib.getExe xsct}' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + glib # for schema discovery + intltool + pkg-config + wrapGAppsHook3 + ]; + + # TODO Can we get around requiring every desktop's schemas just to avoid segfaulting on some systems? + buildInputs = [ + accountsservice + geoclue2 + gsettings-desktop-schemas # gnome schemas + glib + libayatana-common + libgudev + libsForQt5.qtbase + systemd + ] ++ (with lomiri; [ + cmake-extras + lomiri-schemas # lomiri schema + ]) ++ (with mate; [ + mate.marco # marco schema + mate.mate-settings-daemon # mate mouse schema + ]); + + nativeCheckInputs = [ + cppcheck + dbus + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + gtest + libqtdbusmock + libqtdbustest + properties-cpp + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_COLOR_TEMP" true) + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + ayatana-indicators = [ "ayatana-indicator-display" ]; + tests.vm = nixosTests.ayatana-indicators; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Ayatana Indicator for Display configuration"; + longDescription = '' + This Ayatana Indicator is designed to be placed on the right side of a + panel and give the user easy control for changing their display settings. + ''; + homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-display"; + changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-display/blob/${finalAttrs.version}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +}) From d29e469f2a129a40b232760d0cd282f36a0cdaf9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 20 Apr 2024 10:58:17 +0200 Subject: [PATCH 85/93] nixos/lomiri: Add display indicator --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + nixos/tests/lomiri.nix | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index d16c3c750da6..06930b15a008 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -72,6 +72,7 @@ in { enable = true; packages = (with pkgs; [ ayatana-indicator-datetime + ayatana-indicator-display ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index b0be3baa20fb..6ae1e1c666d9 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -290,7 +290,7 @@ in { # There's a test app we could use that also displays their contents, but it's abit inconsistent. with subtest("ayatana indicators work"): mouse_click(735, 0) # the cog in the top-right, for the session indicator - machine.wait_for_text(r"(Notifications|Battery|Sound|Time|Date|System)") + machine.wait_for_text(r"(Notifications|Rotation|Battery|Sound|Time|Date|System)") machine.screenshot("indicators_open") # Indicator order within the menus *should* be fixed based on per-indicator order setting @@ -299,10 +299,16 @@ in { machine.send_key("left") machine.send_key("left") machine.send_key("left") + machine.send_key("left") # Notifications are usually empty, nothing to check there - with subtest("lomiri indicator network works"): + with subtest("ayatana indicator display works"): # We start on this, don't go right + machine.wait_for_text("Lock") + machine.screenshot("indicators_display") + + with subtest("lomiri indicator network works"): + machine.send_key("right") machine.wait_for_text(r"(Flight|Wi-Fi)") machine.screenshot("indicators_network") From 01152519d6cde79a4077d0cf98cf80e2acf8ebdc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 23 May 2024 20:40:15 +0200 Subject: [PATCH 86/93] nixos/tests/lomiri: Fix sound indicator subtest name It's an ayatana one, not a lomiri one. --- nixos/tests/lomiri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 6ae1e1c666d9..99f04a303be3 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -312,7 +312,7 @@ in { machine.wait_for_text(r"(Flight|Wi-Fi)") machine.screenshot("indicators_network") - with subtest("lomiri indicator sound works"): + with subtest("ayatana indicator sound works"): machine.send_key("right") machine.wait_for_text(r"(Silent|Volume)") machine.screenshot("indicators_sound") From 69b8e69de7b66d4b09ca420cbb413c7001d977dc Mon Sep 17 00:00:00 2001 From: cjshearer Date: Mon, 6 May 2024 10:12:48 -0400 Subject: [PATCH 87/93] ideamaker: init at 4.3.3 --- pkgs/by-name/id/ideamaker/mimetypes.xml | 25 +++ pkgs/by-name/id/ideamaker/package.nix | 225 ++++++++++++++++++++++++ 2 files changed, 250 insertions(+) create mode 100644 pkgs/by-name/id/ideamaker/mimetypes.xml create mode 100644 pkgs/by-name/id/ideamaker/package.nix diff --git a/pkgs/by-name/id/ideamaker/mimetypes.xml b/pkgs/by-name/id/ideamaker/mimetypes.xml new file mode 100644 index 000000000000..1bef9f862f73 --- /dev/null +++ b/pkgs/by-name/id/ideamaker/mimetypes.xml @@ -0,0 +1,25 @@ + + + + + + + + + IDEA project + + + + + + + + + + + + + + + + diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix new file mode 100644 index 000000000000..42f18c6dd669 --- /dev/null +++ b/pkgs/by-name/id/ideamaker/package.nix @@ -0,0 +1,225 @@ +{ + stdenv, + autoPatchelfHook, + cacert, + common-updater-scripts, + curl, + dpkg, + fetchurl, + fetchzip, + lib, + libcork, + libGLU, + libsForQt5, + makeDesktopItem, + openssl, + shared-mime-info, + writeShellApplication, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ideamaker"; + version = "4.3.3.6560"; + src = + let + semver = lib.strings.concatStringsSep "." ( + lib.lists.init (builtins.splitVersion finalAttrs.version) + ); + in + fetchurl { + url = "https://download.raise3d.com/${finalAttrs.pname}/release/${semver}/ideaMaker_${finalAttrs.version}-ubuntu_amd64.deb"; + sha256 = "sha256-aTVWCTgnVKD16uhJUVz0vR7KPGJqCVj0xoL53Qi3IKM="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + shared-mime-info + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = + let + # we need curl 7.47.0, as the app segfaults on launch in 7.47.1 and beyond + # (tested with 7.47.1, 7.50.3, 7.62, 7.79.1, and 8.7.1) + curl_7_47_0 = + let + openssl_1_0_1u = openssl.overrideAttrs (previous: { + version = "1.0.1u"; + src = fetchurl { + url = "https://www.openssl.org/source/openssl-1.0.1u.tar.gz"; + sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3"; + }; + patches = [ ]; + withDocs = false; + outputs = lib.lists.remove "doc" previous.outputs; + meta.knownVulnerabilities = [ + "OpenSSL 1.0.1 reached its end of life 2016-12-31, see https://endoflife.software/applications/security-libraries/openssl." + "CVE-2021-4044" + "CVE-2016-7056" + ]; + }); + in + (curl.override { + gnutlsSupport = true; + gssSupport = false; + http2Support = false; + # while we use openssl, the configureFlag has since changed, so we manually set it below + opensslSupport = false; + pslSupport = false; + scpSupport = false; + }).overrideAttrs + (previous: { + version = "7.47.0"; + src = fetchzip { + url = "https://curl.se/download/curl-7.47.0.tar.lzma"; + sha256 = "sha256-XlZk1nJbSmiQp7jMSE2QRCY4C9w2us8BgosBSzlD4dE="; + }; + configureFlags = previous.configureFlags ++ [ + "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" + "--with-ssl=${lib.getLib openssl_1_0_1u}" + ]; + patches = [ ]; + # curl https://curl.se/docs/vuln-7.74.0.json | jq -r '.[].id' | sed 's/^/"/;s/$/"/' + meta.knownVulnerabilities = [ + "CURL-CVE-2024-2398" + "CURL-CVE-2023-46218" + "CURL-CVE-2023-38546" + "CURL-CVE-2023-38545" + "CURL-CVE-2023-28322" + "CURL-CVE-2023-28321" + "CURL-CVE-2023-28320" + "CURL-CVE-2023-27538" + "CURL-CVE-2023-27536" + "CURL-CVE-2023-27535" + "CURL-CVE-2023-27534" + "CURL-CVE-2023-27533" + "CURL-CVE-2023-23916" + "CURL-CVE-2022-43552" + "CURL-CVE-2022-32221" + "CURL-CVE-2022-35252" + "CURL-CVE-2022-32208" + "CURL-CVE-2022-32207" + "CURL-CVE-2022-32206" + "CURL-CVE-2022-32205" + "CURL-CVE-2022-27782" + "CURL-CVE-2022-27781" + "CURL-CVE-2022-27776" + "CURL-CVE-2022-27775" + "CURL-CVE-2022-27774" + "CURL-CVE-2022-22576" + "CURL-CVE-2021-22947" + "CURL-CVE-2021-22946" + "CURL-CVE-2021-22945" + "CURL-CVE-2021-22926" + "CURL-CVE-2021-22925" + "CURL-CVE-2021-22924" + "CURL-CVE-2021-22923" + "CURL-CVE-2021-22922" + "CURL-CVE-2021-22898" + "CURL-CVE-2021-22897" + "CURL-CVE-2021-22890" + "CURL-CVE-2021-22876" + ]; + }); + in + [ + (lib.getLib curl_7_47_0) + libcork + libGLU + libsForQt5.qtbase + libsForQt5.qtserialport + libsForQt5.quazip + ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + install -D usr/lib/x86_64-linux-gnu/ideamaker/ideamaker \ + $out/bin/${finalAttrs.pname} + + patchelf --replace-needed libquazip.so.1 libquazip1-qt5.so \ + $out/bin/${finalAttrs.pname} + + mimetypeDir=$out/share/icons/hicolor/128x128/mimetypes + mkdir -p ''$mimetypeDir + for file in usr/share/ideamaker/icons/*.ico; do + mv $file ''$mimetypeDir/''$(basename ''${file%.ico}).png + done + install -D ${./mimetypes.xml} \ + $out/share/mime/packages/${finalAttrs.pname}.xml + + install -D usr/share/ideamaker/icons/ideamaker-icon.png \ + $out/share/pixmaps/${finalAttrs.pname}.png + + ln -s ${finalAttrs.desktopItem}/share/applications $out/share/ + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = finalAttrs.pname; + exec = finalAttrs.pname; + icon = finalAttrs.pname; + desktopName = "Ideamaker"; + comment = "ideaMaker - www.raise3d.com"; + categories = [ + "Qt" + "Utility" + "3DGraphics" + "Viewer" + "Engineering" + ]; + genericName = finalAttrs.meta.description; + mimeTypes = [ + "application/x-ideamaker" + "model/3mf" + "model/obj" + "model/stl" + "text/x.gcode" + ]; + noDisplay = false; + startupNotify = true; + terminal = false; + type = "Application"; + }; + + passthru.updateScript = lib.getExe (writeShellApplication { + name = "ideamaker-update-script"; + runtimeInputs = [ + curl + common-updater-scripts + ]; + text = '' + set -eu -o pipefail + + release_page=$(mktemp) + curl -s https://www.raise3d.com/download/ideamaker-all-versions/ > "$release_page" + + latest_stable_version=$( + sed -nE '/Beta|Alpha/! s/.*Version ([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' "$release_page" | \ + head -n 1 + ) + + latest_stable_build_number=$( + sed -nE "s/.*ideaMaker_$latest_stable_version\.([0-9]+).*/\1/p" "$release_page" | head -n 1 + ) + + update-source-version ideamaker "$latest_stable_version.$latest_stable_build_number" + ''; + }); + + meta = { + homepage = "https://www.raise3d.com/ideamaker/"; + description = "Raise3D's 3D slicer software"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ cjshearer ]; + }; +}) From 30e7e4163bb4fee3e816f917ce3cad29bd4447a3 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 23 May 2024 13:58:35 -0300 Subject: [PATCH 88/93] bicep: 0.26.54 -> 0.27.1 Release: https://github.com/Azure/bicep/releases/tag/v0.27.1 --- pkgs/by-name/bi/bicep/deps.nix | 126 +++++++++--------------------- pkgs/by-name/bi/bicep/package.nix | 4 +- 2 files changed, 38 insertions(+), 92 deletions(-) diff --git a/pkgs/by-name/bi/bicep/deps.nix b/pkgs/by-name/bi/bicep/deps.nix index 78b0b2c1b727..490fd2cf150c 100644 --- a/pkgs/by-name/bi/bicep/deps.nix +++ b/pkgs/by-name/bi/bicep/deps.nix @@ -3,27 +3,30 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Azure.Bicep.Internal.RoslynAnalyzers"; version = "0.1.38"; sha256 = "1b13vbl0y851nr7rfhyxc0djihxfr7xv010f9zvvbibyz5wqis7v"; }) - (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.6"; sha256 = "0kzyy21jvhc6gy24w9sfb6ic0pg22j8y6s23q8ls0i15qf3rng77"; }) - (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.677"; sha256 = "1wgng31pfm272yipigjz24ky2qfrq7mfj9fx0wbyr3q8g6cascnp"; }) + (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.9"; sha256 = "02v5jzrap5flk5r6jwbw3mzvkxb51kmz4g71j2nnikqgnc4v5dh2"; }) + (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.686"; sha256 = "08yv067s9cccr7brsw85mdgbq0cyw39vmbmfxcvhhnvrgd7g4mgf"; }) (fetchNuGet { pname = "Azure.Bicep.Types.K8s"; version = "0.1.626"; sha256 = "1c07igq6jqxkg9iln452fnng2n6ddd0008vb5lgbzdpgp1amz2ji"; }) (fetchNuGet { pname = "Azure.Containers.ContainerRegistry"; version = "1.1.1"; sha256 = "0hn6mq1bffcq7d5w4rj4ffdxb3grvymzrpyl1qrbxksqpfbd0bh4"; }) (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; }) - (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.0.1158"; sha256 = "07bjwmal3qy23axa9g0gsc5qdajypvbpys15k8y05gnflz85rqzy"; }) - (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.0.1158"; sha256 = "1kn515apm33fmrdz8v9y8ac2w83cbbvf74w2grrl1aimg5n4qjsb"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.38.0"; sha256 = "1rnnip757kdzipfvrz9qc730mpkcq8r36lspwx20p0s9hss8qdc3"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.39.0"; sha256 = "0b36vi12pzqls6ad1dwzc8zq8wb07rkg2y52divl8gh2za43x5wp"; }) + (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.0.1243.1"; sha256 = "18lh45y9axc494hpxdp8w6d8c92n8m6k4lqjyh4znd2mcmm57wbz"; }) + (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.0.1243.1"; sha256 = "1shk9amp9d3v6lbf2s0j1fxf5xm468fvphhnni95v6w2cpv1fdv8"; }) (fetchNuGet { pname = "Azure.Deployments.Internal.GenerateNotice"; version = "0.1.38"; sha256 = "00jzm0c1ch24mh50hqmzs2jxda929zg1j1dgnhs5gbsyk7zjlvrd"; }) - (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.0.1158"; sha256 = "1zww735mbw1jswd3l8m7y48giqkcxn9v1fy9g6kp3c4dr97519wq"; }) - (fetchNuGet { pname = "Azure.Identity"; version = "1.10.4"; sha256 = "0w345hzp43wbs5f5qk1y7wmyp11cayphnycpflil5ayvvz2jjfn2"; }) - (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.9.0"; sha256 = "143rv7rq16q4b4fhh3yjjc5r4g226jhpl6ngwvr69kbbxhw0n618"; }) - (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.0"; sha256 = "1hjbb607fxb26c7bxx1lc3v50hxmv446klg7c1k89a7wkiqgvmh9"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "6.0.1"; sha256 = "12xiib5p8f4aj9gz0jn6s96lsa172qi92j46rrb39sidh0mbbdil"; }) + (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.0.1243.1"; sha256 = "11glwwxq9xzi3vrnqx833dry9n6ykspf6gfab0g23d8fygd5d2rf"; }) + (fetchNuGet { pname = "Azure.Identity"; version = "1.11.2"; sha256 = "1zb18p50l24nr9v0srywqq5cx6xbyrlcib1i244z9vmi1qkjia2h"; }) + (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.11.1"; sha256 = "0vfp2rs4r9x3zkvw0za8q6xz3rrb8nywjd1137rpbpy0zx7qnbry"; }) + (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.2"; sha256 = "1cw732wpixh4vrlznc70ld3d1hrw6smk57ar8imh4l7jvd9fn041"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; sha256 = "0fll8yssdzi2wv8l26qz2zl0qqrp5nlbdqxjwfh5p356nd991m1d"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; sha256 = "04fhn67930zv3i0d8xbrbw5vwz99c83bbvgdwqiir55vw5xlys9c"; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "IPNetwork2"; version = "2.6.598"; sha256 = "03nxkiwy1bxgpv5n1lfd06grdyjc10a3k9gyc04rhzysjsswiy0l"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Json.More.Net"; version = "1.8.0"; sha256 = "1jlcmgn3pw4jzk9ys6jhkbigfdn9rrrb0wb2v0yxi5wv82arviq5"; }) - (fetchNuGet { pname = "Json.More.Net"; version = "1.9.2"; sha256 = "1w5xascr03iv7830vdrlpxjrxiabypaqkkcij118lfm41pqhw8b7"; }) - (fetchNuGet { pname = "JsonPatch.Net"; version = "2.1.0"; sha256 = "0ckz04108p7j8gzqs61bkvlbxfbqvbr19aykmkbbw44inr9azxai"; }) - (fetchNuGet { pname = "JsonPath.Net"; version = "0.7.0"; sha256 = "0lv9w9m8327hyjzqbl2mwv61zsimc8b114nc67jwv0lm9v29skm0"; }) - (fetchNuGet { pname = "JsonPointer.Net"; version = "3.0.1"; sha256 = "109q63pdsxdiy4rwj4qm1rj1cadxhksw3ik1frsrn2clkpj4lwks"; }) + (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.1"; sha256 = "0i6w5n075qhawqr832hl8bzsdspwkfkmfnnv94c9ilq06srvy1gc"; }) + (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.2"; sha256 = "1fzw9d55hvynrwz01gj0xv6ybjm7nsrm2vxqy6d15wr75w3pyyky"; }) + (fetchNuGet { pname = "JsonPatch.Net"; version = "3.0.0.2"; sha256 = "1pi7qvjpndgxiipn21hbqf0f5ff1rijhqkcjag8pg3lcyrlm1vnl"; }) + (fetchNuGet { pname = "JsonPath.Net"; version = "1.0.1.2"; sha256 = "0br6k35mwc1nisvma5izpig5mc8390fly12sics6yi82xyvhgqx5"; }) + (fetchNuGet { pname = "JsonPointer.Net"; version = "4.0.1.3"; sha256 = "06yvdiwz4j8rg42wlvlflaiq2qyhcm5r3x7gczjvfihfsydvj09f"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) @@ -39,7 +42,7 @@ (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.1.3"; sha256 = "1bappkn6vzaaq5yw9fzhds2gz557bhgmxvh38ifw6l39jkar2lii"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.1"; sha256 = "0w5w0h1clv7585qkajy0vqb28blghhcv5j9ygfi13219idhx10r9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) @@ -52,18 +55,19 @@ (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.3-preview"; sha256 = "0y910m1gw4sn41qskhxf9lwhvqlg9wnpyj2frzj7nbgyxwdljrqk"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.56.0"; sha256 = "0rwyj8qagx93ys67a8k878ib3zdcrjb3jrl0aif3i8a0knwpsxxx"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.56.0"; sha256 = "1pcq46kfk3b1yyqr1rlk7sxd69xg0l9hrmard5nvqd7kh287l08m"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) + (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.5-preview"; sha256 = "0k26hh1mbrchmkymhf0in7g7dpgyzn2i1dfffi58w5wi5f25gsph"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.60.3"; sha256 = "065iifhffri8wc5i4nfbnkzjrvflav9v5bfkwvmax8f35rks1mnn"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.PowerPlatform.ResourceStack"; version = "6.0.0.1485"; sha256 = "1dszc9fhg9xpp96gx5djg2azxvfb36551malysdgxvd2r23vvfwh"; }) + (fetchNuGet { pname = "Microsoft.PowerPlatform.ResourceStack"; version = "7.0.0.2007"; sha256 = "1higvig4ajwgcw6bdhxmf0s5p4gy1m69rnngdi1ik42731wrafay"; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; sha256 = "0xrr8yd34ij7dqnyddkp2awfmf9qn3c89xmw2f3npaa4wnajmx81"; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; sha256 = "1gdx7n45wwia3yvang3ls92sk3wrymqcx9p349j8wba2lyjf9m44"; }) (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.2"; sha256 = "00psv2mvynd2bz8xnzvqvb32qr33glqxg4ni5j91b93k84yjy5ma"; }) @@ -75,19 +79,17 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.7.35"; sha256 = "1sr2ydgl6clnpf7axjhnffx3z2jz1zhnxfiizsv1prl26r3y52f9"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.9.28"; sha256 = "0g64zn1wk96v9rj04rkcg7jwklaihj317gsdfswqg33yrcn4z5ig"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; sha256 = "00p3ywq4ppfl14l9yzxl5id5zmay8fv42b4w3ppr1b3d5ipldxhj"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry.AccessControl"; version = "6.0.0"; sha256 = "1c1x47c6p21l6l84kw8wvsdhnd7ifrrrl8in0bnkaq7y1va4fvsn"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.1"; sha256 = "1map729br97ny6mqkaw5qsg55yjbfz2hskvy56qz8rf7p1bjhky2"; }) (fetchNuGet { pname = "Microsoft.Windows.Compatibility"; version = "6.0.7"; sha256 = "1b01dg77mw2ih3dy5sajjvqd89zv4yjqffmb8gs7dpzwnncin91d"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.2"; sha256 = "14nrxg1cd3lzaxw7zz8z91168sgnsf1xxnrpdy7wkd6ggk22hi19"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.2"; sha256 = "0igdrjr300bqz5lnibf9vl8pkaky1l27f889gza3a9xs83mpd06p"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.3.1"; sha256 = "1k706rfifdx28kxhnqpfhfc79zvzd7wnyqvf3g6r27p9ramzw3j9"; }) (fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.133"; sha256 = "1cdw8krvsnx0n34f7fm5hiiy7bs6h3asvncqcikc0g46l50w2j80"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; sha256 = "1klsyly7k1xhbhrpq2s2iwdlmw3xyvh51rcakfazwxkv2hm5fj3b"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) @@ -96,7 +98,6 @@ (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) @@ -108,7 +109,6 @@ (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) @@ -117,42 +117,32 @@ (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "0ss8fzqnvxps1ybfy70fj4vs2w78mizg4sxdriw8bvcdcfsv0rg2"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.Data.SqlClient.sni"; version = "4.7.0"; sha256 = "1b84b8rkwwwgvx1hh5r6icd975rl1ry3bc1xb87br2d8k433wgbj"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "0nl8z42aiqfz0v4h1lx84jz312n1f01rlr2kzd7yfiv7p7i1dl3w"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "114swwc99lg4zjzywfcfxvbxynrlh9pvgl1wpihf88jbs2mjicw5"; }) (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "1kwip1pj1xaqrlkf5flkk30zn2lg4821g64nfj1glpjjcj49b3wv"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni"; version = "4.4.0"; sha256 = "07byf1iyqb7jkb17sp0mmjk46fwq6fx8mlpzywxl7qk09sma44gk"; }) (fetchNuGet { pname = "runtime.win-x64.runtime.native.System.Data.SqlClient.sni"; version = "4.4.0"; sha256 = "0167s4mpq8bzk3y11pylnynzjr2nc84w96al9x4l8yrf34ccm18y"; }) (fetchNuGet { pname = "runtime.win-x86.runtime.native.System.Data.SqlClient.sni"; version = "4.4.0"; sha256 = "0k3rkfrlm9jjz56dra61jgxinb8zsqlqzik2sjwz7f8v6z6ddycc"; }) - (fetchNuGet { pname = "Sarif.Sdk"; version = "4.4.0"; sha256 = "0860mqyzcckvfg1air1pva5v9npzq6d2cn8bds8zqxg06jxq9gvy"; }) - (fetchNuGet { pname = "SharpYaml"; version = "2.1.0"; sha256 = "05qrppbhfyikv94vnzpb7x1y6yd3znkr8pc0vsmdgca6z6jsy2lq"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.17.8"; sha256 = "187zkhi7a81idma7gw072xxsikmvadkxszl48qzffsqzjz8y2wxb"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "Sarif.Sdk"; version = "4.5.4"; sha256 = "0bw2r6qndqj49x2g90rxyp966mdzik9355jgjan6ijib1rad2z2w"; }) + (fetchNuGet { pname = "SharpYaml"; version = "2.1.1"; sha256 = "171s60qpqj5r7krkn2zq6fg6f09ixsd5czrw91qm5lg3vpvknar9"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.17.11"; sha256 = "1y6pr2lcpqbwian0iiyf9bagwyx0l7dbarazk3cyah1fl3rrjaqd"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.ClientModel"; version = "1.0.0"; sha256 = "0rhbabgfnxx6qcaxq218h5si4gbq6sn4rgg6cn9bgw6rrzcgnxn8"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; sha256 = "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) @@ -160,20 +150,16 @@ (fetchNuGet { pname = "System.ComponentModel.Composition.Registration"; version = "6.0.0"; sha256 = "1lv5b42lssrkzbk2fz9phmdgwmqzi2n3yg3rl081q661nij3vv1l"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.1"; sha256 = "1d6cx49fzycbl2fam8d1j3491sqx6mh7qkb5ddrawr00x74hgzak"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Data.Odbc"; version = "6.0.1"; sha256 = "12g9fzx6y5gb1bb5lyfxin1d5snw69pdwv481x13m6qhkfhk3lx4"; }) (fetchNuGet { pname = "System.Data.OleDb"; version = "6.0.0"; sha256 = "0cbf6qw7k13rjrk5zfd158yri023ryaifd6fz5cbqgwdg4vpnvpz"; }) - (fetchNuGet { pname = "System.Data.SqlClient"; version = "4.8.5"; sha256 = "17g5snnjf4fy67ayqj8vqa4vz916njffahbc365z37l5v0w7g92a"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Data.SqlClient"; version = "4.8.6"; sha256 = "153wgkb8gcbqk00zsdj8lw8d4ms60h6k08n57yiyxlyyimrg5ks1"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "6.0.1"; sha256 = "17p5vwbgrycsrvv9a9ksxbiziy75x4s25dw71fnbw1ci5kpp8yz7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.DirectoryServices"; version = "6.0.1"; sha256 = "17abibzqmr4amxpnbpv198qzdpb5mafn655ayisfc4mmhmyks39a"; }) (fetchNuGet { pname = "System.DirectoryServices.AccountManagement"; version = "6.0.0"; sha256 = "1hvmasf4zsjpds0q8j8k5n61lr6mqhi37bsz1m65r6fs5kx5jrfn"; }) @@ -183,36 +169,22 @@ (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "20.0.15"; sha256 = "0lj2y0fpns0dgw9wfsx804qsm9i9g01hrdsws3pmlwzrin73ghyg"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.2"; sha256 = "1mp73hkrxb83bs16458qgf7l3n20ddnfkij1pd603dr8w22j7279"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.IO.Packaging"; version = "6.0.0"; sha256 = "112nq0k2jc4vh71rifqqmpjxkaanxfapk7g8947jkfgq3lmfmaac"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) (fetchNuGet { pname = "System.IO.Ports"; version = "6.0.0"; sha256 = "0b0gvn7b2xsy2b0wwa170jzm5cwy3xxwpyqm21m4cbpc0ckri802"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Management"; version = "6.0.2"; sha256 = "190bxmg0y5dmzh0yv9gzh8k6safdz20gqaifpnl8v7yw3z5wcpgj"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.9.0"; sha256 = "117vxa0pfgg6xfdxfpza4296ay7sqiaynyvfbsai43yrkh0lmch1"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) @@ -220,19 +192,14 @@ (fetchNuGet { pname = "System.Reflection.Context"; version = "6.0.0"; sha256 = "1vy3b143429amaa0501xjgdszvpdygkrs5rkivnrkl69f67dad5j"; }) (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.7.1"; sha256 = "10yh3q2i71gcw7c0dfz9qxql2vlvnqjav1hyf1q9rpbvdbgsabrs"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) @@ -247,27 +214,16 @@ (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.ServiceModel.Duplex"; version = "4.9.0"; sha256 = "0jwbpcpgxv5zar3raypgvfnwvn4bv3n212cbcgyj7r0xj33c1kqi"; }) @@ -280,21 +236,17 @@ (fetchNuGet { pname = "System.Speech"; version = "6.0.0"; sha256 = "1g7b077189x9xy4l9yrh2yfnhc83mk6aj7b0v64xdqsrsqv1z16v"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.2"; sha256 = "1pi1dkypmn34qqspvwfcp1fx78v0nh78dpdyj4rcaa2qch40y15r"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.AccessControl"; version = "6.0.0"; sha256 = "1f036x8994yqz13a1cx6vvzd2bqzwy4mchn1pgfsybaw1xa10jk6"; }) @@ -302,17 +254,11 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.Web.Services.Description"; version = "4.9.0"; sha256 = "08f9ksj826nz4pfw1bw7xg811x99yyj871nfmvav6yxfkx9faqkh"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "20.0.15"; sha256 = "14ivs6f91frvnygxg1qb7f7a96a3nazncj2sx4gsv1y22wmwizn4"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "20.0.15"; sha256 = "0avsf5bwjq4ymjmri917w610xzv6l300fxq3h7xhfprs25crby3k"; }) - (fetchNuGet { pname = "WindowsAzure.Storage"; version = "9.3.3"; sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.2"; sha256 = "1mc358wlq9y21gzj44af8hxlyjm0ws0i9f5vmsn31dn5wbfh4dy5"; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.2"; sha256 = "0q3vghssyh6rd7w7n4rjv5ngh5byf1y80i22yw9fx10f4hcsw1az"; }) ] diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index d91ffd7e5c6c..7cd6a06463f3 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "bicep"; - version = "0.26.54"; + version = "0.27.1"; src = fetchFromGitHub { owner = "Azure"; repo = "bicep"; rev = "v${version}"; - hash = "sha256-Obu9I2FzuYBD466DE9VZnjTHSRX+qeKqTiIJ2433DQc="; + hash = "sha256-7yEsxKUG2jhki1u5CObdjN4JMnEcAYR+SoGPaNJ+9Fs="; }; projectFile = "src/Bicep.Cli/Bicep.Cli.csproj"; From 4c627d7adc3303ab9a5c272129c38dda585c6c54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 20:32:29 +0000 Subject: [PATCH 89/93] surrealdb: 1.5.0 -> 1.5.1 --- pkgs/by-name/su/surrealdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 0e881eeb7dac..0e598094c57c 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-MX7XE+1YCP6zSc207GAaFgr0QJLMX0dbFqGjLMf/KOI="; + hash = "sha256-piLanhc59jfsXHoaY217nqPahuyV2xtvlT4aqFNjaxM="; }; - cargoHash = "sha256-skPCmQVH76qdmBVd4IVCnKn1uHP7mEgJ8YXprycpQ5I="; + cargoHash = "sha256-dqbq7irajpDWsxCt1B8W6G+ulPJowpu2ykXMqQoT1Sw="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From a1090bebdcca0c8eb7f60c475f67ef7fedd471ff Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 22 May 2024 18:41:18 +0200 Subject: [PATCH 90/93] gobang: unbreak, modernize --- pkgs/by-name/go/gobang/package.nix | 40 + pkgs/by-name/go/gobang/update-sqlx.patch | 1553 +++++++++++++++++ .../tools/database/gobang/default.nix | 35 - pkgs/top-level/all-packages.nix | 4 - 4 files changed, 1593 insertions(+), 39 deletions(-) create mode 100644 pkgs/by-name/go/gobang/package.nix create mode 100644 pkgs/by-name/go/gobang/update-sqlx.patch delete mode 100644 pkgs/development/tools/database/gobang/default.nix diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix new file mode 100644 index 000000000000..9691aa78fd81 --- /dev/null +++ b/pkgs/by-name/go/gobang/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, +}: +let + version = "0.1.0-alpha.5"; +in +rustPlatform.buildRustPackage { + pname = "gobang"; + inherit version; + + src = fetchFromGitHub { + owner = "tako8ki"; + repo = "gobang"; + rev = "v${version}"; + hash = "sha256-RinfQhG7iCp0Xcs9kLs3I2/wjkJEgCjFYe3mS+FY9Ak="; + }; + + cargoPatches = [ ./update-sqlx.patch ]; + + cargoHash = "sha256-3A3bf7iq1acsWttKmcJmxWM74B0qUIcROBAkjDZFKxE="; + + buildInputs = + with darwin.apple_sdk.frameworks; + lib.optionals stdenv.isDarwin [ + CoreFoundation + Security + SystemConfiguration + ]; + + meta = { + description = "A cross-platform TUI database management tool written in Rust"; + homepage = "https://github.com/tako8ki/gobang"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/go/gobang/update-sqlx.patch b/pkgs/by-name/go/gobang/update-sqlx.patch new file mode 100644 index 000000000000..1571b00f0339 --- /dev/null +++ b/pkgs/by-name/go/gobang/update-sqlx.patch @@ -0,0 +1,1553 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 6cf1c13..c3ea64b 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,24 +4,15 @@ version = 3 + + [[package]] + name = "ahash" +-version = "0.7.4" ++version = "0.7.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" ++checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" + 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 = "ansi_term" + version = "0.11.0" +@@ -39,9 +30,9 @@ checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" + + [[package]] + name = "arrayvec" +-version = "0.5.2" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + + [[package]] + name = "async-trait" +@@ -51,7 +42,7 @@ checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -74,12 +65,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "autocfg" +-version = "0.1.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +- + [[package]] + name = "autocfg" + version = "1.0.1" +@@ -92,31 +77,70 @@ version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + ++[[package]] ++name = "base64ct" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" ++ + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] +-name = "bitvec" +-version = "0.19.5" ++name = "block-buffer" ++version = "0.10.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" ++checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" + dependencies = [ +- "funty", +- "radium", +- "tap", +- "wyz", ++ "generic-array", + ] + + [[package]] +-name = "block-buffer" +-version = "0.9.0" ++name = "borsh" ++version = "0.10.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" ++checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" + dependencies = [ +- "generic-array", ++ "borsh-derive", ++ "hashbrown 0.11.2", ++] ++ ++[[package]] ++name = "borsh-derive" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" ++dependencies = [ ++ "borsh-derive-internal", ++ "borsh-schema-derive-internal", ++ "proc-macro-crate", ++ "proc-macro2", ++ "syn 1.0.109", ++] ++ ++[[package]] ++name = "borsh-derive-internal" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", ++] ++ ++[[package]] ++name = "borsh-schema-derive-internal" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", + ] + + [[package]] +@@ -125,6 +149,28 @@ version = "3.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" + ++[[package]] ++name = "bytecheck" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" ++dependencies = [ ++ "bytecheck_derive", ++ "ptr_meta", ++ "simdutf8", ++] ++ ++[[package]] ++name = "bytecheck_derive" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", ++] ++ + [[package]] + name = "byteorder" + version = "1.4.3" +@@ -184,22 +230,18 @@ dependencies = [ + ] + + [[package]] +-name = "cpufeatures" +-version = "0.1.5" ++name = "const-oid" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +-dependencies = [ +- "libc", +-] ++checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + + [[package]] +-name = "crossbeam-channel" +-version = "0.5.1" ++name = "cpufeatures" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" ++checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" + dependencies = [ +- "cfg-if", +- "crossbeam-utils", ++ "libc", + ] + + [[package]] +@@ -273,15 +315,25 @@ dependencies = [ + ] + + [[package]] +-name = "crypto-mac" +-version = "0.10.1" ++name = "crypto-bigint" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" ++checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" + dependencies = [ + "generic-array", + "subtle", + ] + ++[[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 = "database-tree" + version = "0.1.0-alpha.5" +@@ -291,20 +343,33 @@ dependencies = [ + "thiserror", + ] + ++[[package]] ++name = "der" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" ++dependencies = [ ++ "const-oid", ++ "crypto-bigint", ++ "pem-rfc7468", ++] ++ + [[package]] + name = "digest" +-version = "0.9.0" ++version = "0.10.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" + dependencies = [ +- "generic-array", ++ "block-buffer", ++ "crypto-common", ++ "subtle", + ] + + [[package]] + name = "dirs" +-version = "3.0.2" ++version = "4.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" ++checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" + dependencies = [ + "dirs-sys", + ] +@@ -359,6 +424,24 @@ version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + ++[[package]] ++name = "event-listener" ++version = "2.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" ++ ++[[package]] ++name = "flume" ++version = "0.10.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++ "pin-project", ++ "spin 0.9.8", ++] ++ + [[package]] + name = "form_urlencoded" + version = "1.0.1" +@@ -369,12 +452,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "funty" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +- + [[package]] + name = "futures" + version = "0.3.15" +@@ -392,9 +469,9 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" ++checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" + dependencies = [ + "futures-core", + "futures-sink", +@@ -402,15 +479,15 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" ++checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + + [[package]] + name = "futures-executor" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" ++checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" + dependencies = [ + "futures-core", + "futures-task", +@@ -430,42 +507,39 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" ++checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + + [[package]] + name = "futures-macro" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" ++checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ +- "autocfg 1.0.1", +- "proc-macro-hack", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.65", + ] + + [[package]] + name = "futures-sink" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" ++checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + + [[package]] + name = "futures-task" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" ++checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + + [[package]] + name = "futures-util" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" ++checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" + dependencies = [ +- "autocfg 1.0.1", + "futures-channel", + "futures-core", + "futures-io", +@@ -475,8 +549,6 @@ dependencies = [ + "memchr", + "pin-project-lite", + "pin-utils", +- "proc-macro-hack", +- "proc-macro-nested", + "slab", + ] + +@@ -523,7 +595,7 @@ dependencies = [ + "strum", + "strum_macros", + "tokio", +- "toml", ++ "toml 0.4.10", + "tui", + "unicode-width", + "which", +@@ -538,13 +610,22 @@ dependencies = [ + "ahash", + ] + ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++dependencies = [ ++ "ahash", ++] ++ + [[package]] + name = "hashlink" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" + dependencies = [ +- "hashbrown", ++ "hashbrown 0.11.2", + ] + + [[package]] +@@ -556,6 +637,15 @@ dependencies = [ + "unicode-segmentation", + ] + ++[[package]] ++name = "heck" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" ++dependencies = [ ++ "unicode-segmentation", ++] ++ + [[package]] + name = "hermit-abi" + version = "0.1.18" +@@ -571,13 +661,21 @@ 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.10.1" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" ++checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" + dependencies = [ +- "crypto-mac", + "digest", + ] + +@@ -598,8 +696,8 @@ version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" + dependencies = [ +- "autocfg 1.0.1", +- "hashbrown", ++ "autocfg", ++ "hashbrown 0.11.2", + ] + + [[package]] +@@ -622,9 +720,9 @@ dependencies = [ + + [[package]] + name = "itoa" +-version = "0.4.7" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +@@ -641,27 +739,14 @@ version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + dependencies = [ +- "spin", +-] +- +-[[package]] +-name = "lexical-core" +-version = "0.7.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +-dependencies = [ +- "arrayvec", +- "bitflags", +- "cfg-if", +- "ryu", +- "static_assertions", ++ "spin 0.5.2", + ] + + [[package]] + name = "libc" +-version = "0.2.97" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libm" +@@ -671,9 +756,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" + + [[package]] + name = "libsqlite3-sys" +-version = "0.22.2" ++version = "0.24.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" ++checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" + dependencies = [ + "cc", + "pkg-config", +@@ -698,12 +783,6 @@ dependencies = [ + "cfg-if", + ] + +-[[package]] +-name = "maplit" +-version = "1.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +- + [[package]] + name = "matches" + version = "0.1.8" +@@ -712,20 +791,25 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + + [[package]] + name = "md-5" +-version = "0.9.1" ++version = "0.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" ++checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" + dependencies = [ +- "block-buffer", ++ "cfg-if", + "digest", +- "opaque-debug", + ] + + [[package]] + name = "memchr" +-version = "2.4.0" ++version = "2.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" ++checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" ++ ++[[package]] ++name = "minimal-lexical" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "mio" +@@ -751,15 +835,12 @@ dependencies = [ + + [[package]] + name = "nom" +-version = "6.1.2" ++version = "7.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" ++checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" + dependencies = [ +- "bitvec", +- "funty", +- "lexical-core", + "memchr", +- "version_check", ++ "minimal-lexical", + ] + + [[package]] +@@ -773,33 +854,21 @@ dependencies = [ + + [[package]] + name = "num-bigint" +-version = "0.3.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" +-dependencies = [ +- "autocfg 1.0.1", +- "num-integer", +- "num-traits", +-] +- +-[[package]] +-name = "num-bigint" +-version = "0.4.2" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" ++checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-integer", + "num-traits", + ] + + [[package]] + name = "num-bigint-dig" +-version = "0.7.0" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480" ++checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" + dependencies = [ +- "autocfg 0.1.7", + "byteorder", + "lazy_static", + "libm", +@@ -817,7 +886,7 @@ version = "0.1.44" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-traits", + ] + +@@ -827,7 +896,7 @@ version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-integer", + "num-traits", + ] +@@ -838,7 +907,7 @@ version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "libm", + ] + +@@ -854,15 +923,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.8.0" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +- +-[[package]] +-name = "opaque-debug" +-version = "0.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "parking_lot" +@@ -884,20 +947,24 @@ dependencies = [ + "cfg-if", + "instant", + "libc", +- "redox_syscall", ++ "redox_syscall 0.2.9", + "smallvec", + "winapi", + ] + + [[package]] +-name = "pem" +-version = "0.8.3" ++name = "paste" ++version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" ++checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" ++ ++[[package]] ++name = "pem-rfc7468" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" + dependencies = [ +- "base64", +- "once_cell", +- "regex", ++ "base64ct", + ] + + [[package]] +@@ -906,11 +973,31 @@ version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + ++[[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.65", ++] ++ + [[package]] + name = "pin-project-lite" +-version = "0.2.6" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" ++checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + + [[package]] + name = "pin-utils" +@@ -918,6 +1005,28 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "pkcs1" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" ++dependencies = [ ++ "der", ++ "pkcs8", ++ "zeroize", ++] ++ ++[[package]] ++name = "pkcs8" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" ++dependencies = [ ++ "der", ++ "spki", ++ "zeroize", ++] ++ + [[package]] + name = "pkg-config" + version = "0.3.19" +@@ -930,6 +1039,15 @@ version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + ++[[package]] ++name = "proc-macro-crate" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++dependencies = [ ++ "toml 0.5.11", ++] ++ + [[package]] + name = "proc-macro-error" + version = "1.0.4" +@@ -939,7 +1057,7 @@ dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "version_check", + ] + +@@ -955,41 +1073,43 @@ dependencies = [ + ] + + [[package]] +-name = "proc-macro-hack" +-version = "0.5.19" ++name = "proc-macro2" ++version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] +-name = "proc-macro-nested" +-version = "0.1.7" ++name = "ptr_meta" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" ++checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" ++dependencies = [ ++ "ptr_meta_derive", ++] + + [[package]] +-name = "proc-macro2" +-version = "1.0.27" ++name = "ptr_meta_derive" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" ++checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" + dependencies = [ +- "unicode-xid", ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", + ] + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++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.4" +@@ -1039,6 +1159,15 @@ dependencies = [ + "bitflags", + ] + ++[[package]] ++name = "redox_syscall" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" ++dependencies = [ ++ "bitflags", ++] ++ + [[package]] + name = "redox_users" + version = "0.4.0" +@@ -1046,26 +1175,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" + dependencies = [ + "getrandom", +- "redox_syscall", ++ "redox_syscall 0.2.9", + ] + + [[package]] +-name = "regex" +-version = "1.5.4" ++name = "rend" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" + dependencies = [ +- "aho-corasick", +- "memchr", +- "regex-syntax", ++ "bytecheck", + ] + +-[[package]] +-name = "regex-syntax" +-version = "0.6.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +- + [[package]] + name = "ring" + version = "0.16.20" +@@ -1075,41 +1196,73 @@ dependencies = [ + "cc", + "libc", + "once_cell", +- "spin", ++ "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", + ] + ++[[package]] ++name = "rkyv" ++version = "0.7.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c30f1d45d9aa61cbc8cd1eb87705470892289bb2d01943e7803b873a57404dc3" ++dependencies = [ ++ "bytecheck", ++ "hashbrown 0.12.3", ++ "ptr_meta", ++ "rend", ++ "rkyv_derive", ++ "seahash", ++] ++ ++[[package]] ++name = "rkyv_derive" ++version = "0.7.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", ++] ++ + [[package]] + name = "rsa" +-version = "0.4.1" ++version = "0.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe" ++checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" + dependencies = [ + "byteorder", + "digest", +- "lazy_static", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", +- "pem", +- "rand", +- "simple_asn1", ++ "pkcs1", ++ "pkcs8", ++ "rand_core", ++ "smallvec", + "subtle", + "zeroize", + ] + + [[package]] + name = "rust_decimal" +-version = "1.15.0" ++version = "1.30.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c5446d1cf2dfe2d6367c8b27f2082bdf011e60e76fa1fcd140047f535156d6e7" ++checksum = "d0446843641c69436765a35a5a77088e28c2e6a12da93e84aa3ab1cd4aa5a042" + dependencies = [ + "arrayvec", ++ "borsh", ++ "bytecheck", ++ "byteorder", ++ "bytes", + "num-traits", ++ "rand", ++ "rkyv", + "serde", ++ "serde_json", + ] + + [[package]] +@@ -1147,33 +1300,38 @@ dependencies = [ + "untrusted", + ] + ++[[package]] ++name = "seahash" ++version = "4.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" ++ + [[package]] + name = "serde" +-version = "1.0.126" ++version = "1.0.202" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" ++checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.126" ++version = "1.0.202" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" ++checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.65", + ] + + [[package]] + name = "serde_json" +-version = "1.0.64" ++version = "1.0.117" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" + dependencies = [ +- "indexmap", + "itoa", + "ryu", + "serde", +@@ -1181,28 +1339,24 @@ dependencies = [ + + [[package]] + name = "sha-1" +-version = "0.9.6" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" ++checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" + dependencies = [ +- "block-buffer", + "cfg-if", + "cpufeatures", + "digest", +- "opaque-debug", + ] + + [[package]] + name = "sha2" +-version = "0.9.5" ++version = "0.10.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" ++checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" + dependencies = [ +- "block-buffer", + "cfg-if", + "cpufeatures", + "digest", +- "opaque-debug", + ] + + [[package]] +@@ -1247,16 +1401,10 @@ dependencies = [ + ] + + [[package]] +-name = "simple_asn1" +-version = "0.5.4" ++name = "simdutf8" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" +-dependencies = [ +- "chrono", +- "num-bigint 0.4.2", +- "num-traits", +- "thiserror", +-] ++checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + + [[package]] + name = "slab" +@@ -1266,9 +1414,9 @@ checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" + + [[package]] + name = "smallvec" +-version = "1.6.1" ++version = "1.13.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" ++checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + + [[package]] + name = "spin" +@@ -1276,24 +1424,41 @@ 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 = "spki" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" ++dependencies = [ ++ "base64ct", ++ "der", ++] ++ + [[package]] + name = "sqlformat" +-version = "0.1.6" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d86e3c77ff882a828346ba401a7ef4b8e440df804491c6064fe8295765de71c" ++checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" + dependencies = [ +- "lazy_static", +- "maplit", ++ "itertools", + "nom", +- "regex", + "unicode_categories", + ] + + [[package]] + name = "sqlx" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e4b94ab0f8c21ee4899b93b06451ef5d965f1a355982ee73684338228498440" ++checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b" + dependencies = [ + "sqlx-core", + "sqlx-macros", +@@ -1301,9 +1466,9 @@ dependencies = [ + + [[package]] + name = "sqlx-core" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec28b91a01e1fe286d6ba66f68289a2286df023fc97444e1fd86c2fd6d5dc026" ++checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" + dependencies = [ + "ahash", + "atoi", +@@ -1312,29 +1477,32 @@ dependencies = [ + "byteorder", + "bytes", + "chrono", +- "crossbeam-channel", + "crossbeam-queue", +- "crossbeam-utils", + "digest", + "dirs", + "either", ++ "event-listener", ++ "flume", + "futures-channel", + "futures-core", ++ "futures-executor", + "futures-intrusive", + "futures-util", + "generic-array", + "hashlink", + "hex", ++ "hkdf", + "hmac", ++ "indexmap", + "itoa", + "libc", + "libsqlite3-sys", + "log", + "md-5", + "memchr", +- "num-bigint 0.3.2", ++ "num-bigint", + "once_cell", +- "parking_lot", ++ "paste", + "percent-encoding", + "rand", + "rsa", +@@ -1358,41 +1526,34 @@ dependencies = [ + + [[package]] + name = "sqlx-macros" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4dc33c35d54774eed73d54568d47a6ac099aed8af5e1556a017c131be88217d5" ++checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" + dependencies = [ + "dotenv", + "either", +- "futures", +- "heck", ++ "heck 0.4.1", + "once_cell", + "proc-macro2", + "quote", + "serde_json", + "sqlx-core", + "sqlx-rt", +- "syn", ++ "syn 1.0.109", + "url", + ] + + [[package]] + name = "sqlx-rt" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14302b678d9c76b28f2e60115211e25e0aabc938269991745a169753dc00e35c" ++checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" + dependencies = [ + "once_cell", + "tokio", + "tokio-rustls", + ] + +-[[package]] +-name = "static_assertions" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +- + [[package]] + name = "stringprep" + version = "0.1.2" +@@ -1426,11 +1587,11 @@ version = "0.4.15" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" + dependencies = [ +- "heck", ++ "heck 0.3.3", + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1445,10 +1606,10 @@ version = "0.21.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" + dependencies = [ +- "heck", ++ "heck 0.3.3", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1459,33 +1620,26 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" + + [[package]] + name = "syn" +-version = "1.0.73" ++version = "1.0.109" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" + dependencies = [ + "proc-macro2", + "quote", +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +-name = "synstructure" +-version = "0.12.4" ++name = "syn" ++version = "2.0.65" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" + dependencies = [ + "proc-macro2", + "quote", +- "syn", +- "unicode-xid", ++ "unicode-ident", + ] + +-[[package]] +-name = "tap" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +- + [[package]] + name = "textwrap" + version = "0.11.0" +@@ -1497,22 +1651,22 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.25" ++version = "1.0.61" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" ++checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.25" ++version = "1.0.61" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" ++checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.65", + ] + + [[package]] +@@ -1542,11 +1696,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + + [[package]] + name = "tokio" +-version = "1.11.0" ++version = "1.16.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" ++checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" + dependencies = [ +- "autocfg 1.0.1", + "bytes", + "libc", + "memchr", +@@ -1562,13 +1715,13 @@ dependencies = [ + + [[package]] + name = "tokio-macros" +-version = "1.3.0" ++version = "1.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" ++checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1584,9 +1737,9 @@ dependencies = [ + + [[package]] + name = "tokio-stream" +-version = "0.1.7" ++version = "0.1.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" ++checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" + dependencies = [ + "futures-core", + "pin-project-lite", +@@ -1602,6 +1755,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "toml" ++version = "0.5.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" ++dependencies = [ ++ "serde", ++] ++ + [[package]] + name = "tui" + version = "0.15.0" +@@ -1617,9 +1779,9 @@ dependencies = [ + + [[package]] + name = "typenum" +-version = "1.13.0" ++version = "1.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" ++checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + + [[package]] + name = "unicode-bidi" +@@ -1630,6 +1792,12 @@ dependencies = [ + "matches", + ] + ++[[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.19" +@@ -1651,12 +1819,6 @@ version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +-[[package]] +-name = "unicode-xid" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +- + [[package]] + name = "unicode_categories" + version = "0.1.1" +@@ -1705,6 +1867,12 @@ version = "0.10.2+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + ++[[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.74" +@@ -1726,7 +1894,7 @@ dependencies = [ + "log", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "wasm-bindgen-shared", + ] + +@@ -1748,7 +1916,7 @@ checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +@@ -1801,11 +1969,12 @@ dependencies = [ + + [[package]] + name = "whoami" +-version = "1.1.2" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4abacf325c958dfeaf1046931d37f2a901b6dfe0968ee965a29e94c6766b2af6" ++checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" + dependencies = [ +- "wasm-bindgen", ++ "redox_syscall 0.4.1", ++ "wasite", + "web-sys", + ] + +@@ -1831,29 +2000,8 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +-[[package]] +-name = "wyz" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +- + [[package]] + name = "zeroize" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +-dependencies = [ +- "zeroize_derive", +-] +- +-[[package]] +-name = "zeroize_derive" +-version = "1.1.0" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", +- "synstructure", +-] ++checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +diff --git a/Cargo.toml b/Cargo.toml +index 95f5b91..ea7eec5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -20,7 +20,7 @@ tui = { version = "0.15.0", features = ["crossterm"], default-features = false } + crossterm = "0.20" + anyhow = "1.0.38" + unicode-width = "0.1" +-sqlx = { version = "0.5.6", features = ["mysql", "postgres", "sqlite", "chrono", "runtime-tokio-rustls", "decimal", "json"], default-features = false } ++sqlx = { version = "0.5.13", features = ["mysql", "postgres", "sqlite", "chrono", "runtime-tokio-rustls", "decimal", "json"], default-features = false } + chrono = "0.4" + tokio = { version = "1.11.0", features = ["full"] } + futures = "0.3.5" diff --git a/pkgs/development/tools/database/gobang/default.nix b/pkgs/development/tools/database/gobang/default.nix deleted file mode 100644 index b3611169996c..000000000000 --- a/pkgs/development/tools/database/gobang/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, CoreFoundation -, Security -, SystemConfiguration -}: - -rustPlatform.buildRustPackage rec { - pname = "gobang"; - version = "0.1.0-alpha.5"; - - src = fetchFromGitHub { - owner = "tako8ki"; - repo = pname; - rev = "v${version}"; - sha256 = "02glb3hlprpdc72ji0248a7g0vr36yxr0gfbbms2m25v251dyaa6"; - }; - - cargoSha256 = "sha256-Tiefet5gLpiuYY6Scg5fjnaPiZfVl5Gy2oZFdhgNRxY="; - - buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - Security - SystemConfiguration - ]; - - meta = with lib; { - description = "A cross-platform TUI database management tool written in Rust"; - homepage = "https://github.com/tako8ki/gobang"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2907d324cc..4d00e751819e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16024,10 +16024,6 @@ with pkgs; gocover-cobertura = callPackage ../development/tools/gocover-cobertura { }; - gobang = callPackage ../development/tools/database/gobang { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - }; - goblob = callPackage ../tools/security/goblob { }; gogetdoc = callPackage ../development/tools/gogetdoc { }; From 234f4db797d0a64bd2995601f15fd12c2394157f Mon Sep 17 00:00:00 2001 From: Matt Kline Date: Thu, 23 May 2024 14:22:33 -0700 Subject: [PATCH 91/93] nixos/snapper, nixos/borgbackup: Fix module doc typo The persistentTimer argument sets the _Persistent_ field in systemd.timer(5). Pointed out in #312549 --- nixos/modules/services/backup/borgbackup.nix | 2 +- nixos/modules/services/misc/snapper.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 04f971008073..a3c0715c9e60 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -361,7 +361,7 @@ in { type = types.bool; example = true; description = '' - Set the `persistentTimer` option for the + Set the `Persistent` option for the {manpage}`systemd.timer(5)` which triggers the backup immediately if the last trigger was missed (e.g. if the system was powered down). diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index 33207ac2b5bd..a42fca5b6028 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -108,7 +108,7 @@ in type = types.bool; example = true; description = '' - Set the `persistentTimer` option for the + Set the `Persistent` option for the {manpage}`systemd.timer(5)` which triggers the snapshot immediately if the last trigger was missed (e.g. if the system was powered down). From 0f3add331c6a4709bbe5f6f39ba99e3207775d6d Mon Sep 17 00:00:00 2001 From: almini Date: Mon, 18 Mar 2024 17:27:11 +0100 Subject: [PATCH 92/93] segger-jlink: 794l -> 796b --- pkgs/by-name/se/segger-jlink/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix index 074f687f35f0..d7b2e0cfcaeb 100755 --- a/pkgs/by-name/se/segger-jlink/package.nix +++ b/pkgs/by-name/se/segger-jlink/package.nix @@ -15,25 +15,25 @@ let supported = { x86_64-linux = { name = "x86_64"; - hash = "sha256-CELUteYzy0oMxDonOot+DR5MgGjSRwLgRCbJRAaS/EY="; + hash = "sha256-UsDP+wMS7ZeWMQBObwv5RxbwuWU8nLnHes7LEXK6imE="; }; i686-linux = { name = "i386"; - hash = "sha256-lw3gqgCjmASkelj5lPDnltRJ1Cb+318QjrbirQ6oRFI="; + hash = "sha256-InNHXWAc6QZEWyEcTTUCRMDsKd0RtR8d7O0clWKuFo8="; }; aarch64-linux = { name = "arm64"; - hash = "sha256-yq/L9k+22OWhwnAROJlsyYd/AH5SHJD231y6xd83N6g="; + hash = "sha256-ueIGdqfuIRCuEwaPkgZMgghO9DU11IboLLMryg/mxQ8="; }; armv7l-linux = { name = "arm"; - hash = "sha256-FAnzZzz3tgSxgX5n3CUrCbD5lfub91cDkjdD/lVaf0g="; + hash = "sha256-6nTQGQpkbqQntheQqiUAdVS4rp30nl2KRUn5Adsfeoo="; }; }; platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}"); - version = "794l"; + version = "796b"; url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz"; From 5771dbfa7d2f33c4d2bb417ec365282707e9156c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 23 May 2024 17:03:01 -0500 Subject: [PATCH 93/93] bicep: fix updater script --- pkgs/by-name/bi/bicep/updater.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bi/bicep/updater.sh b/pkgs/by-name/bi/bicep/updater.sh index dc45cc135746..22ab3eced420 100755 --- a/pkgs/by-name/bi/bicep/updater.sh +++ b/pkgs/by-name/bi/bicep/updater.sh @@ -4,14 +4,15 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" +deps_file="$(realpath "./deps.nix")" new_version="$(curl -s "https://api.github.com/repos/azure/bicep/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date!" - exit 0 + echo "Already up to date!" + exit 0 fi cd ../../../.. -update-source-version bicep "${new_version//v}" -nix-build -A bicep.fetch-deps --no-out-link +update-source-version bicep "${new_version//v/}" +"$(nix-build . -A bicep.fetch-deps --no-out-link)" "$deps_file"