From 5827278ab41c15aca17ea4a94284cf1aa87a8a1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 12:17:29 +0000
Subject: [PATCH 01/48] tfmigrate: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix
index 0b8ba744f031..54460e85527c 100644
--- a/pkgs/by-name/tf/tfmigrate/package.nix
+++ b/pkgs/by-name/tf/tfmigrate/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tfmigrate";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = "tfmigrate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+5nw+EgFTor8XL4cibxkpJL4fdEQ6UuEj5wyOjpaANA=";
+    hash = "sha256-tuLbcxJj8TsG3I/o3cHO2DtQm9ql3wlhYBtYiMbRW7o=";
   };
 
-  vendorHash = "sha256-mm34U4nLow4lCz/AgfqYZJRb71GpQjR14+tm0hfmdDc=";
+  vendorHash = "sha256-TqZi5NZ+4eSzq98/ZM4Gab7Sud7bz1DNHrp5nGaGHDE=";
 
   checkFlags = [
     "-skip TestExecutorDir" # assumes /usr/bin to be present

From e354f4a0cb0cb38f374fe09133fffbe9b6cdc178 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 04:07:56 +0000
Subject: [PATCH 02/48] jazz2: 3.3.0 -> 3.4.0

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

diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index d7781911b0f5..72fcde7dfc7d 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jazz2";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "deathkiller";
     repo = "jazz2-native";
     tag = finalAttrs.version;
-    hash = "sha256-dj+BEAx626vSPy26+Ip3uaj3SBE1SWkfbh5P8U0iXsg=";
+    hash = "sha256-96NiBE0/sBnIdajKui3pZmR8IGlElbeoyqYEYFWtOuM=";
   };
 
   patches = [ ./nocontent.patch ];

From c9f8d474ffff970dfd5c391f1fcd471479c048b2 Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Tue, 26 Aug 2025 19:02:33 +0800
Subject: [PATCH 03/48] ccache: Add meta.mainProgram to links

Inherit meta.mainProgram from unwrappedCC, which should have
meta.mainProgram set.

Fixes #437074
---
 pkgs/by-name/cc/ccache/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index 58957dbddec4..d38e8e92463b 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -158,6 +158,10 @@ stdenv.mkDerivation (finalAttrs: {
               ln -s ${unwrappedCC}/$file $out/$file
             done
           '';
+
+        meta = {
+          inherit (unwrappedCC.meta) mainProgram;
+        };
       };
 
     updateScript = nix-update-script { };

From 5063462bf3a895993cb9a19eae172bb4cdee840e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 26 Aug 2025 13:42:41 +0200
Subject: [PATCH 04/48] nixos/lomiri: Exclude Morph Browser by default

Qt5 qtwebengine will be marked insecure, so this would block the entire DE from being usable.
Epiphany seems to work as a replacement until Morph can be built with Qt6.

Content-Hub test will still need adjustment, but keeping it out of this to make future reverting easier.
---
 .../services/desktop-managers/lomiri.nix      |  5 ++++-
 nixos/tests/lomiri.nix                        | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index c0b04270b3ec..c74d2f316a93 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -125,7 +125,10 @@ in
             lomiri-thumbnailer
             lomiri-url-dispatcher
             mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target
-            morph-browser
+            # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067
+            # morph-browser
+            # Adding another browser that is known-working until Morph Browser can migrate to Qt6
+            pkgs.epiphany
             qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
             teleports
           ]);
diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index d65682c8e2ee..5b3317b3168d 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -431,15 +431,16 @@ in
               machine.send_key("alt-f4")
 
           # Morph is how we go online
-          with subtest("morph browser works"):
-              open_starter()
-              machine.send_chars("Morph\n")
-              wait_for_text(r"(Bookmarks|address|site|visited any)")
-              machine.screenshot("morph_open")
-
-              # morph-browser has a separate VM test to test its basic functionalities
-
-              machine.send_key("alt-f4")
+          # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067
+          # with subtest("morph browser works"):
+          #     open_starter()
+          #     machine.send_chars("Morph\n")
+          #     wait_for_text(r"(Bookmarks|address|site|visited any)")
+          #     machine.screenshot("morph_open")
+          #
+          #     # morph-browser has a separate VM test to test its basic functionalities
+          #
+          #     machine.send_key("alt-f4")
 
           # LSS provides DE settings
           with subtest("system settings open"):

From 8ae6f582ef7b2326f99e096fd56f551d1a66d00d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 26 Aug 2025 14:36:27 +0200
Subject: [PATCH 05/48] nixosTests.lomiri.desktop-appinteractions: Switch
 Content-Hub test to using Gallery app instead

---
 nixos/tests/lomiri.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 5b3317b3168d..0ac80f0dce38 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -614,14 +614,14 @@ in
               machine.send_key("ret")
 
               # Peers should be loaded
-              wait_for_text("Morph") # or Gallery, but Morph is already packaged
+              wait_for_text("Gallery")
               machine.screenshot("settings_lomiri-content-hub_peers")
 
-              # Select Morph as content source
-              mouse_click(340, 80)
+              # Select Gallery as content source
+              mouse_click(460, 80)
 
-              # Expect Morph to be brought into the foreground, with its Downloads page open
-              wait_for_text("No downloads")
+              # Expect Gallery to be brought into the foreground, with its sharing page open
+              wait_for_text("Photos")
 
               # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request.
               # Check that it's still alive
@@ -630,9 +630,10 @@ in
               machine.screenshot("lomiri-content-hub_exchange")
 
               # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign
-              machine.send_key("esc")
+              machine.send_key("tab")
+              machine.send_key("ret")
 
-              machine.sleep(2) # sleep a tiny bit so morph can close & the focus can return to LSS
+              machine.sleep(2) # sleep a tiny bit so gallery can close & the focus can return to LSS
               machine.send_key("alt-f4")
         '';
     }

From f03a8caee567853df1713958eb33aa0ee8697ad4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 26 Aug 2025 17:10:42 +0200
Subject: [PATCH 06/48] ayatana-indicator-sound: Lengthen timeouts in tests

OfBorg please...
---
 pkgs/by-name/ay/ayatana-indicator-sound/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
index cb21509d75ed..142aefe75ad6 100644
--- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
@@ -48,6 +48,17 @@ stdenv.mkDerivation (finalAttrs: {
     # Build-time Vala codegen
     substituteInPlace src/CMakeLists.txt \
       --replace-fail '/usr/share/gir-1.0/AccountsService-1.0.gir' '${lib.getDev accountsservice}/share/gir-1.0/AccountsService-1.0.gir'
+
+    # timeouts are too short for aarch64 OfBorg builder under loads, which leads to spurious test failures
+    substituteInPlace \
+      tests/accounts-service-user.cc \
+      tests/media-player-user.cc \
+      tests/name-watch-test.cc \
+      tests/notifications-test.cc \
+      tests/volume-control-test.cc \
+      --replace-quiet 'loop(50)' 'loop(500)' \
+      --replace-quiet 'loop(100)' 'loop(1000)' \
+      --replace-quiet 'loop(500)' 'loop(5000)' \
   '';
 
   strictDeps = true;

From 87fc9b9b3ba90ef84939a812101e37c6a83736ef Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Wed, 27 Aug 2025 01:19:33 +0000
Subject: [PATCH 07/48] monero-{cli,gui}: 0.18.4.1 -> 0.18.4.2

---
 pkgs/by-name/mo/monero-cli/package.nix | 4 ++--
 pkgs/by-name/mo/monero-gui/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix
index 81f73b14b431..10734346d211 100644
--- a/pkgs/by-name/mo/monero-cli/package.nix
+++ b/pkgs/by-name/mo/monero-cli/package.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.4.1";
+  version = "0.18.4.2";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-z5yhU1xePFBSmfl0X8x7AAgPvqUX0PQzLzxMblS8Um8=";
+    hash = "sha256-ibwcvEHlJkMjXoJQMPVrlir5irdclJsmV7aBB4/m190=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix
index 9f6ed89018ee..4d56bd6bec84 100644
--- a/pkgs/by-name/mo/monero-gui/package.nix
+++ b/pkgs/by-name/mo/monero-gui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.4.1";
+  version = "0.18.4.2";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-Fm/kV31aKcjQjMO8vwjfDQsH8Qq8pRdFX3zbZdEGETg=";
+    hash = "sha256-FKQrB47q791lDaomI5A10qw1oGh5zp9TFPpFoX2ZAmc=";
   };
 
   nativeBuildInputs = [

From ab6d5396d929c16e785c7bba661a29d030c607a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Wed, 27 Aug 2025 11:28:02 +0100
Subject: [PATCH 08/48] gemini-cli: 0.1.22 -> 0.2.1

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

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index d9108d096081..1ddd34275c79 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.1.22";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-taQyrthHrlHc6Zy8947bpxvbHeSq0+JbgxROtQOGq44=";
+    hash = "sha256-TcXCGI27qJOVbR8XaJzE9dYV/3uDM9HATU1OkziRib8=";
   };
 
   patches = [
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
     ./restore-missing-dependencies-fields.patch
   ];
 
-  npmDepsHash = "sha256-1AJ+EZfPKioeptms3uio4U20zeQ9+yKC69Gbm6HlFMY=";
+  npmDepsHash = "sha256-0j6kXlnWg7N23cnmMialZVqyZTAzgPn0VGAqSeYIVZM=";
 
   preConfigure = ''
     mkdir -p packages/generated

From 3bc063ae2e321044751daa727555ebd20a2970ce Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 27 Aug 2025 13:11:20 +0200
Subject: [PATCH 09/48] zstd: Include overrides in package tests

---
 pkgs/tools/compression/zstd/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index ebca23a792bc..d6a28ece4163 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -25,17 +25,16 @@
   python3Packages,
   haskellPackages,
   testers,
-  zstd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zstd";
   version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "zstd";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44=";
   };
 
@@ -122,13 +121,19 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = nix-update-script { };
     tests = {
+
+      # Reverse dependencies
+
       inherit libarchive rocksdb arrow-cpp;
       libzip = libzip.override { withZstd = true; };
       curl = curl.override { zstdSupport = true; };
       python-zstd = python3Packages.zstd;
       haskell-zstd = haskellPackages.zstd;
       haskell-hs-zstd = haskellPackages.hs-zstd;
-      pkg-config = testers.hasPkgConfigModules { package = zstd; };
+
+      # Package tests (coherent with overrides)
+
+      pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     };
   };
 
@@ -151,4 +156,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ orivej ];
     pkgConfigModules = [ "libzstd" ];
   };
-}
+})

From 2af0f5c486c99e00d266def1fe538cb6af0848a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 27 Aug 2025 16:22:05 +0200
Subject: [PATCH 10/48] python313Packages.ropper: 1.13.10 -> 1.13.13

Diff: https://github.com/sashs/Ropper/compare/v1.13.10...v1.13.13
---
 pkgs/development/python-modules/ropper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 4d88ca3d47d8..dac88fd1c4c0 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "ropper";
-  version = "1.13.10";
+  version = "1.13.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "sashs";
     repo = "Ropper";
     rev = "v${version}";
-    hash = "sha256-yuHJ+EpglumEAXEu0iJKIXK1ouW1yptNahM9Wmk7AW4=";
+    hash = "sha256-MOAbACLDdeKCMV4K/n1rAQlxDN0JoDIiUF6Zr3yPw8o=";
   };
 
   build-system = [ setuptools ];

From 0dacf5741eaf6e6957d69a1fb165ab95717968d4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 27 Aug 2025 16:25:19 +0200
Subject: [PATCH 11/48] python313Packages.ropper: add changelog to meta

---
 pkgs/development/python-modules/ropper/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index dac88fd1c4c0..56ec4b5ebc43 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sashs";
     repo = "Ropper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MOAbACLDdeKCMV4K/n1rAQlxDN0JoDIiUF6Zr3yPw8o=";
   };
 
@@ -36,9 +36,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Show information about files in different file formats";
-    mainProgram = "ropper";
     homepage = "https://scoding.de/ropper/";
+    changelog = "https://github.com/sashs/Ropper/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ bennofs ];
+    mainProgram = "ropper";
   };
 }

From f80ee4181c800757f5663096b07481300b6b1870 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 27 Aug 2025 16:27:55 +0200
Subject: [PATCH 12/48] python313Packages.ropper: add optional-dependencies

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

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 56ec4b5ebc43..4c8398a101d9 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   capstone,
   filebytes,
+  keystone-engine,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -30,6 +31,10 @@ buildPythonPackage rec {
     filebytes
   ];
 
+  optional-dependencies = {
+    ropchain = [ keystone-engine ];
+  };
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "ropper" ];

From 78ee7afce24c433af408124a3c29791ca98a891a Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 27 Aug 2025 18:50:14 +0300
Subject: [PATCH 13/48] comma: Fix cross

---
 pkgs/by-name/co/comma/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index 779537f11180..0ea3e749541c 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   comma,
   fetchFromGitHub,
   installShellFiles,
@@ -8,6 +9,7 @@
   nix,
   rustPlatform,
   testers,
+  buildPackages,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -48,8 +50,9 @@ rustPlatform.buildRustPackage rec {
       "$out/share/comma/command-not-found.nu" \
       "$out/share/comma/command-not-found.fish" \
       --replace-fail "comma --ask" "$out/bin/comma --ask"
-
-    "$out/bin/comma" --mangen > comma.1
+  ''
+  + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''
+    ${stdenv.hostPlatform.emulator buildPackages} "$out/bin/comma" --mangen > comma.1
     installManPage comma.1
   '';
 

From 8ef3753d558ae396b9330862e9450f823f009d13 Mon Sep 17 00:00:00 2001
From: Franco Biasin <franconbiasin+github@gmail.com>
Date: Mon, 18 Aug 2025 23:48:29 -0300
Subject: [PATCH 14/48] calibre: fix cuda build

---
 pkgs/by-name/ca/calibre/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 4a38e656b0ef..39927d95c0e8 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -222,6 +222,11 @@ stdenv.mkDerivation (finalAttrs: {
       $ETN 'test_qt'  # we don't include svg or webp support
       $ETN 'test_import_of_all_python_modules'  # explores actual file paths, gets confused
       $ETN 'test_websocket_basic'  # flakey
+      # hangs with cuda enabled, also:
+      # eglInitialize: Failed to get system egl display
+      # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
+      $ETN 'test_recipe_browser_webengine'
+
       ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038
       ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}
     )

From 48b0e31a544f7bf3c99f41689b2e68476f890e03 Mon Sep 17 00:00:00 2001
From: Hugo Herter <git@hugoherter.com>
Date: Wed, 27 Aug 2025 21:00:12 +0200
Subject: [PATCH 15/48] python3Packages.smolagents: 1.20.0 -> 1.21.2

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

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index ad177f998e12..e33ac26a8b55 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -52,14 +52,14 @@
 
 buildPythonPackage rec {
   pname = "smolagents";
-  version = "1.20.0";
+  version = "1.21.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "smolagents";
     tag = "v${version}";
-    hash = "sha256-ING+C2MACKFto+1FON5OGFgzLf8SM99ViTdADzNzQLw=";
+    hash = "sha256-sm0G8z5Jaes8XybxeAUiRh3LVuzvnGaem5FLkcA5Qls=";
   };
 
   # TODO: remove at the next release

From e3647452600bdd4f577cb9d8681eb879f4cb5615 Mon Sep 17 00:00:00 2001
From: Hugo Herter <git@hugoherter.com>
Date: Tue, 26 Aug 2025 13:12:54 +0200
Subject: [PATCH 16/48] python3Packages.smolagents: fix duckduckgo-search
 renamed ddgs

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

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index e33ac26a8b55..977710b04449 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -33,7 +33,7 @@
   # openai
   openai,
   # toolkit
-  duckduckgo-search,
+  ddgs,
   markdownify,
   # torch
   numpy,
@@ -108,7 +108,7 @@ buildPythonPackage rec {
     #   opentelemetry-sdk
     # ];
     toolkit = [
-      duckduckgo-search
+      ddgs
       markdownify
     ];
     torch = [

From 2fc4da0c7ad9f7b3814e8fbb33cd9f8fac309109 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 27 Aug 2025 16:04:33 -0400
Subject: [PATCH 17/48] gnunet{,-gtk}: move to by-name

Also enable strictDeps = true; if needed

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../p2p/gnunet/gtk.nix => by-name/gn/gnunet-gtk/package.nix}  | 2 ++
 .../p2p/gnunet/default.nix => by-name/gn/gnunet/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{applications/networking/p2p/gnunet/gtk.nix => by-name/gn/gnunet-gtk/package.nix} (97%)
 rename pkgs/{applications/networking/p2p/gnunet/default.nix => by-name/gn/gnunet/package.nix} (100%)

diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/by-name/gn/gnunet-gtk/package.nix
similarity index 97%
rename from pkgs/applications/networking/p2p/gnunet/gtk.nix
rename to pkgs/by-name/gn/gnunet-gtk/package.nix
index 69cb8c180954..a174a7b7ee44 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/by-name/gn/gnunet-gtk/package.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rsQzMvOoQEuushd0jBGQt9j6zXj2G1SMax8d4QoDV6s=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook3
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/by-name/gn/gnunet/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/gnunet/default.nix
rename to pkgs/by-name/gn/gnunet/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 780faa072ac8..de6d590b8e85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11850,10 +11850,6 @@ with pkgs;
     jdk = jdk.override { enableJavaFX = true; };
   };
 
-  gnunet = callPackage ../applications/networking/p2p/gnunet { };
-
-  gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { };
-
   gphoto2 = callPackage ../applications/misc/gphoto2 { };
 
   gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };

From 45385f597d21e353baf374f9b4db0731d7225b60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 21:09:34 +0000
Subject: [PATCH 18/48] soft-serve: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix
index 763f79baf4c8..a51249a1e827 100644
--- a/pkgs/by-name/so/soft-serve/package.nix
+++ b/pkgs/by-name/so/soft-serve/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "soft-serve";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "soft-serve";
     rev = "v${version}";
-    hash = "sha256-gjkq1Be+x5qZYjO3pWt+u5A2izgMfR3+nxIHTc1ck6Y=";
+    hash = "sha256-Lg7cESGMbVCNx0KQBIAP/UsfvO3IO+DO9bYiQbg9Fls=";
   };
 
-  vendorHash = "sha256-l0gsStKkfH0TQ1a935LSuFah3BBwVsMD4iSf2oDyViY=";
+  vendorHash = "sha256-DBgVcbt2kejtEJSajJh6vS4feT3Lwm+KqUOks55iWIc=";
 
   doCheck = false;
 

From 75fe7dbb27b9dc644efdeed1a7c447cfcdfc2502 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 27 Aug 2025 22:05:47 +0200
Subject: [PATCH 19/48] radicle-node: fix update script

- only update to stable releases
- sort git tags to find the latest version
---
 pkgs/by-name/ra/radicle-node/update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/update.sh b/pkgs/by-name/ra/radicle-node/update.sh
index b1a79b18da55..586dd95cc2fa 100755
--- a/pkgs/by-name/ra/radicle-node/update.sh
+++ b/pkgs/by-name/ra/radicle-node/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils gnused common-updater-scripts nix-update
+#!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update
 
-version=$(list-git-tags | tail -1 | sed 's|^releases/||')
+version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+$' | sort -rV | head -1)
 nix-update --version="$version" radicle-node

From 6e7f9c62d1f5b59aca435894917d47c2a96de2a8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 28 Aug 2025 01:01:23 +0200
Subject: [PATCH 20/48] python313Packages.adafruit-platformdetect: 3.82.0 ->
 3.83.0

Changelog: https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/3.83.0
---
 .../python-modules/adafruit-platformdetect/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index a6e5c276524d..92a785702089 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.82.0";
+  version = "3.83.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "adafruit_platformdetect";
     inherit version;
-    hash = "sha256-C/ese6ezyDFp+3ifobq/DlHsz4g0wrBnuWCoa69qYYg=";
+    hash = "sha256-woiuT3RnxDkLtDaBAh9vdUvsMKAp3s5ahpJNS1T2DcQ=";
   };
 
   build-system = [ setuptools-scm ];

From 035445eaaa84134d4433dceef07aa4e0e89118c9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 28 Aug 2025 01:34:36 +0200
Subject: [PATCH 21/48] python3Packages.pandas-stubs: 2.2.3.250308 ->
 2.3.2.250827

Diff: https://github.com/pandas-dev/pandas-stubs/compare/v2.2.3.250308...v2.3.2.250827
---
 .../python-modules/pandas-stubs/default.nix         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix
index cc22e73d99d6..7f5beb398a14 100644
--- a/pkgs/development/python-modules/pandas-stubs/default.nix
+++ b/pkgs/development/python-modules/pandas-stubs/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -36,16 +35,14 @@
 
 buildPythonPackage rec {
   pname = "pandas-stubs";
-  version = "2.2.3.250308";
+  version = "2.3.2.250827";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "pandas-dev";
     repo = "pandas-stubs";
     tag = "v${version}";
-    hash = "sha256-93XVzdb3A2S+Exk33v3U8HDMg9vPKAEkWjLZnBaXMWQ=";
+    hash = "sha256-qjHnFT/ydK5n6QfUzAhnGJWVpqHQbMoqGkel3Pu7S78=";
   };
 
   build-system = [ poetry-core ];
@@ -99,10 +96,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pandas" ];
 
-  meta = with lib; {
+  meta = {
     description = "Type annotations for Pandas";
     homepage = "https://github.com/pandas-dev/pandas-stubs";
-    license = licenses.mit;
-    maintainers = with maintainers; [ malo ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ malo ];
   };
 }

From c9ffcb161e8668e40347df7d6a1d4a67bad9e631 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 28 Aug 2025 02:45:45 +0200
Subject: [PATCH 22/48] scrounge-ntfs: fix build

---
 pkgs/by-name/sc/scrounge-ntfs/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/sc/scrounge-ntfs/package.nix b/pkgs/by-name/sc/scrounge-ntfs/package.nix
index 25523e6d971d..0a3b9d094493 100644
--- a/pkgs/by-name/sc/scrounge-ntfs/package.nix
+++ b/pkgs/by-name/sc/scrounge-ntfs/package.nix
@@ -13,6 +13,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-HYrMIMTRPmgAac/vaZ1jaUFchyAl5B0quxgHH0DHJ84=";
   };
 
+  env.NIX_CFLAGS_COMPILE = "-D_FILE_OFFSET_BITS=64";
+
+  postPatch = ''
+    substituteInPlace src/{list,ntfsx,scrounge}.c \
+      --replace-fail "lseek64" "lseek"
+  '';
+
   patches = [
     ./darwin.diff
   ];

From 348a7e899b85f611addeaa59b8ae9a8d251f7f74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 00:56:24 +0000
Subject: [PATCH 23/48] ledger-live-desktop: 2.124.0 -> 2.126.0

---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 2ee705103dc0..5c6c001f1c5c 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.124.0";
+  version = "2.126.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-aB9WFfGSdrIaBpOL7qqomfCqYIIsTeCch2fkta4M9RM=";
+    hash = "sha256-QAe8ft06Nna2rFyFTGK4mwfO1ueZKFcuacvKU4lln0k=";
   };
 
   appimageContents = appimageTools.extractType2 {

From c17a3e73c7cefb20aafe766d10aa70173da7026b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 05:44:36 +0000
Subject: [PATCH 24/48] python3Packages.stripe: 12.4.0 -> 12.5.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 618d1cf3a1cd..6f5af8ba14d7 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "12.4.0";
+  version = "12.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HNH1sFeYZ5IwgbrPWUlZ0fQD8hgiOgbcOCc76wfQFWc=";
+    hash = "sha256-zSuOcSFrau1dwem15vZYteIdaaYNRPuMCPQeH3vd7dA=";
   };
 
   build-system = [ setuptools ];

From 54747c2ed778d9140058b99b5439f04c3d29e084 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 28 Aug 2025 08:07:43 +0200
Subject: [PATCH 25/48] claude-code: 1.0.93 -> 1.0.95

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Changes include:
- Added Vertex global endpoint support for models
- "/memory" command now allows direct editing of imported memory files
- SDK: Added custom tools as callbacks
- New "/todos" command to list current todo items
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 5ad1b80c6379..d8e5a2431352 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.93"
+        "@anthropic-ai/claude-code": "^1.0.95"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.93",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.93.tgz",
-      "integrity": "sha512-HSrbuYVu4k1dwoj/IYsXEVSoMWDPujy2D4zl9BMt4Zt0kwUwZch0nHpTyQ0C+YeHMN7hHbViz0bw6spg0a5GgQ==",
+      "version": "1.0.95",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.95.tgz",
+      "integrity": "sha512-VLwfezJ8vnNpkdUdyMORQ1JXx/C7GFd8MLiJTXXThvMTxhNEr8IhAY/bExNrtdkWx2+aipGocRLgNZrUon9HMw==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index d75cbc98cbbe..7ceb269f1463 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.93";
+  version = "1.0.95";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-vEUty4HRPSkFpT94bxMWcLj0nFe34AeQEZ0WsCXuy10=";
+    hash = "sha256-msAIwzvmzu9qherfXUAgyt7NMq+vZwhTKhu/9ksX6xs=";
   };
 
-  npmDepsHash = "sha256-JL0GPIhpyTQonKsyMR5zN8LaPfX3KkEfQbMR1Z7gTFE=";
+  npmDepsHash = "sha256-nUzpOO3GQ2ME0kwyTcqhy30OW0wOPlai2YX/GH8pgS4=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 667f803bb4fe6a38b1cb9800d0741b08806757d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 28 Aug 2025 00:16:29 -0600
Subject: [PATCH 26/48] gst_all_1.gst-plugins-rs: add test patch from upstream
 and re-enable tests

---
 .../libraries/gstreamer/rs/default.nix        |  5 +++++
 .../libraries/gstreamer/rs/ignore-tests.patch | 20 -------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index f8390aed9c40..7bfb0fbfce5a 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -189,6 +189,11 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723
     ./ignore-tests.patch
+    (fetchpatch {
+      name = "x264enc-test-fix.patch";
+      url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/c0c9888d66e107f9e0b6d96cd3a85961c7e97d9a.diff";
+      hash = "sha256-/ILdPDjI20k5l9Qf/klglSuhawmFUs9mR+VhBnQqsWw=";
+    })
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
index 63c053f9a066..52b231816ce8 100644
--- a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
+++ b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
@@ -1,23 +1,3 @@
-diff --git a/mux/mp4/tests/tests.rs b/mux/mp4/tests/tests.rs
-index 52b91f59..c5875554 100644
---- a/mux/mp4/tests/tests.rs
-+++ b/mux/mp4/tests/tests.rs
-@@ -1339,6 +1339,7 @@ fn test_taic_encode_cannot_sync(video_enc: &str) {
-     );
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn test_taic_x264() {
-     init();
-@@ -1359,6 +1360,7 @@ fn test_taic_stai_x264_not_enabled() {
-     test_taic_stai_encode("x264enc", false);
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn test_taic_x264_no_sync() {
-     init();
 diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs
 index 3489eaa8..569635d6 100644
 --- a/utils/uriplaylistbin/tests/uriplaylistbin.rs

From 56aac88f6f77cb60688522de6d8a376e54e43ebe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 00:07:12 +0000
Subject: [PATCH 27/48] linuxKernel.kernels.linux_zen: 6.16.1 -> 6.16.3

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 6726f6de2e33..f03f31265a1c 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.16.1"; # zen
+      version = "6.16.3"; # zen
       suffix = "zen1"; # zen
-      sha256 = "1z20d53hz1zwg65x8jbq57v7snh9z5qk0gnvw4v6xfn9hwi79sjs"; # zen
+      sha256 = "1dxxpd1j163m0ijw3ldc0v958jwn002crw5x0n1yzrklgs4jp4dm"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From f7570e0dc7cbf28c45a71011d332598c8524f94a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 26 Aug 2025 20:41:00 -0400
Subject: [PATCH 28/48] linuxPackages.tmon: don't inherit makeFlags from kernel

tmon broke with the addition of unwrapped compilers to
kernelModuleMakeFlags. Apply the same fix as with perf (see #429818) and
manually pass ARCH and CROSS_COMPILE.

Fixes: e9b2edb ("linux: un-simplify toolchain selection")
---
 pkgs/os-specific/linux/tmon/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix
index 9b3b04753458..2968d0b2c2bc 100644
--- a/pkgs/os-specific/linux/tmon/default.nix
+++ b/pkgs/os-specific/linux/tmon/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   kernel,
-  kernelModuleMakeFlags,
   ncurses,
 }:
 
@@ -18,7 +17,9 @@ stdenv.mkDerivation {
     cd tools/thermal/tmon
   '';
 
-  makeFlags = kernelModuleMakeFlags ++ [
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
     "INSTALL_ROOT=\"$(out)\""
     "BINDIR=bin"
   ];

From b96d72bd940b0b35b81c20f6ecd23cdb3d7baa36 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 24 Aug 2025 09:34:18 +0200
Subject: [PATCH 29/48] memray: 1.17.2 -> 1.18.0

Diff: https://github.com/bloomberg/memray/compare/v1.17.2...v1.18.0

Changelog: https://github.com/bloomberg/memray/releases/tag/vv1.18.0
---
 pkgs/by-name/me/memray/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix
index 51b16f81a501..e149eca1f70c 100644
--- a/pkgs/by-name/me/memray/package.nix
+++ b/pkgs/by-name/me/memray/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "memray";
-  version = "1.17.2";
+  version = "1.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bloomberg";
     repo = "memray";
     tag = "v${version}";
-    hash = "sha256-n000m2jIJJFZFTjfECS3gFrO6xHauZW46xe1tDqI6Lg=";
+    hash = "sha256-bShFMuDJlvBA3rQJRwXlsgRk4q+gdFQjOpDzOrp4/8k=";
   };
 
   build-system = with python3Packages; [
@@ -77,7 +77,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Memory profiler for Python";
     homepage = "https://bloomberg.github.io/memray/";
-    changelog = "https://github.com/bloomberg/memray/releases/tag/v${src.tag}";
+    changelog = "https://github.com/bloomberg/memray/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;

From 625c47875de341b6f722afed7651eb68d8049876 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 07:10:37 +0000
Subject: [PATCH 30/48] python3Packages.tlds: 2025051700 -> 2025082700

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

diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index 4a4d2cd161c1..c07b7d8d6a91 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tlds";
-  version = "2025051700";
+  version = "2025082700";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
     tag = version;
-    hash = "sha256-AqVe9U/gLjXkmLls4+t04youpY7DtrbmlaHVUdAElMo=";
+    hash = "sha256-sMK+jglwhF8FX8yLDHBtheudfg20MOJhk+zHznQ0hbk=";
   };
 
   nativeBuildInputs = [ setuptools ];

From fbada41e91787b5e6ed29fd121e340668c77488a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 07:11:21 +0000
Subject: [PATCH 31/48] golds: 0.7.6 -> 0.7.8

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

diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix
index e83216488c64..62af987d2f38 100644
--- a/pkgs/by-name/go/golds/package.nix
+++ b/pkgs/by-name/go/golds/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "golds";
-  version = "0.7.6";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "go101";
     repo = "golds";
     tag = "v${version}";
-    hash = "sha256-j6k68+hiXsXW5WLnmbN/iFLFpyU64z/1+DKuaAnNbac=";
+    hash = "sha256-sK7mnvIy8xgsb/K73bEsp1x667AXrDJXSXjFbOSoX9A=";
   };
 
   # nixpkgs is not using the go distpack archive and missing a VERSION file in the source
@@ -22,7 +22,7 @@ buildGoModule rec {
   # https://github.com/NixOS/nixpkgs/pull/358316#discussion_r1855322027
   patches = [ ./info_module-gover.patch ];
 
-  vendorHash = "sha256-Sy9O23iCW8voImPFQkqczPxqGyD5rf0/tKxaRDFgbSs=";
+  vendorHash = "sha256-CL9CdLGeMTxXazJUr2+syQYJZXafX6ARzmEOHn7l14I=";
 
   ldflags = [ "-s" ];
 

From d4c11beaf170365931764857f04a63cfa56d2f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 28 Aug 2025 09:38:44 +0200
Subject: [PATCH 32/48] feh: get rid of generic arguments

---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index fdd7cd5186a0..09c9d15efb99 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   xorg,
-  imlib2,
+  imlib2Full,
   libjpeg,
   libpng,
   curl,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libXt
     xorg.libX11
     xorg.libXinerama
-    imlib2
+    imlib2Full
     libjpeg
     libpng
     curl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aaa461e12614..9c0a9779f47f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11620,9 +11620,7 @@ with pkgs;
 
   fclones = callPackage ../tools/misc/fclones { };
 
-  feh = callPackage ../applications/graphics/feh {
-    imlib2 = imlib2Full;
-  };
+  feh = callPackage ../applications/graphics/feh { };
 
   buildMozillaMach =
     opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };

From 63aa3b433f2ea5b3735549ab8045e063c705f299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 28 Aug 2025 09:39:52 +0200
Subject: [PATCH 33/48] feh: move to pkgs/by-name

---
 .../graphics/feh/default.nix => by-name/fe/feh/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/graphics/feh/default.nix => by-name/fe/feh/package.nix} (100%)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/by-name/fe/feh/package.nix
similarity index 100%
rename from pkgs/applications/graphics/feh/default.nix
rename to pkgs/by-name/fe/feh/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c0a9779f47f..66ee99867806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11620,8 +11620,6 @@ with pkgs;
 
   fclones = callPackage ../tools/misc/fclones { };
 
-  feh = callPackage ../applications/graphics/feh { };
-
   buildMozillaMach =
     opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };
 

From 6bde05bafe8e622dd8f46357d953a83cc72fcecc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 07:57:29 +0000
Subject: [PATCH 34/48] tideways-daemon: 1.9.48 -> 1.9.52

---
 pkgs/by-name/ti/tideways-daemon/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index 5d84cadd1d9b..399de2fdd5e1 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.9.48";
+  version = "1.9.52";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-5o39BwSKltqkbbcbArbKXmU3HQdXwC7QD3sq+3OK3yI=";
+        hash = "sha256-8OGGF1b74lYv1EQgcY54gdwJ2mvuS2D2oNdmKoJmkmM=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-akhRnWAzisjxOb4j3HCSGZ1e/qJcHERR2Msd1hB1on4=";
+        hash = "sha256-adtA5+Ft7ToTDeQ2vp3Hx1UUHgU0NUlcCVpJsV1alvU=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-7Ss+TQPkMyV18LU2EA7KZZjtb2S6hzEbwkIzAemee5E=";
+        hash = "sha256-kMIvW3dabv9iHLOx9QbsuiBkts62FHjvEYzBze9prlw=";
       };
     };
     updateScript = "${

From fba9afc2f63678462d7213b49840dd8d303e1fb5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 28 Aug 2025 10:04:08 +0200
Subject: [PATCH 35/48] python313Packages.skops: update inputs

---
 .../python-modules/skops/default.nix          | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix
index 4356e4fe4983..2f6045014129 100644
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@@ -1,16 +1,21 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   hatchling,
-  pytestCheckHook,
-  pytest-cov-stub,
   huggingface-hub,
   matplotlib,
+  numpy,
+  packaging,
   pandas,
+  prettytable,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  pyyaml,
+  rich,
   scikit-learn,
-  stdenv,
   streamlit,
   tabulate,
 }:
@@ -30,7 +35,9 @@ buildPythonPackage rec {
   build-system = [ hatchling ];
 
   dependencies = [
-    huggingface-hub
+    numpy
+    packaging
+    prettytable
     scikit-learn
     tabulate
   ];
@@ -38,19 +45,22 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     matplotlib
     pandas
-    pytestCheckHook
     pytest-cov-stub
+    pytestCheckHook
+    pyyaml
     streamlit
   ];
+  optional-dependencies = {
+    rich = [ rich ];
+  };  
   enabledTestPaths = [ "skops" ];
   disabledTests = [
     # flaky
     "test_base_case_works_as_expected"
+    # fairlearn is not available in nixpkgs
+    "TestAddFairlearnMetricFrame"
   ];
   disabledTestPaths = [
-    # try to download data from Huggingface Hub:
-    "skops/hub_utils/tests"
-    "skops/card/tests"
     # minor output formatting issue
     "skops/card/_model_card.py"
   ]

From dc881d34786a10f9a4f1af65ae062b4857c16ac0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 28 Aug 2025 10:05:12 +0200
Subject: [PATCH 36/48] python313Packages.skops: update formatting

---
 pkgs/development/python-modules/skops/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix
index 2f6045014129..ed6cf8b9c555 100644
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@@ -50,16 +50,20 @@ buildPythonPackage rec {
     pyyaml
     streamlit
   ];
+
   optional-dependencies = {
     rich = [ rich ];
-  };  
+  };
+
   enabledTestPaths = [ "skops" ];
+
   disabledTests = [
     # flaky
     "test_base_case_works_as_expected"
     # fairlearn is not available in nixpkgs
     "TestAddFairlearnMetricFrame"
   ];
+
   disabledTestPaths = [
     # minor output formatting issue
     "skops/card/_model_card.py"
@@ -68,19 +72,21 @@ buildPythonPackage rec {
     # Segfaults on darwin
     "skops/io/tests/test_persist.py"
   ];
+
   pytestFlags = [
     # Warning from scipy.optimize in skops/io/tests/test_persist.py::test_dump_and_load_with_file_wrapper
     # https://github.com/skops-dev/skops/issues/479
     "-Wignore::DeprecationWarning"
   ];
+
   pythonImportsCheck = [ "skops" ];
 
   meta = {
     description = "Library for saving/loading, sharing, and deploying scikit-learn based models";
-    mainProgram = "skops";
     homepage = "https://skops.readthedocs.io/en/stable";
     changelog = "https://github.com/skops-dev/skops/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.bcdarwin ];
+    mainProgram = "skops";
   };
 }

From 3bc770c7d4f67d48408d905400d8fd50ff5b9b45 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 28 Aug 2025 10:17:54 +0200
Subject: [PATCH 37/48] python313Packages.fastapi-mcp: use pytest-asyncio_0

---
 pkgs/development/python-modules/fastapi-mcp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix
index 844ba0f6de2d..bc9c51e8f0d3 100644
--- a/pkgs/development/python-modules/fastapi-mcp/default.nix
+++ b/pkgs/development/python-modules/fastapi-mcp/default.nix
@@ -20,7 +20,7 @@
 
   # tests
   coverage,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-cov-stub,
   pytestCheckHook,
 }:
@@ -59,7 +59,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     coverage
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-cov-stub
     pytestCheckHook
   ];

From 350494975943afe5036f8165c15fdcaa106fb05d Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:52:29 +0200
Subject: [PATCH 38/48] scx.full: 1.0.14 -> 1.0.15

---
 pkgs/os-specific/linux/scx/scx_cscheds.nix    | 13 ------------
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 20 +------------------
 pkgs/os-specific/linux/scx/version.json       | 10 +++++-----
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index 23c183bf8a2a..8497ddac1d15 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -58,10 +58,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
     substituteInPlace meson.build \
       --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"
-
-    # TODO: Remove in next release.
-    substituteInPlace lib/scxtest/overrides.h \
-      --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1'
   '';
 
   nativeBuildInputs = [
@@ -89,7 +85,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       "systemd" = false;
       # not for nix
       "openrc" = false;
-      "libalpm" = false;
     })
     (lib.mapAttrsToList lib.mesonBool {
       # needed libs are already fetched as FOD
@@ -106,16 +101,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     "zerocallusedregs"
   ];
 
-  # We copy the compiled header files to the dev output
-  # These are needed for the rust schedulers
-  postFixup = ''
-    mkdir -p ${placeholder "dev"}
-    cp -r libbpf ${placeholder "dev"}
-  '';
-
   outputs = [
     "bin"
-    "dev"
     "out"
   ];
 
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index fc48fd7b26d4..edbdcfef4795 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -7,7 +7,6 @@
   zlib,
   zstd,
   scx-common,
-  scx,
   protobuf,
   libseccomp,
 }:
@@ -17,12 +16,6 @@ rustPlatform.buildRustPackage {
 
   inherit (scx-common.versionInfo.scx) cargoHash;
 
-  # Copy compiled headers and libs from scx.cscheds
-  postPatch = ''
-    mkdir libbpf
-    cp -r ${scx.cscheds.dev}/libbpf/* libbpf/
-  '';
-
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook
@@ -37,18 +30,6 @@ rustPlatform.buildRustPackage {
 
   env = {
     BPF_CLANG = lib.getExe llvmPackages.clang;
-    BPF_EXTRA_CFLAGS_PRE_INCL = lib.concatStringsSep " " [
-      "-I${scx.cscheds.dev}/libbpf/src/usr/include"
-      "-I${scx.cscheds.dev}/libbpf/include/uapi"
-      "-I${scx.cscheds.dev}/libbpf/include/linux"
-    ];
-    RUSTFLAGS = lib.concatStringsSep " " [
-      "-C relocation-model=pic"
-      "-C link-args=-lelf"
-      "-C link-args=-lz"
-      "-C link-args=-lzstd"
-      "-L ${scx.cscheds.dev}/libbpf/src"
-    ];
   };
 
   hardeningDisable = [
@@ -63,6 +44,7 @@ rustPlatform.buildRustPackage {
     "--skip=compat::tests::test_struct_has_field"
     "--skip=cpumask"
     "--skip=topology"
+    "--skip=proc_data::tests::test_thread_operations"
   ];
 
   meta = scx-common.meta // {
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
index 822e674361ed..ba4efd7bc025 100644
--- a/pkgs/os-specific/linux/scx/version.json
+++ b/pkgs/os-specific/linux/scx/version.json
@@ -1,15 +1,15 @@
 {
   "scx": {
-    "version": "1.0.14",
-    "hash": "sha256-Wh+8vaQO93Erj+z8S2C633UDmUrFjQc3Bg+Nm7EML0E=",
-    "cargoHash": "sha256-6uiDx2/5ZcYkz8x8vuOTEUclIttzxVMvh1Q6QHg9N6E="
+    "version": "1.0.15",
+    "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=",
+    "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs="
   },
   "bpftool": {
     "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
     "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="
   },
   "libbpf": {
-    "rev": "c5f22aca0f3aa855daa159b2777472b35e721804",
-    "hash": "sha256-ggGVqAkdZt28KAx+LztVIYGxj0j79hKcPKmUy8TrJy8="
+    "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",
+    "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="
   }
 }

From 14c8785cb8bcf9707fbb70be03cf2f28bdf7550b Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 27 Aug 2025 09:36:33 +0200
Subject: [PATCH 39/48] nixos/scx: add missing schedulers

---
 nixos/modules/services/scheduling/scx.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/scheduling/scx.nix b/nixos/modules/services/scheduling/scx.nix
index 7f92587f75e1..c43aeb304341 100644
--- a/nixos/modules/services/scheduling/scx.nix
+++ b/nixos/modules/services/scheduling/scx.nix
@@ -39,6 +39,8 @@ in
     scheduler = lib.mkOption {
       type = lib.types.enum [
         "scx_bpfland"
+        "scx_chaos"
+        "scx_cosmos"
         "scx_central"
         "scx_flash"
         "scx_flatcg"
@@ -46,14 +48,18 @@ in
         "scx_layered"
         "scx_mitosis"
         "scx_nest"
+        "scx_p2dq"
         "scx_pair"
+        "scx_prev"
         "scx_qmap"
         "scx_rlfifo"
         "scx_rustland"
         "scx_rusty"
         "scx_sdt"
         "scx_simple"
+        "scx_tickless"
         "scx_userland"
+        "scx_wd40"
       ];
       default = "scx_rustland";
       example = "scx_bpfland";

From f14f77b5e6b94cfe56d15fcf9a755a9157bfedb1 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 27 Aug 2025 09:37:34 +0200
Subject: [PATCH 40/48] nixos/scx: inherit pkgs.scx.full.meta maintainers

---
 nixos/modules/services/scheduling/scx.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/scheduling/scx.nix b/nixos/modules/services/scheduling/scx.nix
index c43aeb304341..2a83788adfd8 100644
--- a/nixos/modules/services/scheduling/scx.nix
+++ b/nixos/modules/services/scheduling/scx.nix
@@ -121,5 +121,7 @@ in
     ];
   };
 
-  meta.maintainers = with lib.maintainers; [ johnrtitor ];
+  meta = {
+    inherit (pkgs.scx.full.meta) maintainers;
+  };
 }

From f447c7c08d6c38218f671a22c0834a555e999c6c Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 27 Aug 2025 11:56:04 +0200
Subject: [PATCH 41/48] nixosTests.scx: add production ready schedulers

---
 nixos/tests/scx/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/scx/default.nix b/nixos/tests/scx/default.nix
index 67627d0ed3e3..11034d575633 100644
--- a/nixos/tests/scx/default.nix
+++ b/nixos/tests/scx/default.nix
@@ -13,10 +13,16 @@
     specialisation = {
       bpfland.configuration.services.scx.scheduler = "scx_bpfland";
       central.configuration.services.scx.scheduler = "scx_central";
+      cosmos.configuration.services.scx.scheduler = "scx_cosmos";
+      flash.configuration.services.scx.scheduler = "scx_flash";
+      flatcg.configuration.services.scx.scheduler = "scx_flatcg";
       lavd.configuration.services.scx.scheduler = "scx_lavd";
+      nest.configuration.services.scx.scheduler = "scx_nest";
+      p2dq.configuration.services.scx.scheduler = "scx_p2dq";
       rlfifo.configuration.services.scx.scheduler = "scx_rlfifo";
       rustland.configuration.services.scx.scheduler = "scx_rustland";
       rusty.configuration.services.scx.scheduler = "scx_rusty";
+      simple.configuration.services.scx.scheduler = "scx_simple";
     };
   };
 
@@ -24,10 +30,16 @@
     specialisation = [
       "bpfland",
       "central",
+      "cosmos",
+      "flash",
+      "flatcg",
       "lavd",
+      "nest",
+      "p2dq",
       "rlfifo",
       "rustland",
-      "rusty"
+      "rusty",
+      "simple"
     ]
 
     def activate_specialisation(name: str):

From 4adf5a21d5d19f2bdd974b9e8ddc122f748341e0 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 27 Aug 2025 12:07:41 +0200
Subject: [PATCH 42/48] nixosTests.scx: remove scx_central test - Not
 considered production-ready by upstream - Crashes shortly after being run

---
 nixos/tests/scx/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/tests/scx/default.nix b/nixos/tests/scx/default.nix
index 11034d575633..d321314b4ef6 100644
--- a/nixos/tests/scx/default.nix
+++ b/nixos/tests/scx/default.nix
@@ -12,7 +12,6 @@
 
     specialisation = {
       bpfland.configuration.services.scx.scheduler = "scx_bpfland";
-      central.configuration.services.scx.scheduler = "scx_central";
       cosmos.configuration.services.scx.scheduler = "scx_cosmos";
       flash.configuration.services.scx.scheduler = "scx_flash";
       flatcg.configuration.services.scx.scheduler = "scx_flatcg";
@@ -29,7 +28,6 @@
   testScript = ''
     specialisation = [
       "bpfland",
-      "central",
       "cosmos",
       "flash",
       "flatcg",

From 079b7a006c021a2a378400fe286d1a49830bca46 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 28 Aug 2025 12:09:01 +0530
Subject: [PATCH 43/48] scx.rustscheds: restore RUSTFLAGS

Per https://github.com/sched-ext/scx/blob/059ce35c31c5d7906d2886b0e1c235ef5b6f6da4/meson.build#L347-L349
but linking libbpf is not required, built in rust one should work fine.

See https://github.com/NixOS/nixpkgs/pull/437169/commits/8ec509cc139a8d5e665690fac7794ee277233f4a#r2302122465 and https://github.com/sched-ext/scx/pull/2592
---
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index edbdcfef4795..c43bfee59861 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -30,6 +30,12 @@ rustPlatform.buildRustPackage {
 
   env = {
     BPF_CLANG = lib.getExe llvmPackages.clang;
+    RUSTFLAGS = lib.concatStringsSep " " [
+      "-C relocation-model=pic"
+      "-C link-args=-lelf"
+      "-C link-args=-lz"
+      "-C link-args=-lzstd"
+    ];
   };
 
   hardeningDisable = [

From 0633a9d6405a3324037d7c4cb16a7044523b9cb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 08:34:23 +0000
Subject: [PATCH 44/48] python3Packages.llama-index-vector-stores-chroma: 0.5.0
 -> 0.5.2

---
 .../llama-index-vector-stores-chroma/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
index 53d96d53493f..09142c15c739 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-chroma";
-  version = "0.5.0";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_chroma";
     inherit version;
-    hash = "sha256-5gkwYvmBXeRxGBL1CoM5H/obYDTceap1TP00uv8SDs4=";
+    hash = "sha256-2NX72ejiuzhjCi15EPa9OJZtTkKb5ySjMRfiDP617lY=";
   };
 
   build-system = [ hatchling ];

From b648158feb7a6a1c052893e6134f0cf2b0610dfd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 00:29:48 +0000
Subject: [PATCH 45/48] feh: 3.10.3 -> 3.11

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

diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix
index 09c9d15efb99..e7395f815523 100644
--- a/pkgs/by-name/fe/feh/package.nix
+++ b/pkgs/by-name/fe/feh/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "feh";
-  version = "3.10.3";
+  version = "3.11";
 
   src = fetchFromGitHub {
     owner = "derf";
     repo = "feh";
     rev = finalAttrs.version;
-    hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og=";
+    hash = "sha256-3QKKXgwrDXVn8ahIG+NfP60GezFrZiHWOFoM2T0OoqU=";
   };
 
   outputs = [

From a30076d5de66bb7ae5f7994664be85027608b8b7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 28 Aug 2025 11:53:51 +0200
Subject: [PATCH 46/48] python3Packages.duckduckgo-search: fix

---
 pkgs/development/python-modules/duckduckgo-search/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
index 4e82b6382161..8e68e05545f3 100644
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ b/pkgs/development/python-modules/duckduckgo-search/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   doCheck = false; # tests require network access
 
-  pythonImportsCheck = [ "duckduckgo_search" ];
+  pythonImportsCheck = [ "ddgs" ];
 
   meta = {
     description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";

From f24637f047b1f5f1a31bba17c501531968d7a9db Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 12:54:05 +0300
Subject: [PATCH 47/48] paperless-ngx: unpin rapidfuzz version

Broken in #437560
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 80143f6e9599..3d3c8a0afdd1 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -169,6 +169,7 @@ python.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "django-allauth"
+    "rapidfuzz"
     "redis"
   ];
 

From bcd38e11bf3b6410d31b55d94931b674a5d5c3da Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 28 Aug 2025 12:19:24 +0200
Subject: [PATCH 48/48] nixos/systemd: fix enabling non-existent service

This service doesn't exist when withBootLoader is false.

Fixes: 2c98ea1e3309 ("nixos/systemd: add upstream units for boot counting")
---
 nixos/modules/system/boot/systemd.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 153ee54cb4b2..26ee1c46caf4 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -107,15 +107,16 @@ let
     # Maintaining state across reboots.
     "systemd-random-seed.service"
   ]
-  ++ (optional cfg.package.withBootloader "systemd-boot-random-seed.service")
+  ++ optionals cfg.package.withBootloader [
+    "systemd-boot-random-seed.service"
+    "systemd-bless-boot.service"
+  ]
   ++ [
     "systemd-backlight@.service"
     "systemd-rfkill.service"
     "systemd-rfkill.socket"
 
-    # Boot counting
     "boot-complete.target"
-    "systemd-bless-boot.service"
 
     # Hibernate / suspend.
     "hibernate.target"