From 09b536d6ad8e48de21e836a85e42bf6fa470ff43 Mon Sep 17 00:00:00 2001
From: Palmer Cox
Date: Sat, 21 Mar 2026 22:11:21 -0400
Subject: [PATCH 01/74] librespeed-cli: no longer broken on darwin
I tested on aarch64-darwin and it compiled and seemed to run fine.
---
pkgs/by-name/li/librespeed-cli/package.nix | 2 --
1 file changed, 2 deletions(-)
diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix
index 3b914218fc9c..051704a891fa 100644
--- a/pkgs/by-name/li/librespeed-cli/package.nix
+++ b/pkgs/by-name/li/librespeed-cli/package.nix
@@ -1,6 +1,5 @@
{
lib,
- stdenv,
buildGoModule,
fetchFromGitHub,
}:
@@ -32,6 +31,5 @@ buildGoModule (finalAttrs: {
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "librespeed-cli";
- broken = stdenv.hostPlatform.isDarwin;
};
})
From 0ae9f156faae92d27becda0fd936ee83f6cad4a0 Mon Sep 17 00:00:00 2001
From: Nicolas Benes
Date: Mon, 23 Mar 2026 17:15:30 +0100
Subject: [PATCH 02/74] opentelemetry-cpp: 1.25.0 -> 1.26.0
https://github.com/open-telemetry/opentelemetry-cpp/releases/tag/v1.26.0
---
pkgs/by-name/op/opentelemetry-cpp/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index c27869edc59d..866bb5731046 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "opentelemetry-cpp";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-cpp";
rev = "v${finalAttrs.version}";
- hash = "sha256-/iuAv8UcRYkuQjV6Hgs1HHqW0SSVH+By5narF+vy7JU=";
+ hash = "sha256-jYYTPcTFIrgMn1NUjwacZC1J26TZRKdGlq+5yw7NNsU=";
};
patches = [
From e81555bfa9ec909d6ea55874bfd3b73b88e6a6c9 Mon Sep 17 00:00:00 2001
From: Tom Hunze
Date: Tue, 24 Mar 2026 13:40:04 +0100
Subject: [PATCH 03/74] stremio-linux-shell: fix fetchCargoVendor path
#387337 changed the directory layout of `cargoDeps` such that the
vendored dependencies are split by dependency source
(e.g., `source-git-0`, `source-git-1`, `source-registry-0`).
---
pkgs/by-name/st/stremio-linux-shell/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix
index f22d7e6bfc23..3b82f29fe336 100644
--- a/pkgs/by-name/st/stremio-linux-shell/package.nix
+++ b/pkgs/by-name/st/stremio-linux-shell/package.nix
@@ -66,11 +66,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
substituteInPlace src/config.rs \
--replace-fail "@serverjs@" "${placeholder "out"}/share/stremio/server.js"
- substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+ substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
- substituteInPlace $cargoDepsCopy/xkbcommon-dl-*/src/lib.rs \
+ substituteInPlace $cargoDepsCopy/*/xkbcommon-dl-*/src/lib.rs \
--replace-fail "libxkbcommon.so.0" "${libxkbcommon}/lib/libxkbcommon.so.0"
- substituteInPlace $cargoDepsCopy/xkbcommon-dl-*/src/x11.rs \
+ substituteInPlace $cargoDepsCopy/*/xkbcommon-dl-*/src/x11.rs \
--replace-fail "libxkbcommon-x11.so.0" "${libxkbcommon}/lib/libxkbcommon-x11.so.0"
'';
From c5adb8ac2db96371a63bcef342b72cf441abcff6 Mon Sep 17 00:00:00 2001
From: redianthus
Date: Thu, 26 Mar 2026 13:45:36 +0100
Subject: [PATCH 04/74] ocamlPackages.caqti-miou: init at 2.2.4
---
pkgs/development/ocaml-modules/caqti/miou.nix | 23 +++++++++++++++++++
pkgs/top-level/ocaml-packages.nix | 2 ++
2 files changed, 25 insertions(+)
create mode 100644 pkgs/development/ocaml-modules/caqti/miou.nix
diff --git a/pkgs/development/ocaml-modules/caqti/miou.nix b/pkgs/development/ocaml-modules/caqti/miou.nix
new file mode 100644
index 000000000000..ba7edc16ac61
--- /dev/null
+++ b/pkgs/development/ocaml-modules/caqti/miou.nix
@@ -0,0 +1,23 @@
+{
+ buildDunePackage,
+ caqti,
+ logs,
+ miou,
+}:
+
+buildDunePackage {
+ pname = "caqti-miou";
+ inherit (caqti) version src;
+
+ minimalOCamlVersion = "5.1";
+
+ propagatedBuildInputs = [
+ caqti
+ logs
+ miou
+ ];
+
+ meta = caqti.meta // {
+ description = "Miou support for Caqti";
+ };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9c772d078b05..b57a74e05ce7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -221,6 +221,8 @@ let
caqti-lwt = callPackage ../development/ocaml-modules/caqti/lwt.nix { };
+ caqti-miou = callPackage ../development/ocaml-modules/caqti/miou.nix { };
+
caqti-type-calendar = callPackage ../development/ocaml-modules/caqti/type-calendar.nix { };
carton = callPackage ../development/ocaml-modules/carton {
From 7a02a60031c717d956b4af7c7f04c2a343e330f8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Thu, 26 Mar 2026 23:41:07 +0100
Subject: [PATCH 05/74] =?UTF-8?q?ocamlPackages.core:=200.17.1=20=E2=86=92?=
=?UTF-8?q?=200.17.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/development/ocaml-modules/janestreet/0.17.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index cf1ac323149b..1250dfe2b447 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -460,8 +460,8 @@ with self;
core = janePackage {
pname = "core";
- version = "0.17.1";
- hash = "sha256-XkABcvglVJLVnWJmvfr5eVywyclPSDqanVOLQNqdNtQ=";
+ version = "0.17.2";
+ hash = "sha256-KIpQ6W2gsuq44TtGPpIs/j1kwbSP3GMmIwvZAYMYtNo=";
meta.description = "Industrial strength alternative to OCaml's standard library";
buildInputs = [ jst-config ];
propagatedBuildInputs = [
From b25b10ca8ae32acfd0c83b27569fb509d187cf14 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao
Date: Fri, 27 Mar 2026 14:04:28 +0800
Subject: [PATCH 06/74] obsidian: expose obsidian-cli
---
pkgs/by-name/ob/obsidian/package.nix | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix
index 0255df853502..e7c079d253e5 100644
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@@ -6,6 +6,7 @@
electron,
makeDesktopItem,
imagemagick,
+ autoPatchelfHook,
writeScript,
_7zz,
commandLineArgs ? "",
@@ -71,6 +72,7 @@ let
meta
;
nativeBuildInputs = [
+ autoPatchelfHook
makeWrapper
imagemagick
];
@@ -81,6 +83,7 @@ let
--add-flags $out/share/obsidian/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
+ install -m 755 -D obsidian-cli $out/bin/obsidian-cli
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
install -m 444 -D "${desktopItem}/share/applications/"* \
@@ -118,7 +121,8 @@ let
runHook preInstall
mkdir -p $out/{Applications/${appname}.app,bin}
cp -R . $out/Applications/${appname}.app
- makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname}
+ makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/obsidian
+ makeWrapper $out/Applications/${appname}.app/Contents/MacOS/obsidian-cli $out/bin/obsidian-cli
runHook postInstall
'';
};
From b9decce359499434eaa43c92766a13a0c0b39722 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Fri, 27 Mar 2026 16:39:28 +0000
Subject: [PATCH 07/74] radicle-node: 1.7.1 -> 1.8.0
Changelog: https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/CHANGELOG.md
---
pkgs/by-name/ra/radicle-node/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 46846fa219f5..57fe9f6b471b 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -15,9 +15,9 @@
xdg-utils,
versionCheckHook,
- version ? "1.7.1",
- srcHash ? "sha256-MPanUDVKol7mWVJDrGoGUkKqmcje+MsiK0WfqXQ27iI=",
- cargoHash ? "sha256-Lru4ps9FYi03NVtRLtwZX9jhozAvBDsJ72ihdIpQcQ8=",
+ version ? "1.8.0",
+ srcHash ? "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=",
+ cargoHash ? "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=",
updateScript ? ./update.sh,
}:
From f6b8bf4d8966fae8a38e72e0d81ee024a3303118 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Fri, 27 Mar 2026 16:39:57 +0000
Subject: [PATCH 08/74] radicle-node-unstable: 1.8.0-rc.3 -> 1.8.0
Changelog: https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/CHANGELOG.md
---
pkgs/by-name/ra/radicle-node/unstable.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/ra/radicle-node/unstable.nix b/pkgs/by-name/ra/radicle-node/unstable.nix
index 0404e5a77202..29015eac64ca 100644
--- a/pkgs/by-name/ra/radicle-node/unstable.nix
+++ b/pkgs/by-name/ra/radicle-node/unstable.nix
@@ -1,8 +1,8 @@
{ radicle-node }:
radicle-node.override {
- version = "1.8.0-rc.3";
- srcHash = "sha256-W94Vwf7ozwkENLueKF9Lvkns7HRX7PbMtvMHMCujV/s=";
- cargoHash = "sha256-9+mlNQwV2bUyAXkPN7aflGuN/Xd32uT+JEjl48ZDeXY=";
+ version = "1.8.0";
+ srcHash = "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=";
+ cargoHash = "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=";
updateScript = ./update-unstable.sh;
}
From a5a7b56298dc28cddbc81d87a5287584e878d7e5 Mon Sep 17 00:00:00 2001
From: Cathal Mullan
Date: Sat, 28 Mar 2026 00:40:32 +0000
Subject: [PATCH 09/74] dioxus-cli: 0.7.3 -> 0.7.4
---
pkgs/by-name/di/dioxus-cli/package.nix | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix
index 8bb791570628..b85c58a59a80 100644
--- a/pkgs/by-name/di/dioxus-cli/package.nix
+++ b/pkgs/by-name/di/dioxus-cli/package.nix
@@ -7,7 +7,8 @@
openssl,
rustfmt,
makeWrapper,
- wasm-bindgen-cli_0_2_108,
+ esbuild,
+ wasm-bindgen-cli_0_2_114,
testers,
dioxus-cli,
withTelemetry ? false,
@@ -15,15 +16,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dioxus-cli";
- version = "0.7.3";
+ version = "0.7.4";
src = fetchCrate {
pname = "dioxus-cli";
version = finalAttrs.version;
- hash = "sha256-6uG737MNk+wTKqNWgFEd8MsOOvllZLDnIrJPAn5Wjuw=";
+ hash = "sha256-6ZKVnLMq2eB6kj2Ly3z0/dWpZ+x9bJwPtyxE8Ef6haI=";
};
- cargoHash = "sha256-BdPsdWah/f2pveQViPikIV2riSwjSo+qGOFoP+hHaiM=";
+ cargoHash = "sha256-VrJuT3ori25joRe7kjSr6j8xfbKn5udETviV3id2mG4=";
buildFeatures = [
"no-downloads"
]
@@ -68,7 +69,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
postInstall = ''
wrapProgram $out/bin/dx \
- --suffix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_108 ]}
+ --suffix PATH : ${
+ lib.makeBinPath [
+ esbuild
+ wasm-bindgen-cli_0_2_114
+ ]
+ }
'';
meta = {
From 18b14a34e1c792378a76014be2430bea00563abf Mon Sep 17 00:00:00 2001
From: Sizhe Zhao
Date: Sat, 28 Mar 2026 14:53:06 +0800
Subject: [PATCH 10/74] watchexec: fix update script
---
pkgs/by-name/wa/watchexec/package.nix | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index d3553f90056f..d1c5c0671423 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -46,7 +46,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
--zsh completions/zsh
'';
- passthru.updateScript = nix-update-script { };
+ passthru.updateScript = nix-update-script {
+ extraArgs = [
+ "--version-regex"
+ "^v(.+)"
+ ];
+ };
meta = {
description = "Executes commands in response to file modifications";
From 02005471086b8525f3e61315e67e4d4495dc9a45 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao
Date: Sat, 28 Mar 2026 14:53:40 +0800
Subject: [PATCH 11/74] watchexec: 2.3.2 -> 2.5.0
---
pkgs/by-name/wa/watchexec/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index d1c5c0671423..12f1d4311b61 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "watchexec";
- version = "2.3.2";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "watchexec";
repo = "watchexec";
tag = "v${finalAttrs.version}";
- hash = "sha256-BJRvz3rFLaOCNhOsEo0rSOgB9BCJ2LMB9XEw8RBWXXs=";
+ hash = "sha256-QXoqRJl4eLBE2rmOBvAhlBRE4OavvEWpGMKlBrxwbaU=";
};
- cargoHash = "sha256-VtSRC4lyjMo2O9dNbVllcDEx08zQWJMQmQ/2bNMup6U=";
+ cargoHash = "sha256-svDmGwI7YYbGdI5/TMJGPo0wVgBF6aDec9C3fYsHxYQ=";
nativeBuildInputs = [ installShellFiles ];
From 8e8f1cc00d1956382f900d1b774334dd6b5a0f4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sat, 28 Mar 2026 09:30:46 +0000
Subject: [PATCH 12/74] rime-wanxiang: 15.2.0 -> 15.4.0
---
pkgs/by-name/ri/rime-wanxiang/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index b3cb9f42b4de..7be5a6df79f4 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "rime-wanxiang";
- version = "15.2.0";
+ version = "15.4.0";
src = fetchFromGitHub {
owner = "amzxyz";
repo = "rime_wanxiang";
tag = "v" + finalAttrs.version;
- hash = "sha256-jX3QJO5gi5zk8ZbRTT2GGnevPDXzqs/H0MoxKiFOuJY=";
+ hash = "sha256-MbPTW+Bams2Zze8PjSHsNnUzpyvZ/l7xS8wnCTQn8MA=";
};
installPhase = ''
From 27775f183bb4a6f08d62331d1bc1966776871902 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sat, 28 Mar 2026 19:55:27 +0000
Subject: [PATCH 13/74] python3Packages.aiorussound: 4.9.0 -> 4.9.1
---
pkgs/development/python-modules/aiorussound/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index 9f42d664085f..5841e5992817 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aiorussound";
- version = "4.9.0";
+ version = "4.9.1";
pyproject = true;
# requires newer f-strings introduced in 3.12
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "noahhusby";
repo = "aiorussound";
tag = version;
- hash = "sha256-okuDbY4Dx57a7zQc+LYCwe+FOjQS+hbAzSAK47uhGFg=";
+ hash = "sha256-vDGNb2eXvNLWzEs9ZI2vOk4+7RJQ/ISu9PCkIWCBJQw=";
};
build-system = [ poetry-core ];
From 20d77286185ec1d8bc811666257b3614da2589b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 29 Mar 2026 04:55:47 +0000
Subject: [PATCH 14/74] python3Packages.swift: 2.37.0 -> 2.37.1
---
pkgs/development/python-modules/swift/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix
index 07f00b0485b7..9f3d8475fca4 100644
--- a/pkgs/development/python-modules/swift/default.nix
+++ b/pkgs/development/python-modules/swift/default.nix
@@ -24,12 +24,12 @@
buildPythonPackage (finalAttrs: {
pname = "swift";
- version = "2.37.0";
+ version = "2.37.1";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
- hash = "sha256-EO50/6S6fXIZtYsCAO8VmpWotKdwgnmY48W6XKCypGU=";
+ hash = "sha256-d5Jol5iCY8o+Ix+xrviufMLOh3T0UN2bVa+GrsA8D6k=";
};
nativeBuildInputs = [ installShellFiles ];
From 9f8f667830026ac7614ce227e4b37456eb484277 Mon Sep 17 00:00:00 2001
From: DarkOnion0
Date: Sun, 29 Mar 2026 15:12:39 +0200
Subject: [PATCH 15/74] drawio: 29.0.3 -> 29.6.6
https://github.com/jgraph/drawio-desktop/releases/tag/v29.6.6
---
pkgs/by-name/dr/drawio/package.nix | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/pkgs/by-name/dr/drawio/package.nix b/pkgs/by-name/dr/drawio/package.nix
index a86bddff9fff..a97c8f721a73 100644
--- a/pkgs/by-name/dr/drawio/package.nix
+++ b/pkgs/by-name/dr/drawio/package.nix
@@ -2,27 +2,26 @@
lib,
stdenv,
fetchFromGitHub,
- fetchYarnDeps,
+ fetchNpmDeps,
makeDesktopItem,
copyDesktopItems,
- fixup-yarn-lock,
+ npm-lockfile-fix,
makeWrapper,
darwin,
nodejs,
- yarn,
electron,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "drawio";
- version = "29.0.3";
+ version = "29.6.6";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-YVkGt096Vy1s/ZjvuWUWVE2eiaI7Wg/YdWSueTsKzEg=";
+ hash = "sha256-g2p6PEKWynS/+yvy6TUNrJJi4fQjBMq4koihSeVfxU4=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@@ -31,16 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
'';
- offlineCache = fetchYarnDeps {
- yarnLock = finalAttrs.src + "/yarn.lock";
- hash = "sha256-/CzHvGUKhB2RBaz+LVXaHr5q6KLkQR0asFZRruOUmqU=";
+ offlineCache = fetchNpmDeps {
+ src = finalAttrs.src;
+ hash = "sha256-53QqN5FBn7K13BjLoM4B6EgMsxPRNNXpQ0ecXjxpGpE=";
};
nativeBuildInputs = [
- fixup-yarn-lock
+ npm-lockfile-fix
makeWrapper
nodejs
- yarn
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
copyDesktopItems
@@ -55,12 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
runHook preConfigure
export HOME="$TMPDIR"
- yarn config --offline set yarn-offline-mirror "$offlineCache"
- fixup-yarn-lock yarn.lock
- # Ensure that the node_modules folder is created by yarn install.
- # See https://github.com/yarnpkg/yarn/issues/5500#issuecomment-1221456246
- echo "nodeLinker: node-modules" > .yarnrc.yml
- yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
+ npm config set cache "$offlineCache"
+ npm-lockfile-fix package-lock.json
+ npm ci --offline --ignore-scripts --no-audit --no-fund
patchShebangs node_modules/
runHook postConfigure
@@ -77,7 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
sed -i "/afterSign/d" electron-builder-linux-mac.json
''
+ ''
- yarn --offline run electron-builder --dir \
+ npm exec electron-builder -- \
+ --dir \
${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json --config.mac.identity=null"} \
-c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \
-c.electronVersion=${electron.version}
From 6279ce386d328a315235df042c9c0af9a23406e2 Mon Sep 17 00:00:00 2001
From: eyjhb
Date: Sun, 29 Mar 2026 16:15:09 +0200
Subject: [PATCH 16/74] alvr: use ffmpeg_7 instead of ffmpeg_8
Fixes vaapi error messages, as ALVR uses ffmpeg 6, but ffmpeg 7 works
fine based on testing.
---
pkgs/by-name/al/alvr/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix
index c564fe2f7e34..6de02465903e 100644
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@@ -11,7 +11,7 @@
brotli,
bzip2,
celt,
- ffmpeg,
+ ffmpeg_7,
gmp,
jack2,
lame,
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
patches = [
(replaceVars ./fix-finding-libs.patch {
- ffmpeg = lib.getDev ffmpeg;
+ ffmpeg = lib.getDev ffmpeg_7;
x264 = lib.getDev x264;
})
];
@@ -107,7 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
brotli
bzip2
celt
- ffmpeg
+ ffmpeg_7
gmp
jack2
lame
From e0c8e655c389e05eafa85e455ae685972749cf1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 29 Mar 2026 14:51:09 +0000
Subject: [PATCH 17/74] cariddi: 1.4.5 -> 1.4.6
---
pkgs/by-name/ca/cariddi/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix
index 518bdc61478c..2c65e29bbba4 100644
--- a/pkgs/by-name/ca/cariddi/package.nix
+++ b/pkgs/by-name/ca/cariddi/package.nix
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "cariddi";
- version = "1.4.5";
+ version = "1.4.6";
src = fetchFromGitHub {
owner = "edoardottt";
repo = "cariddi";
tag = "v${finalAttrs.version}";
- hash = "sha256-ULeG+TmpRbHT+GsEuEsSSCzlOwRzDzUZmPZNN7KZdrA=";
+ hash = "sha256-+nVZmifJvsNbYJ0TYTSQfYB/B0NJaU3wPn/e/2A3j60=";
};
- vendorHash = "sha256-DgyDRMDYBC4GVuffJCrNpoDsqtpZ/LH++q5zXdkC1YE=";
+ vendorHash = "sha256-/xnnkzoS1+fow5audoa4SllSzGMwrxvbjCjCHzOguYU=";
ldflags = [
"-w"
From 0ac6e5343efa2b71937f88e360af3c151605e684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Sun, 29 Mar 2026 10:26:14 -0700
Subject: [PATCH 18/74] python3Packages.pyblu: 2.0.5 -> 2.0.6
Diff: https://github.com/LouisChrist/pyblu/compare/v2.0.5...v2.0.6
Changelog: https://github.com/LouisChrist/pyblu/releases/tag/v2.0.6
---
pkgs/development/python-modules/pyblu/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix
index 4894ed593025..baa7ff79bd63 100644
--- a/pkgs/development/python-modules/pyblu/default.nix
+++ b/pkgs/development/python-modules/pyblu/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyblu";
- version = "2.0.5";
+ version = "2.0.6";
pyproject = true;
src = fetchFromGitHub {
owner = "LouisChrist";
repo = "pyblu";
tag = "v${version}";
- hash = "sha256-Cmc0GXucoSSBWii+Xkx2jhG81kO+UeQUX3fKHUgLNS4=";
+ hash = "sha256-qLB9o40tRYgmbYJEEx8r3SodH1hB8MM4yLXbdKIs/xA=";
};
pythonRelaxDeps = [ "aiohttp" ];
From a83fc661d44e50b5b2b87da35aca5585308e8baa Mon Sep 17 00:00:00 2001
From: sarahec
Date: Sun, 29 Mar 2026 19:03:48 +0000
Subject: [PATCH 19/74] python3Packages.groq: 1.1.1 -> 1.1.2
---
pkgs/development/python-modules/groq/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index a5422c038bc0..6abb7629726c 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "groq";
- version = "1.1.1";
+ version = "1.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "groq";
repo = "groq-python";
tag = "v${version}";
- hash = "sha256-rXKuQKrpI3cnJbADDgvL/3vwC25ydTNEbKCwVhjYtFg=";
+ hash = "sha256-uOTttpjV2iislaink/0Jewkinyb2hYt0J+sv/OSuhJ4=";
};
postPatch = ''
From bed8ca5d52789c15fb83c7ac18c3a96009aa5f48 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 29 Mar 2026 00:15:41 -0400
Subject: [PATCH 20/74] super-productivity: 17.2.1 -> 18.1.0
changelog: https://github.com/super-productivity/super-productivity/releases/tag/v18.0.0
changelog: https://github.com/super-productivity/super-productivity/releases/tag/v18.1.0
---
pkgs/by-name/su/super-productivity/package.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 6646c5140edd..867eb2fc2e5f 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -10,15 +10,15 @@
prefetch-npm-deps,
rsync,
stdenv,
- nodejs_22,
+ nodejs_24,
}:
let
electron = electron_39;
- nodejs = nodejs_22;
+ nodejs = nodejs_24;
in
buildNpmPackage rec {
pname = "super-productivity";
- version = "17.2.1";
+ version = "18.1.0";
inherit nodejs;
@@ -26,7 +26,7 @@ buildNpmPackage rec {
owner = "johannesjo";
repo = "super-productivity";
tag = "v${version}";
- hash = "sha256-yt3HXOhpy2uzzpFInZbTHCWA9LfHB2bqEFCHzHwIv70=";
+ hash = "sha256-gIRnc+UqrDBcYxq0BXxS8rrOOVylTwH2WYne7h2A5fk=";
postFetch = ''
find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -69,7 +69,7 @@ buildNpmPackage rec {
dontInstall = true;
outputHashMode = "recursive";
- hash = "sha256-hNmM8Ln0klZBnC5TwtL7Bog82MlC4D0sCb9+uMqB0D0=";
+ hash = "sha256-/D6pI8Kbih+bQalyE7Jb42OhYesneKsXPC2ghdMumRQ=";
}
);
From 7636ad0e609a33c3c237e50683ae62164066a474 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 00:53:36 +0000
Subject: [PATCH 21/74] cyrus-imapd: 3.12.1 -> 3.12.2
---
pkgs/by-name/cy/cyrus-imapd/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index 1850b328def1..8e95b5a449a5 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -66,13 +66,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cyrus-imapd";
- version = "3.12.1";
+ version = "3.12.2";
src = fetchFromGitHub {
owner = "cyrusimap";
repo = "cyrus-imapd";
tag = "cyrus-imapd-${finalAttrs.version}";
- hash = "sha256-fwt8ierxM4bMp+ZfYINXUIcKNMnkTIWJTNWyv8GyX0c=";
+ hash = "sha256-zPEaxETzG4Aj8JYP/aZpN2xXrD+O22io/HzI4LK+s/o=";
};
nativeBuildInputs = [
From e688af1ce8102604d019c517b89843440f4e69c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 01:55:22 +0000
Subject: [PATCH 22/74] petsc: 3.24.5 -> 3.24.6
---
pkgs/by-name/pe/petsc/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index ea2825e06ddd..c3fa2eccd233 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -110,11 +110,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "petsc";
- version = "3.24.5";
+ version = "3.24.6";
src = fetchzip {
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
- hash = "sha256-tuJRRWh+xyVV7Ek/99mOn0gNjZmXplLv3UJabbXXWPc=";
+ hash = "sha256-PIW+dnIgnzQjpHqNBi4k730Bg7goO3G9zYVYoehvn7k=";
};
patches = [
From 1b80310c95a8982a5919800edac01133dd132f83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 02:24:34 +0000
Subject: [PATCH 23/74] sub-store: 2.21.45 -> 2.21.64
---
pkgs/by-name/su/sub-store/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix
index 191282573493..22593f5d06e7 100644
--- a/pkgs/by-name/su/sub-store/package.nix
+++ b/pkgs/by-name/su/sub-store/package.nix
@@ -15,13 +15,13 @@
buildNpmPackage (finalAttrs: {
pname = "sub-store";
- version = "2.21.45";
+ version = "2.21.64";
src = fetchFromGitHub {
owner = "sub-store-org";
repo = "Sub-Store";
tag = finalAttrs.version;
- hash = "sha256-GjHlz3MicNKDaGYdRE/SJ6Xx5avkLt3oRnoAtVvpqiM=";
+ hash = "sha256-aCDGOCtIojNnPK33GWGhYKZMmByrC5ywjxr6QVlemrM=";
};
sourceRoot = "${finalAttrs.src.name}/backend";
@@ -41,7 +41,7 @@ buildNpmPackage (finalAttrs: {
;
inherit pnpm;
fetcherVersion = 3;
- hash = "sha256-VsK6qvBeOF2smXRFmMk4gWxQgAD1GG/ExvZdIERdz9g=";
+ hash = "sha256-4RFzky/KaRSNvBizH717KtiwavO+KB69AwPKAAnTmh4=";
};
npmConfigHook = pnpmConfigHook;
From 270ad5bd26a50d3f38c04a7c4d18eee885016b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Sun, 29 Mar 2026 19:53:32 -0700
Subject: [PATCH 24/74] python3Packages.json-timeseries: fetch tag
---
.../python-modules/json-timeseries/default.nix | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/json-timeseries/default.nix b/pkgs/development/python-modules/json-timeseries/default.nix
index 654b3d559933..c172c8694a0f 100644
--- a/pkgs/development/python-modules/json-timeseries/default.nix
+++ b/pkgs/development/python-modules/json-timeseries/default.nix
@@ -8,7 +8,7 @@
setuptools-scm,
}:
-buildPythonPackage {
+buildPythonPackage (finalAttrs: {
pname = "json-timeseries";
version = "0.1.7";
pyproject = true;
@@ -16,9 +16,7 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "slaxor505";
repo = "json-timeseries-py";
- # asked upstream for tags
- # https://github.com/slaxor505/json-timeseries-py/issues/2
- rev = "d5a4f6307ce38f790c2594c3eae0f64bbc7c353e";
+ tag = "v${finalAttrs.version}";
hash = "sha256-5+eS+e6d61CBIqBXFaIQta95nenF5XK2mA9pQ+Rj0vQ=";
};
@@ -36,9 +34,10 @@ buildPythonPackage {
pythonImportsCheck = [ "json_timeseries" ];
meta = {
+ changelog = "https://github.com/slaxor505/json-timeseries-py/releases/tag/${finalAttrs.src.tag}";
description = "JSON Time Series (JTS) spec Python library";
homepage = "https://github.com/slaxor505/json-timeseries-py";
maintainers = with lib.maintainers; [ SuperSandro2000 ];
license = lib.licenses.mit;
};
-}
+})
From e8ab81d7b593124827b289c79fa9330c8922415a Mon Sep 17 00:00:00 2001
From: Tristan Ross
Date: Sun, 29 Mar 2026 21:13:53 -0700
Subject: [PATCH 25/74] llvmPackages_git: 23.0.0-unstable-2026-03-22 ->
23.0.0-unstable-2026-03-29
---
pkgs/development/compilers/llvm/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9b5338a5772e..345de596db00 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
"22.1.2".officialRelease.sha256 = "sha256-z6YcxgDd3F3JwfU5Y/wMw5MK+ZPISI3KLwHwUaraTuw=";
"23.0.0-git".gitRelease = {
- rev = "c911b8492374942bf4cfe35411e90a35d3837f6a";
- rev-version = "23.0.0-unstable-2026-03-22";
- sha256 = "sha256-LrA705BjLHt8U2qazT6+tOLglxNxTbwiCdTkYYIzIfU=";
+ rev = "3e015b89e8bd9c71f6bb1cf38747d2862f5d5a3d";
+ rev-version = "23.0.0-unstable-2026-03-29";
+ sha256 = "sha256-sCyBinGy0kytpxK39OxiOrWMS3UPOHOxxwtm02vIIPk=";
};
}
// llvmVersions;
From f362b3e89653142fb329dc0a98ea9b94cb5271b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Sun, 29 Mar 2026 22:14:07 -0700
Subject: [PATCH 26/74] python3Packages.aiotractive: 1.0.0 -> 1.0.1
Diff: https://github.com/zhulik/aiotractive/compare/v1.0.0...v1.0.1
Changelog: https://github.com/zhulik/aiotractive/releases/tag/v1.0.1
---
pkgs/development/python-modules/aiotractive/default.nix | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix
index a61b92a87d14..b42628aa409c 100644
--- a/pkgs/development/python-modules/aiotractive/default.nix
+++ b/pkgs/development/python-modules/aiotractive/default.nix
@@ -10,18 +10,22 @@
buildPythonPackage rec {
pname = "aiotractive";
- version = "1.0.0";
+ version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "zhulik";
repo = "aiotractive";
tag = "v${version}";
- hash = "sha256-pU6Ugd4l9+oUWJAd1hT3oBPfXK5NEjOg+k3YN52C3B8=";
+ hash = "sha256-DP0dFDXaa0PyaERmhL6dNCOpiNs+N7ojMIapcajfMrk=";
};
build-system = [ setuptools ];
+ pythonRelaxDeps = [
+ "orjson"
+ ];
+
dependencies = [
aiohttp
orjson
From b0da3198cbceca315d8aa2e8794186c84952c439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Sun, 29 Mar 2026 22:22:28 -0700
Subject: [PATCH 27/74] python3Packages.uiprotect: 10.2.2 -> 10.2.3
Diff: https://github.com/uilibs/uiprotect/compare/v10.2.2...v10.2.3
Changelog: https://github.com/uilibs/uiprotect/blob/v10.2.3/CHANGELOG.md
---
pkgs/development/python-modules/uiprotect/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 2b44a01a3c73..531f1f4e727c 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -38,14 +38,14 @@
buildPythonPackage (finalAttrs: {
pname = "uiprotect";
- version = "10.2.2";
+ version = "10.2.3";
pyproject = true;
src = fetchFromGitHub {
owner = "uilibs";
repo = "uiprotect";
tag = "v${finalAttrs.version}";
- hash = "sha256-C0daz9PY7UI/jUo1zZvvT7qN6YRp+VXiNl+Rm5H7uac=";
+ hash = "sha256-vEpdGUl2eceF32U8HcCrOVGxsdM0AdcV3v5Ya1ej7Mk=";
};
build-system = [ poetry-core ];
From e7577157e4973120e92a8339d09faf59da20023e Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 07:12:59 +0000
Subject: [PATCH 28/74] python3Packages.textual: 8.1.1 -> 8.2.1
---
pkgs/development/python-modules/textual/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 04df3dbebf33..29e44f719aaf 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -37,14 +37,14 @@
buildPythonPackage rec {
pname = "textual";
- version = "8.1.1";
+ version = "8.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Textualize";
repo = "textual";
tag = "v${version}";
- hash = "sha256-jYjw4iqJ/CrawQwcwqAfQLc04tfdTqq6ERJsfx4FDMs=";
+ hash = "sha256-GFn+DNpR10G/0qii6wKnh3InbIaDuvriJCCN9M9rsWg=";
};
build-system = [ poetry-core ];
From 3db852706fbc4f13418d56c8b2d17a443dd3a2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Mon, 30 Mar 2026 00:17:45 -0700
Subject: [PATCH 29/74] python3Packages.pyvlx: 0.2.30 -> 0.2.32
Diff: https://github.com/Julius2342/pyvlx/compare/0.2.30...0.2.32
Changelog: https://github.com/Julius2342/pyvlx/releases/tag/0.2.32
---
pkgs/development/python-modules/pyvlx/default.nix | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix
index 4398d8d6ab16..92d0b6f5b8d6 100644
--- a/pkgs/development/python-modules/pyvlx/default.nix
+++ b/pkgs/development/python-modules/pyvlx/default.nix
@@ -1,40 +1,35 @@
{
lib,
buildPythonPackage,
+ deprecated,
fetchFromGitHub,
pytestCheckHook,
pyyaml,
setuptools,
setuptools-scm,
- typing-extensions,
zeroconf,
}:
buildPythonPackage (finalAttrs: {
pname = "pyvlx";
- version = "0.2.30";
+ version = "0.2.32";
pyproject = true;
src = fetchFromGitHub {
owner = "Julius2342";
repo = "pyvlx";
tag = finalAttrs.version;
- hash = "sha256-owrWYBAb/5JAangGwt56gdjJf99C3i04IiKAh1P/MYY=";
+ hash = "sha256-ArNWXvYZ/eZWPUvV8z/+6WsAcm5MTnKblMrUFj51JhM=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "setuptools-scm>=8.0" "setuptools-scm"
- '';
-
build-system = [
setuptools
setuptools-scm
];
dependencies = [
+ deprecated
pyyaml
- typing-extensions
zeroconf
];
From 1e3382ed48b87e864490a918762ee2ddb7d61857 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 08:01:52 +0000
Subject: [PATCH 30/74] git-pages-cli: 1.6.0 -> 1.8.0
---
pkgs/by-name/gi/git-pages-cli/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix
index 7b6ad691505b..36a15804ab9b 100644
--- a/pkgs/by-name/gi/git-pages-cli/package.nix
+++ b/pkgs/by-name/gi/git-pages-cli/package.nix
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "git-pages-cli";
- version = "1.6.0";
+ version = "1.8.0";
src = fetchFromCodeberg {
owner = "git-pages";
repo = "git-pages-cli";
rev = "v${finalAttrs.version}";
- hash = "sha256-VImFTyV1REHIWWEY5Kqd3WJ+YF5OupQhEa4/VWnrHi4=";
+ hash = "sha256-xM2/7cg9ZZ5wWzlJdtmU1lHYhXQQinp8S643IKzTb7U=";
};
- vendorHash = "sha256-Vp6cqGM4Lhsfhjgv0Tz6Bmdz20EAGyPGR2Y91dnGejA=";
+ vendorHash = "sha256-lGnl1onxJ9x0UIf2uPZcZgx2qbj/43VG+UcQvqwd1uw=";
ldflags = [
"-X"
From 026d8eda0ac2161532c82fd04dc7924eceaefe2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 09:21:18 +0000
Subject: [PATCH 31/74] octoscan: 0.1.6 -> 0.1.7
---
pkgs/by-name/oc/octoscan/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix
index 69ba2ddf8606..d2939381f150 100644
--- a/pkgs/by-name/oc/octoscan/package.nix
+++ b/pkgs/by-name/oc/octoscan/package.nix
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "octoscan";
- version = "0.1.6";
+ version = "0.1.7";
src = fetchFromGitHub {
owner = "synacktiv";
repo = "octoscan";
tag = "v${finalAttrs.version}";
- hash = "sha256-BFq4PXW5V8L4NP6wn2t2hG5xBKwxlgS+YC75VDTKKjs=";
+ hash = "sha256-wdxuFYdM/0oEPQzr4EZ8fqNGo5CZrpz014kaVQXB3Bs=";
};
vendorHash = "sha256-+TQDZXqWNBFAPES0qsrpBdl/jQZAfHXBcav2HcS0d7o=";
From dc1d36d3bddecd6008afe0864af6432e895c7cd7 Mon Sep 17 00:00:00 2001
From: sm-idk <43745781+sm-idk@users.noreply.github.com>
Date: Mon, 30 Mar 2026 12:58:44 +0300
Subject: [PATCH 32/74] libkrunfw: 5.1.0 -> 5.3.0
Changelog: https://github.com/containers/libkrunfw/releases/tag/v5.3.0
Diff: https://github.com/containers/libkrunfw/compare/v5.1.0...v5.3.0
---
pkgs/by-name/li/libkrunfw/package.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix
index ae029136b150..73120ed22c99 100644
--- a/pkgs/by-name/li/libkrunfw/package.nix
+++ b/pkgs/by-name/li/libkrunfw/package.nix
@@ -21,18 +21,18 @@ assert lib.elem variant [
stdenv.mkDerivation (finalAttrs: {
pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}";
- version = "5.1.0";
+ version = "5.3.0";
src = fetchFromGitHub {
owner = "containers";
repo = "libkrunfw";
tag = "v${finalAttrs.version}";
- hash = "sha256-x9HQP+EqCteoCq2Sl/TQcfdzQC5iuE4gaSKe7tN5dAA=";
+ hash = "sha256-fhG/bP1HzmhyU2N+wnr1074WEGsD9RdTUUBhYUFpWlA=";
};
kernelSrc = fetchurl {
- url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.62.tar.xz";
- hash = "sha256-E+LGhayPq13Zkt0QVzJVTa5RSu81DCqMdBjnt062LBM=";
+ url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.76.tar.xz";
+ hash = "sha256-u7Q+g0xG5r1JpcKPIuZ5qTdENATh9lMgTUskkp862JY=";
};
postPatch = ''
From 0f1494af7f5d5ec076e75450f3d3e2f95b3a7549 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 12:43:05 +0100
Subject: [PATCH 33/74] teams/radicle: init
---
maintainers/team-list.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index a4dd4e619691..ef8d01cac28e 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -687,6 +687,10 @@ with lib.maintainers;
enableFeatureFreezePing = true;
};
+ radicle = {
+ github = "radicle";
+ };
+
rocm = {
github = "rocm";
};
From dcb8521ca855c047628e8ad34b8a2823e211947e Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 34/74] radicle-ci-broker: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-ci-broker/package.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix
index eb58afa5334a..54a86ae40314 100644
--- a/pkgs/by-name/ra/radicle-ci-broker/package.nix
+++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
mit
asl20
];
- maintainers = with lib.maintainers; [ defelo ];
+ teams = [ lib.teams.radicle ];
mainProgram = "cib";
};
})
From b7851ae664e2a8662cd37d550c5e0b82b285e509 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 35/74] radicle-desktop: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-desktop/package.nix | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix
index ee7db4fadb68..74f145b4b6e8 100644
--- a/pkgs/by-name/ra/radicle-desktop/package.nix
+++ b/pkgs/by-name/ra/radicle-desktop/package.nix
@@ -129,11 +129,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [
- matthiasbeyer
- defelo
- faukah
- ];
+ teams = [ lib.teams.radicle ];
+ maintainers = with lib.maintainers; [ faukah ];
mainProgram = "radicle-desktop";
};
})
From ea0487d1ec5f61c94bc0892834a6395e3175b5f4 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 36/74] radicle-explorer: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-explorer/package.nix | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 3a268662b20a..f11e26d9af52 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -111,11 +111,8 @@ lib.fix (
homepage = "https://radicle.xyz";
license = lib.licenses.gpl3;
- maintainers = with lib.maintainers; [
- tazjin
- lorenzleutgeb
- defelo
- ];
+ teams = [ lib.teams.radicle ];
+ maintainers = with lib.maintainers; [ tazjin ];
};
}
)
From ad7bed1c6ebce168431b6cc9ab7ae0b03b37ae19 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 37/74] radicle-httpd: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-httpd/package.nix | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 2546734433e8..852e76731b55 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -86,11 +86,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
asl20
];
platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [
- gador
- lorenzleutgeb
- defelo
- ];
+ teams = [ lib.teams.radicle ];
+ maintainers = with lib.maintainers; [ gador ];
mainProgram = "radicle-httpd";
};
})
From 012acc31f96a36aca3807c61b5131833abf28296 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 38/74] radicle-job: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-job/package.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix
index b688e421b6af..b84a56428ee5 100644
--- a/pkgs/by-name/ra/radicle-job/package.nix
+++ b/pkgs/by-name/ra/radicle-job/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
mit
asl20
];
- maintainers = with lib.maintainers; [ defelo ];
+ teams = [ lib.teams.radicle ];
mainProgram = "rad-job";
};
})
From f24b2190dd9aae8bec4d0b3138d1d87916df1fb9 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 39/74] radicle-native-ci: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-native-ci/package.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix
index e0e51db4d816..919ece422a9a 100644
--- a/pkgs/by-name/ra/radicle-native-ci/package.nix
+++ b/pkgs/by-name/ra/radicle-native-ci/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
mit
asl20
];
- maintainers = with lib.maintainers; [ defelo ];
+ teams = [ lib.teams.radicle ];
mainProgram = "radicle-native-ci";
};
})
From f94361f7371c3f03a6c74baced68b82cdbf89e4f Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 40/74] radicle-node: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-node/package.nix | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 46846fa219f5..3e281246d4b1 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -171,11 +171,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
mit
];
platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [
- amesgen
- lorenzleutgeb
- defelo
- ];
+ teams = [ lib.teams.radicle ];
mainProgram = "rad";
};
})
From 1b3d212d4a8b8ee2bc4c8b65b61e7054a9bd61f9 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 41/74] radicle-tui: add radicle team as maintainer
---
pkgs/by-name/ra/radicle-tui/package.nix | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix
index ac536ae1bc59..1e2d3564d3e1 100644
--- a/pkgs/by-name/ra/radicle-tui/package.nix
+++ b/pkgs/by-name/ra/radicle-tui/package.nix
@@ -72,10 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
asl20 # or
mit
];
- maintainers = with lib.maintainers; [
- matthiasbeyer
- defelo
- ];
+ teams = [ lib.teams.radicle ];
mainProgram = "rad-tui";
};
})
From 9e715a494c3d0d982f5646b5934c721236666915 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:50:58 +0100
Subject: [PATCH 42/74] nixos/radicle: add radicle team as maintainer
---
nixos/modules/services/misc/radicle.nix | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix
index ed404dbf4bf9..da174a6b5331 100644
--- a/nixos/modules/services/misc/radicle.nix
+++ b/nixos/modules/services/misc/radicle.nix
@@ -437,9 +437,5 @@ in
]
);
- meta.maintainers = with lib.maintainers; [
- defelo
- julm
- lorenzleutgeb
- ];
+ meta.teams = [ lib.teams.radicle ];
}
From a03e3a391baa7afbe61c6710af924c4b41f55fe9 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 43/74] nixos/radicle-ci-broker: add radicle team as maintainer
---
.../services/continuous-integration/radicle/ci-broker.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
index aab0967e5b51..6c285ea656f7 100644
--- a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
+++ b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
@@ -37,7 +37,7 @@ let
in
{
- meta.maintainers = with lib.maintainers; [ defelo ];
+ meta.teams = [ lib.teams.radicle ];
options.services.radicle.ci.broker = {
enable = lib.mkEnableOption "radicle-ci-broker";
From 03b0dea5b0b9f8840d78e2adccf6a58da4d22e82 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:55:23 +0100
Subject: [PATCH 44/74] nixos/radicle-native-ci: add radicle team as maintainer
---
.../services/continuous-integration/radicle/adapters/native.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
index 8e2a19f447d6..3cbc191a96d6 100644
--- a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
+++ b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
@@ -15,7 +15,7 @@ let
in
{
- meta.maintainers = with lib.maintainers; [ defelo ];
+ meta.teams = [ lib.teams.radicle ];
options.services.radicle.ci.adapters.native = {
instances = lib.mkOption {
From 970a3308f078bc911e6b344702be012fb0363ed0 Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:46:18 +0100
Subject: [PATCH 45/74] nixos/tests/radicle: add radicle team as maintainer
---
nixos/tests/radicle.nix | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix
index cfc1ddc0c2e6..17a26c85820b 100644
--- a/nixos/tests/radicle.nix
+++ b/nixos/tests/radicle.nix
@@ -2,7 +2,7 @@
# and verifies that an alice peer can host a repository on the seed,
# and that a bob peer can send alice a patch via the seed.
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
let
# The Node ID depends on nodes.seed.services.radicle.privateKeyFile
@@ -63,13 +63,7 @@ in
{
name = "radicle";
- meta = with pkgs.lib.maintainers; {
- maintainers = [
- defelo
- julm
- lorenzleutgeb
- ];
- };
+ meta.maintainers = lib.teams.radicle.members;
nodes = {
seed =
From 6422f90ca9ba54a4e6be1439f117a050435ab40f Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 14:48:24 +0100
Subject: [PATCH 46/74] nixos/tests/radicle-ci-broker: add radicle team as
maintainer
---
nixos/tests/radicle-ci-broker.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/tests/radicle-ci-broker.nix b/nixos/tests/radicle-ci-broker.nix
index 28330c7784af..c65ddf8af69f 100644
--- a/nixos/tests/radicle-ci-broker.nix
+++ b/nixos/tests/radicle-ci-broker.nix
@@ -16,7 +16,7 @@ in
{
name = "radicle-ci-broker";
- meta.maintainers = with lib.maintainers; [ defelo ];
+ meta.maintainers = lib.teams.radicle.members;
nodes.seed = {
virtualisation.credentials = {
From 6d380de67b4422a9a1bb1780ff56eea6c12385de Mon Sep 17 00:00:00 2001
From: Defelo
Date: Tue, 24 Mar 2026 15:04:58 +0100
Subject: [PATCH 47/74] ci/OWNERS: add radicle fetchers
---
ci/OWNERS | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ci/OWNERS b/ci/OWNERS
index 695c91aa1af0..052135bf6a68 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -519,3 +519,7 @@ pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor
/pkgs/build-support/build-nim-package.nix @NixOS/nim
/pkgs/build-support/build-nim-sbom.nix @NixOS/nim
/pkgs/top-level/nim-overrides.nix @NixOS/nim
+
+# Radicle
+/pkgs/build-support/fetchradicle/ @NixOS/radicle
+/pkgs/build-support/fetchradiclepatch/ @NixOS/radicle
From c682eb4b53c94409f3e83bea5f0d3b98cfe79689 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI
Date: Mon, 30 Mar 2026 10:39:57 +0000
Subject: [PATCH 48/74] mealie: unpin 'pyhumps'
---
pkgs/by-name/me/mealie/package.nix | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index e06c9f633010..d475fbd20914 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -24,14 +24,6 @@ let
pythonpkgs = python3Packages;
python = pythonpkgs.python;
- pyhumps38 = python3Packages.pyhumps.overrideAttrs (oldAttrs: {
- src = pkgs.fetchFromGitHub {
- owner = "nficano";
- repo = "humps";
- tag = "v3.8.0";
- hash = "sha256-ElL/LY2V2Z3efdV5FnDy9dSoBltULrzxsjaOx+7W9Oo=";
- };
- });
in
pythonpkgs.buildPythonApplication rec {
pname = "mealie";
@@ -75,7 +67,7 @@ pythonpkgs.buildPythonApplication rec {
psycopg2 # pgsql optional-dependencies
pydantic
pydantic-settings
- pyhumps38
+ pyhumps
pyjwt
python-dateutil
python-dotenv
From 6946a1e00ff0c9ee72fccd12b0a6c06c68e5db83 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI
Date: Mon, 30 Mar 2026 10:39:57 +0000
Subject: [PATCH 49/74] mealie: use 'python3' input
This makes it easier to use `packageOverrides` to pin dependencies in
the future.
---
pkgs/by-name/me/mealie/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index d475fbd20914..8200c4b38e1e 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -5,7 +5,7 @@
fetchFromGitHub,
makeWrapper,
nixosTests,
- python3Packages,
+ python3,
nltk-data,
writeShellScript,
nix-update-script,
@@ -22,8 +22,8 @@ let
frontend = callPackage (import ./mealie-frontend.nix src version) { };
- pythonpkgs = python3Packages;
- python = pythonpkgs.python;
+ python = python3;
+ pythonpkgs = python.pkgs;
in
pythonpkgs.buildPythonApplication rec {
pname = "mealie";
From ba75e2d39eb6d4ff4abad3354fe1b7c0e2893d14 Mon Sep 17 00:00:00 2001
From: SystematicError
Date: Mon, 30 Mar 2026 12:24:03 +0100
Subject: [PATCH 50/74] stix-{otf,two}: use installFonts
---
pkgs/by-name/st/stix-otf/package.nix | 9 ++-------
pkgs/by-name/st/stix-two/package.nix | 10 ++--------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/pkgs/by-name/st/stix-otf/package.nix b/pkgs/by-name/st/stix-otf/package.nix
index 26e308768f06..672a0c4e673b 100644
--- a/pkgs/by-name/st/stix-otf/package.nix
+++ b/pkgs/by-name/st/stix-otf/package.nix
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
+ installFonts,
}:
stdenvNoCC.mkDerivation rec {
@@ -14,13 +15,7 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-M3STue+RPHi8JgZZupV0dVLZYKBiFutbBOlanuKkD08=";
};
- installPhase = ''
- runHook preInstall
-
- install -Dm644 Fonts/STIX-Word/*.otf -t $out/share/fonts/opentype
-
- runHook postInstall
- '';
+ nativeBuildInputs = [ installFonts ];
meta = {
homepage = "http://www.stixfonts.org/";
diff --git a/pkgs/by-name/st/stix-two/package.nix b/pkgs/by-name/st/stix-two/package.nix
index 791edc6df848..b21a7b98ceff 100644
--- a/pkgs/by-name/st/stix-two/package.nix
+++ b/pkgs/by-name/st/stix-two/package.nix
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
+ installFonts,
}:
stdenvNoCC.mkDerivation rec {
@@ -16,14 +17,7 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-hfQmrw7HjlhQSA0rVTs84i3j3iMVR0k7tCRBcB6hEpU=";
};
- installPhase = ''
- runHook preInstall
-
- install -Dm644 */*.otf -t $out/share/fonts/opentype
- install -Dm644 */*.ttf -t $out/share/fonts/truetype
-
- runHook postInstall
- '';
+ nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://www.stixfonts.org/";
From 00f9122077f9e8adb1940aa6f8ee4156fecd46ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 11:56:27 +0000
Subject: [PATCH 51/74] python3Packages.claude-agent-sdk: 0.1.50 -> 0.1.52
---
pkgs/development/python-modules/claude-agent-sdk/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index 95aca62bfe8a..ffdf01616e48 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage (finalAttrs: {
pname = "claude-agent-sdk";
- version = "0.1.50";
+ version = "0.1.52";
pyproject = true;
src = fetchFromGitHub {
owner = "anthropics";
repo = "claude-agent-sdk-python";
tag = "v${finalAttrs.version}";
- hash = "sha256-uRuJqcUR+23SsI4i4W0tDCFQSE4lJWGxBcCap+ij7Ns=";
+ hash = "sha256-4sj9jqf06RSec9xUhJ1gDbfuYaxFODvM5pz9uVpsLTo=";
};
build-system = [ hatchling ];
From 42ffad04d6c499da4654675e61a0c01cc5fff9e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 12:28:42 +0000
Subject: [PATCH 52/74] xbyak: 7.35.3 -> 7.35.4
---
pkgs/by-name/xb/xbyak/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix
index 439421822365..b2b416d25385 100644
--- a/pkgs/by-name/xb/xbyak/package.nix
+++ b/pkgs/by-name/xb/xbyak/package.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xbyak";
- version = "7.35.3";
+ version = "7.35.4";
src = fetchFromGitHub {
owner = "herumi";
repo = "xbyak";
tag = "v${finalAttrs.version}";
- hash = "sha256-qsv0cgm5AmH9Ip1cNX8fKEA5D2b/255ZhYtCQb9Kr5I=";
+ hash = "sha256-UPqqsG7GeWelOO9AKzveLNa1AYcHFBU6eLjOghDuS1s=";
};
nativeBuildInputs = [ cmake ];
From 347dd1a6123d4d7a2de9fab45bc803719a203f58 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 15:03:35 +0200
Subject: [PATCH 53/74] python3Packages.griffelib: 2.0.1 -> 2.0.2
https://github.com/mkdocstrings/griffe/releases/tag/2.0.2
---
pkgs/development/python-modules/griffelib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/griffelib/default.nix b/pkgs/development/python-modules/griffelib/default.nix
index c6ae46c79274..5ebee7b09a85 100644
--- a/pkgs/development/python-modules/griffelib/default.nix
+++ b/pkgs/development/python-modules/griffelib/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "griffelib";
- version = "2.0.1";
+ version = "2.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "mkdocstrings";
repo = "griffe";
tag = finalAttrs.version;
- hash = "sha256-8lrpIlWuf9/4Lm+YWLC6GHKwRE7vh+lqBIJIO/WnnSg=";
+ hash = "sha256-Fxa9lrBVQ/enVLiU7hUc0d5x9ItI19EGnbxa7MX6Plc=";
};
sourceRoot = "${finalAttrs.src.name}/packages/griffelib";
From f48f235a22e65e73788dbb84d5c790f8e9297a40 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 15:05:20 +0200
Subject: [PATCH 54/74] python3Packages.pydantic-graph: 1.70.0 -> 1.73.0
https://github.com/pydantic/pydantic-ai/compare/v1.70.0...v1.73.0
---
pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index 5e169ea7ad97..8d6152bde53d 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "pydantic-graph";
- version = "1.70.0";
+ version = "1.73.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pydantic";
repo = "pydantic-ai";
tag = "v${finalAttrs.version}";
- hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo=";
+ hash = "sha256-bcL/ZquuJTbaXu1DKzZGNdRluUUhwhakqnYVOqQ84Ts=";
};
sourceRoot = "${finalAttrs.src.name}/pydantic_graph";
From 3a21356b6a9eff675d8c6140027dd9822ec281d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 15:06:01 +0200
Subject: [PATCH 55/74] python3Packages.pydantic-ai-slim: 1.70.0 -> 1.73.0
https://github.com/pydantic/pydantic-ai/compare/v1.70.0...v1.73.0
---
pkgs/development/python-modules/pydantic-ai-slim/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index c001a34f2069..b4e3653337ce 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,14 +20,14 @@
buildPythonPackage (finalAttrs: {
pname = "pydantic-ai-slim";
- version = "1.70.0";
+ version = "1.73.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pydantic";
repo = "pydantic-ai";
tag = "v${finalAttrs.version}";
- hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo=";
+ hash = "sha256-bcL/ZquuJTbaXu1DKzZGNdRluUUhwhakqnYVOqQ84Ts=";
};
sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";
From 52529f17f8a0a8e7094cb4d62ecf162ca1d1c7a1 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Mon, 30 Mar 2026 15:35:09 +0200
Subject: [PATCH 56/74] luaPackages.lua-rtoml: 0.2 -> 0.3
Noticed while etrying to bump luarocks-nix: the update would fail for
lua-rtoml because the rockspec was renamed from 0.2 to 0.3 and thus
could not be downloaded anymore.
I replaced the url with a sturdier one.
---
maintainers/scripts/luarocks-packages.csv | 3 ++-
pkgs/development/lua-modules/generated-packages.nix | 6 +++---
pkgs/development/lua-modules/overrides.nix | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 7a61b3ad4a52..7478ab45b9df 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -65,7 +65,8 @@ lua-resty-jwt,,,,,,
lua-resty-openidc,,,,,,
lua-resty-openssl,,,,,,
lua-resty-session,,,,,,
-lua-rtoml,https://raw.githubusercontent.com/lblasc/lua-rtoml/main/lua-rtoml-0.2-0.rockspec,,,,,lblasc
+# we have to set url because luarocks.org lua-rtoml is squatted by another package
+lua-rtoml,https://raw.githubusercontent.com/lblasc/lua-rtoml/eb89439070c72ccf05efb8576abae7643abab354/lua-rtoml-0.3-0.rockspec,,,,,lblasc
lua-subprocess,https://raw.githubusercontent.com/0x0ade/lua-subprocess/master/subprocess-scm-1.rockspec,,,,5.1,scoder12
lua-term,,,,,,
lua-toml,,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 531f1101235d..61d3b48c0582 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -2178,13 +2178,13 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "lua-rtoml";
- version = "0.2-0";
+ version = "0.3-0";
src = fetchFromGitHub {
owner = "lblasc";
repo = "lua-rtoml";
- rev = "c83f56b9519d85968d663308e303f384c55c7b18";
- hash = "sha256-PRoaUQSSvzl9VFK+aGHbJqCW37AsO+oFXNYgM0OdIoY=";
+ rev = "aedc4030912e1c86a1490428dc547f35a1a99be6";
+ hash = "sha256-Ge2Acy1XuAQENhoJpuRudazY2D8HSiVv1Ab+jqMjo0U=";
};
disabled = luaOlder "5.1";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 37530b0b0ad2..af4acdffa2e0 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -474,7 +474,7 @@ in
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (old) src;
- hash = "sha256-7mFn4dLgaxfAxtPFCc3VzcBx2HuywcZTYqCGTbaGS0k=";
+ hash = "sha256-nkWQOjqShgDcLfQDOGsB9CMHZxI/Lrx/+tC4ZeUl/Ak=";
};
propagatedBuildInputs = old.propagatedBuildInputs ++ [
From 8acda648e3d127d05dd21e1e833382dcd0c975ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 15:45:02 +0200
Subject: [PATCH 57/74] python3Packages.django-statici18n: 2.6.0 -> 2.7.1
https://github.com/zyegfryed/django-statici18n/compare/v2.6.0...v2.7.1
---
pkgs/development/python-modules/django-statici18n/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix
index 8a08d2e2f544..d94b1d1c4cab 100644
--- a/pkgs/development/python-modules/django-statici18n/default.nix
+++ b/pkgs/development/python-modules/django-statici18n/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "django-statici18n";
- version = "2.6.0";
+ version = "2.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "zyegfryed";
repo = "django-statici18n";
tag = "v${version}";
- hash = "sha256-G1JF/AQEDgvDamvjCYiQM7b6HfbdMBhfEUvT3yL1io0=";
+ hash = "sha256-e6sCH/9h+Ki96hfG4ftuLo34HfZbwImThi9YxmZOmRc=";
};
build-system = [ setuptools ];
From 3e509a3fbad577500eacbac3e9b41df27e25fda7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 16:16:36 +0200
Subject: [PATCH 58/74] pretix: 2026.2.0 -> 2026.3.0
https://pretix.eu/about/en/blog/20260330-release-2026-3/
---
pkgs/by-name/pr/pretix/package.nix | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index e94249197345..f9a700704847 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -16,7 +16,7 @@ let
python = python312.override {
self = python;
packageOverrides = self: super: {
- django = super.django_4;
+ django = super.django_5;
django-oauth-toolkit = super.django-oauth-toolkit.overridePythonAttrs (oldAttrs: {
version = "2.3.0";
@@ -25,6 +25,12 @@ let
tag = "v${version}";
hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY=";
};
+ disabledTests = [
+ # error message mismatch
+ "test_validation_failed_message"
+ # fails dns resolution
+ "test_response_when_auth_server_response_return_404"
+ ];
});
stripe = super.stripe.overridePythonAttrs rec {
@@ -45,13 +51,13 @@ let
};
pname = "pretix";
- version = "2026.2.0";
+ version = "2026.3.0";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
tag = "v${version}";
- hash = "sha256-S8HcCtTBTU9oU7X+XD6avSZVtlRkXeF7pIqnggqJRPs=";
+ hash = "sha256-D8i8wRdPak1L0D451WP7upr3yn+8SzG/0wuWD/EsemM=";
};
npmDeps = buildNpmPackage {
@@ -59,7 +65,7 @@ let
inherit version src;
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
- npmDepsHash = "sha256-n4Gd4DKdP4b6LT34uy9aJDWcTz9okk4imq6vtw1cC+k=";
+ npmDepsHash = "sha256-+84WFNs0iPhMb4YIKfHYByYeFQHITyWeF5yIM8pvQSs=";
dontBuild = true;
@@ -96,7 +102,7 @@ python.pkgs.buildPythonApplication rec {
"django-phonenumber-field"
"dnspython"
"drf_ujson2"
- "importlib-metadata"
+ "importlib_metadata"
"kombu"
"markdown"
"oauthlib"
From 46fd1f01f375c014f2224899d2f8ec87aa90e19d Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 16:19:24 +0200
Subject: [PATCH 59/74] pretix.plugins.mollie: 2.5.2 -> 2.5.3
https://github.com/pretix/pretix-mollie/compare/v2.5.2...v2.5.3
---
pkgs/by-name/pr/pretix/plugins/mollie/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index 5b73897b6147..e48900a713c8 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pretix-mollie";
- version = "2.5.2";
+ version = "2.5.3";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-mollie";
tag = "v${version}";
- hash = "sha256-Q9cofG4etT8Lb/RZbOVkSYlN1ONS3vPGkE53ph92cLg=";
+ hash = "sha256-fWfevPhwpdHkpvuedf16b/f2QfHLy1/FAS3nVV4utwM=";
};
build-system = [
From 23b609909da6663093db9accdf5ebbf05a16b024 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 16:19:45 +0200
Subject: [PATCH 60/74] pretix.plugins.passbook: 1.14.0 -> 1.14.1
https://github.com/pretix/pretix-passbook/compare/v1.14.0...v1.14.1
---
pkgs/by-name/pr/pretix/plugins/passbook/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/pr/pretix/plugins/passbook/package.nix b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
index 540159166d9b..8cf87c5c4549 100644
--- a/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "pretix-passbook";
- version = "1.14.0";
+ version = "1.14.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-passbook";
rev = "v${version}";
- hash = "sha256-Qy9VQBhC6SvLqmQvf4nVFhHPRNYDn1W6eEdCOGbD0y8=";
+ hash = "sha256-cTXgDr845TGMGWr9bSaFvRPQ0GynXn3CVnZxcf96orc=";
};
patches = [
From a0d3a03422c08df86eddfe865b842694ed83e9ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 16:19:59 +0200
Subject: [PATCH 61/74] pretix.plugins.payone: 1.4.1 -> 1.4.2
https://github.com/pretix/pretix-payone/compare/v1.4.1...v1.4.2
---
pkgs/by-name/pr/pretix/plugins/payone/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/pr/pretix/plugins/payone/package.nix b/pkgs/by-name/pr/pretix/plugins/payone/package.nix
index 02f4c23a4fd6..1d38c6c820b5 100644
--- a/pkgs/by-name/pr/pretix/plugins/payone/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/payone/package.nix
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "pretix-payone";
- version = "1.4.1";
+ version = "1.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-payone";
rev = "v${finalAttrs.version}";
- hash = "sha256-8DXORej+OJ65l/KGcanavHU4rabK9qTSnRPbdCidkgQ=";
+ hash = "sha256-y1BO8Hz/pGKalURCbF3QJ49xn+L/sd8SWTGdCIl43yw=";
};
build-system = [
From 944a98b671bd990a0372043e9c1f3260d477ec76 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 16:20:49 +0200
Subject: [PATCH 62/74] pretix.plugins.worldlinedirect: 1.1.0 -> 1.1.1
https://github.com/pretix/pretix-worldlinedirect/compare/v1.1.0...v1.1.1
---
pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix b/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix
index d2de73989ff0..2933279afd2f 100644
--- a/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/worldlinedirect/package.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pretix-worldlinedirect";
- version = "1.1.0";
+ version = "1.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-worldlinedirect";
rev = "v${version}";
- hash = "sha256-ofDGbRYTA2GTnVexn0dE6Iftq6+MkigOXWVR4kPUJzY=";
+ hash = "sha256-SqXXnYetz52OFPKM61mANA71hrCEK7FgsdEoxskR5bk=";
};
build-system = [
From 7c85ce9cb0e552b5fd15fd49a4202c142e1f3604 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 14:21:31 +0000
Subject: [PATCH 63/74] exaile: 4.2.1 -> 4.2.2
---
pkgs/by-name/ex/exaile/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix
index c339b4192f91..99e86ea806db 100644
--- a/pkgs/by-name/ex/exaile/package.nix
+++ b/pkgs/by-name/ex/exaile/package.nix
@@ -36,13 +36,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "exaile";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchFromGitHub {
owner = "exaile";
repo = "exaile";
rev = finalAttrs.version;
- sha256 = "sha256-eH7JhoGd5jiaye8ZLx836tgEXsRpEd3D3z6gvnVrbIs=";
+ sha256 = "sha256-8q7OP9imTaoxqNgDOcVmvGSb5Sra0JtPOtZPo7zgkHM=";
};
nativeBuildInputs = [
From 82839c1e61d4b29f143b0e6f91dd9da2971ec08a Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 16:22:33 +0200
Subject: [PATCH 64/74] pretix.plugins.zugferd: 2.6.2 -> 2.6.3
https://github.com/pretix/pretix-zugferd/compare/v2.6.2...v2.6.3
---
pkgs/by-name/pr/pretix/plugins/zugferd/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
index 3380a91b0690..50d4dc179d88 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pretix-zugferd";
- version = "2.6.2";
+ version = "2.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-zugferd";
rev = "v${version}";
- hash = "sha256-C2Z/S3lEKmdi6fch/erjPc9evnKc69tBRTInXRgi24E=";
+ hash = "sha256-HE3L5VS0n1NL/jprcnMwaNriFKIN1pogPM2cDw2ZPdk=";
};
postPatch = ''
From 01f7659b32f53a037b6272efba8a11ed04b9d151 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Mon, 30 Mar 2026 14:23:29 +0000
Subject: [PATCH 65/74] go-ethereum: 1.17.1 -> 1.17.2
---
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 e68303159f98..f2cef646489f 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 (finalAttrs: {
pname = "go-ethereum";
- version = "1.17.1";
+ version = "1.17.2";
src = fetchFromGitHub {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${finalAttrs.version}";
- hash = "sha256-Fg+xitRROkLVXIpCoQ78eY/RFRcj7pBPI4kTSLLl+pw=";
+ hash = "sha256-7otn9F+S4HJ2tWyn8w96NX3hWSLdApTwUL2zAyAW9Xw=";
};
proxyVendor = true;
- vendorHash = "sha256-S/CkTWx4fUI54JVCW9ixhNADdBuMD2i7NI5U8aDy66k=";
+ vendorHash = "sha256-rHTZmwy/ZHpsHNFh00mWXe6F8wEtL0JcLaehBwyvtJw=";
doCheck = false;
From cbda4e872410bcef6c2ff63767915d4f2f9df0bc Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Mon, 30 Mar 2026 16:34:15 +0200
Subject: [PATCH 66/74] python3Packages.django_4: drop
Removing due to it becoming a leaf package right before it's EOL on April
30th.
Closes: #490868
---
.../python-modules/bcrypt/default.nix | 4 +-
pkgs/development/python-modules/django/4.nix | 174 ------------------
.../django/django_4_set_geos_gdal_lib.patch | 26 ---
.../django/django_4_set_zoneinfo_dir.patch | 13 --
.../django/django_4_tests.patch | 51 -----
.../python-modules/sqlparse/default.nix | 2 -
pkgs/top-level/python-aliases.nix | 1 +
pkgs/top-level/python-packages.nix | 2 -
8 files changed, 3 insertions(+), 270 deletions(-)
delete mode 100644 pkgs/development/python-modules/django/4.nix
delete mode 100644 pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch
delete mode 100644 pkgs/development/python-modules/django/django_4_set_zoneinfo_dir.patch
delete mode 100644 pkgs/development/python-modules/django/django_4_tests.patch
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index b50cb3faef22..464986863266 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -10,7 +10,7 @@
pytestCheckHook,
# for passthru.tests
asyncssh,
- django_4,
+ django,
fastapi,
paramiko,
twisted,
@@ -57,7 +57,7 @@ buildPythonPackage rec {
passthru.tests = {
inherit
asyncssh
- django_4
+ django
fastapi
paramiko
twisted
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
deleted file mode 100644
index 69127fd6767f..000000000000
--- a/pkgs/development/python-modules/django/4.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-{
- lib,
- stdenv,
- buildPythonPackage,
- fetchFromGitHub,
- fetchpatch,
- pythonAtLeast,
- replaceVars,
-
- # build
- setuptools,
-
- # patched in
- geos,
- gdal,
- withGdal ? false,
-
- # propagates
- asgiref,
- sqlparse,
-
- # extras
- argon2-cffi,
- bcrypt,
-
- # tests
- aiosmtpd,
- docutils,
- geoip2,
- jinja2,
- numpy,
- pillow,
- pylibmc,
- pymemcache,
- python,
- pywatchman,
- pyyaml,
- pytz,
- redis,
- selenium,
- tblib,
- tzdata,
-}:
-
-buildPythonPackage rec {
- pname = "django";
- version = "4.2.29";
- pyproject = true;
-
- disabled = pythonAtLeast "3.13";
-
- src = fetchFromGitHub {
- owner = "django";
- repo = "django";
- tag = version;
- hash = "sha256-30OcLxtACSxLJ1jT+k7fmM8CyMyleXSPc+l7/3JZKzI=";
- };
-
- patches = [
- (replaceVars ./django_4_set_zoneinfo_dir.patch {
- zoneinfo = tzdata + "/share/zoneinfo";
- })
- # make sure the tests don't remove packages from our pythonpath
- # and disable failing tests
- ./django_4_tests.patch
-
- # fix filename length limit tests on bcachefs
- # FIXME: remove if ever backported
- (fetchpatch {
- url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch";
- hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";
- })
-
- # backport fix for https://code.djangoproject.com/ticket/36056
- # FIXME: remove if ever backported upstream
- (fetchpatch {
- url = "https://github.com/django/django/commit/ec0e784f91b551c654f0962431cc31091926792d.patch";
- includes = [ "django/*" ]; # tests don't apply
- hash = "sha256-8YwdOBNJq6+GNoxzdLyN9HEEIWRXGQk9YbyfPwYVkwU=";
- })
-
- ]
- ++ lib.optionals withGdal [
- (replaceVars ./django_4_set_geos_gdal_lib.patch {
- geos = geos;
- gdal = gdal;
- extension = stdenv.hostPlatform.extensions.sharedLibrary;
- })
- ];
-
- postPatch = ''
- substituteInPlace tests/utils_tests/test_autoreload.py \
- --replace "/usr/bin/python" "${python.interpreter}"
- ''
- + lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") ''
- # Test regression after xz was reverted from 5.6.0 to 5.4.6
- # https://hydra.nixos.org/build/254630990
- substituteInPlace tests/view_tests/tests/test_debug.py \
- --replace-fail "test_files" "dont_test_files"
- ''
- + lib.optionalString (pythonAtLeast "3.13") ''
- # Fixed CommandTypes.test_help_default_options_with_custom_arguments test on Python 3.13+.
- # https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876
- substituteInPlace tests/admin_scripts/tests.py --replace-fail \
- "test_help_default_options_with_custom_arguments" \
- "dont_test_help_default_options_with_custom_arguments"
- '';
-
- nativeBuildInputs = [ setuptools ];
-
- propagatedBuildInputs = [
- asgiref
- sqlparse
- ];
-
- optional-dependencies = {
- argon2 = [ argon2-cffi ];
- bcrypt = [ bcrypt ];
- };
-
- nativeCheckInputs = [
- # tests/requirements/py3.txt
- aiosmtpd
- docutils
- geoip2
- jinja2
- numpy
- pillow
- pylibmc
- pymemcache
- pywatchman
- pyyaml
- pytz
- redis
- selenium
- tblib
- tzdata
- ]
- ++ lib.concatAttrValues optional-dependencies;
-
- doCheck =
- !stdenv.hostPlatform.isDarwin
- # pywatchman depends on folly which does not support 32bits
- && !stdenv.hostPlatform.is32bit;
-
- preCheck = ''
- # make sure the installed library gets imported
- rm -rf django
-
- # provide timezone data, works only on linux
- export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo
- '';
-
- checkPhase = ''
- runHook preCheck
-
- pushd tests
- ${python.interpreter} runtests.py --settings=test_sqlite
- popd
-
- runHook postCheck
- '';
-
- __darwinAllowLocalNetworking = true;
-
- meta = {
- changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor version}/releases/${version}/";
- description = "High-level Python Web framework that encourages rapid development and clean, pragmatic design";
- mainProgram = "django-admin";
- homepage = "https://www.djangoproject.com";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ hexa ];
- };
-}
diff --git a/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch
deleted file mode 100644
index b3da31f1e109..000000000000
--- a/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
-index 05b5732..91fafee 100644
---- a/django/contrib/gis/gdal/libgdal.py
-+++ b/django/contrib/gis/gdal/libgdal.py
-@@ -14,7 +14,7 @@ try:
- from django.conf import settings
- lib_path = settings.GDAL_LIBRARY_PATH
- except (AttributeError, ImportError, ImproperlyConfigured, OSError):
-- lib_path = None
-+ lib_path = "@gdal@/lib/libgdal@extension@"
-
- if lib_path:
- lib_names = None
-diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
-index 2cdb5d3..fac2d04 100644
---- a/django/contrib/gis/geos/libgeos.py
-+++ b/django/contrib/gis/geos/libgeos.py
-@@ -24,7 +24,7 @@ def load_geos():
- from django.conf import settings
- lib_path = settings.GEOS_LIBRARY_PATH
- except (AttributeError, ImportError, ImproperlyConfigured, OSError):
-- lib_path = None
-+ lib_path = "@geos@/lib/libgeos_c@extension@"
-
- # Setting the appropriate names for the GEOS-C library.
- if lib_path:
diff --git a/pkgs/development/python-modules/django/django_4_set_zoneinfo_dir.patch b/pkgs/development/python-modules/django/django_4_set_zoneinfo_dir.patch
deleted file mode 100644
index d9848772b85a..000000000000
--- a/pkgs/development/python-modules/django/django_4_set_zoneinfo_dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/django/conf/__init__.py b/django/conf/__init__.py
-index cb70a71791..5156f7dd73 100644
---- a/django/conf/__init__.py
-+++ b/django/conf/__init__.py
-@@ -227,7 +227,7 @@ class Settings:
- if hasattr(time, "tzset") and self.TIME_ZONE:
- # When we can, attempt to validate the timezone. If we can't find
- # this file, no check happens and it's harmless.
-- zoneinfo_root = Path("/usr/share/zoneinfo")
-+ zoneinfo_root = Path("@zoneinfo@")
- zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/"))
- if zoneinfo_root.exists() and not zone_info_file.exists():
- raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
diff --git a/pkgs/development/python-modules/django/django_4_tests.patch b/pkgs/development/python-modules/django/django_4_tests.patch
deleted file mode 100644
index 689e1ed652a8..000000000000
--- a/pkgs/development/python-modules/django/django_4_tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
-index 6d67c2931a..0c1f407f88 100644
---- a/tests/admin_scripts/tests.py
-+++ b/tests/admin_scripts/tests.py
-@@ -127,6 +127,7 @@ class AdminScriptTestCase(SimpleTestCase):
- del test_environ["DJANGO_SETTINGS_MODULE"]
- python_path = [base_dir, django_dir, tests_dir]
- python_path.extend(ext_backend_base_dirs)
-+ python_path.extend(sys.path)
- test_environ["PYTHONPATH"] = os.pathsep.join(python_path)
- test_environ["PYTHONWARNINGS"] = ""
-
-diff --git a/tests/auth_tests/test_hashers.py b/tests/auth_tests/test_hashers.py
-index 36f22d5f09..6cc6888980 100644
---- a/tests/auth_tests/test_hashers.py
-+++ b/tests/auth_tests/test_hashers.py
-@@ -1,4 +1,4 @@
--from unittest import mock, skipUnless
-+from unittest import mock, skipUnless, skip
-
- from django.conf.global_settings import PASSWORD_HASHERS
- from django.contrib.auth.hashers import (
-@@ -241,6 +241,7 @@ class TestUtilsHashPass(SimpleTestCase):
-
- @ignore_warnings(category=RemovedInDjango50Warning)
- @skipUnless(crypt, "no crypt module to generate password.")
-+ @skip("Legacy crypt algorithms are unsupported in nixpkgs")
- @override_settings(
- PASSWORD_HASHERS=["django.contrib.auth.hashers.CryptPasswordHasher"]
- )
-diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py
-index 62cbffbee9..2f0ec718f8 100644
---- a/tests/settings_tests/tests.py
-+++ b/tests/settings_tests/tests.py
-@@ -2,7 +2,7 @@ import os
- import sys
- import unittest
- from types import ModuleType, SimpleNamespace
--from unittest import mock
-+from unittest import mock, skip
-
- from django.conf import (
- ENVIRONMENT_VARIABLE,
-@@ -342,6 +342,7 @@ class SettingsTests(SimpleTestCase):
- getattr(s, "foo")
-
- @requires_tz_support
-+ @skip("Assertion fails, exception does not get raised")
- @mock.patch("django.conf.global_settings.TIME_ZONE", "test")
- def test_incorrect_timezone(self):
- with self.assertRaisesMessage(ValueError, "Incorrect timezone setting: test"):
diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix
index 652813e38ae4..20086d0bb43e 100644
--- a/pkgs/development/python-modules/sqlparse/default.nix
+++ b/pkgs/development/python-modules/sqlparse/default.nix
@@ -8,7 +8,6 @@
# for passthru.tests
django,
- django_4,
django-silk,
pgadmin4,
}:
@@ -36,7 +35,6 @@ buildPythonPackage rec {
passthru.tests = {
inherit
django
- django_4
django-silk
pgadmin4
;
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 223f597fd1d0..3f7af9295e62 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -152,6 +152,7 @@ mapAliases {
django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
django-modelsearch = modelsearch; # added 2026-03-02
django_3 = throw "Django 3 has reached it's EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
+ django_4 = throw "Django 4 has reached it's EOL in 2026-04 and has therefore been removed."; # added 2026-03-30
django_5_1 = throw "Django 5.1 has reached it's EOL in 2025-12 and has therefore been removed."; # added 2025-11-30"
django_5_2 = django_5; # added 2026-01-18
django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b667a6235c6c..115f36295c15 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4443,8 +4443,6 @@ self: super: with self; {
{ };
# LTS in extended support phase
- django_4 = callPackage ../development/python-modules/django/4.nix { };
-
django_5 = callPackage ../development/python-modules/django/5.nix { };
django_6 = callPackage ../development/python-modules/django/6.nix { };
From 15b9a7f5872cb6a7819b165f3d4789f11cfef13c Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine
Date: Mon, 30 Mar 2026 12:46:12 +0000
Subject: [PATCH 67/74] opencode{,-desktop}: 1.3.2 -> 1.3.7
Changelogs:
- https://github.com/anomalyco/opencode/releases/tag/v1.3.3
- https://github.com/anomalyco/opencode/releases/tag/v1.3.4
- https://github.com/anomalyco/opencode/releases/tag/v1.3.5
- https://github.com/anomalyco/opencode/releases/tag/v1.3.6
- https://github.com/anomalyco/opencode/releases/tag/v1.3.7
Diff: https://github.com/anomalyco/opencode/compare/v1.3.2...v1.3.7
---
pkgs/by-name/op/opencode/package.nix | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 51df68568128..e13b41819e8c 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -5,6 +5,7 @@
fetchFromGitHub,
makeBinaryWrapper,
models-dev,
+ nodejs,
nix-update-script,
ripgrep,
sysctl,
@@ -15,13 +16,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
- version = "1.3.2";
+ version = "1.3.7";
src = fetchFromGitHub {
owner = "anomalyco";
repo = "opencode";
tag = "v${finalAttrs.version}";
- hash = "sha256-04eOIBHX9e8Brwn+uL/7q8szvRUilr4G0B8eB76dhKU=";
+ hash = "sha256-DL/3AFyYevK4SD3pC+goTHLrlD29dRoyL0QAlxZDLcU=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -46,8 +47,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
bun install \
--cpu="*" \
--frozen-lockfile \
- --filter ./packages/opencode \
+ --filter ./packages/app \
--filter ./packages/desktop \
+ --filter ./packages/opencode \
--ignore-scripts \
--no-progress \
--os="*"
@@ -70,13 +72,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
- outputHash = "sha256-LRLKvI1tfIebiVP6SQIs7heoOqAsB+FaCnrpFE0VLe4=";
+ outputHash = "sha256-//yE+ngjobja2Y5yIcvW0oEVSu85nqNAvjWu5OyISGU=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
nativeBuildInputs = [
bun
+ nodejs
installShellFiles
makeBinaryWrapper
models-dev
@@ -94,6 +97,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook preConfigure
cp -R ${finalAttrs.node_modules}/. .
+ patchShebangs node_modules
+ patchShebangs packages/*/node_modules
runHook postConfigure
'';
From c56295d5524609b7ccd20fe5fa69e55d0d7bb738 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens"
Date: Mon, 30 Mar 2026 11:06:51 -0400
Subject: [PATCH 68/74] beamPackages.expert: 0.1.0-rc.6 -> 0.1.0
Diff: https://github.com/elixir-lang/expert/compare/v0.1.0-rc.6...v0.1.0
Changelog: https://github.com/elixir-lang/expert/blob/v0.1.0/CHANGELOG.md
---
pkgs/development/beam-modules/expert/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/beam-modules/expert/default.nix b/pkgs/development/beam-modules/expert/default.nix
index e10ba9ec50a9..a656cb55203e 100644
--- a/pkgs/development/beam-modules/expert/default.nix
+++ b/pkgs/development/beam-modules/expert/default.nix
@@ -6,13 +6,13 @@
fetchMixDeps,
}:
let
- version = "0.1.0-rc.6";
+ version = "0.1.0";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "expert";
tag = "v${version}";
- hash = "sha256-w3jRpQLbigQVNuuPlyoOHp6wO0gPsgdR0kwHP6Zul6Y=";
+ hash = "sha256-r/SovUjU12ENT6OqbYuGK7XAmoxchUgiHTswlON/WeI=";
};
engineDeps = fetchMixDeps {
From eb04b1bcbdbf7907f42d3880ac79588a77811d6c Mon Sep 17 00:00:00 2001
From: Ulysses Zhan
Date: Sat, 28 Mar 2026 23:26:05 -0700
Subject: [PATCH 69/74] python2Packages.wcwidth: typo
---
pkgs/top-level/python2-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 9f09c1c044b5..8784cb32b65a 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -61,7 +61,7 @@ with super;
six = disabled super.six;
- wcwidth = disabled super.wcwitch;
+ wcwidth = disabled super.wcwidth;
wheel = callPackage ../development/python2-modules/wheel { };
From 4d8bc18f05ee10d0832bdfc11272c35bf6a19af9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter
Date: Mon, 30 Mar 2026 17:43:53 +0200
Subject: [PATCH 70/74] python3Packages.iamdata: 0.1.202603281 -> 0.1.202603301
Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202603281...v0.1.202603301
Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202603301
---
pkgs/development/python-modules/iamdata/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 1e646c40935a..2a92f7c2d298 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
- version = "0.1.202603281";
+ version = "0.1.202603301";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
- hash = "sha256-Wl9GlMr8Y7jLjw6uYLb4JtLIzoQo8WZm0vOL9np1xPU=";
+ hash = "sha256-cJ+CvwbPLyZZazeKVZywBLsIChvZKZ8huQbEh3yIsto=";
};
__darwinAllowLocalNetworking = true;
From f7402854717e287d2405933d7a3d478d9f9ba4e9 Mon Sep 17 00:00:00 2001
From: sm-idk <43745781+sm-idk@users.noreply.github.com>
Date: Mon, 30 Mar 2026 18:16:34 +0200
Subject: [PATCH 71/74] libkrun: 1.17.0 -> 1.17.4
Changelog: https://github.com/containers/libkrun/releases/tag/v1.17.4
Diff: https://github.com/containers/libkrun/compare/v1.17.0...v1.17.4
---
pkgs/by-name/li/libkrun/package.nix | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix
index 4630a6fb1926..aecdc47cb31f 100644
--- a/pkgs/by-name/li/libkrun/package.nix
+++ b/pkgs/by-name/li/libkrun/package.nix
@@ -7,6 +7,7 @@
pkg-config,
glibc,
openssl,
+ libcap_ng,
libepoxy,
libdrm,
pipewire,
@@ -33,13 +34,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "libkrun" + lib.optionalString (variant != null) "-${variant}";
- version = "1.17.0";
+ version = "1.17.4";
src = fetchFromGitHub {
owner = "containers";
repo = "libkrun";
tag = "v${finalAttrs.version}";
- hash = "sha256-6HBSL5Zu29sDoEbZeQ6AsNIXUcqXVVGMk0AR2X6v1yU=";
+ hash = "sha256-Th4vCg3xHb6lbo26IDZES7tLOUAJTebQK2+h3xSYX7U=";
};
outputs = [
@@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
- hash = "sha256-UIzbtBJH6aivoIxko1Wxdod/jUN44pERX9Hd+v7TC3Q=";
+ hash = "sha256-0xpAyNe1jF1OMtc7FXMsejqIv0xKc1ktEvm3rj/mVFU=";
};
# Make sure libkrunfw can be found by dlopen()
@@ -65,11 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
cargo
+ pkg-config
rustc
- ]
- ++ lib.optional (variant == "sev" || variant == "tdx" || withGpu) pkg-config;
+ ];
buildInputs = [
+ libcap_ng
libkrunfw'
glibc
glibc.static
From fad8c4bfd75dbc484b3078d7e077f09474bb1d69 Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Mon, 30 Mar 2026 18:26:25 +0200
Subject: [PATCH 72/74] ren-find: 0-unstable-2024-01-11 -> 0.0.4
---
pkgs/by-name/re/ren-find/package.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/by-name/re/ren-find/package.nix b/pkgs/by-name/re/ren-find/package.nix
index ce70c4e207f7..1b44187dc4d6 100644
--- a/pkgs/by-name/re/ren-find/package.nix
+++ b/pkgs/by-name/re/ren-find/package.nix
@@ -4,18 +4,18 @@
fetchFromGitHub,
}:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
pname = "ren-find";
- version = "0-unstable-2024-01-11";
+ version = "0.0.4";
src = fetchFromGitHub {
owner = "robenkleene";
repo = "ren-find";
- rev = "50c40172e354caffee48932266edd7c7a76a20f";
- hash = "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=";
+ tag = finalAttrs.version;
+ hash = "sha256-DipYEem+Vr6lvnsSMAePjYF3yx0qWMM7CLG9ORcehJk=";
};
- cargoHash = "sha256-lSeO/GaJPZ8zosOIJRXVIEuPXaBg1GBvKBIuXtu1xZg=";
+ cargoHash = "sha256-LeYd2FFdzW35ylghEoq6Tqrg7bUXwegmWfxfQi7/tpI=";
meta = {
description = "Command-line utility that takes find-formatted lines and batch renames them";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage {
maintainers = with lib.maintainers; [ philiptaron ];
mainProgram = "ren";
};
-}
+})
From 4007f7c86114428e7a1d738cbbe33965553e7145 Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Mon, 30 Mar 2026 18:49:20 +0200
Subject: [PATCH 73/74] rep-grep: 0-unstable-2024-02-06 -> 0.0.8
---
pkgs/by-name/re/rep-grep/package.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/by-name/re/rep-grep/package.nix b/pkgs/by-name/re/rep-grep/package.nix
index ce66bb6b3bd2..cad5c9705a61 100644
--- a/pkgs/by-name/re/rep-grep/package.nix
+++ b/pkgs/by-name/re/rep-grep/package.nix
@@ -4,18 +4,18 @@
fetchFromGitHub,
}:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
pname = "rep-grep";
- version = "0-unstable-2024-02-06";
+ version = "0.0.8";
src = fetchFromGitHub {
owner = "robenkleene";
repo = "rep-grep";
- rev = "10510d47e392cb9d30a861c69f702fd194b3fa88";
- hash = "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=";
+ tag = finalAttrs.version;
+ hash = "sha256-GJXpzqc9reFFyZWPsaiohFsPj3PseijSLn6Td8Ouidk=";
};
- cargoHash = "sha256-t4tfQaFq4EV4ZWeU+IestSFiSAIeVQslTZhLbpKVoO4=";
+ cargoHash = "sha256-ugQxJsu/U7O3S8SQwhGGDAdEIDesW7JbwFBkNYRe13w=";
meta = {
description = "Command-line utility that takes grep-formatted lines and performs a find-and-replace on them";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage {
maintainers = with lib.maintainers; [ philiptaron ];
mainProgram = "rep";
};
-}
+})
From adf2ec46c7a1317d69e489dfcbb76a690370ee84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Mon, 30 Mar 2026 10:09:36 -0700
Subject: [PATCH 74/74] python3Packages.gpiod: rename from libgpiod
On PyPI the package is called gpiod and that's also what's listed as its
name in the METADATA file.
---
.../python-modules/{libgpiod => gpiod}/default.nix | 8 ++++++--
pkgs/development/python-modules/gpiodevice/default.nix | 4 ++--
.../python-modules/universal-silabs-flasher/default.nix | 4 ++--
.../home-assistant/custom-components/gpio/package.nix | 4 ++--
pkgs/top-level/python-aliases.nix | 1 +
pkgs/top-level/python-packages.nix | 4 ++--
6 files changed, 15 insertions(+), 10 deletions(-)
rename pkgs/development/python-modules/{libgpiod => gpiod}/default.nix (80%)
diff --git a/pkgs/development/python-modules/libgpiod/default.nix b/pkgs/development/python-modules/gpiod/default.nix
similarity index 80%
rename from pkgs/development/python-modules/libgpiod/default.nix
rename to pkgs/development/python-modules/gpiod/default.nix
index 6a1c3ca6f1d5..248dffdcc939 100644
--- a/pkgs/development/python-modules/libgpiod/default.nix
+++ b/pkgs/development/python-modules/gpiod/default.nix
@@ -2,10 +2,14 @@
lib,
buildPythonPackage,
libgpiod,
+ setuptools,
}:
buildPythonPackage {
- inherit (libgpiod) pname version src;
- format = "setuptools";
+ pname = "gpiod";
+ inherit (libgpiod) version src;
+ pyproject = true;
+
+ build-system = [ setuptools ];
buildInputs = [ libgpiod ];
diff --git a/pkgs/development/python-modules/gpiodevice/default.nix b/pkgs/development/python-modules/gpiodevice/default.nix
index 0cba569db157..f024870aaedc 100644
--- a/pkgs/development/python-modules/gpiodevice/default.nix
+++ b/pkgs/development/python-modules/gpiodevice/default.nix
@@ -6,7 +6,7 @@
fetchFromGitHub,
hatchling,
hatch-fancy-pypi-readme,
- libgpiod,
+ gpiod,
mock,
}:
buildPythonPackage (finalAttrs: {
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
];
dependencies = [
- libgpiod
+ gpiod
];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index c415b0d11680..9b2a23664e2b 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -12,7 +12,7 @@
click,
coloredlogs,
crc,
- libgpiod,
+ gpiod,
pyserial-asyncio-fast,
typing-extensions,
zigpy,
@@ -53,7 +53,7 @@ buildPythonPackage rec {
typing-extensions
zigpy
]
- ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ];
+ ++ lib.optionals (stdenv.hostPlatform.isLinux) [ gpiod ];
nativeCheckInputs = [
pytestCheckHook
diff --git a/pkgs/servers/home-assistant/custom-components/gpio/package.nix b/pkgs/servers/home-assistant/custom-components/gpio/package.nix
index 9c53c94e7ee8..327ad206cb4d 100644
--- a/pkgs/servers/home-assistant/custom-components/gpio/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/gpio/package.nix
@@ -2,7 +2,7 @@
lib,
buildHomeAssistantComponent,
fetchFromCodeberg,
- libgpiod,
+ gpiod,
}:
buildHomeAssistantComponent rec {
@@ -17,7 +17,7 @@ buildHomeAssistantComponent rec {
hash = "sha256-JyyJPI0lbZLJj+016WgS1KXU5rnxUmRMafel4/wKsYk=";
};
- dependencies = [ libgpiod ];
+ dependencies = [ gpiod ];
meta = {
description = "Home Assistant GPIO custom integration";
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3f7af9295e62..139c2c39f18f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -287,6 +287,7 @@ mapAliases {
lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
+ libgpiod = gpiod; # added 2026-03-30
libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
linear-garage-door = throw "'linear-garage-door' has been superseded by 'nice-go'"; # Added 2025-11-16
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 115f36295c15..9a842d71a989 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6597,6 +6597,8 @@ self: super: with self; {
gpib-ctypes = callPackage ../development/python-modules/gpib-ctypes { };
+ gpiod = callPackage ../development/python-modules/gpiod { inherit (pkgs) libgpiod; };
+
gpiodevice = callPackage ../development/python-modules/gpiodevice { };
gpiozero = callPackage ../development/python-modules/gpiozero { };
@@ -8699,8 +8701,6 @@ self: super: with self; {
libfive = toPythonModule (pkgs.libfive.override { python3 = python; });
- libgpiod = callPackage ../development/python-modules/libgpiod { inherit (pkgs) libgpiod; };
-
libgravatar = callPackage ../development/python-modules/libgravatar { };
libiio =