From 0b5807460f785acb8f222cf025c950ead779043f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 13:09:08 +0000
Subject: [PATCH 01/27] masterpdfeditor: 5.9.94 -> 5.9.98

---
 pkgs/by-name/ma/masterpdfeditor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix
index 5cddce59d771..f9df3696180b 100644
--- a/pkgs/by-name/ma/masterpdfeditor/package.nix
+++ b/pkgs/by-name/ma/masterpdfeditor/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "masterpdfeditor";
-  version = "5.9.94";
+  version = "5.9.98";
 
   src =
     let
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
         aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-WKMk0uzcjI4/dwjas4Ws3S6VBcUZYO9/WDXgKY22EeE=";
-        aarch64-linux = "sha256-DKNOvEAjCzOHRAn8PRiT/1tv6/NggoWCHgHf5OWOHSA=";
+        x86_64-linux = "sha256-KNAssyWLeMqtMyZQIF6Qr1K/9tioC4cD84lL9c1iMgM=";
+        aarch64-linux = "sha256-+jNXO4fbbkh9Uea0N+0fJbHRMu9zS/d7o8W4D2+7kMI=";
       };
     };
 

From 088daa4b922b17640900d7d32c2030e61b8699a4 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 1 May 2026 10:06:53 -0400
Subject: [PATCH 02/27] shelfmark{,-frontend}: 1.2.1 -> 1.2.2

Diff: https://github.com/calibrain/shelfmark/compare/v1.2.1...v1.2.2

Changelog: https://github.com/calibrain/shelfmark/releases/tag/v1.2.2
---
 pkgs/by-name/sh/shelfmark-frontend/package.nix | 2 +-
 pkgs/by-name/sh/shelfmark/package.nix          | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sh/shelfmark-frontend/package.nix b/pkgs/by-name/sh/shelfmark-frontend/package.nix
index 95fcfeac6214..c39f7920f828 100644
--- a/pkgs/by-name/sh/shelfmark-frontend/package.nix
+++ b/pkgs/by-name/sh/shelfmark-frontend/package.nix
@@ -9,7 +9,7 @@ buildNpmPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
-  npmDepsHash = "sha256-VCnxEcaqWo31oIpF6X8Lid4I/aaQCQZ9l9rV6TTqXPI=";
+  npmDepsHash = "sha256-c/KDGUe+X4dfzbDXpkzYsEzvBxJjq46PTzqbgoCdGgw=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/sh/shelfmark/package.nix b/pkgs/by-name/sh/shelfmark/package.nix
index ca13ad35ae59..2267d26bda21 100644
--- a/pkgs/by-name/sh/shelfmark/package.nix
+++ b/pkgs/by-name/sh/shelfmark/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python3Packages,
+  python314Packages,
   makeWrapper,
   nixosTests,
   shelfmark-frontend,
@@ -10,6 +10,8 @@
 }:
 
 let
+  python3Packages = python314Packages;
+
   pythonDeps = with python3Packages; [
     flask
     flask-cors
@@ -35,13 +37,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shelfmark";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "calibrain";
     repo = "shelfmark";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Fe7zu51gFG2QgcBWcGkFi64CdZW4ohZg+7jdmeMFVLI=";
+    hash = "sha256-4x5HwVNNGmoJ/ey1+hc7IqgYjaEJjOWpFuqGlTc4MsM=";
   };
 
   nativeBuildInputs = [

From 15552e032fe756180e2c0d9186137bca85fe58d4 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 1 May 2026 14:05:41 -0400
Subject: [PATCH 03/27] shelfmark: inline frontend and add updateScript

---
 .../by-name/sh/shelfmark-frontend/package.nix | 25 ----------
 pkgs/by-name/sh/shelfmark/package.nix         | 46 +++++++++++++++----
 2 files changed, 37 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/sh/shelfmark-frontend/package.nix

diff --git a/pkgs/by-name/sh/shelfmark-frontend/package.nix b/pkgs/by-name/sh/shelfmark-frontend/package.nix
deleted file mode 100644
index c39f7920f828..000000000000
--- a/pkgs/by-name/sh/shelfmark-frontend/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  buildNpmPackage,
-  shelfmark,
-}:
-
-buildNpmPackage (finalAttrs: {
-  pname = "shelfmark-frontend";
-  inherit (shelfmark) version src;
-
-  sourceRoot = "${finalAttrs.src.name}/src/frontend";
-
-  npmDepsHash = "sha256-c/KDGUe+X4dfzbDXpkzYsEzvBxJjq46PTzqbgoCdGgw=";
-
-  installPhase = ''
-    runHook preInstall
-    cp -r dist $out
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Shelfmark frontend";
-    homepage = "https://github.com/calibrain/shelfmark/tree/main/src/frontend";
-    inherit (shelfmark.meta) changelog license maintainers;
-  };
-})
diff --git a/pkgs/by-name/sh/shelfmark/package.nix b/pkgs/by-name/sh/shelfmark/package.nix
index 2267d26bda21..891242c77951 100644
--- a/pkgs/by-name/sh/shelfmark/package.nix
+++ b/pkgs/by-name/sh/shelfmark/package.nix
@@ -1,12 +1,14 @@
 {
   lib,
   stdenv,
+  buildNpmPackage,
   fetchFromGitHub,
   python314Packages,
+  nix-update-script,
   makeWrapper,
   nixosTests,
-  shelfmark-frontend,
   unrar-free,
+  _experimental-update-script-combinators,
 }:
 
 let
@@ -34,18 +36,35 @@ let
     authlib
     apprise
   ];
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "shelfmark";
+
   version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "calibrain";
     repo = "shelfmark";
-    tag = "v${finalAttrs.version}";
+    tag = "v${version}";
     hash = "sha256-4x5HwVNNGmoJ/ey1+hc7IqgYjaEJjOWpFuqGlTc4MsM=";
   };
 
+  frontend = buildNpmPackage (finalAttrs: {
+    pname = "shelfmark-frontend";
+    inherit version src;
+
+    sourceRoot = "${finalAttrs.src.name}/src/frontend";
+
+    npmDepsHash = "sha256-c/KDGUe+X4dfzbDXpkzYsEzvBxJjq46PTzqbgoCdGgw=";
+
+    installPhase = ''
+      runHook preInstall
+      cp -r dist $out
+      runHook postInstall
+    '';
+  });
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "shelfmark";
+  inherit version src;
+
   nativeBuildInputs = [
     python3Packages.wrapPython
     makeWrapper
@@ -62,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     cp -r shelfmark $out/libexec/shelfmark
     cp -r data $out/libexec/data
-    ln -s ${finalAttrs.passthru.frontend} $out/libexec/frontend-dist
+    ln -s ${frontend} $out/libexec/frontend-dist
 
     makeWrapper ${python3Packages.python.interpreter} $out/bin/shelfmark \
       --prefix PATH : ${
@@ -79,12 +98,21 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    frontend = shelfmark-frontend.override {
-      shelfmark = finalAttrs.finalPackage;
-    };
+    inherit frontend;
+
     tests = {
       inherit (nixosTests) shelfmark;
     };
+
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { })
+      (nix-update-script {
+        extraArgs = [
+          "--subpackage=frontend"
+          "--version=skip"
+        ];
+      })
+    ];
   };
 
   meta = {

From 3aa172c2edbcbfd5bb7edf7c55a7dc217c147f9c Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 2 May 2026 10:25:10 -0400
Subject: [PATCH 04/27] shelfmark: 1.2.2 -> 1.2.3

Changelog: https://github.com/calibrain/shelfmark/releases/tag/v1.2.3
---
 pkgs/by-name/sh/shelfmark/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shelfmark/package.nix b/pkgs/by-name/sh/shelfmark/package.nix
index 891242c77951..18db8a5a8a52 100644
--- a/pkgs/by-name/sh/shelfmark/package.nix
+++ b/pkgs/by-name/sh/shelfmark/package.nix
@@ -37,13 +37,13 @@ let
     apprise
   ];
 
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "calibrain";
     repo = "shelfmark";
     tag = "v${version}";
-    hash = "sha256-4x5HwVNNGmoJ/ey1+hc7IqgYjaEJjOWpFuqGlTc4MsM=";
+    hash = "sha256-abRM2ZWfA5nyD0YF7BVmZ6AU37+qd7osjQVGqhjdEV0=";
   };
 
   frontend = buildNpmPackage (finalAttrs: {

From b76a1254d915b969ea43bdb4daa61e696375e646 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 May 2026 12:29:58 +0000
Subject: [PATCH 05/27] lycheeslicer: 7.6.4 -> 7.6.5

---
 pkgs/by-name/ly/lycheeslicer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ly/lycheeslicer/package.nix b/pkgs/by-name/ly/lycheeslicer/package.nix
index 884e988fd4d6..bf7e3e864f0b 100644
--- a/pkgs/by-name/ly/lycheeslicer/package.nix
+++ b/pkgs/by-name/ly/lycheeslicer/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "lycheeslicer";
-  version = "7.6.4";
+  version = "7.6.5";
 
   src = fetchurl {
     url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
-    hash = "sha256-lLE40ByNdfK7GkLjfbEEX0nmhL0+E51qPDe+whIJqEM=";
+    hash = "sha256-HVCAvukGeF4hRJ/l41iBV1MZD5i9qzIYGSgMrncNfDg=";
   };
 
   desktopItem = makeDesktopItem {

From 29c41af60ec25de27b7ca476848a11bbca49c42a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 8 May 2026 23:49:41 +0700
Subject: [PATCH 06/27] nixos/zfs: fix indentation

this block was off
---
 nixos/modules/tasks/filesystems/zfs.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7fcbde36087c..91df1388a191 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -204,11 +204,11 @@ let
             poolImported "${pool}" || poolImport "${pool}"  # Try one last time, e.g. to import a degraded pool.
           fi
           if poolImported "${pool}"; then
-          ${lib.optionalString config.boot.initrd.clevis.enable (
-            lib.concatMapStringsSep "\n" (
-              elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key -L prompt ${elem} || true "
-            ) (lib.filter (p: (lib.elemAt (lib.splitString "/" p) 0) == pool) clevisDatasets)
-          )}
+            ${lib.optionalString config.boot.initrd.clevis.enable (
+              lib.concatMapStringsSep "\n" (
+                elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key -L prompt ${elem} || true "
+              ) (lib.filter (p: (lib.elemAt (lib.splitString "/" p) 0) == pool) clevisDatasets)
+            )}
 
 
             ${lib.optionalString keyLocations.hasKeys ''

From d754d2e4adec0be3e3a5853da75f269784e3516e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 May 2026 07:36:25 +0000
Subject: [PATCH 07/27] hyprutils: 0.13.0 -> 0.13.1

---
 pkgs/by-name/hy/hyprutils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index e04bbcaf7a6d..6b1153743b93 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=";
+    hash = "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=";
   };
 
   nativeBuildInputs = [

From f4513092a3c0356888ed3e63d215edea5f8e4514 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 9 May 2026 23:53:21 +0200
Subject: [PATCH 08/27] jjui: 0.10.4 -> 0.10.5

Changelog: https://github.com/idursun/jjui/releases/tag/v0.10.5
Diff: https://github.com/idursun/jjui/compare/v0.10.4...v0.10.5
---
 pkgs/by-name/jj/jjui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 6050122523e2..c00abb320409 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -8,16 +8,16 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "jjui";
-  version = "0.10.4";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-20NWoojFBwHs33NFNeZbk1kiZ418kYD42XTUOHuQtv8=";
+    hash = "sha256-3cr6aSJoIAv9Ine2ePHCC6xBaS1G4i23yQh8I5mq47g=";
   };
 
-  vendorHash = "sha256-AJlJ9iHkkWNS8a4oGt8AG89StjMH9UH3WuOcZwa3VS8=";
+  vendorHash = "sha256-iUWeQIYwOkXhRFsQc5zBjFFG5m412ysR5LsZsHET1ak=";
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 

From faf7bd1d3868acefe7b9e82a14b5dfa906596d07 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Wed, 29 Apr 2026 09:41:53 -0400
Subject: [PATCH 09/27] stdenv.mkDerivation: move concretizeFlagImplications to
 global scope

---
 pkgs/stdenv/generic/make-derivation.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e6df0134b234..7a17cb27737e 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -165,6 +165,10 @@ let
     "zerocallusedregs"
   ];
 
+  concretizeFlagImplications =
+    flag: impliesFlags: list:
+    if elem flag list then (list ++ impliesFlags) else list;
+
   removedOrReplacedAttrNames = [
     "checkInputs"
     "installCheckInputs"
@@ -409,10 +413,6 @@ let
           actualValue;
       outputs' = if separateDebugInfo' then outputs ++ [ "debug" ] else outputs;
 
-      concretizeFlagImplications =
-        flag: impliesFlags: list:
-        if elem flag list then (list ++ impliesFlags) else list;
-
       hardeningDisable' = unique (
         pipe hardeningDisable [
           # disabling fortify implies fortify3 should also be disabled

From 32dc7f6f02e01cd844fd289d5f7b1b47ed769ea8 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Wed, 29 Apr 2026 09:44:54 -0400
Subject: [PATCH 10/27] stdenv.mkDerivation: inline hardeningDisable'

We can safely check `elem "all" hardeningDisable'` on the original list,
because calling `unique` and `concretizeFlagImplications` will never
change whether the list contains "all".
---
 pkgs/stdenv/generic/make-derivation.nix | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 7a17cb27737e..855615856299 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -413,21 +413,20 @@ let
           actualValue;
       outputs' = if separateDebugInfo' then outputs ++ [ "debug" ] else outputs;
 
-      hardeningDisable' = unique (
-        pipe hardeningDisable [
-          # disabling fortify implies fortify3 should also be disabled
-          (concretizeFlagImplications "fortify" [ "fortify3" ])
-          # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled
-          (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ])
-          # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled
-          (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ])
-        ]
-      );
       enabledHardeningOptions =
-        if elem "all" hardeningDisable' then
+        if elem "all" hardeningDisable then
           [ ]
         else
-          subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable);
+          subtractLists (unique (
+            pipe hardeningDisable [
+              # disabling fortify implies fortify3 should also be disabled
+              (concretizeFlagImplications "fortify" [ "fortify3" ])
+              # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled
+              (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ])
+              # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled
+              (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ])
+            ]
+          )) (defaultHardeningFlags ++ hardeningEnable);
       # hardeningDisable additionally supports "all".
       erroneousHardeningFlags = subtractLists knownHardeningFlags (
         hardeningEnable ++ remove "all" hardeningDisable

From 9c1453602e75fb9c4632dfabb26fe928afe18b7a Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Wed, 29 Apr 2026 09:58:53 -0400
Subject: [PATCH 11/27] stdenv.mkDerivation: only create
 enabledHardeningOptions variable if necessary

---
 pkgs/stdenv/generic/make-derivation.nix | 30 +++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 855615856299..a5470d9b6c2b 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -413,20 +413,6 @@ let
           actualValue;
       outputs' = if separateDebugInfo' then outputs ++ [ "debug" ] else outputs;
 
-      enabledHardeningOptions =
-        if elem "all" hardeningDisable then
-          [ ]
-        else
-          subtractLists (unique (
-            pipe hardeningDisable [
-              # disabling fortify implies fortify3 should also be disabled
-              (concretizeFlagImplications "fortify" [ "fortify3" ])
-              # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled
-              (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ])
-              # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled
-              (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ])
-            ]
-          )) (defaultHardeningFlags ++ hardeningEnable);
       # hardeningDisable additionally supports "all".
       erroneousHardeningFlags = subtractLists knownHardeningFlags (
         hardeningEnable ++ remove "all" hardeningDisable
@@ -694,6 +680,22 @@ let
             else
               null
           } =
+            let
+              enabledHardeningOptions =
+                if elem "all" hardeningDisable then
+                  [ ]
+                else
+                  subtractLists (unique (
+                    pipe hardeningDisable [
+                      # disabling fortify implies fortify3 should also be disabled
+                      (concretizeFlagImplications "fortify" [ "fortify3" ])
+                      # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled
+                      (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ])
+                      # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled
+                      (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ])
+                    ]
+                  )) (defaultHardeningFlags ++ hardeningEnable);
+            in
             concatStringsSep " " enabledHardeningOptions;
 
           # TODO: remove platform condition

From 95a031c36339a349f90c9d949f5c37178af6b351 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 1 May 2026 16:10:27 -0400
Subject: [PATCH 12/27] stdenv.mkDerivation: remove assertMsg usage

Saves function calls on the happy path.
---
 pkgs/stdenv/generic/make-derivation.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index a5470d9b6c2b..263bc63ddb8c 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -14,7 +14,6 @@ let
   # Lib attributes are inherited to the lexical scope for performance reasons.
   inherit (lib)
     all
-    assertMsg
     attrNames
     concatLists
     concatMap
@@ -602,9 +601,8 @@ let
                 attrs.name + hostSuffix
               else
                 # we cannot coerce null to a string below
-                assert assertMsg (
-                  attrs ? version && attrs.version != null
-                ) "The `version` attribute cannot be null.";
+                assert
+                  (attrs ? version && attrs.version != null) || throw "The `version` attribute cannot be null.";
                 "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
             );
 
@@ -919,14 +917,17 @@ let
               }"
           ) overlappingNames;
         in
-        assert assertMsg (isAttrs env && !isDerivation env)
-          "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name.";
-        assert assertMsg (overlappingNames == [ ])
-          "The `env` attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping:\n${errors}";
+        assert
+          (isAttrs env && !isDerivation env)
+          || throw "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name.";
+        assert
+          (overlappingNames == [ ])
+          || throw "The `env` attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping:\n${errors}";
         mapAttrs (
           n: v:
-          assert assertMsg (isString v || isBool v || isInt v || isDerivation v)
-            "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${builtins.typeOf v}.";
+          assert
+            (isString v || isBool v || isInt v || isDerivation v)
+            || throw "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${builtins.typeOf v}.";
           v
         ) env';
 

From 2113c381ea0a2b9b404a7a99aa8f39f4b9f854d8 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 1 May 2026 16:12:18 -0400
Subject: [PATCH 13/27] stdenv.mkDerivation: move errors variable out of happy
 path

---
 pkgs/stdenv/generic/make-derivation.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 263bc63ddb8c..ca9dc2a29a7a 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -910,19 +910,24 @@ let
       checkedEnv =
         let
           overlappingNames = attrNames (builtins.intersectAttrs env' derivationArg);
-          errors = lib.concatMapStringsSep "\n" (
-            name:
-            "  - ${name}: in `env`: ${lib.generators.toPretty { } env'.${name}}; in derivation arguments: ${
-                lib.generators.toPretty { } derivationArg.${name}
-              }"
-          ) overlappingNames;
         in
         assert
           (isAttrs env && !isDerivation env)
           || throw "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name.";
         assert
           (overlappingNames == [ ])
-          || throw "The `env` attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping:\n${errors}";
+          || throw (
+            let
+              errors = lib.concatMapStringsSep "\n" (
+                name:
+                "  - ${name}: in `env`: ${lib.generators.toPretty { } env'.${name}}; in derivation arguments: ${
+                    lib.generators.toPretty { } derivationArg.${name}
+                  }"
+              ) overlappingNames;
+
+            in
+            "The `env` attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping:\n${errors}"
+          );
         mapAttrs (
           n: v:
           assert

From dfa34d93769703cd099a0f2f86cb39c67a4d0f41 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 1 May 2026 16:13:59 -0400
Subject: [PATCH 14/27] stdenv.mkDerivation: move attrNames out of happy path

---
 pkgs/stdenv/generic/make-derivation.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index ca9dc2a29a7a..a3bef62d4d71 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -26,6 +26,7 @@ let
     getDev
     head
     foldl'
+    intersectAttrs
     isAttrs
     isBool
     isDerivation
@@ -909,13 +910,13 @@ let
 
       checkedEnv =
         let
-          overlappingNames = attrNames (builtins.intersectAttrs env' derivationArg);
+          overlappingArgs = intersectAttrs env' derivationArg;
         in
         assert
           (isAttrs env && !isDerivation env)
           || throw "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name.";
         assert
-          (overlappingNames == [ ])
+          (overlappingArgs == { })
           || throw (
             let
               errors = lib.concatMapStringsSep "\n" (
@@ -923,7 +924,7 @@ let
                 "  - ${name}: in `env`: ${lib.generators.toPretty { } env'.${name}}; in derivation arguments: ${
                     lib.generators.toPretty { } derivationArg.${name}
                   }"
-              ) overlappingNames;
+              ) (attrNames overlappingArgs);
 
             in
             "The `env` attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping:\n${errors}"

From fa7a5111487f0977c48cf9ce4b839f2fd1deba96 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 10 May 2026 02:27:20 +0200
Subject: [PATCH 15/27] python3Packages.serialx: disable racy tests

---
 pkgs/development/python-modules/serialx/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix
index 15b6680e6972..3b3d7cfe2c37 100644
--- a/pkgs/development/python-modules/serialx/default.nix
+++ b/pkgs/development/python-modules/serialx/default.nix
@@ -70,6 +70,9 @@ buildPythonPackage (finalAttrs: {
     "test_compat_tools_module"
     # connects to 192.0.2.1
     "test_async_socket_connect_timeout"
+    # racy
+    "test_sync_readexactly_total_timeout"
+    "test_sync_read_until_total_timeout"
   ];
 
   meta = {

From 57c99d57221c89a1b2911753026b0376fb9ea1cf Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 7 May 2026 21:41:27 -0400
Subject: [PATCH 16/27] stdenv.mkDerivation: move list of attribute names out
 to global scope

---
 pkgs/stdenv/generic/make-derivation.nix | 41 ++++++++++++-------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index a3bef62d4d71..6724fb18f487 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -187,6 +187,25 @@ let
     "allowedImpureDLLs"
   ];
 
+  attrsToRemoveLast = [
+    # Fixed-output derivations may not reference other paths, which means that
+    # for a fixed-output derivation, the corresponding inputDerivation should
+    # *not* be fixed-output. To achieve this we simply delete the attributes that
+    # would make it fixed-output.
+    "outputHashAlgo"
+    "outputHash"
+    "outputHashMode"
+
+    # inputDerivation produces the inputs; not the outputs, so any
+    # restrictions on what used to be the outputs don't serve a purpose
+    # anymore.
+    "allowedReferences"
+    "allowedRequisites"
+    "disallowedReferences"
+    "disallowedRequisites"
+    "outputChecks"
+  ];
+
   inherit (stdenv)
     hostPlatform
     buildPlatform
@@ -936,26 +955,6 @@ let
             || throw "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${builtins.typeOf v}.";
           v
         ) env';
-
-      attrsToRemove = [
-        # Fixed-output derivations may not reference other paths, which means that
-        # for a fixed-output derivation, the corresponding inputDerivation should
-        # *not* be fixed-output. To achieve this we simply delete the attributes that
-        # would make it fixed-output.
-        "outputHashAlgo"
-        "outputHash"
-        "outputHashMode"
-
-        # inputDerivation produces the inputs; not the outputs, so any
-        # restrictions on what used to be the outputs don't serve a purpose
-        # anymore.
-        "allowedReferences"
-        "allowedRequisites"
-        "disallowedReferences"
-        "disallowedRequisites"
-        "outputChecks"
-      ];
-
     in
 
     extendDerivation validity.handled (
@@ -966,7 +965,7 @@ let
         # needed to enter a nix-shell with
         #   nix-build shell.nix -A inputDerivation
         inputDerivation = derivation (
-          removeAttrs derivationArg attrsToRemove
+          removeAttrs derivationArg attrsToRemoveLast
           // {
             # Add a name in case the original drv didn't have one
             name = "inputDerivation" + optionalString (derivationArg ? name) "-${derivationArg.name}";

From 6ca5391f9621ba3cc3012a0bc3d91a120bf6c60e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 10 May 2026 02:30:40 +0200
Subject: [PATCH 17/27] python3Packages.serialx: fix tests on darwin

---
 pkgs/development/python-modules/serialx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix
index 3b3d7cfe2c37..077891120c37 100644
--- a/pkgs/development/python-modules/serialx/default.nix
+++ b/pkgs/development/python-modules/serialx/default.nix
@@ -65,6 +65,8 @@ buildPythonPackage (finalAttrs: {
     socat
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   disabledTests = [
     # tries to access /sys/class/tty in sandbox
     "test_compat_tools_module"

From 8de09cd1f8839e9af47ad9ce8e23028087c45438 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 7 May 2026 21:43:40 -0400
Subject: [PATCH 18/27] stdenv.mkDerivation: move reference checking attrs to
 global scope

---
 pkgs/stdenv/generic/make-derivation.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 6724fb18f487..c7415b226a46 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -187,6 +187,13 @@ let
     "allowedImpureDLLs"
   ];
 
+  referenceCheckingAttrsToRemove = [
+    "allowedReferences"
+    "allowedRequisites"
+    "disallowedReferences"
+    "disallowedRequisites"
+  ];
+
   attrsToRemoveLast = [
     # Fixed-output derivations may not reference other paths, which means that
     # for a fixed-output derivation, the corresponding inputDerivation should
@@ -828,12 +835,7 @@ let
                     # that's "normal". Notably it symlinks to the source.
                     # So disable reference checking for the debug output
                     if separateDebugInfo' && name == "debug" then
-                      removeAttrs raw [
-                        "allowedReferences"
-                        "allowedRequisites"
-                        "disallowedReferences"
-                        "disallowedRequisites"
-                      ]
+                      removeAttrs raw referenceCheckingAttrsToRemove
                     else
                       raw;
                 }) outputs

From 9f278a55db99e9e575ec31f0fc555ed8c8b2cd4e Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 7 May 2026 21:49:42 -0400
Subject: [PATCH 19/27] stdenv.mkDerivation: store default builder args in
 global scope

---
 pkgs/stdenv/generic/make-derivation.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index c7415b226a46..a3062c6024e2 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -213,6 +213,12 @@ let
     "outputChecks"
   ];
 
+  defaultBuilderArgs = [
+    "-e"
+    ./source-stdenv.sh
+    ./default-builder.sh
+  ];
+
   inherit (stdenv)
     hostPlatform
     buildPlatform
@@ -635,11 +641,16 @@ let
 
           builder = attrs.realBuilder or stdenvShell;
           args =
-            attrs.args or [
-              "-e"
-              ./source-stdenv.sh
-              (attrs.builder or ./default-builder.sh)
-            ];
+            attrs.args or (
+              if attrs ? builder then
+                [
+                  "-e"
+                  ./source-stdenv.sh
+                  attrs.builder
+                ]
+              else
+                defaultBuilderArgs
+            );
           inherit stdenv;
 
           # The `system` attribute of a derivation has special meaning to Nix.

From 789a15ef68b7c509ed7ff315ef9ea8ce0b4ac864 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 7 May 2026 21:53:49 -0400
Subject: [PATCH 20/27] stdenv.mkDerivation: move attrs removed for
 derivationArg to global scope

---
 pkgs/stdenv/generic/make-derivation.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index a3062c6024e2..bc8522a5cfec 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -194,6 +194,13 @@ let
     "disallowedRequisites"
   ];
 
+  argumentAttrsToRemove = [
+    "meta"
+    "passthru"
+    "pos"
+    "env"
+  ];
+
   attrsToRemoveLast = [
     # Fixed-output derivations may not reference other paths, which means that
     # for a fixed-output derivation, the corresponding inputDerivation should
@@ -917,12 +924,7 @@ let
         if attrs ? meta.mainProgram then env // { NIX_MAIN_PROGRAM = attrs.meta.mainProgram; } else env;
 
       derivationArg = makeDerivationArgument (
-        removeAttrs attrs [
-          "meta"
-          "passthru"
-          "pos"
-          "env"
-        ]
+        removeAttrs attrs argumentAttrsToRemove
         // {
           ${if __structuredAttrs then "env" else null} = checkedEnv;
           cmakeFlags = makeCMakeFlags attrs;

From 13fb2f08dc9511aae71dd4d570cf728bb23fe2f0 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 9 May 2026 20:32:15 -0400
Subject: [PATCH 21/27] stdenv.mkDerivation: inherit all lib variables

---
 pkgs/stdenv/generic/make-derivation.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index bc8522a5cfec..d5272a522b05 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -18,6 +18,7 @@ let
     concatLists
     concatMap
     concatMapStrings
+    concatMapStringsSep
     concatStringsSep
     elem
     extendDerivation
@@ -41,14 +42,19 @@ let
     optionals
     pipe
     remove
+    seq
     splitString
     subtractLists
+    toExtension
     toFunction
     unique
+    warnIf
     zipAttrsWith
-    seq
     ;
 
+  inherit (lib.generators) toPretty;
+  inherit (lib.strings) sanitizeDerivationName;
+
   inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags;
   inherit (import ../../build-support/lib/meson.nix { inherit lib stdenv; }) makeMesonFlags;
 
@@ -101,10 +107,10 @@ let
           final:
           let
             prev = rattrs final;
-            thisOverlay = lib.toExtension f0 final prev;
+            thisOverlay = toExtension f0 final prev;
             pos = builtins.unsafeGetAttrPos "version" thisOverlay;
           in
-          lib.warnIf
+          warnIf
             (
               prev ? src
               && thisOverlay ? version
@@ -482,7 +488,7 @@ let
     if erroneousHardeningFlags != [ ] then
       abort (
         "mkDerivation was called with unsupported hardening flags: "
-        + lib.generators.toPretty { } {
+        + toPretty { } {
           inherit
             erroneousHardeningFlags
             hardeningDisable
@@ -636,7 +642,7 @@ let
               # it again.
               staticMarker = stdenvStaticMarker;
             in
-            lib.strings.sanitizeDerivationName (
+            sanitizeDerivationName (
               if attrs ? name then
                 attrs.name + hostSuffix
               else
@@ -953,10 +959,10 @@ let
           (overlappingArgs == { })
           || throw (
             let
-              errors = lib.concatMapStringsSep "\n" (
+              errors = concatMapStringsSep "\n" (
                 name:
-                "  - ${name}: in `env`: ${lib.generators.toPretty { } env'.${name}}; in derivation arguments: ${
-                    lib.generators.toPretty { } derivationArg.${name}
+                "  - ${name}: in `env`: ${toPretty { } env'.${name}}; in derivation arguments: ${
+                    toPretty { } derivationArg.${name}
                   }"
               ) (attrNames overlappingArgs);
 

From 1aea84e9f7dd54f2a0ce7e1bd60af72b5b8dc803 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 9 May 2026 20:34:07 -0400
Subject: [PATCH 22/27] stdenv.mkDerivation: inherit all builtins

---
 pkgs/stdenv/generic/make-derivation.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index d5272a522b05..7df90e856846 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -24,9 +24,9 @@ let
     extendDerivation
     filter
     filterAttrs
+    foldl'
     getDev
     head
-    foldl'
     intersectAttrs
     isAttrs
     isBool
@@ -35,6 +35,7 @@ let
     isList
     isPath
     isString
+    listToAttrs
     mapAttrs
     mapNullable
     optional
@@ -47,7 +48,10 @@ let
     subtractLists
     toExtension
     toFunction
+    typeOf
     unique
+    unsafeDiscardStringContext
+    unsafeGetAttrPos
     warnIf
     zipAttrsWith
     ;
@@ -108,7 +112,7 @@ let
           let
             prev = rattrs final;
             thisOverlay = toExtension f0 final prev;
-            pos = builtins.unsafeGetAttrPos "version" thisOverlay;
+            pos = unsafeGetAttrPos "version" thisOverlay;
           in
           warnIf
             (
@@ -312,7 +316,7 @@ let
   unsafeDerivationToUntrackedOutpath =
     drv:
     if isDerivation drv && (!drv.__contentAddressed or false) then
-      builtins.unsafeDiscardStringContext drv.outPath
+      unsafeDiscardStringContext drv.outPath
     else
       drv;
 
@@ -844,7 +848,7 @@ let
             then
               if separateDebugInfo' then debugCachedOutputChecks else cachedOutputChecks
             else
-              builtins.listToAttrs (
+              listToAttrs (
                 map (name: {
                   inherit name;
                   value =
@@ -899,11 +903,11 @@ let
       pos ? # position used in error messages and for meta.position
         (
           if attrs.meta.description or null != null then
-            builtins.unsafeGetAttrPos "description" attrs.meta
+            unsafeGetAttrPos "description" attrs.meta
           else if attrs.version or null != null then
-            builtins.unsafeGetAttrPos "version" attrs
+            unsafeGetAttrPos "version" attrs
           else
-            builtins.unsafeGetAttrPos "name" attrs
+            unsafeGetAttrPos "name" attrs
         ),
 
       # Experimental.  For simple packages mostly just works,
@@ -973,7 +977,7 @@ let
           n: v:
           assert
             (isString v || isBool v || isInt v || isDerivation v)
-            || throw "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${builtins.typeOf v}.";
+            || throw "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${typeOf v}.";
           v
         ) env';
     in

From bbe8cd680a6c57cf5f21169b3197320823603fae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 10 May 2026 02:39:54 +0200
Subject: [PATCH 23/27] python3Packages.piper-phonemize: mark broken on
 x86-64-darwin

---
 pkgs/development/python-modules/piper-phonemize/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/piper-phonemize/default.nix b/pkgs/development/python-modules/piper-phonemize/default.nix
index f3a9e40531ae..2c9e443d1400 100644
--- a/pkgs/development/python-modules/piper-phonemize/default.nix
+++ b/pkgs/development/python-modules/piper-phonemize/default.nix
@@ -31,6 +31,8 @@ buildPythonPackage {
   doCheck = false;
 
   meta = {
+    # dylib import fails with no LC_RPATH's found
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86;
     description = "Phonemization libary used by Piper text to speech system";
     inherit (piper-phonemize-native.meta) homepage license maintainers;
   };

From ef0d4d924b094d8292d65ab79a7bdfca1cdc928e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 01:06:14 +0000
Subject: [PATCH 24/27] piliplus: 2.0.6 -> 2.0.7

---
 pkgs/by-name/pi/piliplus/git-hashes.json   |  5 +-
 pkgs/by-name/pi/piliplus/package.nix       |  2 +-
 pkgs/by-name/pi/piliplus/pubspec.lock.json | 83 ++++++++++++----------
 pkgs/by-name/pi/piliplus/src-info.json     |  8 +--
 4 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json
index f4d5cc104b57..81ee95e55a6f 100644
--- a/pkgs/by-name/pi/piliplus/git-hashes.json
+++ b/pkgs/by-name/pi/piliplus/git-hashes.json
@@ -3,7 +3,6 @@
   "chat_bottom_container": "sha256-+R1MiDMO4onCMXiJ7MJtJVAwyEJcikTyONwp+HibqA0=",
   "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
   "extended_nested_scroll_view": "sha256-ocjIy7gpCikoqRMqY4oGw/p9YaQ2v2clhon2pIzTXk4=",
-  "file_picker": "sha256-4zwyrsyXb6KnCzSRGBLgypH79ifKVji8Y8lIb5AIc58=",
   "floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=",
   "flutter_smart_dialog": "sha256-sehrQraEWmYvUd9pdG4l3edbtR4yTcJOqPbuhzIrih4=",
   "flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=",
@@ -16,7 +15,9 @@
   "media_kit_libs_windows_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
   "media_kit_native_event_loop": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
   "media_kit_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
-  "native_device_orientation": "sha256-MCgN6HXCeONLrDAOt27Ve8kUvIrOfFRbfJtX8p92Txk=",
+  "native_device_orientation": "sha256-8abnUV7ZTAo0DAjekf353ey6xFvxfilTfbQOUWIahtk=",
+  "screen_brightness_android": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=",
+  "screen_brightness_platform_interface": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=",
   "super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=",
   "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=",
   "window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo="
diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix
index 7ba91e42e2a3..2b100ce4b535 100644
--- a/pkgs/by-name/pi/piliplus/package.nix
+++ b/pkgs/by-name/pi/piliplus/package.nix
@@ -14,7 +14,7 @@
 let
   srcInfo = lib.importJSON ./src-info.json;
   description = "Third-party Bilibili client developed in Flutter";
-  version = "2.0.6";
+  version = "2.0.7";
 in
 flutter341.buildFlutterApplication {
   pname = "piliplus";
diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json
index b9741f7494dd..cd591fe1d4d2 100644
--- a/pkgs/by-name/pi/piliplus/pubspec.lock.json
+++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json
@@ -244,11 +244,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
+        "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.5"
+      "version": "8.12.6"
     },
     "cached_network_image": {
       "dependency": "direct main",
@@ -487,21 +487,21 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd",
+        "sha256": "6a642e1daa10190af89ba6cb6386c0df7d071a3592080bfe1e44faa63ae1df65",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.4.0"
+      "version": "13.1.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
+        "sha256": "04b173a92e2d9161dfead145667037c8d834db725ce2e7b942bfe18fd2f45a46",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.3"
+      "version": "8.1.0"
     },
     "dio": {
       "dependency": "direct main",
@@ -634,6 +634,16 @@
       "source": "hosted",
       "version": "2.2.0"
     },
+    "ffi_leak_tracker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi_leak_tracker",
+        "sha256": "4093d4ef9ca06ffe2786e73bfb25e22aa92112b9bb4ec941f11e3e6b61489a97",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
+    },
     "file": {
       "dependency": "transitive",
       "description": {
@@ -647,13 +657,12 @@
     "file_picker": {
       "dependency": "direct main",
       "description": {
-        "path": ".",
-        "ref": "mod",
-        "resolved-ref": "d1dde80df07a6ec46d9291cfeba6c01de53b5305",
-        "url": "https://github.com/bggRGjQaUbCoE/flutter_file_picker.git"
+        "name": "file_picker",
+        "sha256": "1d4afa261268e59863af47b9f9dd9a230502d4c702b9d9183353646fe6d5b6e1",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "11.0.2"
+      "source": "hosted",
+      "version": "12.0.0-beta.1"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -1556,7 +1565,7 @@
       "description": {
         "path": ".",
         "ref": "master",
-        "resolved-ref": "731bb77e39cca77065c86ece38902d35f5d653d2",
+        "resolved-ref": "a987a459f17af0002397e49800ba4f68912b375c",
         "url": "https://github.com/bggRGjQaUbCoE/flutter_native_device_orientation.git"
       },
       "source": "git",
@@ -1616,21 +1625,21 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20",
+        "sha256": "4bf625947f6c7713ee242296a682e23e44823c09cf9d79e4f1238923c92db852",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.1"
+      "version": "10.1.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
+        "sha256": "db762cb2f4f25ee60fb6359773861b0f199e00b90d237bd85a76a1e806b46ef4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "4.1.0"
     },
     "path": {
       "dependency": "direct main",
@@ -1905,11 +1914,12 @@
     "screen_brightness_android": {
       "dependency": "direct overridden",
       "description": {
-        "name": "screen_brightness_android",
-        "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96",
-        "url": "https://pub.dev"
+        "path": "screen_brightness_android",
+        "ref": "dev",
+        "resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9",
+        "url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "2.1.3"
     },
     "screen_brightness_ios": {
@@ -1925,11 +1935,12 @@
     "screen_brightness_platform_interface": {
       "dependency": "direct main",
       "description": {
-        "name": "screen_brightness_platform_interface",
-        "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c",
-        "url": "https://pub.dev"
+        "path": "screen_brightness_platform_interface",
+        "ref": "dev",
+        "resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9",
+        "url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "2.1.0"
     },
     "screen_retriever": {
@@ -1996,21 +2007,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa",
+        "sha256": "a857d8b1479250aff6b57a51b2c02d31ca05848d441817c43f1640c885c286c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.2"
+      "version": "13.1.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
+        "sha256": "7f7ae28cf400d13f811e297ff37742dba83b79e0a6f5dce14eec0248274e6ce9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.1.0"
     },
     "shared_preferences": {
       "dependency": "transitive",
@@ -2463,11 +2474,11 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1",
+        "sha256": "2b09acadd7a2862d33c3577e77e7a2aabb684f47ccca1711f1413bd7307a6a72",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.2"
+      "version": "1.6.0"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
@@ -2544,21 +2555,21 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
+        "sha256": "ba7d5750e3441caa1bbe31d9e516348fcf8dfcb32aa29ef87a844a59f4d1f1d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.15.0"
+      "version": "6.1.0"
     },
     "win32_registry": {
       "dependency": "transitive",
       "description": {
         "name": "win32_registry",
-        "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
+        "sha256": "73b1d78920a9d6e03f8b4e43e612b87bf3152a0e5c5e5150267762b7c4116904",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "3.0.3"
     },
     "window_manager": {
       "dependency": "direct main",
@@ -2604,6 +2615,6 @@
   },
   "sdks": {
     "dart": ">=3.11.0 <4.0.0",
-    "flutter": "3.41.6"
+    "flutter": "3.41.9"
   }
 }
diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json
index b08a6a6c28bb..b9bda4a36985 100644
--- a/pkgs/by-name/pi/piliplus/src-info.json
+++ b/pkgs/by-name/pi/piliplus/src-info.json
@@ -1,6 +1,6 @@
 {
-  "rev": "7b6d8bef994c5a50c2b476978e739dee651129df",
-  "revCount": 4915,
-  "commitDate": 1777542771,
-  "hash": "sha256-jKF0FTTmq5xRB607iya3PtsgRFl73uXiuDA2oSGNbfs="
+  "rev": "b7b40c557e708ace77ed65098005193eb89b8208",
+  "revCount": 4940,
+  "commitDate": 1777948879,
+  "hash": "sha256-E0ezM87Ecw54XD/MccPhRjg4iQ8LJRewQKbH/bPV9MI="
 }

From 93374c3b798496d490b85553ce4b1af5e53c4143 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 01:16:07 +0000
Subject: [PATCH 25/27] terraform-providers.turbot_turbot: 1.13.1 -> 1.13.3

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f27c14412f99..ebb74eb53e54 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1391,11 +1391,11 @@
     "vendorHash": "sha256-ozAYLFkilSK0Nygdglhz3VNtRVKoLDGRnrVvg4nWyH4="
   },
   "turbot_turbot": {
-    "hash": "sha256-zh809E1qII8EJm7QFHEORju2WF//+A2uk7olrCNdBkU=",
+    "hash": "sha256-sJODPeFzU3vaiHbKlGe1dR5Pi7aS56JcmZUe8Yg1BcQ=",
     "homepage": "https://registry.terraform.io/providers/turbot/turbot",
     "owner": "turbot",
     "repo": "terraform-provider-turbot",
-    "rev": "v1.13.1",
+    "rev": "v1.13.3",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 01c4ab9d66c94cb1a2c9fd2a29caba1dbdf38dfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 01:31:37 +0000
Subject: [PATCH 26/27] home-assistant-themes.material-you-theme: 5.0.1 ->
 5.0.12

---
 .../home-assistant/themes/material-you-theme/package.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/themes/material-you-theme/package.nix b/pkgs/servers/home-assistant/themes/material-you-theme/package.nix
index 0d9fe767c0e8..65da22973d9f 100644
--- a/pkgs/servers/home-assistant/themes/material-you-theme/package.nix
+++ b/pkgs/servers/home-assistant/themes/material-you-theme/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "material-you-theme";
-  version = "5.0.1";
+  version = "5.0.12";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "material-you-theme";
     tag = version;
-    hash = "sha256-xJXhvKwp/l08/ZWi3OcGPmCdsUiMjBDwrKz5OIpD2t8=";
+    hash = "sha256-2wiWHU/iNIhVSJB2EqNhBi4ppsWfO9oNgfU9xU3FnrA=";
   };
 
-  npmDepsHash = "sha256-g133Je2Md4nKLZucSeM6TVEdaCsR2Ja1Aj2kf7JQk6w=";
+  npmDepsHash = "sha256-4FNqAJlupbZT14Sy5mfCsKj7f1xK6tcpKKPrbFoSje8=";
 
   installPhase = ''
     runHook preInstall

From 5e554dedcd736adb5d3193106eb9ab155dd713b9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 10 May 2026 05:54:49 +0300
Subject: [PATCH 27/27] mesa: drop jdupes dependency

Doesn't actually do anything, upstream installs symlinks correctly
and has done so for a very long time.
---
 pkgs/development/libraries/mesa/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index d65868fa97ea..0557a3dabbf1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -12,7 +12,6 @@
   glslang,
   spirv-tools,
   intltool,
-  jdupes,
   libdisplay-info,
   libdrm,
   libgbm,
@@ -318,7 +317,6 @@ stdenv.mkDerivation {
     python3Packages.mako
     python3Packages.ply
     python3Packages.pyyaml
-    jdupes
     # Use bin output from glslang to not propagate the dev output at
     # the build time with the host glslang.
     (lib.getBin glslang)
@@ -382,9 +380,6 @@ stdenv.mkDerivation {
     # Don't depend on build python
     patchShebangs --host --update $out/bin/*
 
-    # NAR doesn't support hard links, so convert them to symlinks to save space.
-    jdupes --hard-links --link-soft --recurse "$out"
-
     # add RPATH here so Zink can find libvulkan.so
     patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so $opencl/lib/libRusticlOpenCL.so
   '';