From 4d7ff1d59d4e4948f0f46d29e01bad106bdee327 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 04:21:05 +0000 Subject: [PATCH 001/108] python3Packages.tskit: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/tskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index 839df33507ce..b8572e0f3541 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bbo89pMhTDEF2M3c1pauDjECNmk34CmmqmXNmOcbVfI="; + hash = "sha256-vawbt+OuPR9WLsGRtdhAFW4ILdKtxq98QbFwxPsb55I="; }; postPatch = '' From 4ec18b35715d477cd20f0b97dd09ecedd67d0066 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 08:10:44 +0000 Subject: [PATCH 002/108] python3Packages.python-arango: 8.1.6 -> 8.2.0 --- pkgs/development/python-modules/python-arango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 683fb494643e..7e4d50915daa 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.1.6"; + version = "8.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; tag = version; - hash = "sha256-y+ECfrLoenjXl71hty7snNdu6tN5q8XTGtBlXtkSg7g="; + hash = "sha256-DPyCHa9tAnxKYeieiHe10UV7EPnF7octbDm23dSlIb0="; }; nativeBuildInputs = [ From 9ffaffa6f5f1345e20c893e81723a17328d75395 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 19:51:47 +0000 Subject: [PATCH 003/108] python3Packages.panel: 1.6.3 -> 1.7.1 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index b432381aee8c..21e2018a5815 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.6.3"; + version = "1.7.1"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-zNKgWHqzgr1VuOoJlwbzG2Sq2saXuKQZI9Oxi57WGNY="; + hash = "sha256-gM67iOMxCIfThsiC+JSxN6N3A1VhoGCZCP4tH1QrWIw="; dist = "py3"; python = "py3"; }; From f599de2a8694116b1ae691d04dd6813109728467 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 03:35:53 +0000 Subject: [PATCH 004/108] python3Packages.pyaml: 25.1.0 -> 25.5.0 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index ca1342ab9fb2..e7902b1d72a4 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "25.1.0"; + version = "25.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-M6k6xJIY9X4CC4HigNJwbOpVSsWnZEWsea3XYNAZxwk="; + hash = "sha256-V5lWDHscna81p6RTX1PiwwMj90y9fLTy5xWxbdaBpYo="; }; nativeBuildInputs = [ setuptools ]; From c02e977717dc040a8cadb0d589c9b519d0e30a01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jun 2025 06:00:04 +0000 Subject: [PATCH 005/108] linuxPackages.tuxedo-drivers: 4.13.1 -> 4.14.0 --- pkgs/os-specific/linux/tuxedo-drivers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index bd2769f8eb45..7386e0b8ddf1 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "tuxedo-drivers-${kernel.version}"; - version = "4.13.1"; + version = "4.14.0"; src = fetchFromGitLab { group = "tuxedocomputers"; owner = "development/packages"; repo = "tuxedo-drivers"; rev = "v${finalAttrs.version}"; - hash = "sha256-RXicBP4LVQnCcI99ZD0Fwx9BQAMvHJjFUqJE/wsWbdU="; + hash = "sha256-79YZaK8WrHOxSUJWxi4lc+foh4xz3EgRnjw+OrL8yqU="; }; buildInputs = [ pahole ]; From 6f8194b4361778b46d24f1a3a4375c336635ba06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jun 2025 22:49:12 +0000 Subject: [PATCH 006/108] python3Packages.google-cloud-pubsub: 2.29.1 -> 2.30.0 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index ac4b5e0d6c8d..3f57119cad3e 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.29.1"; + version = "2.30.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_pubsub"; inherit version; - hash = "sha256-X0sFNMWHOU3SBTjBuuq31OvO14lWEFhzlVXrRNeSTOQ="; + hash = "sha256-Jpde1yjSIJR59PsmZ+OzvXDedgWrrfSzAcZRw57YMEI="; }; build-system = [ setuptools ]; From 1a935f1aa3215cc357a0f9d4843033d0fe783354 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jun 2025 03:05:12 +0000 Subject: [PATCH 007/108] opencryptoki: 3.24.0 -> 3.25.0 --- pkgs/by-name/op/opencryptoki/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opencryptoki/package.nix b/pkgs/by-name/op/opencryptoki/package.nix index 5870a23d823e..fec8f764047c 100644 --- a/pkgs/by-name/op/opencryptoki/package.nix +++ b/pkgs/by-name/op/opencryptoki/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencryptoki"; - version = "3.24.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; tag = "v${finalAttrs.version}"; - hash = "sha256-GIcUI5Gjk+whwlD9dBiB2N7q6sPYFnhj5VvyQvc2Z2A="; + hash = "sha256-JIDy5LY2rJqMM1uWDWn6Q62kJ+7pYU4G7zptkbyvf9Q="; }; nativeBuildInputs = [ From 1e09c914410c21ea474820d69e9065b40e94546f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jun 2025 03:14:06 +0000 Subject: [PATCH 008/108] python3Packages.migen: 0.9.2-unstable-2025-02-07 -> 0.9.2-unstable-2025-06-10 --- pkgs/development/python-modules/migen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix index e77fab6e0e9f..26c560a68519 100644 --- a/pkgs/development/python-modules/migen/default.nix +++ b/pkgs/development/python-modules/migen/default.nix @@ -10,14 +10,14 @@ buildPythonPackage { pname = "migen"; - version = "0.9.2-unstable-2025-02-07"; + version = "0.9.2-unstable-2025-06-10"; pyproject = true; src = fetchFromGitHub { owner = "m-labs"; repo = "migen"; - rev = "2828df54594673653a641ab551caf6c6b1bfeee5"; - hash = "sha256-GproDJowtcgbccsT+I0mObzFhE483shcS8MSszKXwlc="; + rev = "6e3a9e150fb006dabc4b55043d3af18dbfecd7e8"; + hash = "sha256-NshlPiORBHWljSUP5bB7YBxe7k8dW0t8UXOsIq2EK8I="; }; nativeBuildInputs = [ setuptools ]; From f9d65e69df4a71ecc82ed9cfcd3610e66242b2a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jun 2025 08:51:27 +0000 Subject: [PATCH 009/108] python3Packages.ufo2ft: 3.4.3 -> 3.5.0 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 55ab61ab621a..820cda2373bf 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.4.3"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-jGMH1VZQAUszd8uxH+3mRAfudTiOEoBXSnGOUcqPXao="; + hash = "sha256-mAuMJzuXxO00j0YqxZ21qk+HTAwBhPCws6DUhE9vIrs="; }; build-system = [ From 9756b3f128f2a6d342c1f5d998d4ecf14751dbef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jun 2025 12:40:34 +0000 Subject: [PATCH 010/108] mcpp: 2.7.2.1 -> 2.7.2.2 --- pkgs/by-name/mc/mcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mc/mcpp/package.nix b/pkgs/by-name/mc/mcpp/package.nix index 6ca62d1fe8c7..a90a19953473 100644 --- a/pkgs/by-name/mc/mcpp/package.nix +++ b/pkgs/by-name/mc/mcpp/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mcpp"; - version = "2.7.2.1"; + version = "2.7.2.2"; src = fetchFromGitHub { owner = "museoa"; repo = "mcpp"; rev = finalAttrs.version; - hash = "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY="; + hash = "sha256-wz225bhBF0lFerOAhl8Rwmw8ItHd9BXQceweD9BqvEQ="; }; env = lib.optionalAttrs stdenv.cc.isGNU { From 92b9795003234a782db49c40929a9698d0429ba0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 09:48:59 +0000 Subject: [PATCH 011/108] ppsspp: 1.18.1 -> 1.19.2 --- pkgs/by-name/pp/ppsspp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix index 70c95e38e69e..4cd0346e5a4d 100644 --- a/pkgs/by-name/pp/ppsspp/package.nix +++ b/pkgs/by-name/pp/ppsspp/package.nix @@ -40,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.18.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-X5Sb6oxjjhlsm1VN9e0Emk4SqiHTe3G3ZiuIgw5DSds="; + hash = "sha256-HwZHV5x60V/H4wx5wgC6VAZY7zHjMt0ZVRDWAnXDvj4="; }; patches = lib.optionals useSystemFfmpeg [ From d59dedca67f6271519051cae178a3dbf38e72bd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 10:13:31 +0000 Subject: [PATCH 012/108] netmaker: 0.90.0 -> 0.99.0 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 12a3474fef98..70221db24e72 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.90.0"; + version = "0.99.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-/7tj3SuTa2lSMgN4f2/OutzoPvAN7ARK1RKTLlMw13Y="; + hash = "sha256-DUD6JTnTM3QVLhWIoRZ0Jc+Jre8GXtuKkV6MzLYCg4U="; }; - vendorHash = "sha256-Yd9vwdIwAGinIr/RLGdb4N9hsDeMu9aB2Z1EVnlxxtA="; + vendorHash = "sha256-QD9jkpsANzJeFHd4miShgACNOvI6sy38fs7pZNkPhms="; inherit subPackages; From 557d7b0973a0a2406b8b6f3e286bab00c1cae733 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 10:13:53 +0000 Subject: [PATCH 013/108] netclient: 0.90.0 -> 0.99.0 --- pkgs/by-name/ne/netclient/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index e4a2d4f52a74..41f3cc7a20ae 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.90.0"; + version = "0.99.0"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-/drujpz0oeAZmV24Fxy3N6aqa5z72WiVxkjccbc6xmE="; + hash = "sha256-hSylhELMfiYNFHt03bJN1gTfy3EXSHJOj+ayUeU3+4w="; }; - vendorHash = "sha256-l2Vx1lD+LF/4N0QLVTDD1/TmWpR3JPAgMyrgw7aT2EQ="; + vendorHash = "sha256-bpXGXK97ohepYoAyJFZE49vo48ch3gAsVyax1+uLIfE="; buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11; From 6068cd35529199e0f8f0272ede6ba73e922fa65d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 10:35:46 +0000 Subject: [PATCH 014/108] flowblade: 2.20 -> 2.22 --- pkgs/by-name/fl/flowblade/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index f7e539bae1bc..60ca28ce649f 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.20"; + version = "2.22"; src = fetchFromGitHub { owner = "jliljebl"; repo = "flowblade"; rev = "v${version}"; - sha256 = "sha256-5w8mGFPOawbUwinzVLSCUZWGxuyxhi1/3tOrmQyfUUg="; + sha256 = "sha256-0puu0S4zONapjXaVBpPG5mH3UidQwre9yCSkjJVhdkc="; }; buildInputs = [ From 8c910f09108fe5968ba9961fa316c8f233e1e18f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 11:49:29 +0000 Subject: [PATCH 015/108] sof-firmware: 2025.01.1 -> 2025.05 --- pkgs/by-name/so/sof-firmware/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index 6b3b22cb0c7b..d3e691752b52 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sof-firmware"; - version = "2025.01.1"; + version = "2025.05"; src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${finalAttrs.version}/sof-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM="; + hash = "sha256-4vJgOw04x8vbFnKQGGP7+EtNtJIfQFlSojaRXLioa8w="; }; dontFixup = true; # binaries must not be stripped or patchelfed From e9ffd6a4fa30d95c5118f305f552fa92e7b7ce04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 12:13:41 +0000 Subject: [PATCH 016/108] sentry-cli: 2.45.0 -> 2.46.0 --- pkgs/by-name/se/sentry-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index fb1ddcae10ed..782a14840c71 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.45.0"; + version = "2.46.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - hash = "sha256-nuqjlckrM4i4+cYJ3+oBoDB2g7PitAkkHv2CiI6Ttqc="; + hash = "sha256-IWDMcmpwKCIE7ogo5upGTtWuF00pFlUwj6RRXTC+RDQ="; }; doCheck = false; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-cRK8olhz/3DdEvfXX5PBMgPsVihr5VFOdFZIkCy1r/0="; + cargoHash = "sha256-PDDlt0KmPhJWH3Hd9no/cqYdL/QPGdAE2pIj0EXXc70="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ From 0d678539a1b519ca3aa48ce3ad7b807e462c86be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 14:58:33 +0000 Subject: [PATCH 017/108] fluidd: 1.34.2 -> 1.34.3 --- pkgs/by-name/fl/fluidd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix index 7ea445a94baa..d4e715ef76f7 100644 --- a/pkgs/by-name/fl/fluidd/package.nix +++ b/pkgs/by-name/fl/fluidd/package.nix @@ -8,13 +8,13 @@ buildNpmPackage rec { pname = "fluidd"; - version = "1.34.2"; + version = "1.34.3"; src = fetchFromGitHub { owner = "fluidd-core"; repo = "fluidd"; tag = "v${version}"; - hash = "sha256-DbuUAHsRwAiXTGjAPxT1zEcsxNloCEFLuA62/wR4+yg="; + hash = "sha256-e3JM9QshQFHvDXvZznQBDFsOiwzxw2lz2hChw66lmMM="; }; patches = [ @@ -23,7 +23,7 @@ buildNpmPackage rec { }) ]; - npmDepsHash = "sha256-ZOsPUON9/bBvSrc432SGHEKKLl9ZVCq9/Nkr9Xxba/g="; + npmDepsHash = "sha256-WDquc35cwyTyVM8Il5aVYWbJqSKhR8wsMNNFgexFKYg="; installPhase = '' mkdir -p $out/share/fluidd From 8e8635cf0cf886dc4393fb9ead5e5ce98103aa89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 20:28:56 +0000 Subject: [PATCH 018/108] cctz: 2.4 -> 2.5 --- pkgs/by-name/cc/cctz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cc/cctz/package.nix b/pkgs/by-name/cc/cctz/package.nix index a28c22d0443f..9f16f6550d1c 100644 --- a/pkgs/by-name/cc/cctz/package.nix +++ b/pkgs/by-name/cc/cctz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cctz"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "google"; repo = "cctz"; rev = "v${version}"; - sha256 = "sha256-F4h8nT1karymV16FFHC0ldSbdOOx5AMstqi4Bc5m3UQ="; + sha256 = "sha256-YCE0DXuOT5tCOfLlemMH7I2F8c7HEK1NEUJvtfqnCg8="; }; makeFlags = [ "PREFIX=$(out)" ]; From 7bb844458b83be4852740408d357571829590939 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 22:09:21 +0000 Subject: [PATCH 019/108] cannelloni: 1.2.1 -> 2.0.0 --- pkgs/by-name/ca/cannelloni/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cannelloni/package.nix b/pkgs/by-name/ca/cannelloni/package.nix index ad67a463313a..2d52d39f4831 100644 --- a/pkgs/by-name/ca/cannelloni/package.nix +++ b/pkgs/by-name/ca/cannelloni/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "cannelloni"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mguentner"; repo = "cannelloni"; tag = "v${finalAttrs.version}"; - hash = "sha256-dhrB3qg/ljAP7nX+WpX+g7HaUEGj5pTPdDhY2Mi7pUo="; + hash = "sha256-b3pBC2XFK+pyONvnkPw/0YUXAG2cRD1OaN7k2ONzFV8="; }; nativeBuildInputs = [ From 4c968b64399df0ae70708e3e5b2a586205ec933e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Jun 2025 01:38:40 +0000 Subject: [PATCH 020/108] min-ed-launcher: 0.12.0 -> 0.12.1 --- pkgs/by-name/mi/min-ed-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix index 54e4f1d44278..25510bb33167 100644 --- a/pkgs/by-name/mi/min-ed-launcher/package.nix +++ b/pkgs/by-name/mi/min-ed-launcher/package.nix @@ -6,13 +6,13 @@ }: buildDotnetModule rec { pname = "min-ed-launcher"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "rfvgyhn"; repo = "min-ed-launcher"; tag = "v${version}"; - hash = "sha256-x3T88bhjxlf6K+COGfZGLsgwlEBSs9WR9zV+ZiTzh7g="; + hash = "sha256-/dzcWwpg1nIrqICAQIxzwMgfrCB1G9bu2bT7Cv1khFM="; leaveDotGit = true; # During build the current commit is appended to the version }; From 9d246dc2054c5c1b86e0057f8234b7d294d93573 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Jun 2025 05:48:44 +0000 Subject: [PATCH 021/108] linkerd_edge: 25.6.1 -> 25.6.2 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index ea8d7e5ac924..5fe88ae348a8 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "25.6.1"; - sha256 = "0lpf9f5bj6x8b21xak6dzwscj0w9jcdvz83fl6nymy8z8y0dybq7"; + version = "25.6.2"; + sha256 = "0499zs1iq1a8i2xyg5yb59c8r08nw3zlahbn8w4rsrfb5099924p"; vendorHash = "sha256-ePioPHA9gps76VncdPkDEDE3sLUlrCxr7CFsXqoR6KM="; } From dfdf44c7a0156af78b10c6589d2c504628cdc772 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jun 2025 07:03:38 +0000 Subject: [PATCH 022/108] python3Packages.litestar-htmx: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/litestar-htmx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/litestar-htmx/default.nix b/pkgs/development/python-modules/litestar-htmx/default.nix index 2eec220ce2c9..b23f0584c7ec 100644 --- a/pkgs/development/python-modules/litestar-htmx/default.nix +++ b/pkgs/development/python-modules/litestar-htmx/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "litestar-htmx"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { pname = "litestar_htmx"; inherit version; - hash = "sha256-uiU3AI64zBi/yL7lzssoCSTHgYuxwGbXnq5LIhaWygg="; + hash = "sha256-4C0aOpIXLIdINfo+Z0nWWun8Ym0N9GcZSQoWKT4hRvs="; }; pyproject = true; From 9d019100b45153acbbc5ec52dcf3384a01124fa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 21:41:27 +0000 Subject: [PATCH 023/108] python3Packages.evaluate: 0.4.3 -> 0.4.4 --- pkgs/development/python-modules/evaluate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index 9eadd3784211..b0ecf70ed8ae 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "evaluate"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "evaluate"; tag = "v${version}"; - hash = "sha256-G/SK0nMpkpCEzX8AX/IJqpOPZWAQhP8tyr7TJ+F0NCE="; + hash = "sha256-zN0Kud4CJMM5gazWKOR9kmwTVHYgT7DsZqbHjFIe47w="; }; build-system = [ setuptools ]; @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://huggingface.co/docs/evaluate/index"; description = "Easily evaluate machine learning models and datasets"; - changelog = "https://github.com/huggingface/evaluate/releases/tag/v${version}"; + changelog = "https://github.com/huggingface/evaluate/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; mainProgram = "evaluate-cli"; From f76e058136cc0c3ca0bbb9f0cd1f44d9fc9079ff Mon Sep 17 00:00:00 2001 From: MikeHorn-git Date: Sun, 22 Jun 2025 12:18:52 +0200 Subject: [PATCH 024/108] regrippy: init at 2.0.1 --- pkgs/by-name/re/regrippy/package.nix | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/re/regrippy/package.nix diff --git a/pkgs/by-name/re/regrippy/package.nix b/pkgs/by-name/re/regrippy/package.nix new file mode 100644 index 000000000000..b19223c37059 --- /dev/null +++ b/pkgs/by-name/re/regrippy/package.nix @@ -0,0 +1,37 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication { + pname = "regippy"; + version = "2.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "airbus-cert"; + repo = "regrippy"; + rev = "05c9db999853c47af1d15f92f1a34aa2441e8882"; + hash = "sha256-gS7qVPlXwn6UXRXPN5ahPmQL3JpwmESUEi0KKAzOo+8="; + }; + + postInstall = '' + mv $out/bin/regrip.py $out/bin/regrippy + ''; + + build-system = [ python3.pkgs.setuptools ]; + + dependencies = [ + python3.pkgs.importlib-resources + python3.pkgs.python-registry + ]; + + meta = { + description = "Modern Python-3-based alternative to RegRipper"; + homepage = "https://github.com/airbus-cert/regrippy"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mikehorn ]; + mainProgram = "regrippy"; + }; +} From 5c576d03d01ceb40dda02cfbba9897c89798c89e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jun 2025 00:22:24 +0000 Subject: [PATCH 025/108] python3Packages.notion-client: 2.3.0 -> 2.4.0 --- pkgs/development/python-modules/notion-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 46a6f2041f53..c95f19b39efd 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "notion-client"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ramnes"; repo = "notion-sdk-py"; tag = version; - hash = "sha256-oqYBT7K0px0QvShSx1fnr2181h+QXz7I8sdURsBRgWw="; + hash = "sha256-vzgFW37pA4LRS+Rqz1QN92EuLTrlWnJqA/H+IhSHQi8="; }; nativeBuildInputs = [ setuptools ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the official Notion API"; homepage = "https://github.com/ramnes/notion-sdk-py"; - changelog = "https://github.com/ramnes/notion-sdk-py/releases/tag/${version}"; + changelog = "https://github.com/ramnes/notion-sdk-py/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; }; From 8455a2fd8f06f726db31fc01785a4bb654df7509 Mon Sep 17 00:00:00 2001 From: tye-exe Date: Mon, 23 Jun 2025 13:24:41 +0100 Subject: [PATCH 026/108] maintainers: add tye-exe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aaa1cf5ce742..5e3113de18a6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25910,6 +25910,12 @@ github = "TyberiusPrime"; githubId = 1257580; }; + tye-exe = { + name = "Tye"; + email = "nixpkgs-fr@tye-home.xyz"; + github = "tye-exe"; + githubId = 131195812; + }; Tygo-van-den-Hurk = { name = "Tygo van den Hurk"; github = "Tygo-van-den-Hurk"; From 2032774c51941c658f7ba13d4909a8358138dc77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jun 2025 14:50:36 +0200 Subject: [PATCH 027/108] python313Packages.openstackdocstheme: drop disabled It works just fine on 3.13 and upstream is just slow updating the metadata. --- pkgs/development/python-modules/openstackdocstheme/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 3674840098b6..b2bf0e31080f 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -5,7 +5,6 @@ dulwich, pbr, sphinx, - pythonAtLeast, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "3.5.0"; pyproject = true; - disabled = pythonAtLeast "3.13"; - src = fetchPypi { inherit pname version; hash = "sha256-3h1dXtIMk1/CgbUP30ppUo+Q8qdb7PQtGIRD9eGWwJ8="; From d449c9cae1dd42d95431dd7a204b98da831c2668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jun 2025 15:02:52 +0200 Subject: [PATCH 028/108] python313Packages.python-cinderclient: disable very sensitive test which failed due to a dependency update --- pkgs/development/python-modules/python-cinderclient/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index ca6110b77e87..57f7915e6316 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -76,6 +76,7 @@ buildPythonPackage rec { cinderclient.tests.unit.test_client.ClientTest.test_sessionclient_request_method_raises_badrequest cinderclient.tests.unit.test_client.ClientTest.test_sessionclient_request_method_raises_overlimit cinderclient.tests.unit.test_shell.ShellTest.test_password_prompted + cinderclient.tests.unit.test_shell.TestLoadVersionedActions.test_load_versioned_actions_with_help ") runHook postCheck From c4eb085322ba2935746d98b49e1c6556b5517d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jun 2025 15:19:45 +0200 Subject: [PATCH 029/108] treewide: bump openstack clis to python 3.13 --- pkgs/top-level/all-packages.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254403a5c8f0..44842812ab7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9207,21 +9207,21 @@ with pkgs; opencolorio = callPackage ../development/libraries/opencolorio { }; opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; - openstackclient = with python312Packages; toPythonApplication python-openstackclient; + openstackclient = with python313Packages; toPythonApplication python-openstackclient; openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: { dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli-plugins; }); - barbicanclient = with python312Packages; toPythonApplication python-barbicanclient; - glanceclient = with python312Packages; toPythonApplication python-glanceclient; - heatclient = with python312Packages; toPythonApplication python-heatclient; - ironicclient = with python312Packages; toPythonApplication python-ironicclient; - magnumclient = with python312Packages; toPythonApplication python-magnumclient; - manilaclient = with python312Packages; toPythonApplication python-manilaclient; - mistralclient = with python312Packages; toPythonApplication python-mistralclient; - swiftclient = with python312Packages; toPythonApplication python-swiftclient; - troveclient = with python312Packages; toPythonApplication python-troveclient; - watcherclient = with python312Packages; toPythonApplication python-watcherclient; - zunclient = with python312Packages; toPythonApplication python-zunclient; + barbicanclient = with python313Packages; toPythonApplication python-barbicanclient; + glanceclient = with python313Packages; toPythonApplication python-glanceclient; + heatclient = with python313Packages; toPythonApplication python-heatclient; + ironicclient = with python313Packages; toPythonApplication python-ironicclient; + magnumclient = with python313Packages; toPythonApplication python-magnumclient; + manilaclient = with python313Packages; toPythonApplication python-manilaclient; + mistralclient = with python313Packages; toPythonApplication python-mistralclient; + swiftclient = with python313Packages; toPythonApplication python-swiftclient; + troveclient = with python313Packages; toPythonApplication python-troveclient; + watcherclient = with python313Packages; toPythonApplication python-watcherclient; + zunclient = with python313Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; From 106ba85d7120eb4049b7764088e71fe38e5945d6 Mon Sep 17 00:00:00 2001 From: Jasi Date: Fri, 20 Jun 2025 18:15:58 -0400 Subject: [PATCH 030/108] gnome-decoder: overhaul derivation, move to pkgs/by-name --- .../gn/gnome-decoder/package.nix} | 59 ++++++++----------- pkgs/top-level/all-packages.nix | 10 ---- 2 files changed, 26 insertions(+), 43 deletions(-) rename pkgs/{applications/graphics/gnome-decoder/default.nix => by-name/gn/gnome-decoder/package.nix} (57%) diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/by-name/gn/gnome-decoder/package.nix similarity index 57% rename from pkgs/applications/graphics/gnome-decoder/default.nix rename to pkgs/by-name/gn/gnome-decoder/package.nix index 39e309b70e5f..3cbe50607d59 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/by-name/gn/gnome-decoder/package.nix @@ -1,6 +1,6 @@ { lib, - clangStdenv, + stdenv, fetchFromGitLab, rustPlatform, cargo, @@ -11,23 +11,17 @@ glib, gtk4, libadwaita, - zbar, sqlite, openssl, pipewire, - gstreamer, - gst-plugins-base, - gst-plugins-bad, - gst-plugins-good, - gst-plugins-rs, + gst_all_1, wrapGAppsHook4, appstream-glib, desktop-file-utils, - glycin-loaders, nix-update-script, }: -clangStdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-decoder"; version = "0.7.1"; @@ -35,28 +29,21 @@ clangStdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "decoder"; - rev = version; + tag = finalAttrs.version; hash = "sha256-lLZ8tll/R9cwk3t/MULmrR1KWZ1e+zneXL93035epPE="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg="; }; - preFixup = '' - gappsWrapperArgs+=( - # vp8enc preset - --prefix GST_PRESET_PATH : "${gst-plugins-good}/share/gstreamer-1.0/presets" - # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 - --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" - ) - ''; - nativeBuildInputs = [ meson ninja pkg-config + glib + gtk4 wrapGAppsHook4 appstream-glib desktop-file-utils @@ -70,28 +57,34 @@ clangStdenv.mkDerivation rec { glib gtk4 libadwaita - zbar sqlite openssl pipewire - gstreamer - gst-plugins-base - gst-plugins-bad - gst-plugins-good - gst-plugins-rs # for gtk4paintablesink + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-rs # for gtk4paintablesink ]; + # Adds vp8enc preset for camera enablement + preFixup = '' + gappsWrapperArgs+=( + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + ) + ''; + passthru = { updateScript = nix-update-script { }; }; - meta = with lib; { - description = "Scan and Generate QR Codes"; + meta = { + description = "Scan and generate QR codes"; homepage = "https://gitlab.gnome.org/World/decoder"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ zendo ]; mainProgram = "decoder"; - maintainers = with maintainers; [ zendo ]; - teams = [ teams.gnome-circle ]; + platforms = lib.platforms.linux; + teams = [ lib.teams.gnome-circle ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a75e8be6dc84..031eb64d5498 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3082,16 +3082,6 @@ with pkgs; ; }; - gnome-decoder = callPackage ../applications/graphics/gnome-decoder { - inherit (gst_all_1) - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-rs - ; - gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; }; - }; - gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { }; dapl = callPackage ../development/interpreters/dzaima-apl { From 5ad67720a03253093e0d1210e8340cf7bc5f6a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Jun 2025 19:59:57 +0200 Subject: [PATCH 031/108] python313Packages.oslo-log: ignore some new test failures, remove one no longer relevant one --- pkgs/development/python-modules/oslo-log/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 936af70c2e87..80af01d323e0 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -69,8 +69,9 @@ buildPythonPackage rec { disabledTests = [ # not compatible with sandbox "test_logging_handle_error" - # File which is used doesn't seem not to be present - "test_log_config_append_invalid" + # Incompatible Exception Representation, displaying natively + "test_rate_limit" + "test_rate_limit_except_level" ]; pythonImportsCheck = [ "oslo_log" ]; From 777f8cb818bc8d3f80b191cd32c7170208a39d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Jun 2025 20:40:12 +0200 Subject: [PATCH 032/108] python313Packages.python-glanceclient: add more failed tests --- .../python-modules/python-glanceclient/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 209f587f8b9d..ae5626100717 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -24,8 +24,8 @@ let pname = "python-glanceclient"; version = "4.8.0"; - # Skip tests which require networking. disabledTests = [ + # Skip tests which require networking. "test_http_chunked_response" "test_v1_download_has_no_stray_output_to_stdout" "test_v2_requests_valid_cert_verification" @@ -40,6 +40,9 @@ let "test_v2_requests_valid_cert_no_key" "test_v2_requests_valid_cert_verification_no_compression" "test_log_request_id_once" + # asserts exact amount of mock calls + "test_cache_schemas_gets_when_forced" + "test_cache_schemas_gets_when_not_exists" ]; in buildPythonPackage { From d5deebda5a334245ec856544cbc88bae4355b58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Jun 2025 20:52:20 +0200 Subject: [PATCH 033/108] kolla: ignore test which failed because of an additional close syscall --- pkgs/by-name/ko/kolla/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index 975d44e5bce9..3c7698f87554 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { # Tests output a few exceptions but still succeed checkPhase = '' runHook preCheck - stestr run + stestr run -e <(echo "test_load_ok") runHook postCheck ''; From 1c8d13d3657feb25c98cc195df8ace6497d76379 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jun 2025 23:51:17 +0000 Subject: [PATCH 034/108] xivlauncher: 1.1.2 -> 1.2.0 --- pkgs/by-name/xi/xivlauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix index 55b48ef9f862..a537f9383d69 100644 --- a/pkgs/by-name/xi/xivlauncher/package.nix +++ b/pkgs/by-name/xi/xivlauncher/package.nix @@ -17,7 +17,7 @@ }: let - rev = "1.1.2"; + rev = "1.2.0"; in buildDotnetModule rec { pname = "XIVLauncher"; @@ -27,7 +27,7 @@ buildDotnetModule rec { owner = "goatcorp"; repo = "XIVLauncher.Core"; inherit rev; - hash = "sha256-QkA18C3oWxcW0vK6sji7vbm4bY5LxwIWierAg5qf38Q="; + hash = "sha256-2ZL3giUrc4mUNh8rr+yI+k2Sx5rZsoFGR1ZBlTugH6M="; fetchSubmodules = true; }; From 46e2dac3a50d2ee072a6174efc179d310d37d5ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jun 2025 01:56:09 +0000 Subject: [PATCH 035/108] zoom-us: 6.4.13.2309 -> 6.5.1.2550 --- pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 1ba939715d19..01f53aad60c8 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -61,23 +61,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.4.12.56699"; - versions.x86_64-darwin = "6.4.12.56699"; - versions.x86_64-linux = "6.4.13.2309"; + versions.aarch64-darwin = "6.5.1.58208"; + versions.x86_64-darwin = "6.5.1.58208"; + versions.x86_64-linux = "6.5.1.2550"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-rsO4HAvA6hCiGDBuLQj/qYWHR6Dlo+G9rkfhxvKBp4g="; + hash = "sha256-hIYZ2OU5lww4MyRZOhcV4qQDGEN8Hdolw6a4g/ItcFQ="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-MZ5dPHKH1uQuFA8Vej8Hh4CFZAjJFZe04le+e4LPDJc="; + hash = "sha256-t/xIrVfjAl6dM9RWa+imyFHqS2KIJsKnoU0fiDQL9dQ="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-gBUpsIUcsn+5u/1CchuS9mggnAFD8VW5J4RBv0Ziu+Y="; + hash = "sha256-1YcbAlnUEk9R95r7RIuxAxNfRymdIOAjKkCw7a+1Lm4="; }; }; From c4f7b48d2c55b11ff042dd7dfb0a5bbfc240d27c Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Wed, 18 Jun 2025 10:08:36 +0000 Subject: [PATCH 036/108] pdqsort: init at unstable-2021-03-14 Co-authored-by: Alexander Bantyev Co-authored-by: kirillrdy --- pkgs/by-name/pd/pdqsort/package.nix | 49 +++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/pd/pdqsort/package.nix diff --git a/pkgs/by-name/pd/pdqsort/package.nix b/pkgs/by-name/pd/pdqsort/package.nix new file mode 100644 index 000000000000..edb7c7a429d2 --- /dev/null +++ b/pkgs/by-name/pd/pdqsort/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenvNoCC, + stdenv, # for tests + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "pdqsort"; + version = "0-unstable-2021-03-14"; + + src = fetchFromGitHub { + owner = "orlp"; + repo = "pdqsort"; + rev = "b1ef26a55cdb60d236a5cb199c4234c704f46726"; + hash = "sha256-xn3Jjn/jxJBckpg1Tx3HHVAWYPVTFMiDFiYgB2WX7Sc="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -r *.h $out/include/ + + runHook postInstall + ''; + + # The benchmark takes too long to run as a regular checkPhase here. + passthru.tests.bench = stdenv.mkDerivation { + pname = "pdqsort-bench"; + + inherit (finalAttrs) version src; + + doCheck = true; + checkPhase = '' + c++ bench/bench.cpp -o bench/bench + ./bench/bench > $out + ''; + + meta.platforms = lib.platforms.x86_64; + }; + + meta = { + description = "Novel sorting algorithm that combines the fast average case of randomized quicksort with the fast worst case of heapsort"; + homepage = "https://github.com/orlp/pdqsort"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ jherland ]; + }; +}) From 2ecb2c1a3d2f9885de33597903a90aab7b7a8411 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Wed, 28 May 2025 22:43:03 +0200 Subject: [PATCH 037/108] linuxKernel.packages.vmware: workstation-17.6.3 -> workstation-17.6.3-20250608 --- pkgs/os-specific/linux/vmware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index 0bd39ad880f3..d7c15dad2f7a 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "vmware-modules"; - version = "workstation-17.6.3-${kernel.version}"; + version = "workstation-17.6.3-20250608-${kernel.version}"; src = fetchFromGitHub { owner = "philipl"; repo = "vmware-host-modules"; - tag = "w17.6.3"; - hash = "sha256-n9aLpHcO7m51eRtcWWBfTpze0JIWvne+UcYACoA5afc="; + rev = "e08764f84df3bd14407291e02346b7c5c54d0bf6"; + hash = "sha256-RDVKropC+VOv1uJijOGlLt6iqZI8Cm9aWlbmvZj2CSk="; }; hardeningDisable = [ "pic" ]; From ed549950d6639004c4399be708c6011f123e09a7 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Thu, 29 May 2025 18:48:09 +0200 Subject: [PATCH 038/108] linuxKernel.packages.vmware: remove usage of with lib; --- pkgs/os-specific/linux/vmware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index d7c15dad2f7a..c434c6528589 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/misc" ''; - meta = with lib; { + meta = { description = "Kernel modules needed for VMware hypervisor"; homepage = "https://github.com/mkubecek/vmware-host-modules"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; platforms = [ "x86_64-linux" ]; broken = (kernel.kernelOlder "5.5" && kernel.isHardened); - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ deinferno vifino ]; From c4f9164d904ed9af6d2a9df97250136b92ddd38f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jun 2025 13:02:34 +0000 Subject: [PATCH 039/108] sentry-native: 0.9.0 -> 0.9.1 --- pkgs/by-name/se/sentry-native/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index fb05a18ce865..8ae15d686976 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-PFWCC0eaHnwRZ+i2n0O17kTg9jXlgIuzgTB53Dn40iQ="; + hash = "sha256-jB744MO5GaZMQWIToyv1g4WzVu99qt/Cx0shvK7SW/c="; }; nativeBuildInputs = [ From b05f5052a9fc4607958df802646b789bc038eed2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jun 2025 13:58:04 +0000 Subject: [PATCH 040/108] kubectl-view-allocations: 0.22.0 -> 0.22.1 --- .../networking/cluster/kubectl-view-allocations/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 4b0d2eaea476..bb29c098eb2a 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "kubectl-view-allocations"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "davidB"; repo = "kubectl-view-allocations"; tag = version; - hash = "sha256-MwTncyfR6knXss83sd3u879YRFUxWdDyNLpQO40sZ9c="; + hash = "sha256-6kHeILapewfyJjp5Xtq0rK5eHf8jymvc5xFGW8Qi9VU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bbNjOMShJMCWEcxU8F+R1BC6fqlLe2AK0y3N00HXjts="; + cargoHash = "sha256-evxwaZkToAjVvrnvOmz3HpOi+976sxPCOIlR8rmpYyo="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 6f87f7a4e067267727b2435139cac8cb935449d0 Mon Sep 17 00:00:00 2001 From: Mohamed Gaber Date: Sat, 21 Jun 2025 18:03:26 +0300 Subject: [PATCH 041/108] python3Packages.pyglet: add darwin support --- .../python-modules/pyglet/default.nix | 46 +++++++++++++++---- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 5491f4941941..9948a21bdec6 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -19,6 +19,7 @@ libpulseaudio, harfbuzz, mesa, + apple-sdk, }: buildPythonPackage rec { @@ -41,7 +42,7 @@ buildPythonPackage rec { let ext = stdenv.hostPlatform.extensions.sharedLibrary; in - '' + lib.optionalString stdenv.isLinux '' cat > pyglet/lib.py < pyglet/lib.py < Date: Wed, 25 Jun 2025 16:13:52 -0400 Subject: [PATCH 042/108] speakersafetyd: add normalcea as maintainer --- pkgs/by-name/sp/speakersafetyd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 51f02ac93fa1..6507c7755fee 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "speakersafetyd"; homepage = "https://github.com/AsahiLinux/speakersafetyd"; maintainers = with maintainers; [ + normalcea flokli yuka ]; From 2cc2c81634c2a928feace85e05fac7aae613a727 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jun 2025 22:46:42 +0000 Subject: [PATCH 043/108] particle-cli: 3.36.2 -> 3.37.0 --- pkgs/by-name/pa/particle-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix index e5329dae7b5c..96328296a55d 100644 --- a/pkgs/by-name/pa/particle-cli/package.nix +++ b/pkgs/by-name/pa/particle-cli/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "particle-cli"; - version = "3.36.2"; + version = "3.37.0"; src = fetchFromGitHub { owner = "particle-iot"; repo = "particle-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-KLcQmbIuhp71dpJttKA0tWAn2Qf+zl6njBypFkaLmzE="; + hash = "sha256-TMyXCTyihUBP2emY0UzedHAsO945eWJ7w7relP7wBaU="; }; - npmDepsHash = "sha256-oQch+7hH+URMI15YOA3iz4FVPwckJ3K/DOC1PfrA2dU="; + npmDepsHash = "sha256-4PeHMhzcCcXFNV0cS0JVAvpkMyo2w6RDmlIO2/MRy8k="; buildInputs = [ udev From 989aa4f6481e1475a2d3e971f094da8dae78fa00 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:32:01 +0800 Subject: [PATCH 044/108] waagent: pin to python312 due to removal of crypt.crypt --- pkgs/by-name/wa/waagent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index 1e716da55009..ec22ad201ef1 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -2,7 +2,7 @@ coreutils, fetchFromGitHub, lib, - python3, + python312, bash, openssl, nixosTests, @@ -10,7 +10,7 @@ }: let - python = python3; + python = python312; in python.pkgs.buildPythonApplication rec { From c6dff2f8d18ea19ec8cdc85458876253e767b7c3 Mon Sep 17 00:00:00 2001 From: ryota2357 Date: Fri, 20 Jun 2025 15:18:40 +0900 Subject: [PATCH 045/108] vscode-json-languageserver: migrate from nodePackages --- .../vs/vscode-json-languageserver/package.nix | 40 +++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 50 ------------------- 5 files changed, 41 insertions(+), 52 deletions(-) create mode 100644 pkgs/by-name/vs/vscode-json-languageserver/package.nix diff --git a/pkgs/by-name/vs/vscode-json-languageserver/package.nix b/pkgs/by-name/vs/vscode-json-languageserver/package.nix new file mode 100644 index 000000000000..c5ec7f4543d1 --- /dev/null +++ b/pkgs/by-name/vs/vscode-json-languageserver/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + typescript, +}: + +buildNpmPackage (finalAttrs: { + pname = "vscode-json-languageserver"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vscode"; + tag = "1.101.2"; + hash = "sha256-wdI6VlJ4WoSNnwgkb6dkVYcq/P/yzflv5mE9PuYBVx4="; + }; + + sourceRoot = "${finalAttrs.src.name}/extensions/json-language-features/server"; + + npmDepsHash = "sha256-akQukdYTe6um4xo+7T3wHxx+WrXfKYl5a1qwmqX72HQ="; + + nativeBuildInputs = [ typescript ]; + + buildPhase = '' + runHook preBuild + tsc -p . + runHook postBuild + ''; + + dontNpmBuild = true; + + meta = { + description = "JSON language server"; + homepage = "https://github.com/microsoft/vscode/tree/${finalAttrs.src.tag}/extensions/json-language-features/server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ryota2357 ]; + mainProgram = "vscode-json-languageserver"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ba6dfefea5e3..80024647fc3f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -274,6 +274,7 @@ mapAliases { inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30 vscode-css-languageserver-bin = throw "vscode-css-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 + inherit (pkgs) vscode-json-languageserver; # added 2025-06-19 vscode-json-languageserver-bin = throw "vscode-json-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 vue-language-server = self.vls; # added 2023-08-20 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 1b6c38274635..4f92b30cd720 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -40,5 +40,4 @@ purs-tidy = "purs-tidy"; purty = "purty"; pscid = "pscid"; - vscode-json-languageserver = "vscode-json-languageserver"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 41242fb15fe3..a2ad4054fe62 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -154,7 +154,6 @@ , "vega-cli" , "vega-lite" , "vercel" -, "vscode-json-languageserver" , "wavedrom-cli" , "webpack" , "wring" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3c2e8a7cd7d9..ae9a5b68fc00 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -63785,56 +63785,6 @@ in bypassCache = true; reconstructLock = true; }; - vscode-json-languageserver = nodeEnv.buildNodePackage { - name = "vscode-json-languageserver"; - packageName = "vscode-json-languageserver"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageserver/-/vscode-json-languageserver-1.3.4.tgz"; - sha512 = "+ghebnslXk6fVDySBrT0BVqozLDdmKY/qxgkDD4JtOQcU2vXc3e7jh7YyMxvuvE93E9OLvBqUrvajttj8xf3BA=="; - }; - dependencies = [ - sources."agent-base-4.3.0" - sources."debug-3.1.0" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-2.2.4" - sources."jsonc-parser-3.3.1" - sources."ms-2.0.0" - sources."request-light-0.4.0" - ( - sources."vscode-json-languageservice-4.2.1" - // { - dependencies = [ - sources."vscode-nls-5.2.0" - ]; - } - ) - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - ( - sources."vscode-languageserver-protocol-3.16.0" - // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0" - ]; - } - ) - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-nls-4.1.2" - sources."vscode-uri-3.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON language server"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; From 0af8fecc28c789bed854ad576d2759cd4985766b Mon Sep 17 00:00:00 2001 From: ryota2357 Date: Thu, 26 Jun 2025 10:06:10 +0900 Subject: [PATCH 046/108] vscode-json-languageserver: add `vscode-json-language-server` symblink for compatibility --- pkgs/by-name/vs/vscode-json-languageserver/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/vs/vscode-json-languageserver/package.nix b/pkgs/by-name/vs/vscode-json-languageserver/package.nix index c5ec7f4543d1..1a524fdc3188 100644 --- a/pkgs/by-name/vs/vscode-json-languageserver/package.nix +++ b/pkgs/by-name/vs/vscode-json-languageserver/package.nix @@ -30,6 +30,10 @@ buildNpmPackage (finalAttrs: { dontNpmBuild = true; + postInstall = '' + ln -s $out/bin/vscode-json-languageserver $out/bin/vscode-json-language-server + ''; + meta = { description = "JSON language server"; homepage = "https://github.com/microsoft/vscode/tree/${finalAttrs.src.tag}/extensions/json-language-features/server"; From 6426fc771fd199a2044384bc706d9c16a853ebf6 Mon Sep 17 00:00:00 2001 From: "John D. Boy" <2187261+jboynyc@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:17:20 +0200 Subject: [PATCH 047/108] python3Packages.iplotx: init at 0.3.1 --- .../python-modules/iplotx/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/iplotx/default.nix diff --git a/pkgs/development/python-modules/iplotx/default.nix b/pkgs/development/python-modules/iplotx/default.nix new file mode 100644 index 000000000000..a4d0ae442fd2 --- /dev/null +++ b/pkgs/development/python-modules/iplotx/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + igraph, + matplotlib, + networkx, + numpy, + pandas, + pylint, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "iplotx"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fabilab"; + repo = "iplotx"; + tag = version; + hash = "sha256-3Nn/sz1yUaxhGFr0hMGoLEBF5pNs+tz/KpsGtKkYujo="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + matplotlib + numpy + pandas + pylint + ]; + + pythonRelaxDeps = [ "pylint" ]; + + optional-dependencies = { + igraph = [ igraph ]; + networkx = [ networkx ]; + }; + + postPatch = '' + # silence matplotlib warning + export MPLCONFIGDIR=$(mktemp -d) + ''; + + # These four tests result in an ImageComparisonFailure + disabledTests = [ + "test_labels" + "test_complex" + "test_display_shortest_path" + "test_labels_and_colors" + ]; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + + pythonImportsCheck = [ "iplotx" ]; + + meta = { + description = "Plot networkx from igraph and networkx"; + homepage = "https://iplotx.readthedocs.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7aaf06856b21..c02e9c7755d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6732,6 +6732,8 @@ self: super: with self; { ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { }; + iplotx = callPackage ../development/python-modules/iplotx { }; + iptools = callPackage ../development/python-modules/iptools { }; ipwhl = callPackage ../development/python-modules/ipwhl { }; From 8eba83d9fb43fa9ea1a3a9779fac807e57c3f854 Mon Sep 17 00:00:00 2001 From: octvs Date: Thu, 26 Jun 2025 12:09:09 +0200 Subject: [PATCH 048/108] pdfarranger: 1.12.0 -> 1.12.1 Fixes upstream bug [1]. [1]: https://github.com/pdfarranger/pdfarranger/issues/1238 --- pkgs/by-name/pd/pdfarranger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix index d9a0f67ea140..c623e6181f70 100644 --- a/pkgs/by-name/pd/pdfarranger/package.nix +++ b/pkgs/by-name/pd/pdfarranger/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.12.0"; + version = "1.12.1"; pyproject = true; src = fetchFromGitHub { owner = "pdfarranger"; repo = "pdfarranger"; tag = version; - hash = "sha256-//JjIPDeyI+JZoFT2GU+wCP+tkKCchgS9ftMT5rUEOM="; + hash = "sha256-of1itPubf6LBJ4rSh1bca3yoNTiz5Qt9ar9XDe4nhxI="; }; nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; From 6a0c56246ea220a815c5af378f78b4078a52198a Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 26 Jun 2025 15:10:35 +0200 Subject: [PATCH 049/108] readest: 0.9.60 -> 0.9.61 Changelog: https://github.com/readest/readest/releases/tag/v0.9.61 Diff: https://github.com/readest/readest/compare/v0.9.60...v0.9.61 --- pkgs/by-name/re/readest/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 1ffd33d7a3f0..c923cc266e8e 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.60"; + version = "0.9.61"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-CEY3q9IT2miEO5Q77Mw2BkiyUWuImmCtDrVyjK6HApo="; + hash = "sha256-vtswHOG3/9oao+KrHWJi3NLsFghczmyLfT276kq5Llg="; fetchSubmodules = true; }; @@ -39,14 +39,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-Tt1Gm/tlxceQnTd6eStgwboHCDetXdUNtdDShHmB5+M="; + hash = "sha256-9YG0l/cIjk5imkoly/pNmTVN7N+K56tpWnD7HDFSqiw="; }; pnpmRoot = "../.."; useFetchCargoVendor = true; - cargoHash = "sha256-9y/ZR+vbjp56F/EuX7tAp3W1/jwFLYlnBKfyLNx0/Qg="; + cargoHash = "sha256-35REIeZy/D9UWzSI6yQZc1MRYwlAnjzsk5T7KOAhWVw="; cargoRoot = "../.."; From 447a7f316c66879b4dcf43387a4cad3ec715840a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jun 2025 15:05:28 +0000 Subject: [PATCH 050/108] updatecli: 0.101.0 -> 0.102.0 --- pkgs/by-name/up/updatecli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 75c3c39cef72..86a8a8f85196 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.101.0"; + version = "0.102.0"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-anuP3od1cuuB9Y5wUn8CldvMZZFfD9ISyIma97oksjo="; + hash = "sha256-ek8kJAGf51NZ4YOexwOovgIQ9I0WfQDk0KWIJsZRKQk="; }; - vendorHash = "sha256-J8D02rkh+NJJQvk9ORV6WwoWtTKfbLtiL1bAZRVhLnI="; + vendorHash = "sha256-gL2ZukNJROEQc0fv0k/XIvpnHmGywCgRgfKCPcP01Hg="; # tests require network access doCheck = false; From 1666a75a3fa7973cfce6ed101eac8b4d85ede4d9 Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Thu, 26 Jun 2025 18:43:58 +0300 Subject: [PATCH 051/108] pulumi-bin: 3.178.0 -> 3.180.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 130 +++++++++++++-------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 4484a6b01960..f753fd519130 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.178.0"; + version = "3.180.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.178.0-linux-x64.tar.gz"; - sha256 = "0rdsk0qfjw15528532d26c0qb6y1lw25wk6m24k64wmg4jd3lvaq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.180.0-linux-x64.tar.gz"; + sha256 = "134f249939fnn0mspcklqp5rjwr5wb20aa9rsq2zwycvc442wyd2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-linux-amd64.tar.gz"; - sha256 = "0zmylykkr6gfyr9zvi29qn753kn7927y2zwy5781jgidqz2srxqx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-linux-amd64.tar.gz"; + sha256 = "0g0aga1h6g64bw6k5nsgfgh8xdj0h8710pbbhkawjsa1ip731nb4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.1-linux-amd64.tar.gz"; sha256 = "01l92v18irhgwf84i67052jwibhysrjaxwj5gcmgdgjvgy0wdv36"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.80.0-linux-amd64.tar.gz"; - sha256 = "0gwq1gay1x9r6rahdj74xnird7yb777candnpmdbxz9nz3h0dxj6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.81.0-linux-amd64.tar.gz"; + sha256 = "1p1851g9bwg8aj1n1xifyipgk0bzf538yz8x6pz7ghy4wbd12d35"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-linux-amd64.tar.gz"; @@ -49,8 +49,8 @@ sha256 = "02kmnjsrb9n1fgimlhhifvgpjsyl8lia03dvfkgxmylsnvxykval"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-amd64.tar.gz"; - sha256 = "00dqvfk0wiyhxcnx2id19ffi6x6bf0fkbas73axw728g8wc2hr3w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.0-linux-amd64.tar.gz"; + sha256 = "17gpdyk3lb6js6b5x7dhzppzk1xab7rp7kcapmxjpjvmfbcgqbbj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.51.0-linux-amd64.tar.gz"; @@ -97,8 +97,8 @@ sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-linux-amd64.tar.gz"; - sha256 = "1gvhsmf6avr3d9c3byr4drmf5jzarrzi3cr333l7hf81arsvpbjm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-linux-amd64.tar.gz"; + sha256 = "1v3bmv9b4mh2r71yk5aqgbs4lwd45v8x4m3ryvrd5556rkqrbvqv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-linux-amd64.tar.gz"; @@ -121,12 +121,12 @@ sha256 = "0izzpyjizzz4hlv6rnz3l8f4lgyfgxkf67hrxn6ph8zhzs3cgvh4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.0.0-linux-amd64.tar.gz"; - sha256 = "01jvvnbgaghvrsvj4cwssza1588ga0ibsy0wvwav42ylkycf4ra9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.1.0-linux-amd64.tar.gz"; + sha256 = "1xc9cvhd348m2v1l91mrj3n9sb6l3ysqzaxqk0x0db2md5h45kss"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.0-linux-amd64.tar.gz"; - sha256 = "08gqs07dnwwpx7hs846gfh1p38ypwshrkn1yp73f4s8zlhgjafkc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.1-linux-amd64.tar.gz"; + sha256 = "0zcnz6ad0v051za8aj2z2lp9qlp8fn65p5civymbl3j1gmwffskv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -145,8 +145,8 @@ sha256 = "15p2wc0dipgqwj9qdsl6420bxx61vmmfbz487yk74kw7vp3kpr36"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.2-linux-amd64.tar.gz"; - sha256 = "0b8h8lvvfl8j3imbmcxfs5rfnqz6k19104mhfacd323bg3qhqa8r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.3-linux-amd64.tar.gz"; + sha256 = "1967nb77jj8cipp6sr6f5ij5ld1bvylrbyjmmg58c0lgmadjj64a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.14.0-linux-amd64.tar.gz"; @@ -163,20 +163,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.178.0-darwin-x64.tar.gz"; - sha256 = "1cs1ppkpggh9kg0n2c6gqjsfhr0b37729942wac5yfvdpz8hhfh5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.180.0-darwin-x64.tar.gz"; + sha256 = "0wi8dy8ysy03r5a1gd7dw1wmavsfc97ygf5iczvrkk8pkp9dpf27"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-darwin-amd64.tar.gz"; - sha256 = "14z6lbqfzx1qg2m7cmk5fax6gxnqchm6pqkjrkwkz1z9ai5wsig7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-darwin-amd64.tar.gz"; + sha256 = "0gjh1jjcqpck16aji2x3k943yfc8dm5zcd0hxq6218r0s7n7idlc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.1-darwin-amd64.tar.gz"; sha256 = "0n30mk2b30ijcl6ij8jb7ch3snff1mqqja841c9s78jm43bs2k7d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.80.0-darwin-amd64.tar.gz"; - sha256 = "1pagxjn52h2fqvvfdq0h3xhj6jyb29z7aifad6rbsf109mcsm3mn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.81.0-darwin-amd64.tar.gz"; + sha256 = "13i1cicw30qca3vadrj0a6bwcbwg82h2i9giimnmarjdp5y8ifzp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-darwin-amd64.tar.gz"; @@ -207,8 +207,8 @@ sha256 = "1yc2ywwp17l4zyf62j7brg449k22p6qfa8z3d7p889zdwdid28ni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-amd64.tar.gz"; - sha256 = "1s6wdfa3la99xrb4pidsisimgs85v5kak3b9dwq9fg22qnpm5abd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.0-darwin-amd64.tar.gz"; + sha256 = "0yxaq32jr8y8da3b252fkwh9lhb4jah96zryzqprlgh0jxa4nbcl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.51.0-darwin-amd64.tar.gz"; @@ -255,8 +255,8 @@ sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-darwin-amd64.tar.gz"; - sha256 = "1mxlvp95fq1hqiw7b9lxsfa518hqlx263w1kblp2nnbvjrvhpnl7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "15n49pp5yby5g90laf56iygc8kizdj4cg4pbkjvp2fq848jw589p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-darwin-amd64.tar.gz"; @@ -279,12 +279,12 @@ sha256 = "1yj0ciikakxmnrv9dwplp31dcldb4s7asnhg2603zh8wip8ggya2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.0.0-darwin-amd64.tar.gz"; - sha256 = "09jwrr2mmhrdg3m5in8rqp16xi1657f1rzfy23qc6d184f08bn3v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.1.0-darwin-amd64.tar.gz"; + sha256 = "1n4gydqdyzg2340rn691slrxc2wqd48bdnmmawlhsampn8sbyhna"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.0-darwin-amd64.tar.gz"; - sha256 = "06mhxbxisy6chfmvx6cdhw2sl09hiwvb7rajnicxrc35w30mfch8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.1-darwin-amd64.tar.gz"; + sha256 = "1zf9gg9sccjvkda0l5y8lks0nz9znm492997gy2f9zw85whbkhj9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -303,8 +303,8 @@ sha256 = "0713smrbcanza4qw79bm5wzq8whc5rx5d8zkwzg38pb4nzh2nxzj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.2-darwin-amd64.tar.gz"; - sha256 = "0rxn7ibdrb7ir5ybdx9ndjgw8yqfpcrn6gzcjrlk5zr427xbiww6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.3-darwin-amd64.tar.gz"; + sha256 = "1b7b316ajw04i78vyd5wy2f63fidp70h8wv840qlkbnvn3lbzrj4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.14.0-darwin-amd64.tar.gz"; @@ -321,20 +321,20 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.178.0-linux-arm64.tar.gz"; - sha256 = "011s13lfdzgkgdppgq4n0rpkgjlh7f2zywabpv08v9b4k68n3kli"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.180.0-linux-arm64.tar.gz"; + sha256 = "12p5pnps7kw4h1qgi4ll0by7a2jwbdj0d4c8slw075ch5znv9lwz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-linux-arm64.tar.gz"; - sha256 = "1z72zkrpa0mz15q22r7vrkgb5yy8nfs6pp74flvr0alf4119gi49"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-linux-arm64.tar.gz"; + sha256 = "0jk30rylivv3b2qwsmn1ll76391g41yxs2mmq12fz8jjw4afpnka"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.1-linux-arm64.tar.gz"; sha256 = "0bxgmbqgxhya2vndq3ahn50z1bp9isjlzxr4lb8clnp28dsixd2p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.80.0-linux-arm64.tar.gz"; - sha256 = "1kl2kwid4n15hr4g4pnw2jvi4226xslkl0fi8kz1wijn9j112a7b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.81.0-linux-arm64.tar.gz"; + sha256 = "0nhwqdabdf7cf3qlbssfmihg9y9pcygh1qpy1l8sjc1j1nx1hmxc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-linux-arm64.tar.gz"; @@ -365,8 +365,8 @@ sha256 = "1rj3bndkcwxvc6jhldxm2y1ij3xsfgwmfkgs9615ccrikzkj4hrn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-arm64.tar.gz"; - sha256 = "0y1pq89yrflj3vc3d87vkl4xzsa3pszq1sxiajaanbha6apvyni9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.0-linux-arm64.tar.gz"; + sha256 = "1hybm4d3hcp977j0wb4bwl5ndl72cix7b2arw755xd7qw6xxvyrk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.51.0-linux-arm64.tar.gz"; @@ -413,8 +413,8 @@ sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-linux-arm64.tar.gz"; - sha256 = "13s9bfybmbzkrpydjmpbnhwaxyyzz1zcfa512iwbmp3d3hpyw58g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-linux-arm64.tar.gz"; + sha256 = "1bj42skxchbxsvksp3d58bnzmimjilr8znscl6dyy099kshr2g1b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-linux-arm64.tar.gz"; @@ -437,12 +437,12 @@ sha256 = "1dwmbcg3i02nn1nfg7z4vx4622vpyzk9c1mgrishvv6mvm037fb1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.0.0-linux-arm64.tar.gz"; - sha256 = "0y5f0avqkrh0q0lji8kpwfjy65rmn5l62a5xmfmm9ldg9rx5xjym"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.1.0-linux-arm64.tar.gz"; + sha256 = "02nm78sm1s3b7n800vjilazscm299vn7nvm76157rj9mxp0x5sn4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.0-linux-arm64.tar.gz"; - sha256 = "0zgc0phv65dfy9wwl2ll197dyd33d22zkv98b1ijg6cqzlc63ach"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.1-linux-arm64.tar.gz"; + sha256 = "0l5cvk9nlzddn260b0dcsvj130d95xjxwrnw89v1x9y3jb00015h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -461,8 +461,8 @@ sha256 = "0mi3ic4pqdk7n69y1j18ysk73273c760x5gn62xgc86d09ra4agn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.2-linux-arm64.tar.gz"; - sha256 = "1hdvlfvgzac7vz7ym59xsfdmxwl9r010d6lib7z22q18a3yqhhyh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.3-linux-arm64.tar.gz"; + sha256 = "1ix2ga8ns3x0l86pp30fxprx2j86ba84x0c14sfz79sr5dncbdqf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.14.0-linux-arm64.tar.gz"; @@ -479,20 +479,20 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.178.0-darwin-arm64.tar.gz"; - sha256 = "13yr7sf0hspkzcazlh7vm443wqb9d72pk9q7qgyzx0xnjz663yrd"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.180.0-darwin-arm64.tar.gz"; + sha256 = "064sghyfqk2kyq5sqz2qm2zjjskhz321qniwqx16zmbylc8dqmf6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-darwin-arm64.tar.gz"; - sha256 = "0mbyiyasc6z4acyh6a29xbxd269pdbinarxi4g4czvvg2vd76fi1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-darwin-arm64.tar.gz"; + sha256 = "0imd0hcbnv1dkfh9s8vjm5msivpg94jc57a79qvbiyx82fyhx9dd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.1-darwin-arm64.tar.gz"; sha256 = "0210jy7sqwrq861g8ryrmdd5mm5cy5hj8w3f8dmw7ls4ys2a3j0y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.80.0-darwin-arm64.tar.gz"; - sha256 = "1dnkhj4b7v7cncxbj5f4q5rb4rhzpcr0rdn0h2y72rwrgr88mfhh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.81.0-darwin-arm64.tar.gz"; + sha256 = "1dp5333ddwc4x2jpbb54l2p38jwal0qmnhal8gk6ga8mj0xvzw1q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-darwin-arm64.tar.gz"; @@ -523,8 +523,8 @@ sha256 = "02adgrjsa8xg88p5ad7789i1lzqmw2pl70fzakpj6rlkqa98fl33"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-arm64.tar.gz"; - sha256 = "1n7bmr5pg40db0p53dwp12zb4iksf9sqvv5a5q7wj3dxhc1cgx31"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.0-darwin-arm64.tar.gz"; + sha256 = "1w1xhhrhw0l7442s88h5hs9qzm8k0ihm41mgzz2s3843gqpq9ay7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.51.0-darwin-arm64.tar.gz"; @@ -571,8 +571,8 @@ sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-darwin-arm64.tar.gz"; - sha256 = "1zrqg24vpkrdz1ji43idb7jxc0vkqbsdl3rxvfwip2fvkh7c7pzi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "17fzb6mxbkvq0yzdd3nxsq4cc8llbwnib9djpj51h2b5qkqvr3ri"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-darwin-arm64.tar.gz"; @@ -595,12 +595,12 @@ sha256 = "0iikysfqf03pm7mrg383nisgh5v01bxjvxyhl2cg8bj8nsjr4s2h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.0.0-darwin-arm64.tar.gz"; - sha256 = "1pxyws6w1ps6fg1a01yfgms5pr2m55hy7q427m0m4ihsf3320256"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.1.0-darwin-arm64.tar.gz"; + sha256 = "0ly6ylmxkcf6payrpx9gfykpw84ifiznd1f2i2csi48gl8d0hxff"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.0-darwin-arm64.tar.gz"; - sha256 = "1bnajwz0q891c343qbipqvw4xwd8r658cbfivjhmydf93xv2yhdh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.120.1-darwin-arm64.tar.gz"; + sha256 = "0hzqlak1xqw2fkp1apzkdrmb690bxb7kaigbd5b1rp1ql48fyydx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; @@ -619,8 +619,8 @@ sha256 = "07xa21aiw8jgn4wwhwzgwrcn5qhd3j0pa515dh3x3xxhfcy1pl5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.2-darwin-arm64.tar.gz"; - sha256 = "1gs9pjq7d675qz2lblfcq8gziricmch0p5fl4g1zarmn5hpwqk87"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.3-darwin-arm64.tar.gz"; + sha256 = "0kr79wzzvg8mr2yn7qxmnbybg67zc2hiln52p2k9f47fzi2d7lcp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.14.0-darwin-arm64.tar.gz"; From 4b184070a08307e3d5d52d30811561816c6d5220 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jun 2025 17:02:20 +0000 Subject: [PATCH 052/108] vscode-extensions.prisma.prisma: 6.10.0 -> 6.10.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a49e5962bce9..06d98f98b5c2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3948,8 +3948,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "6.10.0"; - hash = "sha256-+oYDEbDMltGhyjtyCJcDaR074SzVWW48vzoOlxklojU="; + version = "6.10.1"; + hash = "sha256-3Qx5HAkRnxByRHyX99PIRlHwI7FeenVcK8v9T+d5++4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; From 214fb8c6d39dd6aec976018cef5286237f35a860 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:47:50 -0700 Subject: [PATCH 053/108] btlejack: use callPackage --- pkgs/applications/radio/btlejack/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix index b4e6e30961bb..166cd407d0e0 100644 --- a/pkgs/applications/radio/btlejack/default.nix +++ b/pkgs/applications/radio/btlejack/default.nix @@ -1,12 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyserial, - halo, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "btlejack"; version = "2.1.1"; @@ -22,8 +20,8 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pyserial - halo + python3Packages.pyserial + python3Packages.halo ]; meta = with lib; { From 0f5c327603514cc7d36f7ebd117829df4b437986 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:48:11 -0700 Subject: [PATCH 054/108] btlejack: remove with lib --- pkgs/applications/radio/btlejack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix index 166cd407d0e0..50afe42db0b9 100644 --- a/pkgs/applications/radio/btlejack/default.nix +++ b/pkgs/applications/radio/btlejack/default.nix @@ -24,11 +24,11 @@ python3Packages.buildPythonApplication rec { python3Packages.halo ]; - meta = with lib; { + meta = { homepage = "https://github.com/virtualabs/btlejack"; description = "Bluetooth Low Energy Swiss-army knife"; mainProgram = "btlejack"; - license = licenses.mit; - maintainers = with maintainers; [ oxzi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ oxzi ]; }; } From 694c4b2180407f447d2d4e3432de378cf3101bad Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:48:55 -0700 Subject: [PATCH 055/108] btlejack: move to by-name --- .../btlejack/default.nix => by-name/bt/btlejack/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/radio/btlejack/default.nix => by-name/bt/btlejack/package.nix} (100%) diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/by-name/bt/btlejack/package.nix similarity index 100% rename from pkgs/applications/radio/btlejack/default.nix rename to pkgs/by-name/bt/btlejack/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a5540fec3f..b2e41957124e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1961,8 +1961,6 @@ with pkgs; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; - btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; - bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw="; From 1c4aa0d63fe2e67453e43dbc9a71e8e437b29184 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:52:34 -0700 Subject: [PATCH 056/108] qdmr: move to by-name --- .../default.nix => by-name/qd/qdmr/package.nix} | 16 ++++++---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 12 deletions(-) rename pkgs/{applications/radio/qdmr/default.nix => by-name/qd/qdmr/package.nix} (90%) diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/by-name/qd/qdmr/package.nix similarity index 90% rename from pkgs/applications/radio/qdmr/default.nix rename to pkgs/by-name/qd/qdmr/package.nix index a9ea80e13e9a..9e5ac1f5ab56 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/by-name/qd/qdmr/package.nix @@ -6,12 +6,8 @@ cmake, libxslt, docbook_xsl_ns, - wrapQtAppsHook, + libsForQt5, libusb1, - qtlocation, - qtserialport, - qttools, - qtbase, yaml-cpp, }: @@ -33,16 +29,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt - wrapQtAppsHook + libsForQt5.wrapQtAppsHook installShellFiles ]; buildInputs = [ libusb1 - qtlocation - qtserialport - qttools - qtbase + libsForQt5.qtlocation + libsForQt5.qtserialport + libsForQt5.qttools + libsForQt5.qtbase yaml-cpp ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a5540fec3f..acebeaea9bd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -514,8 +514,6 @@ with pkgs; python3Packages = python311Packages; }; - qdmr = libsForQt5.callPackage ../applications/radio/qdmr { }; - fetchbower = callPackage ../build-support/fetchbower { }; fetchbzr = callPackage ../build-support/fetchbzr { }; From a10bca57bb2e8146513de8cf09e8ca4092f39c0d Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:57:03 -0700 Subject: [PATCH 057/108] gqrx: move to by-name --- .../default.nix => by-name/gq/gqrx/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 7 insertions(+), 11 deletions(-) rename pkgs/{applications/radio/gqrx/default.nix => by-name/gq/gqrx/package.nix} (95%) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/by-name/gq/gqrx/package.nix similarity index 95% rename from pkgs/applications/radio/gqrx/default.nix rename to pkgs/by-name/gq/gqrx/package.nix index 61e77bba6824..1db90ede113f 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/by-name/gq/gqrx/package.nix @@ -4,9 +4,7 @@ cmake, desktopToDarwinBundle, pkg-config, - qtbase, - qtsvg, - qtwayland, + qt6Packages, gnuradioMinimal, thrift, mpir, @@ -14,7 +12,6 @@ alsa-lib, libjack2, wrapGAppsHook3, - wrapQtAppsHook, # drivers (optional): rtl-sdr, hackrf, @@ -44,7 +41,7 @@ gnuradioMinimal.pkgs.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6Packages.wrapQtAppsHook wrapGAppsHook3 ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; @@ -55,15 +52,15 @@ gnuradioMinimal.pkgs.mkDerivation rec { fftwFloat libjack2 gnuradioMinimal.unwrapped.boost - qtbase - qtsvg + qt6Packages.qtbase + qt6Packages.qtsvg gnuradioMinimal.pkgs.osmosdr rtl-sdr hackrf ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - qtwayland + qt6Packages.qtwayland ] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [ thrift diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a5540fec3f..9321f27159b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12222,12 +12222,11 @@ with pkgs; inherit (ocamlPackages) google-drive-ocamlfuse; - gqrx = qt6Packages.callPackage ../applications/radio/gqrx { }; - gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx { + gqrx-portaudio = gqrx.override { portaudioSupport = true; pulseaudioSupport = false; }; - gqrx-gr-audio = qt6Packages.callPackage ../applications/radio/gqrx { + gqrx-gr-audio = gqrx.override { portaudioSupport = false; pulseaudioSupport = false; }; From d103e67626d85a588402264d09cde14b2426b11c Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:58:06 -0700 Subject: [PATCH 058/108] qgrx: remove with lib --- pkgs/by-name/gq/gqrx/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gq/gqrx/package.nix b/pkgs/by-name/gq/gqrx/package.nix index 1db90ede113f..d9ddb2c6c3a6 100644 --- a/pkgs/by-name/gq/gqrx/package.nix +++ b/pkgs/by-name/gq/gqrx/package.nix @@ -89,7 +89,7 @@ gnuradioMinimal.pkgs.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { description = "Software defined radio (SDR) receiver"; mainProgram = "gqrx"; longDescription = '' @@ -101,9 +101,9 @@ gnuradioMinimal.pkgs.mkDerivation rec { homepage = "https://gqrx.dk/"; # Some of the code comes from the Cutesdr project, with a BSD license, but # it's currently unknown which version of the BSD license that is. - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ bjornfor fpletz ]; From ee6cfad313d6beb553a9c42d37f38b21fc7ebed5 Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 27 Jun 2025 03:23:31 +0800 Subject: [PATCH 059/108] python312Packages.paddlex: 3.0.1 -> 3.0.3 Diff: https://github.com/PaddlePaddle/PaddleX/compare/refs/tags/v3.0.1...refs/tags/v3.0.3 Changelog: https://github.com/PaddlePaddle/PaddleX/releases/tag/v3.0.3 --- pkgs/development/python-modules/paddlex/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix index a60c3e1d8534..ea4bb32e213c 100644 --- a/pkgs/development/python-modules/paddlex/default.nix +++ b/pkgs/development/python-modules/paddlex/default.nix @@ -18,6 +18,7 @@ typing-extensions, ujson, distutils, + huggingface-hub, }: let @@ -49,14 +50,14 @@ let in buildPythonPackage rec { pname = "paddlex"; - version = "3.0.1"; + version = "3.0.3"; pyproject = true; src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleX"; tag = "v${version}"; - hash = "sha256-qov5nqGIsSfaho2dcWVsyWKQlJsIJgdX3rDz66JtLDI="; + hash = "sha256-uIpt2I6Lx/nJDh4sZYBI6dL8IveQf6aOxA/9vKFU2nU="; }; build-system = [ setuptools ]; @@ -82,6 +83,7 @@ buildPythonPackage rec { typing-extensions ujson gputil + huggingface-hub ]; meta = { From 7d254c7c9c3c724d77cac8523905bf60e52c4501 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jun 2025 19:53:01 +0000 Subject: [PATCH 060/108] go-ethereum: 1.15.11 -> 1.16.0 --- pkgs/by-name/go/go-ethereum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index bae99977f408..0f41d9fd3f04 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -15,17 +15,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.15.11"; + version = "1.16.0"; src = fetchFromGitHub { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - hash = "sha256-2XGKkimwe9h8RxO3SzUta5Bh2Ooldl2LiHqUpn8FK7I="; + hash = "sha256-eu6VeG/vMdCOk15HWnKbtKRZbbYhH3y6SJrwEGxJs8w="; }; proxyVendor = true; - vendorHash = "sha256-R9Qg6estiyjMAwN6tvuN9ZuE7+JqjEy+qYOPAg5lIJY="; + vendorHash = "sha256-Ggng6EDd5qRqcSbdycfivO8yiQcMOCSZt229JZcOlVs="; doCheck = false; From 1abb6a767351f14ffe73cc90ad9d538fbae5d42e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jun 2025 20:16:54 +0000 Subject: [PATCH 061/108] diffoci: 0.1.6 -> 0.1.7 --- pkgs/by-name/di/diffoci/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diffoci/package.nix b/pkgs/by-name/di/diffoci/package.nix index 7f3a5aa322e6..c93faacefaf7 100644 --- a/pkgs/by-name/di/diffoci/package.nix +++ b/pkgs/by-name/di/diffoci/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "diffoci"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "reproducible-containers"; repo = "diffoci"; rev = "v${version}"; - hash = "sha256-rCSLHlHUWS0wEnN8R2v1h+kQ7K62VQPfZmySHGSFZlQ="; + hash = "sha256-RBMgcTUdPO12rFUY82JkubXfaGjfB4oR+UqKwumFWs0="; }; - vendorHash = "sha256-udVigglpCgdYzJe9vdGZiQepZeOplQjqKB4Za8a+u6k="; + vendorHash = "sha256-NqYGehd+RcspQt5gQl9XH85Ds0dw+MU8W7xH/uzNjqU="; ldflags = [ "-s" From d63eebd78afbf18702080fda11aa6e71020e44ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jun 2025 20:24:01 +0000 Subject: [PATCH 062/108] libretro.snes9x: 0-unstable-2025-06-13 -> 0-unstable-2025-06-18 --- pkgs/applications/emulators/libretro/cores/snes9x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index d206e6afbe98..8d6bfc7c1c39 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2025-06-13"; + version = "0-unstable-2025-06-18"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "a93dd67c516061c3390506eb26e0457a264f86b6"; - hash = "sha256-IOxYhDkrd9TgzEGiCM2HQxUiTv3Icmc0JE6216PqbYg="; + rev = "a168e789719d6bc8e06110d517d98c3d098d5834"; + hash = "sha256-Kxi+/Uie0a7gmlNEj351Nlybb16W4A4joC8JSN1rvsU="; }; makefile = "Makefile"; From 2a140ef32eb34efdb574f2204768731eec34a457 Mon Sep 17 00:00:00 2001 From: Jasi Date: Wed, 25 Jun 2025 17:09:21 -0400 Subject: [PATCH 063/108] speakersafetyd: use `fetchFromGitHub` over `fetchCrate` as fetcher --- pkgs/by-name/sp/speakersafetyd/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 6507c7755fee..f9f83113fd7b 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -2,7 +2,7 @@ stdenv, lib, rustPlatform, - fetchCrate, + fetchFromGitHub, pkg-config, alsa-lib, rust, @@ -13,9 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "speakersafetyd"; version = "1.0.2"; - src = fetchCrate { - inherit pname version; - hash = "sha256-3DzBNebg1y/+psD2zOpDsnRJmabQLeO1UMxPq9M0CsU="; + src = fetchFromGitHub { + owner = "AsahiLinux"; + repo = "speakersafetyd"; + tag = version; + hash = "sha256-ULAGdYUfeMlPki6DT2vD+tvDqKMxJtG16o/+7+ERsv4="; }; useFetchCargoVendor = true; cargoHash = "sha256-DnOnqi60JsRX8yqEM/5zZ3yX/rk85/ruwL3aW1FRXKg="; From b0104a221003649e9b46d8060896efebfd90d970 Mon Sep 17 00:00:00 2001 From: Jasi Date: Wed, 25 Jun 2025 17:07:12 -0400 Subject: [PATCH 064/108] speakersafetyd: remove unused attributes; use `finalAttrs` --- pkgs/by-name/sp/speakersafetyd/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index f9f83113fd7b..79092541d6a2 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -5,21 +5,20 @@ fetchFromGitHub, pkg-config, alsa-lib, - rust, udevCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "speakersafetyd"; version = "1.0.2"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "speakersafetyd"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ULAGdYUfeMlPki6DT2vD+tvDqKMxJtG16o/+7+ERsv4="; }; - useFetchCargoVendor = true; + cargoHash = "sha256-DnOnqi60JsRX8yqEM/5zZ3yX/rk85/ruwL3aW1FRXKg="; nativeBuildInputs = [ @@ -58,4 +57,4 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; }; -} +}) From e8e99e359532cb20561cb63aebab3657b8e58e0b Mon Sep 17 00:00:00 2001 From: Jasi Date: Wed, 25 Jun 2025 17:11:48 -0400 Subject: [PATCH 065/108] speakersafetyd: use `DESTDIR` variable in `installFlags` attribute --- pkgs/by-name/sp/speakersafetyd/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 79092541d6a2..1f4226419f55 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -35,11 +35,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; installFlags = [ - "BINDIR=$(out)/bin" - "UNITDIR=$(out)/lib/systemd/system" - "UDEVDIR=$(out)/lib/udev/rules.d" - "SHAREDIR=$(out)/share" - "TMPFILESDIR=$(out)/lib/tmpfiles.d" + "DESTDIR=$(out)" + "BINDIR=bin" + "UNITDIR=lib/systemd/system" + "UDEVDIR=lib/udev/rules.d" + "SHAREDIR=share" + "TMPFILESDIR=lib/tmpfiles.d" ]; dontCargoInstall = true; From 9e2581c4de7374636b7f0d989252cc168261f934 Mon Sep 17 00:00:00 2001 From: Jasi Date: Wed, 25 Jun 2025 17:26:20 -0400 Subject: [PATCH 066/108] speakersafetyd: shorten package description --- pkgs/by-name/sp/speakersafetyd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 1f4226419f55..846a1473c34e 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; meta = with lib; { - description = "Userspace daemon written in Rust that implements an analogue of the Texas Instruments Smart Amp speaker protection model"; + description = "Userspace daemon that implements the Smart Amp protection model"; mainProgram = "speakersafetyd"; homepage = "https://github.com/AsahiLinux/speakersafetyd"; maintainers = with maintainers; [ From 0c54773e7fcdd39d18d1665d4caeb0609b2ce229 Mon Sep 17 00:00:00 2001 From: Jasi Date: Wed, 25 Jun 2025 17:27:32 -0400 Subject: [PATCH 067/108] speakersafetyd: remove `with lib;` usage --- pkgs/by-name/sp/speakersafetyd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 846a1473c34e..15fc619dc4a8 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -46,16 +46,16 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; doInstallCheck = true; - meta = with lib; { + meta = { description = "Userspace daemon that implements the Smart Amp protection model"; mainProgram = "speakersafetyd"; homepage = "https://github.com/AsahiLinux/speakersafetyd"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ normalcea flokli yuka ]; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; }) From f6ecfe5d2b4964d3defa725b6059bc95d004e6fa Mon Sep 17 00:00:00 2001 From: Jasi Date: Wed, 25 Jun 2025 17:32:07 -0400 Subject: [PATCH 068/108] speakersafetyd: add `nix-update-script` --- pkgs/by-name/sp/speakersafetyd/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 15fc619dc4a8..5a2a940ad4ad 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -6,6 +6,7 @@ pkg-config, alsa-lib, udevCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -46,6 +47,10 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; doInstallCheck = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Userspace daemon that implements the Smart Amp protection model"; mainProgram = "speakersafetyd"; From 4ca8227f8a52ae4b2708e15173af9f7b0b66fd54 Mon Sep 17 00:00:00 2001 From: Jasi Date: Thu, 26 Jun 2025 16:56:12 -0400 Subject: [PATCH 069/108] =?UTF-8?q?speakersafetyd:=201.0.2=20=E2=86=92=201?= =?UTF-8?q?.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/sp/speakersafetyd/package.nix | 21 ++++++++++++------- .../speakersafetyd/remove-install-paths.patch | 16 ++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 5a2a940ad4ad..ec73d4cbd676 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -11,16 +11,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "speakersafetyd"; - version = "1.0.2"; + version = "1.1.2"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "speakersafetyd"; tag = finalAttrs.version; - hash = "sha256-ULAGdYUfeMlPki6DT2vD+tvDqKMxJtG16o/+7+ERsv4="; + hash = "sha256-sSGoF2c5HfPM2FBrBJwJ9NvExYijGx6JH1bJp3epfe0="; }; - cargoHash = "sha256-DnOnqi60JsRX8yqEM/5zZ3yX/rk85/ruwL3aW1FRXKg="; + cargoHash = "sha256-9XbrIY1VwnHtqi/ZfS952SyjNjA/TJRdOqCsPReZI8o="; + + patches = [ + ./remove-install-paths.patch + ]; nativeBuildInputs = [ pkg-config @@ -29,10 +33,13 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ alsa-lib ]; postPatch = '' - substituteInPlace speakersafetyd.service --replace "/usr" "$out" - substituteInPlace Makefile --replace "target/release" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType" - # creating files in /var does not make sense in a nix package - substituteInPlace Makefile --replace 'install -dDm0755 $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox' "" + substituteInPlace speakersafetyd.service \ + --replace-fail "/usr" \ + "$out" + + substituteInPlace Makefile \ + --replace-fail "target/release" \ + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType" \ ''; installFlags = [ diff --git a/pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch b/pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch new file mode 100644 index 000000000000..9581dc7ca1e5 --- /dev/null +++ b/pkgs/by-name/sp/speakersafetyd/remove-install-paths.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index 41bf7b4..ca14be7 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,11 +24,8 @@ install-data: + install -pm0644 95-speakersafetyd.rules $(DESTDIR)/$(UDEVDIR)/95-speakersafetyd.rules + install -dDm0755 $(DESTDIR)/$(SHAREDIR)/speakersafetyd/apple + install -pm0644 -t $(DESTDIR)/$(SHAREDIR)/speakersafetyd/apple $(wildcard conf/apple/*) +- install -dDm0755 -o $(SPEAKERSAFETYD_USER) -g $(SPEAKERSAFETYD_GROUP) $(DESTDIR)/$(VARDIR)/lib/speakersafetyd +- install -dDm0700 -o $(SPEAKERSAFETYD_USER) -g $(SPEAKERSAFETYD_GROUP) $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox + install -dDm0755 $(DESTDIR)/$(TMPFILESDIR) + install -pm0644 speakersafetyd.tmpfiles $(DESTDIR)/$(TMPFILESDIR)/speakersafetyd.conf +- install -dDm0755 -o $(SPEAKERSAFETYD_USER) -g $(SPEAKERSAFETYD_GROUP) $(DESTDIR)/run/speakersafetyd + + uninstall: + rm -f $(DESTDIR)/$(BINDIR)/speakersafetyd $(DESTDIR)/$(UNITDIR)/speakersafetyd.service $(DESTDIR)/$(UDEVDIR)/95-speakersafetyd.rules $(DESTDIR)/$(TMPFILESDIR)/speakersafetyd.conf From a7dad7a5658e32d9ff368258424b100fa0fa8845 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 26 Jun 2025 23:55:42 +0200 Subject: [PATCH 070/108] python3Packages.whenever: update meta.changelog --- pkgs/development/python-modules/whenever/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index b5ea39990fcb..17b81c09e484 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = with lib; { description = "Strict, predictable, and typed datetimes"; homepage = "https://github.com/ariebovenberg/whenever"; - changelog = "https://github.com/ariebovenberg/whenever/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/ariebovenberg/whenever/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ pbsds ]; }; From 749ded882625c3908bfdf561233ba50240893086 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 26 Jun 2025 23:03:49 +0100 Subject: [PATCH 071/108] nixos-rebuild-ng: refactor part of __init__.py code in services.py There are a bunch of logic that were happening in `__init__.py` file that was not really fit in other files in the project but also didn't seems fit to the `__init__.py`. While moving this to `services.py` doesn't really solve the problem, at least it reduces the size of the main `execute()` function to a reasonable size, and I hope this will make it easier for other people to understand what is happening. --- .../src/nixos_rebuild/__init__.py | 233 ++----------- .../src/nixos_rebuild/services.py | 319 ++++++++++++++++++ .../nixos-rebuild-ng/src/tests/test_main.py | 10 +- 3 files changed, 343 insertions(+), 219 deletions(-) create mode 100644 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 1696e73bb42f..1759317fc733 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -3,17 +3,15 @@ import json import logging import os import sys -from pathlib import Path from subprocess import CalledProcessError, run from typing import Final, assert_never -from . import nix, tmpdir +from . import nix from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES -from .models import Action, BuildAttr, Flake, ImageVariants, NixOSRebuildError, Profile -from .process import Remote, cleanup_ssh -from .utils import Args, LogFormatter, tabulate - -NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild" +from .models import Action, BuildAttr, Flake, Profile +from .process import Remote +from .services import build_and_activate_system, reexec +from .utils import LogFormatter, tabulate logger: Final = logging.getLogger(__name__) logger.setLevel(logging.INFO) @@ -271,72 +269,6 @@ def parse_args( return args, args_groups -def reexec( - argv: list[str], - args: argparse.Namespace, - build_flags: Args, - flake_build_flags: Args, -) -> None: - drv = None - try: - # Parsing the args here but ignore ask_sudo_password since it is not - # needed and we would end up asking sudo password twice - if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)): - drv = nix.build_flake( - NIXOS_REBUILD_ATTR, - flake, - flake_build_flags | {"no_link": True}, - ) - else: - build_attr = BuildAttr.from_arg(args.attr, args.file) - drv = nix.build( - NIXOS_REBUILD_ATTR, - build_attr, - build_flags | {"no_out_link": True}, - ) - except CalledProcessError: - logger.warning( - "could not build a newer version of nixos-rebuild, using current version", - exc_info=logger.isEnabledFor(logging.DEBUG), - ) - - if drv: - new = drv / f"bin/{EXECUTABLE}" - current = Path(argv[0]) - if new != current: - logger.debug( - "detected newer version of script, re-exec'ing, current=%s, new=%s", - current, - new, - ) - # Manually call clean-up functions since os.execve() will replace - # the process immediately - cleanup_ssh() - tmpdir.TMPDIR.cleanup() - try: - os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) - except Exception: - # Possible errors that we can have here: - # - Missing the binary - # - Exec format error (e.g.: another OS/CPU arch) - logger.warning( - "could not re-exec in a newer version of nixos-rebuild, " - "using current version", - exc_info=logger.isEnabledFor(logging.DEBUG), - ) - # We already run clean-up, let's re-exec in the current version - # to avoid issues - os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) - - -def validate_image_variant(image_variant: str, variants: ImageVariants) -> None: - if image_variant not in variants: - raise NixOSRebuildError( - "please specify one of the following supported image variants via " - "--image-variant:\n" + "\n".join(f"- {v}" for v in variants) - ) - - def execute(argv: list[str]) -> None: args, args_groups = parse_args(argv) @@ -395,147 +327,20 @@ def execute(argv: list[str]) -> None: | Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER ): - logger.info("building the system configuration...") - - dry_run = action == Action.DRY_BUILD - no_link = action in (Action.SWITCH, Action.BOOT) - rollback = bool(args.rollback) - - match action: - case Action.BUILD_IMAGE if flake: - variants = nix.get_build_image_variants_flake( - flake, - eval_flags=flake_common_flags, - ) - validate_image_variant(args.image_variant, variants) - attr = f"config.system.build.images.{args.image_variant}" - case Action.BUILD_IMAGE: - variants = nix.get_build_image_variants( - build_attr, - instantiate_flags=common_flags, - ) - validate_image_variant(args.image_variant, variants) - attr = f"config.system.build.images.{args.image_variant}" - case Action.BUILD_VM: - attr = "config.system.build.vm" - case Action.BUILD_VM_WITH_BOOTLOADER: - attr = "config.system.build.vmWithBootLoader" - case _: - attr = "config.system.build.toplevel" - - match (action, rollback, build_host, flake): - case (Action.SWITCH | Action.BOOT, True, _, _): - path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) - case (Action.TEST | Action.BUILD, True, _, _): - maybe_path_to_config = nix.rollback_temporary_profile( - profile, - target_host, - sudo=args.sudo, - ) - if maybe_path_to_config: # kinda silly but this makes mypy happy - path_to_config = maybe_path_to_config - else: - raise NixOSRebuildError("could not find previous generation") - case (_, True, _, _): - raise NixOSRebuildError( - f"--rollback is incompatible with '{action}'" - ) - case (_, False, Remote(_), Flake(_)): - path_to_config = nix.build_remote_flake( - attr, - flake, - build_host, - eval_flags=flake_common_flags, - flake_build_flags=flake_build_flags - | {"no_link": no_link, "dry_run": dry_run}, - copy_flags=copy_flags, - ) - case (_, False, None, Flake(_)): - path_to_config = nix.build_flake( - attr, - flake, - flake_build_flags=flake_build_flags - | {"no_link": no_link, "dry_run": dry_run}, - ) - case (_, False, Remote(_), None): - path_to_config = nix.build_remote( - attr, - build_attr, - build_host, - realise_flags=common_flags, - instantiate_flags=build_flags, - copy_flags=copy_flags, - ) - case (_, False, None, None): - path_to_config = nix.build( - attr, - build_attr, - build_flags=build_flags - | {"no_out_link": no_link, "dry_run": dry_run}, - ) - case never: - # should never happen, but mypy is not smart enough to - # handle this with assert_never - # https://github.com/python/mypy/issues/16650 - # https://github.com/python/mypy/issues/16722 - raise AssertionError( - f"expected code to be unreachable, but got: {never}" - ) - - if not rollback: - nix.copy_closure( - path_to_config, - to_host=target_host, - from_host=build_host, - copy_flags=copy_flags, - ) - if action in (Action.SWITCH, Action.BOOT): - nix.set_profile( - profile, - path_to_config, - target_host=target_host, - sudo=args.sudo, - ) - - # Print only the result to stdout to make it easier to script - def print_result(msg: str, result: str | Path) -> None: - print(msg, end=" ", file=sys.stderr, flush=True) - print(result, flush=True) - - match action: - case Action.SWITCH | Action.BOOT | Action.TEST | Action.DRY_ACTIVATE: - nix.switch_to_configuration( - path_to_config, - action, - target_host=target_host, - sudo=args.sudo, - specialisation=args.specialisation, - install_bootloader=args.install_bootloader, - ) - print_result("Done. The new configuration is", path_to_config) - case Action.BUILD: - print_result("Done. The new configuration is", path_to_config) - case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER: - # If you get `not-found`, please open an issue - vm_path = next(path_to_config.glob("bin/run-*-vm"), "not-found") - print_result( - "Done. The virtual machine can be started by running", vm_path - ) - case Action.BUILD_IMAGE: - if flake: - image_name = nix.get_build_image_name_flake( - flake, - args.image_variant, - eval_flags=flake_common_flags, - ) - else: - image_name = nix.get_build_image_name( - build_attr, - args.image_variant, - instantiate_flags=flake_common_flags, - ) - disk_path = path_to_config / image_name - print_result("Done. The disk image can be found in", disk_path) + build_and_activate_system( + action=action, + args=args, + build_host=build_host, + target_host=target_host, + profile=profile, + flake=flake, + build_attr=build_attr, + build_flags=build_flags, + common_flags=common_flags, + copy_flags=copy_flags, + flake_build_flags=flake_build_flags, + flake_common_flags=flake_common_flags, + ) case Action.EDIT: nix.edit(flake, flake_build_flags) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py new file mode 100644 index 000000000000..fd9ec3bfea93 --- /dev/null +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py @@ -0,0 +1,319 @@ +import argparse +import logging +import os +import sys +from pathlib import Path +from subprocess import CalledProcessError +from typing import Final + +from . import nix, tmpdir +from .constants import EXECUTABLE +from .models import Action, BuildAttr, Flake, ImageVariants, NixOSRebuildError, Profile +from .process import Remote, cleanup_ssh +from .utils import Args + +NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild" + +logger: Final = logging.getLogger(__name__) +logger.setLevel(logging.INFO) + + +def reexec( + argv: list[str], + args: argparse.Namespace, + build_flags: Args, + flake_build_flags: Args, +) -> None: + drv = None + try: + # Parsing the args here but ignore ask_sudo_password since it is not + # needed and we would end up asking sudo password twice + if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)): + drv = nix.build_flake( + NIXOS_REBUILD_ATTR, + flake, + flake_build_flags | {"no_link": True}, + ) + else: + build_attr = BuildAttr.from_arg(args.attr, args.file) + drv = nix.build( + NIXOS_REBUILD_ATTR, + build_attr, + build_flags | {"no_out_link": True}, + ) + except CalledProcessError: + logger.warning( + "could not build a newer version of nixos-rebuild, using current version", + exc_info=logger.isEnabledFor(logging.DEBUG), + ) + + if drv: + new = drv / f"bin/{EXECUTABLE}" + current = Path(argv[0]) + if new != current: + logger.debug( + "detected newer version of script, re-exec'ing, current=%s, new=%s", + current, + new, + ) + # Manually call clean-up functions since os.execve() will replace + # the process immediately + cleanup_ssh() + tmpdir.TMPDIR.cleanup() + try: + os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) + except Exception: + # Possible errors that we can have here: + # - Missing the binary + # - Exec format error (e.g.: another OS/CPU arch) + logger.warning( + "could not re-exec in a newer version of nixos-rebuild, " + "using current version", + exc_info=logger.isEnabledFor(logging.DEBUG), + ) + # We already run clean-up, let's re-exec in the current version + # to avoid issues + os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) + + +def _validate_image_variant(image_variant: str, variants: ImageVariants) -> None: + if image_variant not in variants: + raise NixOSRebuildError( + "please specify one of the following supported image variants via " + "--image-variant:\n" + "\n".join(f"- {v}" for v in variants) + ) + + +def _get_system_attr( + action: Action, + args: argparse.Namespace, + flake: Flake | None, + build_attr: BuildAttr, + common_flags: Args, + flake_common_flags: Args, +) -> str: + match action: + case Action.BUILD_IMAGE if flake: + variants = nix.get_build_image_variants_flake( + flake, + eval_flags=flake_common_flags, + ) + _validate_image_variant(args.image_variant, variants) + attr = f"config.system.build.images.{args.image_variant}" + case Action.BUILD_IMAGE: + variants = nix.get_build_image_variants( + build_attr, + instantiate_flags=common_flags, + ) + _validate_image_variant(args.image_variant, variants) + attr = f"config.system.build.images.{args.image_variant}" + case Action.BUILD_VM: + attr = "config.system.build.vm" + case Action.BUILD_VM_WITH_BOOTLOADER: + attr = "config.system.build.vmWithBootLoader" + case _: + attr = "config.system.build.toplevel" + + return attr + + +def _build_system( + attr: str, + action: Action, + args: argparse.Namespace, + build_host: Remote | None, + target_host: Remote | None, + profile: Profile, + flake: Flake | None, + build_attr: BuildAttr, + build_flags: Args, + common_flags: Args, + copy_flags: Args, + flake_build_flags: Args, + flake_common_flags: Args, +) -> Path: + dry_run = action == Action.DRY_BUILD + no_link = action in (Action.SWITCH, Action.BOOT) + + match (action, args.rollback, build_host, flake): + case (Action.SWITCH | Action.BOOT, True, _, _): + path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) + case (Action.TEST | Action.BUILD, True, _, _): + maybe_path_to_config = nix.rollback_temporary_profile( + profile, + target_host, + sudo=args.sudo, + ) + if maybe_path_to_config: # kinda silly but this makes mypy happy + path_to_config = maybe_path_to_config + else: + raise NixOSRebuildError("could not find previous generation") + case (_, True, _, _): + raise NixOSRebuildError(f"--rollback is incompatible with '{action}'") + case (_, False, Remote(_), Flake(_)): + path_to_config = nix.build_remote_flake( + attr, + flake, + build_host, + eval_flags=flake_common_flags, + flake_build_flags=flake_build_flags + | {"no_link": no_link, "dry_run": dry_run}, + copy_flags=copy_flags, + ) + case (_, False, None, Flake(_)): + path_to_config = nix.build_flake( + attr, + flake, + flake_build_flags=flake_build_flags + | {"no_link": no_link, "dry_run": dry_run}, + ) + case (_, False, Remote(_), None): + path_to_config = nix.build_remote( + attr, + build_attr, + build_host, + realise_flags=common_flags, + instantiate_flags=build_flags, + copy_flags=copy_flags, + ) + case (_, False, None, None): + path_to_config = nix.build( + attr, + build_attr, + build_flags=build_flags | {"no_out_link": no_link, "dry_run": dry_run}, + ) + case never: + # should never happen, but mypy is not smart enough to + # handle this with assert_never + # https://github.com/python/mypy/issues/16650 + # https://github.com/python/mypy/issues/16722 + raise AssertionError(f"expected code to be unreachable, but got: {never}") + + if not args.rollback: + nix.copy_closure( + path_to_config, + to_host=target_host, + from_host=build_host, + copy_flags=copy_flags, + ) + + return path_to_config + + +def _activate_system( + path_to_config: Path, + action: Action, + args: argparse.Namespace, + build_host: Remote | None, + target_host: Remote | None, + profile: Profile, + flake: Flake | None, + build_attr: BuildAttr, + flake_common_flags: Args, + common_flags: Args, +) -> None: + # Print only the result to stdout to make it easier to script + def print_result(msg: str, result: str | Path) -> None: + print(msg, end=" ", file=sys.stderr, flush=True) + print(result, flush=True) + + match action: + case Action.SWITCH | Action.BOOT if not args.rollback: + nix.set_profile( + profile, + path_to_config, + target_host=target_host, + sudo=args.sudo, + ) + nix.switch_to_configuration( + path_to_config, + action, + target_host=target_host, + sudo=args.sudo, + specialisation=args.specialisation, + install_bootloader=args.install_bootloader, + ) + print_result("Done. The new configuration is", path_to_config) + case Action.SWITCH | Action.BOOT | Action.TEST | Action.DRY_ACTIVATE: + nix.switch_to_configuration( + path_to_config, + action, + target_host=target_host, + sudo=args.sudo, + specialisation=args.specialisation, + install_bootloader=args.install_bootloader, + ) + print_result("Done. The new configuration is", path_to_config) + case Action.BUILD: + print_result("Done. The new configuration is", path_to_config) + case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER: + # If you get `not-found`, please open an issue + vm_path = next(path_to_config.glob("bin/run-*-vm"), "not-found") + print_result("Done. The virtual machine can be started by running", vm_path) + case Action.BUILD_IMAGE: + if flake: + image_name = nix.get_build_image_name_flake( + flake, + args.image_variant, + eval_flags=flake_common_flags, + ) + else: + image_name = nix.get_build_image_name( + build_attr, + args.image_variant, + instantiate_flags=common_flags, + ) + disk_path = path_to_config / image_name + print_result("Done. The disk image can be found in", disk_path) + + +def build_and_activate_system( + action: Action, + args: argparse.Namespace, + build_host: Remote | None, + target_host: Remote | None, + profile: Profile, + flake: Flake | None, + build_attr: BuildAttr, + build_flags: Args, + common_flags: Args, + copy_flags: Args, + flake_build_flags: Args, + flake_common_flags: Args, +) -> None: + logger.info("building the system configuration...") + attr = _get_system_attr( + action=action, + args=args, + flake=flake, + build_attr=build_attr, + common_flags=common_flags, + flake_common_flags=flake_common_flags, + ) + path_to_config = _build_system( + attr, + action=action, + args=args, + build_host=build_host, + target_host=target_host, + profile=profile, + flake=flake, + build_attr=build_attr, + build_flags=build_flags, + common_flags=common_flags, + copy_flags=copy_flags, + flake_build_flags=flake_build_flags, + flake_common_flags=flake_common_flags, + ) + _activate_system( + path_to_config, + action=action, + args=args, + build_host=build_host, + target_host=target_host, + profile=profile, + flake=flake, + build_attr=build_attr, + common_flags=common_flags, + flake_common_flags=flake_common_flags, + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index e3678420bc14..fdf4cdb31a96 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -141,7 +141,7 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) - mock_build.assert_has_calls( [ call( - nr.NIXOS_REBUILD_ATTR, + nr.services.NIXOS_REBUILD_ATTR, nr.models.BuildAttr(ANY, ANY), {"build": True, "no_out_link": True}, ) @@ -185,7 +185,7 @@ def test_reexec_flake( nr.reexec(argv, args, {"build": True}, {"flake": True}) mock_build.assert_called_once_with( - nr.NIXOS_REBUILD_ATTR, + nr.services.NIXOS_REBUILD_ATTR, nr.models.Flake(ANY, ANY), {"flake": True, "no_link": True}, ) @@ -536,7 +536,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: ) @patch("subprocess.run", autospec=True) @patch("uuid.uuid4", autospec=True) -@patch(get_qualified_name(nr.cleanup_ssh), autospec=True) +@patch(get_qualified_name(nr.services.cleanup_ssh), autospec=True) @pytest.mark.skipif( not WITH_NIX_2_18, reason="Tests internal logic based on the assumption that Nix >= 2.18", @@ -755,7 +755,7 @@ def test_execute_nix_switch_build_target_host( clear=True, ) @patch("subprocess.run", autospec=True) -@patch(get_qualified_name(nr.cleanup_ssh), autospec=True) +@patch(get_qualified_name(nr.services.cleanup_ssh), autospec=True) def test_execute_nix_switch_flake_target_host( mock_cleanup_ssh: Mock, mock_run: Mock, @@ -862,7 +862,7 @@ def test_execute_nix_switch_flake_target_host( clear=True, ) @patch("subprocess.run", autospec=True) -@patch(get_qualified_name(nr.cleanup_ssh), autospec=True) +@patch(get_qualified_name(nr.services.cleanup_ssh), autospec=True) def test_execute_nix_switch_flake_build_host( mock_cleanup_ssh: Mock, mock_run: Mock, From 86665fc0a29698ff84b407900109999a93ae11ba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 26 Jun 2025 23:22:37 +0100 Subject: [PATCH 072/108] nixos-rebuild-ng: enable unused arguments linter --- .../src/nixos_rebuild/__init__.py | 4 ++-- .../nixos-rebuild-ng/src/nixos_rebuild/models.py | 2 +- .../ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 4 ++-- .../src/nixos_rebuild/services.py | 2 -- .../ni/nixos-rebuild-ng/src/pyproject.toml | 15 +++++++++++++-- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 6 +++--- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 1759317fc733..a72750f516e3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -366,9 +366,9 @@ def execute(argv: list[str]) -> None: case Action.REPL: if flake: - nix.repl_flake("toplevel", flake, flake_build_flags) + nix.repl_flake(flake, flake_build_flags) else: - nix.repl("system", build_attr, build_flags) + nix.repl(build_attr, build_flags) case _: assert_never(action) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index c0183e1a265b..79be8f4cbc3d 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -154,7 +154,7 @@ class Flake: return cls(path, nixos_attr) @classmethod - def from_arg(cls, flake_arg: Any, target_host: Remote | None) -> Self | None: + def from_arg(cls, flake_arg: Any, target_host: Remote | None) -> Self | None: # noqa: ANN401 match flake_arg: case str(s): return cls.parse(s, target_host) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 0d8abca0f92d..513c5e43e1a4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -545,14 +545,14 @@ def list_generations(profile: Profile) -> list[GenerationJson]: ) -def repl(attr: str, build_attr: BuildAttr, nix_flags: Args | None = None) -> None: +def repl(build_attr: BuildAttr, nix_flags: Args | None = None) -> None: run_args = ["nix", "repl", "--file", build_attr.path] if build_attr.attr: run_args.append(build_attr.attr) run_wrapper([*run_args, *dict_to_flags(nix_flags)]) -def repl_flake(attr: str, flake: Flake, flake_flags: Args | None = None) -> None: +def repl_flake(flake: Flake, flake_flags: Args | None = None) -> None: expr = Template( files(__package__).joinpath(FLAKE_REPL_TEMPLATE).read_text() ).substitute( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py index fd9ec3bfea93..8826bbf61ad6 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py @@ -204,7 +204,6 @@ def _activate_system( path_to_config: Path, action: Action, args: argparse.Namespace, - build_host: Remote | None, target_host: Remote | None, profile: Profile, flake: Flake | None, @@ -309,7 +308,6 @@ def build_and_activate_system( path_to_config, action=action, args=args, - build_host=build_host, target_host=target_host, profile=profile, flake=flake, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml index 3eb78f58e032..757067db9f06 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml @@ -65,10 +65,21 @@ extend-select = [ "ISC001", "ISC002", "ISC003", + # unused arguments + "ARG001", + "ARG002", + "ARG003", + "ARG004", + "ARG005", ] -ignore = [ + +[tool.ruff.lint.per-file-ignores] +"tests/*" = [ + # allow unused arguments in tests (e.g., mocks) + "ARG001", + "ARG005", # allow Any type - "ANN401" + "ANN401" ] [tool.pytest.ini_options] diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 1bca16260012..a8f00fbfc8a6 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -579,18 +579,18 @@ def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) def test_repl(mock_run: Mock) -> None: - n.repl("attr", m.BuildAttr("", None), {"nix_flag": True}) + n.repl(m.BuildAttr("", None), {"nix_flag": True}) mock_run.assert_called_with( ["nix", "repl", "--file", "", "--nix-flag"] ) - n.repl("attr", m.BuildAttr(Path("file.nix"), "myAttr")) + n.repl(m.BuildAttr(Path("file.nix"), "myAttr")) mock_run.assert_called_with(["nix", "repl", "--file", Path("file.nix"), "myAttr"]) @patch(get_qualified_name(n.run_wrapper, n), autospec=True) def test_repl_flake(mock_run: Mock) -> None: - n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True}) + n.repl_flake(m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True}) # See nixos-rebuild-ng.tests.repl for a better test, # this is mostly for sanity check assert mock_run.call_count == 1 From 9d3fde1795b3739fe6f37b6a912fdb95876f4763 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 26 Jun 2025 16:59:41 -0600 Subject: [PATCH 073/108] ollama: 0.9.2 -> 0.9.3 https://github.com/ollama/ollama/releases/tag/v0.9.3 Diff: https://github.com/ollama/ollama/compare/v0.9.2...v0.9.3 --- pkgs/by-name/ol/ollama/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index f75341605558..b15c86f24c46 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -117,17 +117,17 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-2mvaIEfto/w2yjaJxopn5L2rn8pCTHfQvo8mmzTO4i0="; + hash = "sha256-bAxvlFeCxrxE8PuLbsjAwJYDeZfKb8BDuGBgX8uMgr8="; fetchSubmodules = true; }; - vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA="; + vendorHash = "sha256-oHTo8EQGfrKOwg6SRPrL23qSH+p+clBxxiXsuO1auLk="; env = lib.optionalAttrs enableRocm { From 54f3721c45e8f71d62a812f5831b8e7f8adbc883 Mon Sep 17 00:00:00 2001 From: Mahyar Mirrashed Date: Thu, 26 Jun 2025 18:54:55 -0500 Subject: [PATCH 074/108] vimPlugins.freeze-nvim: init at 2025-03-25 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 5 +++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 19 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 194f6919f578..ece5805da48c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5100,6 +5100,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + freeze-nvim = buildVimPlugin { + pname = "freeze.nvim"; + version = "2025-03-25"; + src = fetchFromGitHub { + owner = "charm-and-friends"; + repo = "freeze.nvim"; + rev = "590fdb0d724485f578e4fee0e3ae2b32040dfb1a"; + sha256 = "1641xxp7yq4z25xck3l9vfcm0dvxcjvagawzixs4mvag214ndlam"; + }; + meta.homepage = "https://github.com/charm-and-friends/freeze.nvim/"; + meta.hydraPlatforms = [ ]; + }; + friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; version = "2025-04-29"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 545b306d7eab..4e85370385a2 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -16,6 +16,7 @@ mkYarnModules, python3, # Misc dependencies + charm-freeze, code-minimap, dailies, dasht, @@ -1173,6 +1174,10 @@ in dependencies = [ self.self ]; }; + freeze-nvim = super.freeze-nvim.overrideAttrs { + runtimeDeps = [ charm-freeze ]; + }; + fruzzy = let # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1c7cc3e95779..bbf6c7309b58 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -390,6 +390,7 @@ https://github.com/jghauser/follow-md-links.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, https://github.com/rubiin/fortune.nvim/,HEAD, +https://github.com/charm-and-friends/freeze.nvim/,HEAD, https://github.com/rafamadriz/friendly-snippets/,, https://github.com/raghur/fruzzy/,, https://github.com/SuperBo/fugit2.nvim/,HEAD, From d812d228f762a6931ad6505bb0918674436f0b25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 00:17:35 +0000 Subject: [PATCH 075/108] bento: 1.8.1 -> 1.8.2 --- pkgs/by-name/be/bento/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 7acea78088f9..3769dc5d2e26 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bento"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-5AXXtjQU8GGepAlXWPAA32WfnkFtNmyJDaSqfbvoips="; + hash = "sha256-EAEeyMWXL/OL/LGgOQxvXtwrrVXtqY05AMeU5z86tks="; }; proxyVendor = true; From fc2a3ffb4ba81250ad4426c6cba5dde45be7b126 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 00:41:39 +0000 Subject: [PATCH 076/108] photoqt: 4.9.1 -> 4.9.2 --- pkgs/by-name/ph/photoqt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 972c9a19424b..e03e58a4d643 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-dAqAM9zsFWPiGF7njhy7SM6f/5S19jMyTv57JadgHu8="; + hash = "sha256-kPhxWekecE57wY45qLy/EnfmjFLn0cEmZ+4qWHGbL4U="; }; nativeBuildInputs = [ From 074a79efa450647571d27df3efa48ae9ac821c2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 01:16:17 +0000 Subject: [PATCH 077/108] gowebly: 3.0.3 -> 3.0.4 --- pkgs/by-name/go/gowebly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gowebly/package.nix b/pkgs/by-name/go/gowebly/package.nix index f44aa0dad7b4..df52ccb128e6 100644 --- a/pkgs/by-name/go/gowebly/package.nix +++ b/pkgs/by-name/go/gowebly/package.nix @@ -8,16 +8,16 @@ buildGo124Module rec { pname = "gowebly"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "gowebly"; repo = "gowebly"; tag = "v${version}"; - hash = "sha256-iCdChT/eAWfeZyl5W1UHIjET3MGUD1YakjTToSS7iGs="; + hash = "sha256-oz/O5scGJigWjrmA2wnagDbf+epvwuyRI2CaSQY8K5I="; }; - vendorHash = "sha256-mFCNrcdwSExjVym4BN1Yb/lsfQHxCDrlWoa9vyQ74ko="; + vendorHash = "sha256-BDdH6cFicbjT2WOldNRc8NcFKrIaeqy+mw113PRnwa8="; env.CGO_ENABLED = 0; From 9c9da1089b2bd14a9943f88e8708643080b6599b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 02:10:51 +0000 Subject: [PATCH 078/108] parca: 0.23.1 -> 0.24.0 --- pkgs/by-name/pa/parca/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix index 9f115f8dd184..eafeb89fd3b2 100644 --- a/pkgs/by-name/pa/parca/package.nix +++ b/pkgs/by-name/pa/parca/package.nix @@ -8,13 +8,13 @@ stdenv, }: let - version = "0.23.1"; + version = "0.24.0"; parca-src = fetchFromGitHub { owner = "parca-dev"; repo = "parca"; tag = "v${version}"; - hash = "sha256-UCYBT+KegoXpMRMoA3iuX8WiXhkX43JVOmhHksH5Pwk="; + hash = "sha256-MyI3pyfsdw17K03FOSckVzLSRNbwSm3FwYIHMr/SbWo="; }; ui = stdenv.mkDerivation (finalAttrs: { @@ -24,7 +24,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src version; - hash = "sha256-MByoIJtynv38TFNVDdZWjkJJpABCjJU2wBrChxM2rdE="; + hash = "sha256-gczEkCU9xESn9T1eVOmGAufh+24mOsYCMO6f5tcbdmQ="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { pname = "parca"; src = parca-src; - vendorHash = "sha256-O7dzdMGZ1l+cmVA3svbh/Ig1SbXXiMwJ7TXmrT2IM+g="; + vendorHash = "sha256-2CVXXCWKa21cToe5flxIMtSBPc3HkxWDNkJAWCI4ORw="; ldflags = [ "-X=main.version=${version}" From 70ec5192462e15eb54bf04add610cfd88ccd4353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 02:52:36 +0000 Subject: [PATCH 079/108] linuxPackages.prl-tools: 20.3.2-55975 -> 20.4.0-55980 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index ba2fe72e1277..b00f3401bc44 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.3.2-55975"; + version = "20.4.0-55980"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-eazDR+eSUcp81XdRfYRHIt7E4FNCEjsh0M0wYQQYmMQ="; + hash = "sha256-FTlQNTdR5SpulF9f0qtmm+ynovaD4thTNAk96HbIzFQ="; }; hardeningDisable = [ From b8b941425ae6b7d06d5fecf3cf998ca76923ceef Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 26 Jun 2025 16:45:54 +0800 Subject: [PATCH 080/108] gaphor: fix and standardize schema path --- pkgs/by-name/ga/gaphor/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix index 65e7db2b43b6..eb05f1001a28 100644 --- a/pkgs/by-name/ga/gaphor/package.nix +++ b/pkgs/by-name/ga/gaphor/package.nix @@ -64,8 +64,12 @@ python3Packages.buildPythonApplication rec { install -Dm644 data/logos/gaphor-24x24.png $out/share/icons/hicolor/24x24/apps/org.gaphor.Gaphor.png install -Dm644 data/logos/gaphor-48x48.png $out/share/icons/hicolor/48x48/apps/org.gaphor.Gaphor.png - install -Dm644 gaphor/ui/installschemas/org.gaphor.Gaphor.gschema.xml -t $out/share/glib-2.0/schemas/ - glib-compile-schemas $out/share/glib-2.0/schemas/ + GSCHEMA_PATH=$out/share/gsettings-schemas/$name/glib-2.0/schemas + install -Dm644 gaphor/ui/installschemas/org.gaphor.Gaphor.gschema.xml -t $GSCHEMA_PATH + glib-compile-schemas $GSCHEMA_PATH + substituteInPlace $out/${python3Packages.python.sitePackages}/gaphor/settings.py \ + --replace-fail 'Gio.SettingsSchemaSource.get_default()' \ + "Gio.SettingsSchemaSource.new_from_directory('$GSCHEMA_PATH', Gio.SettingsSchemaSource.get_default(), False)" install -Dm644 data/org.gaphor.Gaphor.service -t $out/share/dbus-1/services/ substituteInPlace $out/share/dbus-1/services/org.gaphor.Gaphor.service \ From 45fb7af337410e64d248c943a6e71221be5f4eb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 05:02:08 +0000 Subject: [PATCH 081/108] python3Packages.elevenlabs: 2.3.0 -> 2.5.0 --- pkgs/development/python-modules/elevenlabs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index a870f36a6088..e1744be1aba1 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.3.0"; + version = "2.5.0"; tag = "v${version}"; in buildPythonPackage { @@ -25,7 +25,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-vj4ZmtumLq7Jveq7ID/FoPjlIz7Dv8uqMN4Nq6tSW/E="; + hash = "sha256-GA+CQR5QPbXWpOMOp+P6fOjBiJemI2vOctM7zCnfmk4="; }; build-system = [ poetry-core ]; From e707db3c4455c2cc6048a4292879ccf7a512e767 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 05:07:44 +0000 Subject: [PATCH 082/108] libretro.stella: 0-unstable-2025-06-12 -> 0-unstable-2025-06-26 --- pkgs/applications/emulators/libretro/cores/stella.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index e499fe2f887a..748f6d250486 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2025-06-12"; + version = "0-unstable-2025-06-26"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "ee0b96cd87710ad19aa47156d39df5a92c156a34"; - hash = "sha256-BnDF/UC3GiBC/06zBCDYrWA5cJPv7vtJ0grYgn5CcKo="; + rev = "c6ce6e80e87c828701629980e8a7119f3b08c5ab"; + hash = "sha256-403Z0W9OQYbb8+O8kSWbpHkqywVhXbqqIyfsGlgEi+M="; }; makefile = "Makefile"; From b5d9acd6a3646e74ea89f950946c76ff2be54c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 14:12:00 +0100 Subject: [PATCH 083/108] valgrind: enable on riscv valgrind 3.25.1 added upstream support for risc-v, so unblock valgrind there. --- pkgs/by-name/va/valgrind/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix index 91a4196fcf63..f15572b5acbf 100644 --- a/pkgs/by-name/va/valgrind/package.nix +++ b/pkgs/by-name/va/valgrind/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.eelco ]; platforms = with lib.platforms; - lib.intersectLists (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips) ( + lib.intersectLists (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips ++ riscv64) ( darwin ++ freebsd ++ illumos ++ linux ); badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; From bb2cd4718c95cadcb2426053ec9ab4fee6886fd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 05:59:27 +0000 Subject: [PATCH 084/108] vscode-extensions.svelte.svelte-vscode: 109.8.1 -> 109.9.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a49e5962bce9..67be366b9e63 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4668,8 +4668,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.8.1"; - hash = "sha256-ILZ7YA7LngwpU3U+qsgHPd+oxyqLNGRiKUCFC/OMBAo="; + version = "109.9.0"; + hash = "sha256-OgcFFYoJOtFVlOM12gYBG0AkliniawG6GdRtrFsjDIg="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; From 43bbaca7b33d3062c8ba0eba1c96d814b0947c97 Mon Sep 17 00:00:00 2001 From: ern775 Date: Fri, 27 Jun 2025 09:09:14 +0300 Subject: [PATCH 085/108] nero-umu: 1.1.1 -> 1.1.2 --- pkgs/by-name/ne/nero-umu/nerofs.patch | 57 ----------------------- pkgs/by-name/ne/nero-umu/neroprefix.patch | 11 ----- pkgs/by-name/ne/nero-umu/package.nix | 10 +--- 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 pkgs/by-name/ne/nero-umu/nerofs.patch delete mode 100644 pkgs/by-name/ne/nero-umu/neroprefix.patch diff --git a/pkgs/by-name/ne/nero-umu/nerofs.patch b/pkgs/by-name/ne/nero-umu/nerofs.patch deleted file mode 100644 index cb310004970f..000000000000 --- a/pkgs/by-name/ne/nero-umu/nerofs.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/src/nerofs.cpp -+++ b/src/nerofs.cpp -@@ -173,31 +173,19 @@ - - QString NeroFS::GetIcoextract() - { -- // TODO: this is for flexibility in sandboxed environments(?) -- // idk what the "good" path should be for Flatpak, so... -- if(QDir("/usr/bin").exists("icoextract")) { -- return "/usr/bin/icoextract"; -- } else return ""; -+ return QStandardPaths::findExecutable("icoextract"); - } - - - QString NeroFS::GetIcoutils() - { -- // TODO: this is for flexibility in sandboxed environments(?) -- // idk what the "good" path should be for Flatpak, so... -- if(QDir("/usr/bin").exists("icotool")) { -- return "/usr/bin/icotool"; -- } else return ""; -+ return QStandardPaths::findExecutable("icotool"); - } - - - QString NeroFS::GetUmU() - { -- // TODO: this is for flexibility in sandboxed environments(?) -- // idk what the "good" path should be for Flatpak, so... -- if(QDir("/usr/bin").exists("umu-run")) { -- return "/usr/bin/umu-run"; -- } else return ""; -+ return QStandardPaths::findExecutable("umu-run"); - } - - QString NeroFS::GetWinetricks(const QString &runner) -@@ -207,17 +195,13 @@ - return protonsPath.path() + '/' + runner + "/protonfixes/winetricks"; - else { - // fall back to system winetricks -- if(QDir("/usr/bin").exists("winetricks")) -- return "/usr/bin/winetricks"; -- else return ""; -+ return QStandardPaths::findExecutable("winetricks"); - } - } else if(QDir(protonsPath.path() + '/' + currentRunner + "/protonfixes").exists("winetricks")) - return protonsPath.path() + '/' + currentRunner + "/protonfixes/winetricks"; - else { - // fall back to system winetricks -- if(QDir("/usr/bin").exists("winetricks")) -- return "/usr/bin/winetricks"; -- else return ""; -+ return QStandardPaths::findExecutable("winetricks"); - } - } - diff --git a/pkgs/by-name/ne/nero-umu/neroprefix.patch b/pkgs/by-name/ne/nero-umu/neroprefix.patch deleted file mode 100644 index 733237d6cdf6..000000000000 --- a/pkgs/by-name/ne/nero-umu/neroprefix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/neroprefixsettings.cpp -+++ b/src/neroprefixsettings.cpp -@@ -598,7 +598,7 @@ - tmpDir.mkdir("nero-manager"); - QProcess process; - process.setWorkingDirectory(tmpDir.path()+"/nero-manager"); -- process.start("/usr/bin/curl", { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" }); -+ process.start(QStandardPaths::findExecutable("curl"), { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" }); - printf("Downloading Discord RPC Bridge...\n"); - - NeroPrefixSettingsWindow::blockSignals(true); diff --git a/pkgs/by-name/ne/nero-umu/package.nix b/pkgs/by-name/ne/nero-umu/package.nix index a0374f0925ad..639d09366e95 100644 --- a/pkgs/by-name/ne/nero-umu/package.nix +++ b/pkgs/by-name/ne/nero-umu/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "nero-umu"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "SeongGino"; repo = "Nero-umu"; tag = "v${finalAttrs.version}"; - hash = "sha256-sX/Z/b5stauut8qg6IV/DdsCIkdx1N3+y1jwoXHr1LY="; + hash = "sha256-7Wmha/WsSmbEgD2Dw2izSRzw8ldIrWcRIdUMp2okHWY="; }; #Replace quazip git submodule with pre-packaged quazip @@ -62,12 +62,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "NERO_QT_VERSION" "Qt6") ]; - #Fixes to be able to find binaries for nix - patches = [ - ./nerofs.patch - ./neroprefix.patch - ]; - installPhase = '' runHook preInstall install -Dm755 "nero-umu" "$out/bin/nero-umu" From a4acbc56c62df2e55e452b6d5dc2398c82e09c3d Mon Sep 17 00:00:00 2001 From: PandapipBot <{{ env.EMAIL }}> Date: Fri, 27 Jun 2025 06:20:31 +0000 Subject: [PATCH 086/108] vscode-extensions.chrischinchilla.vscode-pandoc: 0.4.8 -> 0.6.2 --- .../extensions/chrischinchilla.vscode-pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix b/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix index 775206fa0c53..5430527f6f94 100644 --- a/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pandoc"; publisher = "chrischinchilla"; - version = "0.4.8"; - hash = "sha256-+U6AtT2wf1mE92IR+mv4aKD9/78ULus2GuwwgxdCvBA="; + version = "0.6.2"; + hash = "sha256-d2nVjVTwvVSQXnhTdqv5gLV44L6FWGbHGZtCplbUQz4="; }; nativeBuildInputs = [ jq From d56aed834e44db11cd35ca9db6b6013de336e12c Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Fri, 27 Jun 2025 08:28:23 +0200 Subject: [PATCH 087/108] pkgs/by-name/README: remove irrelevant link to workflow --- pkgs/by-name/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index d19495730995..1b6e81110d0a 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -140,8 +140,6 @@ You can locally emulate the CI check using $ ./ci/nixpkgs-vet.sh master ``` -See [here](../../.github/workflows/nixpkgs-vet.yml) for more info. - ## Recommendation for new packages with multiple versions These checks of the `pkgs/by-name` structure can cause problems in combination: From 1f7e4b19fe9fcdc1e50c18a3a8a3a4797c8de3aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 06:39:48 +0000 Subject: [PATCH 088/108] comrak: 0.39.0 -> 0.39.1 --- pkgs/by-name/co/comrak/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 57c09318b152..d113deb4f776 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.39.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${version}"; - sha256 = "sha256-hy/kn8hShwzLHvzp3x1eSGipYRSXjOYCMPHEM1xQEr0="; + sha256 = "sha256-czdX4Xfh5vD0d30QhxtTnzmwHkrX86fw8dVIx5b5J2c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MFSyxoNzPzIP2Yi3lCyEcsAx4DvNmk2Jr75oD/tX9iE="; + cargoHash = "sha256-QeMFaYpi8d88gpEbev485hGSCVTbEd7jbgkGSyGeM3g="; meta = { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; From 10c63e51170fa43f4e2ff021e8e113578f855662 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 25 Jun 2025 14:51:49 +0200 Subject: [PATCH 089/108] workflows/labels: fix processing the 100 oldest PRs The `page` number is 1-based, but the remainder might very well be 0. This lead to not looking at the 100 oldest PRs, ever. --- .github/workflows/labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 3421ef77da5e..e1b7bd987cb2 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -390,7 +390,7 @@ jobs: // so it should certainly be hit on the next iteration. // TODO: Evaluate after a while, whether the above holds still true and potentially implement // an overlap between runs. - page: total_runs % Math.ceil(total_pulls / 100) + page: (total_runs % Math.ceil(total_pulls / 100)) + 1 })).data // Some items might be in both search results, so filtering out duplicates as well. From 4e9df2fc31d16dc04dff3d500583e4569c3ff07e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 25 Jun 2025 14:54:43 +0200 Subject: [PATCH 090/108] workflows/labels: slightly improve logging --- .github/workflows/labels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index e1b7bd987cb2..e10f4832d513 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -247,6 +247,7 @@ jobs: .sort((a,b) => b-a) .at(0) ?? item.created_at ) + log('latest_event_at', latest_event_at.toISOString()) const stale_at = new Date(new Date().setDate(new Date().getDate() - 180)) From 3be9e2afc1f5745477addf578a87dad76d3d6517 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 25 Jun 2025 15:14:32 +0200 Subject: [PATCH 091/108] workflows/labels: label rebuilds on failed PR workflow We already tried to fix this case earlier, but didn't account for all cases: A scheduled workflow can also encounter a pull request with failed PR workflow. This failure doesn't need to be in the Eval part, so artifacts could *still* be available. To make sure PRs always get rebuild labels, just ignore the status condition. Either the artifact is there, or it is not. --- .github/workflows/labels.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index e10f4832d513..c92a9ac8da9a 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -147,8 +147,6 @@ jobs: ...context.repo, workflow_id: 'pr.yml', event: 'pull_request_target', - // In pull_request contexts the workflow is still running. - status: context.payload.pull_request ? undefined : 'success', exclude_pull_requests: true, head_sha: pull_request.head.sha })).data.workflow_runs[0]?.id ?? From 181802791664a7540b2e008a9daa2f8923842a96 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 27 Jun 2025 09:15:22 +0200 Subject: [PATCH 092/108] workflows/labels: retry on transient API failures Currently, the labels job fails a few times each day with network failures. Retrying the requests should help. --- .github/workflows/labels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index c92a9ac8da9a..d84f49b5895c 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -65,6 +65,7 @@ jobs: uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 with: github-token: ${{ steps.app-token.outputs.token || github.token }} + retries: 3 script: | const Bottleneck = require('bottleneck') const path = require('node:path') From b60fd4c4010fb1f40ecd08b67ecd77414db7ac40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 07:34:18 +0000 Subject: [PATCH 093/108] python3Packages.posthog: 5.0.0 -> 5.4.0 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 99e95ad0011d..4d1dbfa0edde 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "5.0.0"; + version = "5.4.0"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-pNnttrp6s9T+tmDFJ9S3DZ/HcMTifYkr6Rs8E/8+G5c="; + hash = "sha256-UUINopWw2q5INuFiveI5si7jPRLT0Mad3hnfbykHs6M="; }; build-system = [ setuptools ]; From 3af19462562321551facf9f44aa986307f374d1e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 26 Jun 2025 11:38:50 +0900 Subject: [PATCH 094/108] typescript-go: bump vendorHash in updateScript Co-authored-by: Peder Bergebakken Sundt --- pkgs/by-name/ty/typescript-go/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index c2e9cb680249..43ca92495e5c 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - unstableGitUpdater, + nix-update-script, }: buildGoModule { @@ -41,7 +41,9 @@ buildGoModule { ''; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; }; meta = { From 89e05d6c71d0a9450230ca117e2be4a62228146b Mon Sep 17 00:00:00 2001 From: Andrew Field <27866671+andrew-field@users.noreply.github.com> Date: Sat, 14 Jun 2025 11:47:13 +0300 Subject: [PATCH 095/108] iw4x-launcher: init at 0.10.10 --- pkgs/by-name/iw/iw4x-launcher/package.nix | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/iw/iw4x-launcher/package.nix diff --git a/pkgs/by-name/iw/iw4x-launcher/package.nix b/pkgs/by-name/iw/iw4x-launcher/package.nix new file mode 100644 index 000000000000..6c3cc6eb5c10 --- /dev/null +++ b/pkgs/by-name/iw/iw4x-launcher/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "iw4x-launcher"; + version = "0.10.10"; + + src = fetchFromGitHub { + owner = "iw4x"; + repo = "launcher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VJxOkgk96DnmnlBh5jDFjKVDv7eMtx8RHg7qn0gQpaU="; + }; + + cargoHash = "sha256-nAqT4lkn9H9Yh87Ud+GtRAwgoFbAZNhJtWq2GgrcFbk="; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + env.OPENSSL_NO_VENDOR = true; + + meta = { + description = "Official launcher for the IW4x mod"; + longDescription = "IW4x allows you to relive Call of Duty: Modern Warfare 2 (2009) in a secure environment with expanded modding capabilites"; + homepage = "https://iw4x.dev"; + downloadPage = "https://github.com/iw4x/launcher"; + changelog = "https://github.com/iw4x/launcher/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ andrewfield ]; + mainProgram = "iw4x-launcher"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) From b484f27c3747860766a168e4cd24f87e5b17d477 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 27 Jun 2025 17:23:47 +0900 Subject: [PATCH 096/108] typescript-go: 0-unstable-2025-06-09 -> 0-unstable-2025-06-26 Diff: https://github.com/microsoft/typescript-go/compare/f7d02dd5cc61be86f4f61018171c370cefebe3fd...ff49e725dff18d63dd932de7646e35a8efbb54ff --- pkgs/by-name/ty/typescript-go/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 43ca92495e5c..f00ae7fdae9a 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -7,17 +7,17 @@ buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-06-09"; + version = "0-unstable-2025-06-26"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "f7d02dd5cc61be86f4f61018171c370cefebe3fd"; - hash = "sha256-19+t/Yq73Ih8yCoMJe4r65iejOeAeKYEWacMzqGs6jQ="; + rev = "ff49e725dff18d63dd932de7646e35a8efbb54ff"; + hash = "sha256-L5MFedjlAP7EiC3T5FDdLCs06HwJ03qGIp/2ZT6QKWY="; fetchSubmodules = false; }; - vendorHash = "sha256-SoBlxQfMg59UOO+99HPeKqEPxD2p7JauLMTpQ7Jl03s="; + vendorHash = "sha256-9gZ1h/rsJ5DEcU8CJGKszE98GzZqfs2ELp1lbXsliYk="; ldflags = [ "-s" From 0fd1f1e8783ebf97059f0f8727350b86dd0f357e Mon Sep 17 00:00:00 2001 From: Andrew Field <27866671+andrew-field@users.noreply.github.com> Date: Fri, 27 Jun 2025 11:52:22 +0300 Subject: [PATCH 097/108] alterware-launcher: do not vendor openssl --- pkgs/by-name/al/alterware-launcher/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alterware-launcher/package.nix b/pkgs/by-name/al/alterware-launcher/package.nix index 5d7132d0fe13..7d9ea7565c29 100644 --- a/pkgs/by-name/al/alterware-launcher/package.nix +++ b/pkgs/by-name/al/alterware-launcher/package.nix @@ -2,7 +2,8 @@ lib, fetchFromGitHub, rustPlatform, - perl, + openssl, + pkg-config, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -16,15 +17,18 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-DFIiVNYom3LvU9IFA9w9FvXwm9gqfACDs8KaFKQR9Qs="; }; - useFetchCargoVendor = true; cargoHash = "sha256-/2i6GyBTKLf2oNFkizaBUHcLcCPgsy3g0p31D6cO+xg="; - nativeBuildInputs = [ perl ]; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + env.OPENSSL_NO_VENDOR = true; meta = { description = "Official launcher for AlterWare Call of Duty mods"; longDescription = "Our clients are designed to restore missing features that have been removed by the developers, as well as enhance the capabilities of the games"; homepage = "https://alterware.dev"; + downloadPage = "https://github.com/alterware/alterware-launcher"; changelog = "https://github.com/alterware/alterware-launcher/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ andrewfield ]; From eb444bf84e0514751c2fee21d81e94828fa1b2bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 08:56:13 +0000 Subject: [PATCH 098/108] vscode-extensions.saoudrizwan.claude-dev: 3.17.14 -> 3.18.0 --- .../vscode/extensions/saoudrizwan.claude-dev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 2b4fdc758840..467ae73ad5d4 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.17.14"; - hash = "sha256-pYO1uy1Xd2+74rbc0D+MwK8xvSpmDeRLAVIjAR/F23w="; + version = "3.18.0"; + hash = "sha256-h4A3tYCY3o89bF++YqOCUlahJsRE0XTdK7+NN/LbhgM="; }; meta = { From af136988cf2ee057890a489de87e89e0d1d3c21e Mon Sep 17 00:00:00 2001 From: Johan Larsson <13087841+jolars@users.noreply.github.com> Date: Fri, 27 Jun 2025 11:00:57 +0200 Subject: [PATCH 099/108] python3Packages.optype: init at 0.10.0 (#415783) --- .../python-modules/optype/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/optype/default.nix diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix new file mode 100644 index 000000000000..a6bc03c35523 --- /dev/null +++ b/pkgs/development/python-modules/optype/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + typing-extensions, + numpy, + beartype, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "optype"; + version = "0.10.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jorenham"; + repo = "optype"; + tag = "v${version}"; + hash = "sha256-F6nkbSSmAHIs2I/Yi1+PPtEsSSTnCO8Hsws7JyleJsM="; + }; + + disabled = pythonOlder "3.11"; + + build-system = [ + hatchling + ]; + + dependencies = [ + typing-extensions + ]; + + optional-dependencies = { + numpy = [ + numpy + ]; + }; + + pythonImportsCheck = [ + "optype" + ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + beartype + ]; + + meta = { + description = "Opinionated typing package for precise type hints in Python"; + homepage = "https://github.com/jorenham/optype"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jolars ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56ce5f4d779d..3da8ba9a3bc6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10829,6 +10829,8 @@ self: super: with self; { optuna = callPackage ../development/python-modules/optuna { }; + optype = callPackage ../development/python-modules/optype { }; + opuslib = callPackage ../development/python-modules/opuslib { }; opytimark = callPackage ../development/python-modules/opytimark { }; From 6b6da6aa9c32b72806383593bc7826ac0bd8aad3 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Thu, 26 Jun 2025 19:14:19 +0200 Subject: [PATCH 100/108] micronucleus: 2.04 -> 2.6, adopt, fix versioning, dynamic linking, final_attr, with lib fix --- pkgs/by-name/mi/micronucleus/package.nix | 26 +++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mi/micronucleus/package.nix b/pkgs/by-name/mi/micronucleus/package.nix index 51369ef5a704..9e3298816a11 100644 --- a/pkgs/by-name/mi/micronucleus/package.nix +++ b/pkgs/by-name/mi/micronucleus/package.nix @@ -4,21 +4,24 @@ fetchFromGitHub, lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "micronucleus"; - version = "2.04"; + version = "2.6"; - sourceRoot = "${src.name}/commandline"; + sourceRoot = "${finalAttrs.src.name}/commandline"; src = fetchFromGitHub { owner = "micronucleus"; repo = "micronucleus"; - rev = version; - sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-IngVHeYgPUwSsboTZ5h55iLUxtdBSdugiLk5HbyHIvI="; }; buildInputs = [ libusb-compat-0_1 ]; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "STATIC=" + ]; installPhase = '' mkdir -p $out/bin @@ -27,11 +30,14 @@ stdenv.mkDerivation rec { cp 49-micronucleus.rules $out/lib/udev ''; - meta = with lib; { + meta = { description = "Upload tool for micronucleus"; mainProgram = "micronucleus"; homepage = "https://github.com/micronucleus/micronucleus"; - license = licenses.gpl3; - maintainers = [ maintainers.cab404 ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + cab404 + kuflierl + ]; }; -} +}) From 0e23571e82c7fd14906c6a24c0ac8e1ab9b623a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 09:06:51 +0000 Subject: [PATCH 101/108] python3Packages.inject: 5.2.1 -> 5.3.0 --- pkgs/development/python-modules/inject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inject/default.nix b/pkgs/development/python-modules/inject/default.nix index bcf2bf0301ce..b3e56625b2c6 100644 --- a/pkgs/development/python-modules/inject/default.nix +++ b/pkgs/development/python-modules/inject/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "inject"; - version = "5.2.1"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "ivankorobkov"; repo = "python-inject"; tag = "v${version}"; - hash = "sha256-Ws296ESjb+a322imiRRWTS43w32rJc/7Y//OBQXOwnw="; + hash = "sha256-c/OpEsT9KF7285xfD+VRorrNHn3r9IPp/ts9JHyGK9s="; }; build-system = [ From 2a0d54f156974a4a09eeb9a3853f923b0a9a41b4 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 27 Jun 2025 16:32:48 +0800 Subject: [PATCH 102/108] apostrophe: pin to python 3.12 --- pkgs/by-name/ap/apostrophe/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index 9321570e2583..195e72ef6857 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -4,7 +4,7 @@ gtksourceview5, libspelling, fetchFromGitHub, - python3Packages, + python312Packages, nodePackages, meson, ninja, @@ -40,7 +40,10 @@ let hash = "sha256-L6KVBw20K67lHT07Ws+ZC2DwdURahqyuyjAaK0kTgN0="; }; in -python3Packages.buildPythonApplication { + +# Requires telnetlib, and possibly others +# Try to remove in subsequent updates +python312Packages.buildPythonApplication { inherit version src; pname = "apostrophe"; pyproject = false; @@ -80,7 +83,7 @@ python3Packages.buildPythonApplication { webkitgtk_6_0 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python312Packages; [ pygobject3 pypandoc chardet From e86ec35c4b53ea9db1f82d7f4094ae9786d52c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 10:01:09 +0000 Subject: [PATCH 103/108] mcphost: 0.13.1 -> 0.18.1 --- pkgs/by-name/mc/mcphost/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix index 22567f8f046b..f8f0235ff9b2 100644 --- a/pkgs/by-name/mc/mcphost/package.nix +++ b/pkgs/by-name/mc/mcphost/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcphost"; - version = "0.13.1"; + version = "0.18.1"; src = fetchFromGitHub { owner = "mark3labs"; repo = "mcphost"; tag = "v${finalAttrs.version}"; - hash = "sha256-vPho1fotkvGr1H+XiWpCukjgKifu3bALUQL6y5y+R08="; + hash = "sha256-5w42N2RJeZXyM7XiKuwYlGxwH6KIJajGnJ9HCHnBNZ8="; }; - vendorHash = "sha256-4jr73N8WcRQTRNvabOrUb2uRCW2LYxhGy0wshsZOcxc="; + vendorHash = "sha256-U/XtO4OhcioaSU2iGTNmvEilp9+Yu3TVafzNEaFcWEg="; meta = { description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)"; From 237fc36cfc7c48c987c8758e4cc1e2296f3046f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 10:40:36 +0000 Subject: [PATCH 104/108] pgscv: 0.14.0 -> 0.14.1 --- pkgs/by-name/pg/pgscv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pg/pgscv/package.nix b/pkgs/by-name/pg/pgscv/package.nix index 1998cc9ff720..cb3fa9455ad6 100644 --- a/pkgs/by-name/pg/pgscv/package.nix +++ b/pkgs/by-name/pg/pgscv/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pgscv"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "CHERTS"; repo = "pgscv"; tag = "v${version}"; - hash = "sha256-BWGRighkezG3zjhyiYEFTeVvWps4q9+9xjk9EPHI/B0="; + hash = "sha256-jUTHaZvJ6O3dVhBGO+ZFT9A7KmKieR2viGhZXwOv5S8="; }; - vendorHash = "sha256-UEqJz7xKBQaBrBI3mV8W+WtLGDDf3EaV7NzEPofW+TE="; + vendorHash = "sha256-v4Xi2R+q2jGD3Fy6xvKNRaf+P725acr+tvdDxod2KiI="; ldflags = [ "-X=main.appName=pgscv" From e18c139187712e7739cc88a5ee7a1dbd7fb24a76 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 27 Jun 2025 11:44:31 +0100 Subject: [PATCH 105/108] nixos-rebuild-ng: fix tests when `withReexec = true` --- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index fdf4cdb31a96..425997aa82b1 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -132,7 +132,7 @@ def test_parse_args() -> None: @patch("os.execve", autospec=True) @patch(get_qualified_name(nr.nix.build), autospec=True) def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None: - monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng") + monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng") argv = ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"] args, _ = nr.parse_args(argv) mock_build.return_value = Path("/path") @@ -178,7 +178,7 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) - def test_reexec_flake( mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch ) -> None: - monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng") + monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng") argv = ["/path/bin/nixos-rebuild-ng", "switch", "--flake"] args, _ = nr.parse_args(argv) mock_build.return_value = Path("/path") From 31d8e6535b6b8c86629f3f02583fecf129e1618b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 27 Jun 2025 11:45:21 +0100 Subject: [PATCH 106/108] nixos-rebuild-ng: add test when `withReexec`/`withNgSuffix` is used This is to make sure that we don't introduce regressions in those code paths. --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index 020b9ae7694a..955ba82e420f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -111,6 +111,10 @@ python3Packages.buildPythonApplication rec { }; tests = { + with_reexec = nixos-rebuild-ng.override { + withReexec = true; + withNgSuffix = false; + }; with_nix_latest = nixos-rebuild-ng.override { nix = nixVersions.latest; }; @@ -122,11 +126,9 @@ python3Packages.buildPythonApplication rec { nix = nixVersions.nix_2_3; }; with_lix_latest = nixos-rebuild-ng.override { - # oldest / minimum supported version in nixpkgs nix = lixPackageSets.latest.lix; }; with_lix_stable = nixos-rebuild-ng.override { - # oldest / minimum supported version in nixpkgs nix = lixPackageSets.stable.lix; }; From 987d1657a834ca6cf8da56f4ac62878c8ab7b07c Mon Sep 17 00:00:00 2001 From: tye-exe Date: Mon, 23 Jun 2025 14:34:16 +0100 Subject: [PATCH 107/108] minhtml: init at 0.16.4 I generated a `Cargo.lock` file which is included in the patch phase, as upstream does not have one. --- pkgs/by-name/mi/minhtml/Cargo.lock | 2063 +++++++++++++++++++++++++++ pkgs/by-name/mi/minhtml/package.nix | 43 + 2 files changed, 2106 insertions(+) create mode 100644 pkgs/by-name/mi/minhtml/Cargo.lock create mode 100644 pkgs/by-name/mi/minhtml/package.nix diff --git a/pkgs/by-name/mi/minhtml/Cargo.lock b/pkgs/by-name/mi/minhtml/Cargo.lock new file mode 100644 index 000000000000..cef443b0778b --- /dev/null +++ b/pkgs/by-name/mi/minhtml/Cargo.lock @@ -0,0 +1,2063 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.16", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if 1.0.1", + "getrandom 0.3.3", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "backtrace" +version = "0.3.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +dependencies = [ + "addr2line", + "cfg-if 1.0.1", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64-simd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +dependencies = [ + "simd-abstraction", +] + +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "bitflags 2.9.1", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.104", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bumpalo" +version = "3.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" + +[[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.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "c14n" +version = "0.0.1" +dependencies = [ + "minify-html", +] + +[[package]] +name = "cc" +version = "1.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +dependencies = [ + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" + +[[package]] +name = "charlines" +version = "0.0.1" + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.8", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +dependencies = [ + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if 1.0.1", + "wasm-bindgen", +] + +[[package]] +name = "const-str" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21077772762a1002bb421c3af42ac1725fa56066bfc53d9a55bb79905df2aaf3" +dependencies = [ + "const-str-proc-macro", +] + +[[package]] +name = "const-str-proc-macro" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "cssparser" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf", + "smallvec", +] + +[[package]] +name = "cssparser-color" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f" +dependencies = [ + "cssparser", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.104", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.1", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + +[[package]] +name = "data-url" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" +dependencies = [ + "matches", +] + +[[package]] +name = "dtoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "backtrace", + "version_check", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if 1.0.1", + "js-sys", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if 1.0.1", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.12", + "bumpalo", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hashbrown" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "index" +version = "0.16.4" +dependencies = [ + "console_error_panic_hook", + "getrandom 0.2.16", + "js-sys", + "minify-html", + "wasm-bindgen", + "wasm-bindgen-test", + "wee_alloc", +] + +[[package]] +name = "indexmap" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown 0.15.4", + "serde", +] + +[[package]] +name = "indoc" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jni" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1981310da491a4f0f815238097d0d43d8072732b5ae5f8bd0d8eadf5bf245402" +dependencies = [ + "cesu8", + "combine", + "error-chain", + "jni-sys", + "log", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.174" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" + +[[package]] +name = "libloading" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +dependencies = [ + "cfg-if 1.0.1", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" +dependencies = [ + "cfg-if 1.0.1", + "windows-targets 0.53.2", +] + +[[package]] +name = "lightningcss" +version = "1.0.0-alpha.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a73ffa17de66534e4b527232f44aa0a89fad22c4f4e0735f9be35494f058e54" +dependencies = [ + "ahash 0.8.12", + "bitflags 2.9.1", + "const-str", + "cssparser", + "cssparser-color", + "dashmap", + "data-encoding", + "getrandom 0.2.16", + "indexmap", + "itertools 0.10.5", + "lazy_static", + "lightningcss-derive", + "parcel_selectors", + "parcel_sourcemap", + "paste", + "pathdiff", + "rayon", + "serde", + "smallvec", +] + +[[package]] +name = "lightningcss-derive" +version = "1.0.0-alpha.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12744d1279367caed41739ef094c325d53fb0ffcd4f9b84a368796f870252" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "magnus" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479" +dependencies = [ + "magnus-macros", + "rb-sys", + "rb-sys-env", + "seq-macro", +] + +[[package]] +name = "magnus-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memory_units" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" + +[[package]] +name = "minhtml" +version = "0.16.4" +dependencies = [ + "minify-html", + "rayon", + "structopt", +] + +[[package]] +name = "minicov" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" +dependencies = [ + "cc", + "walkdir", +] + +[[package]] +name = "minify-html" +version = "0.16.4" +dependencies = [ + "ahash 0.8.12", + "aho-corasick 0.7.20", + "lightningcss", + "memchr", + "minify-html-common", + "minify-js", + "once_cell", +] + +[[package]] +name = "minify-html-bench" +version = "0.0.1" +dependencies = [ + "minify-html", + "serde", + "serde_json", +] + +[[package]] +name = "minify-html-common" +version = "0.0.2" +dependencies = [ + "ahash 0.8.12", + "aho-corasick 0.7.20", + "itertools 0.12.1", + "memchr", + "once_cell", + "serde", + "serde_json", +] + +[[package]] +name = "minify-html-java" +version = "0.16.4" +dependencies = [ + "jni", + "minify-html", +] + +[[package]] +name = "minify-html-nodejs" +version = "0.16.4" +dependencies = [ + "minify-html", + "neon", +] + +[[package]] +name = "minify-html-onepass" +version = "0.16.4" +dependencies = [ + "ahash 0.8.12", + "aho-corasick 0.7.20", + "lightningcss", + "memchr", + "minify-html-common", + "minify-js", + "once_cell", +] + +[[package]] +name = "minify-html-onepass-bench" +version = "0.0.1" +dependencies = [ + "minify-html-onepass", + "serde", + "serde_json", +] + +[[package]] +name = "minify-html-onepass-python" +version = "0.16.4" +dependencies = [ + "minify-html-onepass", + "pyo3", +] + +[[package]] +name = "minify-html-python" +version = "0.16.4" +dependencies = [ + "minify-html", + "pyo3", +] + +[[package]] +name = "minify-html-ruby" +version = "0.16.4" +dependencies = [ + "magnus", + "minify-html", +] + +[[package]] +name = "minify-js" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1fa5546ee8bd66024113e506cabe4230e76635a094c06ea2051b66021dda92e" +dependencies = [ + "aho-corasick 0.7.20", + "lazy_static", + "parse-js", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", +] + +[[package]] +name = "neon" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" +dependencies = [ + "neon-build", + "neon-macros", + "neon-runtime", + "semver", + "smallvec", +] + +[[package]] +name = "neon-build" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" + +[[package]] +name = "neon-macros" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf" +dependencies = [ + "quote", + "syn 1.0.109", + "syn-mid", +] + +[[package]] +name = "neon-runtime" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" +dependencies = [ + "cfg-if 1.0.1", + "libloading 0.6.7", + "smallvec", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "object" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "outref" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" + +[[package]] +name = "parcel_selectors" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54fd03f1ad26cb6b3ec1b7414fa78a3bd639e7dbb421b1a60513c96ce886a196" +dependencies = [ + "bitflags 2.9.1", + "cssparser", + "log", + "phf", + "phf_codegen", + "precomputed-hash", + "rustc-hash 2.1.1", + "smallvec", +] + +[[package]] +name = "parcel_sourcemap" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb" +dependencies = [ + "base64-simd", + "data-url", + "rkyv", + "serde", + "serde_json", + "vlq", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if 1.0.1", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-js" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2742b5e32dcb5930447ed9f9e401a7dfd883867fc079c4fac44ae8ba3593710e" +dependencies = [ + "aho-corasick 0.7.20", + "bumpalo", + "hashbrown 0.13.2", + "lazy_static", + "memchr", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", +] + +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +dependencies = [ + "cfg-if 1.0.1", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +dependencies = [ + "once_cell", + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rb-sys" +version = "0.9.116" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad" +dependencies = [ + "rb-sys-build", +] + +[[package]] +name = "rb-sys-build" +version = "0.9.116" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0" +dependencies = [ + "bindgen", + "lazy_static", + "proc-macro2", + "quote", + "regex", + "shell-words", + "syn 2.0.104", +] + +[[package]] +name = "rb-sys-env" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb" + +[[package]] +name = "redox_syscall" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +dependencies = [ + "bitflags 2.9.1", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick 1.1.3", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick 1.1.3", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "rkyv" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustversion" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "seq-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-abstraction" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +dependencies = [ + "outref", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck 0.3.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn-mid" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "tinyvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unindent" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" + +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + +[[package]] +name = "uuid" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vlq" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if 1.0.1", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn 2.0.104", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +dependencies = [ + "cfg-if 1.0.1", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3" +dependencies = [ + "js-sys", + "minicov", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wee_alloc" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "memory_units", + "winapi", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.1", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "zerocopy" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] diff --git a/pkgs/by-name/mi/minhtml/package.nix b/pkgs/by-name/mi/minhtml/package.nix new file mode 100644 index 000000000000..02448af08a0c --- /dev/null +++ b/pkgs/by-name/mi/minhtml/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "minhtml"; + version = "0.16.4"; + + src = fetchFromGitHub { + owner = "wilsonzlin"; + repo = "minify-html"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SoCSHhgTLfztSfvzxxpZn/nQpXbKlkE4iiP0YZ0MVjY="; + }; + + # Upstream does not include a lock file so one has to be patched in. + cargoLock = { + lockFile = ./Cargo.lock; + }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + # Ensures that only the correct package gets built, as upstream contains multiple. + cargoBuildFlags = [ + "-p" + "minhtml" + ]; + cargoTestFlags = [ + "-p" + "minhtml" + ]; + + meta = { + description = "Minifier for HTML, JavaScript, and CSS"; + mainProgram = "minhtml"; + homepage = "https://github.com/wilsonzlin/minify-html"; + changelog = "https://github.com/wilsonzlin/minify-html/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tye-exe ]; + }; +}) From f0b2b126e5f04a9d056a071135d20e99460073f2 Mon Sep 17 00:00:00 2001 From: patka Date: Sat, 26 Apr 2025 11:17:47 +0200 Subject: [PATCH 108/108] uwsgi: upgrade from pcre to pcre2 --- pkgs/by-name/uw/uwsgi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix index 29649d754025..a28e6db45180 100644 --- a/pkgs/by-name/uw/uwsgi/package.nix +++ b/pkgs/by-name/uw/uwsgi/package.nix @@ -4,7 +4,7 @@ lib, pkg-config, jansson, - pcre, + pcre2, libxcrypt, expat, zlib, @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ jansson - pcre + pcre2 libxcrypt ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [