From d15794607d45b26ed470d6d7d0e0f34a54717d14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 17:32:07 +0000
Subject: [PATCH 01/28] python3Packages.modern-colorthief: 0.1.12 -> 0.2.0

---
 .../python-modules/modern-colorthief/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/modern-colorthief/default.nix b/pkgs/development/python-modules/modern-colorthief/default.nix
index 2f6a20b4374e..fd51e4b873cf 100644
--- a/pkgs/development/python-modules/modern-colorthief/default.nix
+++ b/pkgs/development/python-modules/modern-colorthief/default.nix
@@ -11,19 +11,19 @@
 
 buildPythonPackage rec {
   pname = "modern-colorthief";
-  version = "0.1.12";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "baseplate-admin";
     repo = "modern_colorthief";
     tag = version;
-    hash = "sha256-8V4S2VdtKnkH9HcY10KtkZXhjMRjPslETFeveFEDFCM=";
+    hash = "sha256-dXJbVXa/urMUL6YSVhQWcC3UMhv8uouaF8SQ39GdB1E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-n5qIlkLvRpIeCG2rr1N0s7n3PTUOesg6PHqIppSaqiM=";
+    hash = "sha256-ED8dDz5dHkiqbbzD+Q3Zk71Xck7SAdkt9enPgwzpWuQ=";
   };
 
   nativeBuildInputs = [

From c41c814bc1bba0b8c660cd15295df3314be5e2c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 May 2026 03:44:15 +0000
Subject: [PATCH 02/28] traefik: 3.7.0-ea.2 -> 3.7.1

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

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index 7a61e2eb3b3f..121f91e360aa 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -8,16 +8,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "traefik";
-  version = "3.7.0-ea.2";
+  version = "3.7.1";
 
   # Archive with static assets for webui
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-GxOqCSLKGOg5gC1vFRP1JHgEOEFAe9aAzi4mqjcuv4E=";
+    hash = "sha256-LP4V70QvPmeafaArt8AWGkOj9dsKkEPE9dCulP+SmFw=";
     stripRoot = false;
   };
 
-  vendorHash = "sha256-wsqxM4hJh6iZIkUouWItgQOzk52gglawRnyYO8Y5gZs=";
+  vendorHash = "sha256-UHsgq6B3h6z/TZZpZi6o/KzahBDTiQszFikbpUvH80s=";
 
   proxyVendor = true;
 

From 4cb428936a0fdebbeddf73c28b94765c1992b325 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 06:25:07 +0000
Subject: [PATCH 03/28] python3Packages.jsonargparse: 4.47.0 -> 4.49.0

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

diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix
index c656d24a6554..3c4acc76b029 100644
--- a/pkgs/development/python-modules/jsonargparse/default.nix
+++ b/pkgs/development/python-modules/jsonargparse/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "jsonargparse";
-  version = "4.47.0";
+  version = "4.49.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "omni-us";
     repo = "jsonargparse";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iZiXIeoxohbiKgE7oMy6q9kc3m0AxPFgoQunXmZDjYA=";
+    hash = "sha256-1uaFarYJcx7J2/acuw/+6BuBUrZkCyBSrreNKV9bR5c=";
   };
 
   build-system = [ setuptools ];

From 39fca0b67991435e4fba3d8aa229a1f6954a6f2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 01:54:14 +0000
Subject: [PATCH 04/28] python3Packages.fastparquet: 2026.3.0 -> 2026.5.0

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

diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix
index 9972e87a5c65..1c8dcd43b6b7 100644
--- a/pkgs/development/python-modules/fastparquet/default.nix
+++ b/pkgs/development/python-modules/fastparquet/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "fastparquet";
-  version = "2026.3.0";
+  version = "2026.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "fastparquet";
     tag = version;
-    hash = "sha256-lf3GBfusZ1dhQ6wdHmfegqSlwG4Gm5Bi4+nof9yCg/o=";
+    hash = "sha256-thvoMXXiGtHGcJ0/IrGujjhVAvSmTMGmrlDHjG8R7PQ=";
   };
 
   build-system = [

From bf4c9c67fdbdb35a8cf1fdb13281ac20248e2ccd Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Tue, 19 May 2026 19:44:59 +0300
Subject: [PATCH 05/28] supabase-cli: 2.98.2 -> 2.100.1

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

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 6f78a1ad0df2..3aead787ef07 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "supabase-cli";
-  version = "2.98.2";
+  version = "2.100.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZiptplUqebmId7noXuVXu9G5y1SW8+FGV6WqPH8R3Cw=";
+    hash = "sha256-vCaPZXf4I2f9kJDBDsZcl1q8PIM35NxwuLTeq1aastw=";
   };
 
-  vendorHash = "sha256-2BIP500MgABRzsG13UaUVv8KKtA0dPM0U10Uk/rfVQY=";
+  # Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli.
+  sourceRoot = "${finalAttrs.src.name}/apps/cli-go";
+
+  vendorHash = "sha256-MebmiEFfWozJV/zEQyRtjmd9eR2nG3ZXcpyY6lEEQgI=";
 
   ldflags = [
     "-s"

From d831d3e72332664bbb680098e3461a8b7ad9c6bf Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Tue, 19 May 2026 19:45:32 +0300
Subject: [PATCH 06/28] supabase-cli: modernize package

- Use versionCheckHook instead of testers.testVersion
- Enable __structuredAttrs
- Use tag instead of rev for fetchFromGitHub
- Drop -w from ldflags
- Flatten passthru
---
 pkgs/by-name/su/supabase-cli/package.nix | 28 +++++++++++-------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 3aead787ef07..4944a52392c1 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -3,8 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  testers,
-  supabase-cli,
+  versionCheckHook,
   nix-update-script,
 }:
 
@@ -12,10 +11,12 @@ buildGoModule (finalAttrs: {
   pname = "supabase-cli";
   version = "2.100.1";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-vCaPZXf4I2f9kJDBDsZcl1q8PIM35NxwuLTeq1aastw=";
   };
 
@@ -26,16 +27,18 @@ buildGoModule (finalAttrs: {
 
   ldflags = [
     "-s"
-    "-w"
     "-X=github.com/supabase/cli/internal/utils.Version=${finalAttrs.version}"
   ];
 
   subPackages = [ "." ];
 
-  doCheck = false; # tests are trying to connect to localhost
-
   nativeBuildInputs = [ installShellFiles ];
 
+  doCheck = false; # Root Go package does not have any tests.
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   postInstall = ''
     mv $out/bin/{cli,supabase}
 
@@ -45,15 +48,10 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/supabase completion zsh)
   '';
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = supabase-cli;
-    };
-    updateScript = nix-update-script {
-      # Fetch versions from GitHub releases to detect pre-releases and
-      # avoid updating to them.
-      extraArgs = [ "--use-github-releases" ];
-    };
+  passthru.updateScript = nix-update-script {
+    # Fetch versions from GitHub releases to detect pre-releases and
+    # avoid updating to them.
+    extraArgs = [ "--use-github-releases" ];
   };
 
   meta = {

From 9e753adc3eca168db88a1eb9f86f92c228d4dfd3 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 19 May 2026 23:00:31 -0600
Subject: [PATCH 07/28] ardour: 9.4 -> 9.5

Diff: https://git.ardour.org/ardour/ardour/compare/9.4...9.5
---
 pkgs/by-name/ar/ardour/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix
index 1fffe8b5aa3a..465a96fd882d 100644
--- a/pkgs/by-name/ar/ardour/package.nix
+++ b/pkgs/by-name/ar/ardour/package.nix
@@ -73,14 +73,14 @@ stdenv.mkDerivation (
   in
   {
     pname = "ardour";
-    version = "9.4";
+    version = "9.5";
 
     # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
     # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
     src = fetchgit {
       url = "git://git.ardour.org/ardour/ardour.git";
-      rev = finalAttrs.version;
-      hash = "sha256-/obRWtluM60OWcr93Ci40tjJMbnBvNqF3tWRO7uCrv8=";
+      tag = finalAttrs.version;
+      hash = "sha256-Jaq1jgiGMmLeIw66RIXfZJxc+HCho2eGl5uEqAlNk6w=";
     };
 
     bundledContent = fetchzip {

From c8765590554ab3f893c14eec12546abf86cbaa3e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 20 May 2026 13:25:49 -0700
Subject: [PATCH 08/28] python3Packages.tpm2-pytss: fix build with cryptography
 47

cryptography 47.0.0 made __deepcopy__ an abstract method on the
RSAPrivateKey and EllipticCurvePrivateKey base classes, which
tpm2-pytss subclasses. tpm2-pytss 2.3.0 only implements __copy__, so its
tpm_rsa_private_key / tpm_ecc_private_key classes can no longer be
instantiated, failing 33 tests in the check phase.

Backport the upstream fix, which adds __deepcopy__ delegating to
__copy__.

https://github.com/tpm2-software/tpm2-pytss/pull/689
---
 pkgs/development/python-modules/tpm2-pytss/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index dbefc00be8c3..9c1fa30570b7 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -45,6 +45,13 @@ buildPythonPackage rec {
       url = "https://github.com/tpm2-software/tpm2-pytss/commit/6ab4c74e6fb3da7cd38e97c1f8e92532312f8439.patch";
       hash = "sha256-01Qe4qpD2IINc5Z120iVdPitiLBwdr8KNBjLFnGgE7E=";
     })
+    # support cryptography >= 47.0.0, which made __deepcopy__ an abstract
+    # method on the private-key base classes
+    # https://github.com/tpm2-software/tpm2-pytss/pull/689
+    (fetchpatch {
+      url = "https://github.com/tpm2-software/tpm2-pytss/commit/5d15cad4bde28902a4becb8e2a8e915aba8abbd0.patch";
+      hash = "sha256-b2zVD7KJGVzJ765HO8LFAe9MyQmjOTpERmEqUrIg3oM=";
+    })
     # Properly restore environment variables upon exit from
     # FAPIConfig context. Accepted into upstream, not yet released.
     (fetchpatch2 {

From 5adeb511950f79ab1746d1fb4c69f25204f5f830 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 20 May 2026 22:33:11 -0600
Subject: [PATCH 09/28] buildbot{,-full,-ui,-worker,-plugins}: switch to
 pyproject

---
 .../buildbot/master.nix                       |  6 +--
 .../continuous-integration/buildbot/pkg.nix   |  5 ++-
 .../buildbot/plugins.nix                      | 41 ++++++++++++-------
 .../buildbot/worker.nix                       | 12 +++---
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index 9d08e76e3768..8be52f704a3c 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -85,14 +85,13 @@ buildPythonApplication rec {
     hash = "sha256-yUtOJRI04/clCMImh5sokpj6MeBIXjEAdf9xnToqJZs=";
   };
 
-  build-system = [
-  ];
+  build-system = [ setuptools ];
 
   pythonRelaxDeps = [
     "twisted"
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     # core
     twisted
     jinja2
@@ -105,7 +104,6 @@ buildPythonApplication rec {
     autobahn
     pyjwt
     pyyaml
-    setuptools
     croniter
     importlib-resources
     packaging
diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix
index fccabdead3cb..71a79c8132e3 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix
@@ -1,14 +1,15 @@
 {
   lib,
   buildPythonPackage,
+  setuptools,
   isPy3k,
   buildbot,
 }:
 
 buildPythonPackage {
-  format = "setuptools";
   pname = "buildbot_pkg";
   inherit (buildbot) src version;
+  pyproject = true;
 
   postPatch = ''
     cd pkg
@@ -17,6 +18,8 @@ buildPythonPackage {
     substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" ""
   '';
 
+  build-system = [ setuptools ];
+
   # No tests
   doCheck = false;
 
diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
index c9997553f75a..ccc4b9ecfbfc 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchurl,
-  callPackage,
+  setuptools,
   mock,
   cairosvg,
   klein,
@@ -13,9 +13,9 @@
   # this is exposed for potential plugins to use and for nix-update
   inherit buildbot-pkg;
   www = buildPythonPackage rec {
-    format = "setuptools";
     pname = "buildbot_www";
     inherit (buildbot-pkg) version;
+    pyproject = true;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
@@ -27,7 +27,9 @@
       sed -i "s/'buildbot'//" setup.py
     '';
 
-    buildInputs = [
+    build-system = [ setuptools ];
+
+    dependencies = [
       buildbot-pkg
       mock
     ];
@@ -46,14 +48,16 @@
   console-view = buildPythonPackage rec {
     pname = "buildbot_console_view";
     inherit (buildbot-pkg) version;
-    format = "setuptools";
+    pyproject = true;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
       hash = "sha256-VA6xqJBjD4XmQabTN8M+PLvfrG7Hq2ooxChtz2jAT8A=";
     };
 
-    buildInputs = [ buildbot-pkg ];
+    build-system = [ setuptools ];
+
+    dependencies = [ buildbot-pkg ];
 
     # No tests
     doCheck = false;
@@ -69,14 +73,16 @@
   waterfall-view = buildPythonPackage rec {
     pname = "buildbot_waterfall_view";
     inherit (buildbot-pkg) version;
-    format = "setuptools";
+    pyproject = true;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
       hash = "sha256-c/Nmr0Uscalnndq72Y6jPM1JDs5OyOCERtuX/GXkxp8=";
     };
 
-    buildInputs = [ buildbot-pkg ];
+    build-system = [ setuptools ];
+
+    dependencies = [ buildbot-pkg ];
 
     # No tests
     doCheck = false;
@@ -92,14 +98,16 @@
   grid-view = buildPythonPackage rec {
     pname = "buildbot_grid_view";
     inherit (buildbot-pkg) version;
-    format = "setuptools";
+    pyproject = true;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
       hash = "sha256-AmY8RkFX0POmVpW71nNz4+dFbr0FHGhNR3RJymDNoaw=";
     };
 
-    buildInputs = [ buildbot-pkg ];
+    build-system = [ setuptools ];
+
+    dependencies = [ buildbot-pkg ];
 
     # No tests
     doCheck = false;
@@ -115,14 +123,16 @@
   wsgi-dashboards = buildPythonPackage rec {
     pname = "buildbot_wsgi_dashboards";
     inherit (buildbot-pkg) version;
-    format = "setuptools";
+    pyproject = true;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
       hash = "sha256-vofKxpIfbAs7HR43Y7ojHLQEn6/WIdjZPgZieBMsz74=";
     };
 
-    buildInputs = [ buildbot-pkg ];
+    build-system = [ setuptools ];
+
+    dependencies = [ buildbot-pkg ];
 
     # No tests
     doCheck = false;
@@ -138,15 +148,17 @@
   badges = buildPythonPackage rec {
     pname = "buildbot_badges";
     inherit (buildbot-pkg) version;
-    format = "setuptools";
+    pyproject = true;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
       hash = "sha256-u7HF6X+ClT4rT3LJcTHXWi5oSxCKPXoUDH+QFRI2S0w=";
     };
 
-    buildInputs = [ buildbot-pkg ];
-    propagatedBuildInputs = [
+    build-system = [ setuptools ];
+
+    dependencies = [
+      buildbot-pkg
       cairosvg
       klein
       jinja2
@@ -163,5 +175,4 @@
       license = lib.licenses.gpl2;
     };
   };
-
 }
diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix
index 10eaa8933986..ad464fc47ebb 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix
@@ -7,6 +7,9 @@
   # patch
   coreutils,
 
+  # build system
+  setuptools,
+
   # propagates
   autobahn,
   msgpack,
@@ -15,7 +18,6 @@
   # tests
   parameterized,
   psutil,
-  setuptools-trial,
 
   # passthru
   nixosTests,
@@ -24,7 +26,7 @@
 buildPythonPackage {
   pname = "buildbot_worker";
   inherit (buildbot) src version;
-  format = "setuptools";
+  pyproject = true;
 
   postPatch = ''
     cd worker
@@ -33,11 +35,9 @@ buildPythonPackage {
       --replace /usr/bin/tail "${coreutils}/bin/tail"
   '';
 
-  nativeBuildInputs = [
-    setuptools-trial
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     autobahn
     msgpack
     twisted

From e3721159a3d5244439d00da75621c26f0792a452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 12:50:44 -0800
Subject: [PATCH 10/28] marisa: 0.3.0 -> 0.3.1

Diff: https://github.com/s-yata/marisa-trie/compare/v0.3.0...v0.3.1

Changelog: https://github.com/s-yata/marisa-trie/releases/tag/v0.3.1
---
 pkgs/by-name/ma/marisa/package.nix                 | 14 ++++++++++++--
 pkgs/development/python-modules/marisa/default.nix |  7 ++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/marisa/package.nix b/pkgs/by-name/ma/marisa/package.nix
index c325fe577d15..175aa1646a7a 100644
--- a/pkgs/by-name/ma/marisa/package.nix
+++ b/pkgs/by-name/ma/marisa/package.nix
@@ -2,20 +2,30 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "marisa";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "s-yata";
     repo = "marisa-trie";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XOXX0NuU+erL/KDAZgBeX+LKO9uSEOyP1/VuMDE5pi0=";
+    hash = "sha256-+rOmbvlcEBBsjUdWRrW9WN0MfhnSe7Gm3DOXfhtcSDc=";
   };
 
+  patches = [
+    # https://github.com/s-yata/marisa-trie/pull/123
+    (fetchpatch {
+      name = "fix-binding-build.patch";
+      url = "https://github.com/s-yata/marisa-trie/commit/cf4602f08df49861d987d122bd85bfdb456fe7a0.patch";
+      hash = "sha256-h6+ixT63cHSpg3fhiLwJlxU296bD5YgfEaGqAHpm6+g=";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix
index 79bd8cc061ea..10d7a790ad21 100644
--- a/pkgs/development/python-modules/marisa/default.nix
+++ b/pkgs/development/python-modules/marisa/default.nix
@@ -2,13 +2,18 @@
   lib,
   buildPythonPackage,
   marisa,
+  setuptools,
   swig,
 }:
 
 buildPythonPackage {
   pname = "marisa";
-  format = "setuptools";
   inherit (marisa) src version;
+  pyproject = true;
+
+  patches = marisa.patches or [ ];
+
+  build-system = [ setuptools ];
 
   nativeBuildInputs = [ swig ];
 

From 5792087ba6ea61836e7c74bce2d76309b3fbb55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 21 May 2026 08:53:57 -0700
Subject: [PATCH 11/28] python3Packages.marisa-trie: fix tests with marisa
 0.3.1

---
 pkgs/development/python-modules/marisa-trie/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix
index e47cbef20291..4cce1653ace1 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/pkgs/development/python-modules/marisa-trie/default.nix
@@ -28,6 +28,12 @@ buildPythonPackage rec {
     })
   ];
 
+  postPatch = ''
+    # https://github.com/pytries/marisa-trie/issues/132
+    substituteInPlace tests/test_binary_trie.py tests/test_trie.py \
+      --replace-fail MARISA_FORMAT_ERROR std::runtime_error
+  '';
+
   build-system = [
     cython
     setuptools

From 19fcf5006ab7a2b131b91f0fe37411bfee467f23 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 14:39:36 -0400
Subject: [PATCH 12/28] lib.mirrorFunctionArgs: inline call to setFunctionArgs

---
 lib/trivial.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index fd48a0456b66..a13f45b7a22c 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -7,7 +7,6 @@ let
     functionArgs
     pathExists
     release
-    setFunctionArgs
     toBaseDigits
     version
     versionSuffix
@@ -1177,7 +1176,10 @@ in
     let
       fArgs = functionArgs f;
     in
-    g: setFunctionArgs g fArgs;
+    g: {
+      __functor = self: g;
+      __functionArgs = fArgs;
+    };
 
   /**
     Turns any non-callable values into constant functions.

From 1f83c2cc226b4f96e36d42c4a5341fe1fd155e60 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 14:40:32 -0400
Subject: [PATCH 13/28] lib.toBaseDigits: avoid reversing list

---
 lib/trivial.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index a13f45b7a22c..b3c1edcfcb90 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -1327,11 +1327,11 @@ in
             r = i - ((i / base) * base);
             q = (i - r) / base;
           in
-          [ r ] ++ go q;
+          go q ++ [ r ];
     in
     assert (isInt base);
     assert (isInt i);
     assert (base >= 2);
     assert (i >= 0);
-    lib.reverseList (go i);
+    go i;
 }

From 7f6eb89aeb1220bfa25e6ad9e3290c4607d70452 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 14:47:07 -0400
Subject: [PATCH 14/28] lib.{importJSON,importTOML}: inherit builtins to global
 scope

---
 lib/trivial.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index b3c1edcfcb90..846d6cc5a1f5 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -13,7 +13,9 @@ let
     warn
     ;
   inherit (lib)
+    fromJSON
     isString
+    readFile
     ;
 in
 {
@@ -788,7 +790,7 @@ in
     importJSON :: Path -> Any
     ```
   */
-  importJSON = path: builtins.fromJSON (builtins.readFile path);
+  importJSON = path: fromJSON (readFile path);
 
   /**
     Reads a TOML file.
@@ -835,7 +837,7 @@ in
     importTOML :: Path -> Any
     ```
   */
-  importTOML = path: fromTOML (builtins.readFile path);
+  importTOML = path: fromTOML (readFile path);
 
   /**
     `warn` *`message`* *`value`*

From f23b117e50f3742b1b29d46d27898d4c2d8e0d31 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 14:50:25 -0400
Subject: [PATCH 15/28] lib.showWarnings: inherit lib functions, beta reduce
 for free

---
 lib/trivial.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 846d6cc5a1f5..1fa1974910c8 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -13,6 +13,7 @@ let
     warn
     ;
   inherit (lib)
+    foldr
     fromJSON
     isString
     readFile
@@ -1047,7 +1048,7 @@ in
 
   info = msg: builtins.trace "INFO: ${msg}";
 
-  showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings;
+  showWarnings = warnings: res: foldr warn res warnings;
 
   ## Function annotations
 

From 57d93f0b835c483607791684ad3d813834107a46 Mon Sep 17 00:00:00 2001
From: oliwia <24637207+kkanden@users.noreply.github.com>
Date: Thu, 21 May 2026 22:00:16 +0200
Subject: [PATCH 16/28] nixos/hyprland: link lua stubs

---
 nixos/modules/programs/wayland/hyprland.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix
index 8e6e7ea3f2f4..c3fba1db7548 100644
--- a/nixos/modules/programs/wayland/hyprland.nix
+++ b/nixos/modules/programs/wayland/hyprland.nix
@@ -81,7 +81,12 @@ in
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       {
-        environment.systemPackages = [ cfg.package ];
+        environment = {
+          systemPackages = [ cfg.package ];
+
+          # Allows lua stub file to be accessed from /run/current-system/sw/share/hypr
+          pathsToLink = [ "/share/hypr" ];
+        };
 
         # Hyprland needs permissions to give itself SCHED_RR on startup:
         # https://github.com/hyprwm/Hyprland/blob/main/src/init/initHelpers.cpp

From a5209d05eeaa64e08c1de3113715164c9c90d559 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 21:46:13 +0000
Subject: [PATCH 17/28] python3Packages.pyvista: 0.48.2 -> 0.48.4

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

diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
index 361e70c452f2..7f8617da10e1 100644
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.48.2";
+  version = "0.48.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
     tag = "v${version}";
-    hash = "sha256-tXTDZ1htOGTrdiqbCyMiCQz44lHN5ruqW6bWkc3G2CI=";
+    hash = "sha256-VF84EMS/FnLl0y1LpWaYosyG0qEWI/QghZQq32ktlLg=";
   };
 
   build-system = [ setuptools ];

From 1cf0065f1804b9a0a2a0b5dbc79bd5945b360973 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 21 May 2026 23:59:29 +0200
Subject: [PATCH 18/28] dmensamenu: migrate to pyproject

---
 pkgs/by-name/dm/dmensamenu/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/dm/dmensamenu/package.nix b/pkgs/by-name/dm/dmensamenu/package.nix
index 5c6d7da2451c..f83272c2523d 100644
--- a/pkgs/by-name/dm/dmensamenu/package.nix
+++ b/pkgs/by-name/dm/dmensamenu/package.nix
@@ -9,7 +9,7 @@
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "dmensamenu";
   version = "1.2.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dotlambda";
@@ -24,6 +24,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
     })
   ];
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies = with python3Packages; [
     requests
   ];

From 02a6844d57be1b1aea87e3d64a009a3071774565 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 22:42:02 +0000
Subject: [PATCH 19/28] json-sort: 1.1.0 -> 1.1.5

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

diff --git a/pkgs/by-name/js/json-sort/package.nix b/pkgs/by-name/js/json-sort/package.nix
index 402d8d8a363c..a560337b0be4 100644
--- a/pkgs/by-name/js/json-sort/package.nix
+++ b/pkgs/by-name/js/json-sort/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "json-sort";
-  version = "1.1.0";
+  version = "1.1.5";
 
   __structuredAttrs = true;
 
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "drupol";
     repo = "json-sort";
     tag = finalAttrs.version;
-    hash = "sha256-yojMXJiP87l5B7D74V6z9FNvSYebtn71GnB0d+Q7/UI=";
+    hash = "sha256-Xs1dMtPUmunkExQQ6IRmfFNz/3hVbARdtAL6K2Ur0ZQ=";
   };
 
-  cargoHash = "sha256-LpZIVWWb8HI1HM3m8Vhfk27bWFpU37GYssmsfEJQAVg=";
+  cargoHash = "sha256-RrNgmQ5v5zCKz/XaaLub16URmurQxfYTeNxy6UswFYY=";
 
   dontUseCargoParallelTests = true;
 

From 436577778a7e429aa7af4f6809fa65867616bf34 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Fri, 22 May 2026 01:04:22 +0200
Subject: [PATCH 20/28] evince: 48.1 -> 48.4

Security update for CVE-2026-46529
See https://gitlab.gnome.org/GNOME/evince/-/work_items/2153
---
 pkgs/by-name/ev/evince/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix
index 3b3bfc32294f..889ec7107238 100644
--- a/pkgs/by-name/ev/evince/package.nix
+++ b/pkgs/by-name/ev/evince/package.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evince";
-  version = "48.1";
+  version = "48.4";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fYuab6OgXT9bkEiFkCdojHOniP9ukjvDlFEmiElD+hA=";
+    hash = "sha256-8pbFxmKIZjXUzVl+isCvzeeYK+RIZTPCt/CVsmi+hmg=";
   };
 
   depsBuildBuild = [

From ecf4b2b14b0d83b28e330a6721c1b2e6464cf0dd Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Mon, 20 Apr 2026 22:27:44 +0100
Subject: [PATCH 21/28] niimblue: init at 0-unstable-2026-05-04

---
 pkgs/by-name/ni/niimblue/package.nix | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/ni/niimblue/package.nix

diff --git a/pkgs/by-name/ni/niimblue/package.nix b/pkgs/by-name/ni/niimblue/package.nix
new file mode 100644
index 000000000000..1f23d220868e
--- /dev/null
+++ b/pkgs/by-name/ni/niimblue/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  npm-lockfile-fix,
+}:
+
+buildNpmPackage {
+  pname = "niimblue";
+  version = "0-unstable-2026-05-04";
+
+  src = fetchFromGitHub {
+    owner = "MultiMote";
+    repo = "niimblue";
+    rev = "89aed31a5162b282d2100dd2c2e3d90584153e41";
+    hash = "sha256-3Vrph+AVBLDSlP29JfYrPBjmpBCiM+EtApthelEBggc=";
+    postFetch = ''
+      ${lib.getExe npm-lockfile-fix} $out/package-lock.json
+    '';
+  };
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -r dist/* $out
+    runHook postInstall
+  '';
+
+  __structuredAttrs = true;
+
+  npmDepsHash = "sha256-+jVD0lfOrQ3hQE15yfcB0dVnPZBFo/naLXhFRiPFUGs=`";
+
+  meta = {
+    description = "Design and print labels with NIIMBOT printers directly from your PC or mobile web browser";
+    homepage = "https://github.com/MultiMote/niimblue";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
+    mainProgram = "niimblue";
+    platforms = lib.platforms.all;
+  };
+}

From bf0ecacf6c66a3dee4f32bef19bbd51a006a812d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 23:43:59 +0000
Subject: [PATCH 22/28] pgdog: 0.1.40 -> 0.1.41

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

diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix
index 9bd130f47c38..7aa3f87e9f7d 100644
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "pgdog";
-  version = "0.1.40";
+  version = "0.1.41";
 
   src = fetchFromGitHub {
     owner = "pgdogdev";
     repo = "pgdog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zs45vhcoiNwR56QqP7I8mhbTohijY5xc0VGLq4ehYdo=";
+    hash = "sha256-SY97Mpzd+tuhNnRdUNk7/J8aZZRSmdvbkRj3OjyMqms=";
   };
 
-  cargoHash = "sha256-4ctREg7x9Oi8KaIqGj+aZZLqM13wsZM0KrnygPUR8UI=";
+  cargoHash = "sha256-8edaOyZ3i7aSpg+6GOCSoQduFMlsuNnjAqa70RQu2Xw=";
 
   # Hardcoded paths for C compiler and linker
   postPatch = ''

From 5eba89ff4364dd0632210756da112f57578764e3 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 May 2026 11:27:39 +1000
Subject: [PATCH 23/28] nixos/nspawn-container: add "usr/bin"

same change was done for nixos/nixos-containers in https://github.com/NixOS/nixpkgs/commit/b9f2fa1c7dc9ae378c5bff43f45fc5c3fd149ae9
---
 .../nspawn-container/run-nspawn/src/run_nspawn/__init__.py       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py b/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py
index 4a28b18d8216..f733ad1845c4 100644
--- a/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py
+++ b/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py
@@ -169,6 +169,7 @@ def run(
 
     root_dir.mkdir(parents=True, exist_ok=True)
     root_dir.chmod(0o755)
+    (root_dir / "usr/bin").mkdir(parents=True, exist_ok=True)
 
     with (
         mk_netns(f"nixos-nspawn-{container_name}") as netns,

From 996d8fc8cb47a1e8915f5f22121b16abb16f43d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 01:39:26 +0000
Subject: [PATCH 24/28] libphonenumber: 9.0.30 -> 9.0.31

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

diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index 39ce7cd3338f..7b134e60b0ac 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "9.0.30";
+  version = "9.0.31";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+VGANm6L2TZkOW97PDYCH+rELyppyJ/GIiabnZXWNTc=";
+    hash = "sha256-5LJVlcii0uolu4p+z4R9uvYnzLBIdJEQp9AUUnNB5mE=";
   };
 
   patches = [

From ea2bdee030419ca675c4ecd55576484e5187a821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 01:47:16 +0000
Subject: [PATCH 25/28] code-cursor: 3.4.16 -> 3.5.17

---
 pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 6a8f27340cee..5ce856190a1c 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "3.4.16",
+  "version": "3.5.17",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/linux/x64/Cursor-3.4.16-x86_64.AppImage",
-      "hash": "sha256-KSicp27+WSr1qIRUFflRHbxc/eRzcOnWEVQkLYr0ekU="
+      "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/linux/x64/Cursor-3.5.17-x86_64.AppImage",
+      "hash": "sha256-hOo7SIITt8GnzChwPCmAXIyOJBhiSV+fQ3ovLFAT49c="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/linux/arm64/Cursor-3.4.16-aarch64.AppImage",
-      "hash": "sha256-EHRffgia7L7l/WXtODIaeFUpfS5WD9mvwR7muPcycgY="
+      "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/linux/arm64/Cursor-3.5.17-aarch64.AppImage",
+      "hash": "sha256-sutJMIhZw45glApbzOrUXleIGkrYeC8lGarc7pckuTg="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-g2jrQNiYI2ekIOsaTeWfbvn2gLVDeBzRo4/jvNHNlSY="
+      "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-0sJSQJyhu2RZhHaU/nr7/whKt31vFq6Tmxr9NOWlJ2g="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-PbU8WqoMyG2/9D7/iWWeqAxEgycH1kGUj7pfH5b4GqI="
+      "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-7POR+9pveTdR9WYx0/OdgOhF8yTkiZwhzg0jKEfWrfs="
     }
   }
 }

From 2a259335fc0db5f3b7c7bd0078438c8b807d43de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 02:12:13 +0000
Subject: [PATCH 26/28] python3Packages.pyfireservicerota: 0.0.47 -> 0.0.48

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

diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix
index 98dbc50387df..1cc7afb19d5f 100644
--- a/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/pkgs/development/python-modules/pyfireservicerota/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyfireservicerota";
-  version = "0.0.47";
+  version = "0.0.48";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-fireservicerota";
     tag = version;
-    hash = "sha256-2pCv/9VwGUDS5wFdJCxOevl7vWg+iXInI/xY3jPp7BM=";
+    hash = "sha256-wHcIzhSofp8dwlPy35gOJwIM0wtWPqUx7/kg6NjfNhc=";
   };
 
   build-system = [ pdm-backend ];

From 059edbdafe650eb34c2f504f8b7d9f831f5b2583 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 02:55:05 +0000
Subject: [PATCH 27/28] codex: 0.131.0 -> 0.133.0

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

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 8453584321c7..1211101245e7 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -25,18 +25,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.131.0";
+  version = "0.133.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-pWQxDJZO+xbY8aax9QRQRtx/BJw+4CZRL65W3Od4Ep8=";
+    hash = "sha256-RTxhhZjZ/64N60pmbNVzLwcSBomn67pPDpOjkL6RPUw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-CaCYBg8U4pxi3EFBH81k1dWtGY1AL/cZmP9ZtvjDxzw=";
+  cargoHash = "sha256-J4wvPn4lSTSsJrTG56vkhJe2F2b+fUvJLEd+qKQ9LUg=";
 
   # Match upstream's release build for the codex binary only.
   cargoBuildFlags = [

From 7e557e7ad14c72ba241705a52bd9507180b9a7ab Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 22 May 2026 00:33:15 -0400
Subject: [PATCH 28/28] fetchFromGitHub: only override fetchzip once

Funny bug - we were running a .override on fetchzip on every single call
to fetchFromGitHub.
---
 pkgs/build-support/fetchgithub/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 288a10b95a4b..e12052e3d15d 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -3,7 +3,7 @@
   repoRevToNameMaybe,
   fetchgit,
   fetchzip,
-}:
+}@args:
 let
   # Here defines fetchFromGitHub arguments that determines useFetchGit,
   # The attribute value is their default values.
@@ -37,6 +37,10 @@ let
   adjustFunctionArgs = f: lib.setFunctionArgs f (faUseFetchGit // lib.functionArgs f);
 
   decorate = f: lib.makeOverridable (adjustFunctionArgs f);
+
+  # fetchzip may not be overridable when using external tools, for example nix-prefetch
+  fetchzip =
+    if args.fetchzip ? override then args.fetchzip.override { withUnzip = false; } else args.fetchzip;
 in
 decorate (
   {
@@ -105,14 +109,7 @@ decorate (
     varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_";
     # We prefer fetchzip in cases we don't need submodules as the hash
     # is more stable in that case.
-    fetcher =
-      if useFetchGit then
-        fetchgit
-      # fetchzip may not be overridable when using external tools, for example nix-prefetch
-      else if fetchzip ? override then
-        fetchzip.override { withUnzip = false; }
-      else
-        fetchzip;
+    fetcher = if useFetchGit then fetchgit else fetchzip;
     privateAttrs = lib.optionalAttrs private {
       netrcPhase =
         # When using private repos: