From 31555b59a090861d8cd173e81e375a5053458ee9 Mon Sep 17 00:00:00 2001
From: Adam Simpson <adam@adamsimpson.net>
Date: Thu, 16 Apr 2026 11:48:31 -0400
Subject: [PATCH 01/43] maintainers: add asimpson

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c841ad38cbc9..9b16da484816 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2430,6 +2430,12 @@
     name = "Mariia Holovata";
     keys = [ { fingerprint = "409D 201E 9450 8732 A49E  D0FC 6BDA F874 0068 08DF"; } ];
   };
+  asimpson = {
+    email = "adam@adamsimpson.net";
+    github = "asimpson";
+    githubId = 1048831;
+    name = "Adam Simpson";
+  };
   asininemonkey = {
     email = "nixpkgs@asininemonkey.com";
     github = "asininemonkey";

From 0eced05aae1e4493a97609f3c3f7613ecf55f91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20St=C3=A4ding?= <alex@staeding.com>
Date: Mon, 27 Apr 2026 22:19:37 +0200
Subject: [PATCH 02/43] lean4: Pin cadical version to 2.1.3 to fix bv_decide

---
 pkgs/by-name/le/lean4/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix
index 6ed596f47a88..dbf5e3b0d7d7 100644
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -6,6 +6,7 @@
   git,
   gmp,
   cadical,
+  makeWrapper,
   pkg-config,
   libuv,
   enableMimalloc ? true,
@@ -13,6 +14,9 @@
   testers,
 }:
 
+let
+  cadical' = cadical.override { version = "2.1.3"; };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lean4";
   version = "4.29.1";
@@ -61,14 +65,20 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    makeWrapper
   ];
 
   buildInputs = [
     gmp
     libuv
-    cadical
+    cadical'
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/lean \
+      --prefix PATH : ${cadical'}/bin
+  '';
+
   nativeCheckInputs = [
     git
     perl

From a0761bdacbee52b5935e7d075635ebd7e1e38815 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Wed, 6 May 2026 15:37:38 -0700
Subject: [PATCH 03/43] hdf4: move libhdf4.settings to dev output

This avoids a reference to gcc-wrapper in the lib closure, significantly
reducing closure size for downstream dependers.

As far as I can tell, this file is only used by `h4cc -showconfig`,
which was already not working as it has been checking the bin output.
It's possible to fix that, but I'd prefer to just focus on the closure
size reduction here since the h4cc path is a preexisting issue.

Closure size of hdf4.out goes from 374 MB -> 40 MB
---
 pkgs/by-name/hd/hdf4/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index 603bd5dd7122..045a5b5092db 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
+    moveToOutput lib/libhdf4.settings "$dev"
     moveToOutput bin "$bin"
   '';
 

From aa286def5dafebe4b4f1518bb957883352b57d7d Mon Sep 17 00:00:00 2001
From: LorenzBischof <1837725+LorenzBischof@users.noreply.github.com>
Date: Wed, 18 Mar 2026 11:45:42 +0100
Subject: [PATCH 04/43] xprin: init at 0.2.0

---
 pkgs/by-name/xp/xprin/package.nix | 43 +++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/xp/xprin/package.nix

diff --git a/pkgs/by-name/xp/xprin/package.nix b/pkgs/by-name/xp/xprin/package.nix
new file mode 100644
index 000000000000..4935d1e2b3b9
--- /dev/null
+++ b/pkgs/by-name/xp/xprin/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "xprin";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "crossplane-contrib";
+    repo = "xprin";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5qRPzrMAW7gw5fv5rgR9hOrZreeWXj/UFyMQAzpCA0s=";
+  };
+
+  vendorHash = "sha256-mFICxQ0WHPFxHJ5wmElqcRMOvExKWmX2XXCRQCWbXoI=";
+
+  subPackages = [
+    "cmd/xprin"
+    "cmd/xprin-helpers"
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/crossplane-contrib/xprin/internal/version.version=v${finalAttrs.version}"
+  ];
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Crossplane testing framework for render and schema validation";
+    homepage = "https://github.com/crossplane-contrib/xprin";
+    changelog = "https://github.com/crossplane-contrib/xprin/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      LorenzBischof
+    ];
+    mainProgram = "xprin";
+  };
+})

From f1166e64b68af1f20bfeda13c871db80642178ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 May 2026 16:51:12 +0000
Subject: [PATCH 05/43] fluent-bit: 5.0.3 -> 5.0.5

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

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 943a1a2e19a4..9d4dceb10122 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "5.0.3";
+  version = "5.0.5";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EMzTOOhtOs2/TzfKVt0aBc2rKIgKLV0+S9R1uEFSjVo=";
+    hash = "sha256-IPTM0jtlu3DZJRXCD0IE13ASGbJsDygPEuDXsiQP7Ts=";
   };
 
   # The source build documentation covers some dependencies and CMake options.

From 67dd5b2465dd1a50094a4ec05081e530ac12c59f Mon Sep 17 00:00:00 2001
From: Test User <test@example.com>
Date: Sun, 10 May 2026 18:19:08 -0400
Subject: [PATCH 06/43] worktrunk: 0.37.0 -> 0.49.0

---
 pkgs/by-name/wo/worktrunk/package.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/wo/worktrunk/package.nix b/pkgs/by-name/wo/worktrunk/package.nix
index 946849ed2a5a..525af95f1362 100644
--- a/pkgs/by-name/wo/worktrunk/package.nix
+++ b/pkgs/by-name/wo/worktrunk/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "worktrunk";
-  version = "0.37.0";
+  version = "0.49.0";
 
   src = fetchFromGitHub {
     owner = "max-sixty";
     repo = "worktrunk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z+Wb0xgu15cSSYB3hPhp6qVwUUXmLJcP788LiQLowqs=";
+    hash = "sha256-booga2TXGXcSgFE4AoA9offhfaiT3dSLH3pSaKNCuJA=";
   };
 
-  cargoHash = "sha256-nBbLlM4Y5IOSeGrgiu7Bm9PcTSarXiqFbC2RnTrhWeE=";
+  cargoHash = "sha256-lccWTEdYr4RHbOZomZIN01h0g+ug5kL69FOurrJ/o8E=";
 
   cargoBuildFlags = [ "--package=worktrunk" ];
 
@@ -45,10 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeCheckInputs = [ gitMinimal ];
 
   checkFlags = [
-    # Expects to run inside a git repository
-    "--skip=git::recover::tests::test_current_or_recover_returns_repo_when_cwd_exists"
-    # Insta snapshot mismatch across git versions
-    "--skip=git::recover::tests::test_hint_for_repo_suggests_switch"
     # Expects `which` on PATH
     "--skip=output::commit_generation::tests::test_command_exists_known_command"
     # Integration tests use insta snapshots with environment-specific paths

From a8d0048fa796deb0057f11506a4ffb04d7bd742c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 07:03:49 +0000
Subject: [PATCH 07/43] haproxy: 3.3.8 -> 3.3.9

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

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 005b3268fbba..fea01ad0d0b5 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.3.8";
+  version = "3.3.9";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ibH+c9VNWZD3SZfag39f0NoWJ6G6pism9dNYpvPEgpU=";
+    hash = "sha256-8x6OaNsHfMCVb07T/3oexjeqXjSMbRxc0hY+ev6xueY=";
   };
 
   buildInputs = [

From de80858ddff0e85dbbc7b375d4e45ea320168d3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 19:45:44 +0000
Subject: [PATCH 08/43] python3Packages.geodatasets: 2026.1.0 -> 2026.5.0

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

diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix
index 6fb9f9b65af8..acb1ac1c4716 100644
--- a/pkgs/development/python-modules/geodatasets/default.nix
+++ b/pkgs/development/python-modules/geodatasets/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "geodatasets";
-  version = "2026.1.0";
+  version = "2026.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geodatasets";
     tag = version;
-    hash = "sha256-fLhlXuqcArMb0PtFCKKqL78Z5A/j33Fzov8fg7PGvaQ=";
+    hash = "sha256-6RaWZOp5V5gc/vY3tZsXDNnDmUYnhmZFpto0pa6uMNg=";
   };
 
   build-system = [ setuptools-scm ];

From 54e84bca591bc75c84566aeea6c9c30043e41e04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 May 2026 17:12:01 +0000
Subject: [PATCH 09/43] cato-client: 5.5.0.2620 -> 5.7.0.5525

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

diff --git a/pkgs/by-name/ca/cato-client/package.nix b/pkgs/by-name/ca/cato-client/package.nix
index e8a3398bb8c6..7e5cf671d3f5 100644
--- a/pkgs/by-name/ca/cato-client/package.nix
+++ b/pkgs/by-name/ca/cato-client/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "cato-client";
-  version = "5.5.0.2620";
+  version = "5.7.0.5525";
 
   src = fetchurl {
     url = "https://clients.catonetworks.com/linux/${version}/cato-client-install.deb";
-    sha256 = "sha256-V1BhgLOHP/pGlwvjVFdNslKupjHBVSTDVIRtZ6amwbk=";
+    sha256 = "sha256-UDIDddVk7UXiOoZGTz1757x66DmOSOGqMielSQ5W5z0=";
   };
 
   passthru.updateScript = writeScript "update-cato-client" ''

From 637d74ac22550632c77c0781632589c9c6713b36 Mon Sep 17 00:00:00 2001
From: Test User <test@example.com>
Date: Thu, 14 May 2026 17:52:00 -0400
Subject: [PATCH 10/43] worktrunk: 0.37.0 -> 0.50.0

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

diff --git a/pkgs/by-name/wo/worktrunk/package.nix b/pkgs/by-name/wo/worktrunk/package.nix
index 525af95f1362..77e6794473e5 100644
--- a/pkgs/by-name/wo/worktrunk/package.nix
+++ b/pkgs/by-name/wo/worktrunk/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "worktrunk";
-  version = "0.49.0";
+  version = "0.50.0";
 
   src = fetchFromGitHub {
     owner = "max-sixty";
     repo = "worktrunk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-booga2TXGXcSgFE4AoA9offhfaiT3dSLH3pSaKNCuJA=";
+    hash = "sha256-ZCcrTXVVbB61r2tMTFwN3x5+C1i6T/wn28dviGr5rtM=";
   };
 
-  cargoHash = "sha256-lccWTEdYr4RHbOZomZIN01h0g+ug5kL69FOurrJ/o8E=";
+  cargoHash = "sha256-GTWoOaDjXS1Lu2JuWw1A/RYbPreivLYuhHhoWj4bFHM=";
 
   cargoBuildFlags = [ "--package=worktrunk" ];
 

From 041d55efa091517f80ff241f059f01b9ae92c539 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 20:57:20 +0000
Subject: [PATCH 11/43] nwg-look: 1.0.6 -> 1.1.1

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

diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix
index 53c1ab2d7599..70a2a01ead6e 100644
--- a/pkgs/by-name/nw/nwg-look/package.nix
+++ b/pkgs/by-name/nw/nwg-look/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nwg-look";
-  version = "1.0.6";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-look";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cNVUgtbdzEuttDO7DZyipDugACr/fIU8RKmh5trykPw=";
+    hash = "sha256-YAFZZIUd/nvDwa3dXBoBL+dmPOVgJKv/taOjLMP4owI=";
   };
 
-  vendorHash = "sha256-8ooWJTOC4fmuu+/Dy7JOaGSO5YlsMfKcf2lyv2ojJIw=";
+  vendorHash = "sha256-9jyR7RLpqdDvwgqlrvToKQlClRbk9ELxapbgb/OUB4I=";
 
   ldflags = [
     "-s"

From e03c858e5097bb8ef63d79a7e56864c73d9cb54e Mon Sep 17 00:00:00 2001
From: Adam Simpson <adam@adamsimpson.net>
Date: Thu, 16 Apr 2026 11:47:37 -0400
Subject: [PATCH 12/43] gcx: init at 0.2.7

A CLI for managing Grafana Cloud resources.
---
 pkgs/by-name/gc/gcx/package.nix | 55 +++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/gc/gcx/package.nix

diff --git a/pkgs/by-name/gc/gcx/package.nix b/pkgs/by-name/gc/gcx/package.nix
new file mode 100644
index 000000000000..09203dc567be
--- /dev/null
+++ b/pkgs/by-name/gc/gcx/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  stdenv,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "gcx";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "grafana";
+    repo = "gcx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-M4qZghOhEq8WgGeJkTB1Ff+RBs2KD8ZLr/zVpX0CB28=";
+  };
+
+  vendorHash = "sha256-fgPyTVN7acPiRls038sINZwiEBs5dZXGXtB+c6CUUVw=";
+
+  subPackages = [ "cmd/gcx" ];
+
+  ldflags = [
+    "-w"
+    "-X=main.version=${finalAttrs.version}"
+    "-X=main.commit=${finalAttrs.src.rev}"
+    "-X=main.date=1970-01-01T00:00:00Z"
+  ];
+
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd gcx \
+      --bash <($out/bin/gcx completion bash) \
+      --fish <($out/bin/gcx completion fish) \
+      --zsh <($out/bin/gcx completion zsh)
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Grafana Cloud CLI";
+    homepage = "https://github.com/grafana/gcx";
+    changelog = "https://github.com/grafana/gcx/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    mainProgram = "gcx";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ asimpson ];
+  };
+})

From c326bd16693cbe90c24ad28d858ce807c3dd97f5 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 15 May 2026 23:25:26 -0300
Subject: [PATCH 13/43] python3Packages.oelint-parser: 8.9.1 -> 8.11.2

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

diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index d2a2800cc0ea..e382d817ff66 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-parser";
-  version = "8.9.1";
+  version = "8.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = finalAttrs.version;
-    hash = "sha256-k/8NESePMe70PbqZNaMJu3aPSDMfT1JkixWYBvnmR9I=";
+    hash = "sha256-wzC9tXhPuGtyD2pQ2hO4sfERNOH8+sCNvXUcrqqlEAM=";
   };
 
   pythonRelaxDeps = [ "regex" ];

From 343fcf565fd454980113d27a1985e9cfb4959509 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 15 May 2026 23:25:26 -0300
Subject: [PATCH 14/43] oelint-adv: 8.2.2 -> 9.7.1

Upstream replaced setup.cfg with pyproject.toml.

Changelog: https://github.com/priv-kweihmann/oelint-adv/releases/tag/9.7.1
---
 pkgs/by-name/oe/oelint-adv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix
index 69c25f46c544..81f95ba03bcc 100644
--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -7,18 +7,18 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "oelint-adv";
-  version = "8.2.2";
+  version = "9.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-adv";
     tag = finalAttrs.version;
-    hash = "sha256-W8W+hNgRVxBVkEDyKtFVx2mCyvbMA4CPjR1NrehClJs=";
+    hash = "sha256-44ebctMX7QfF459RvjJM4oz+ByBF3cz4e+02GnY9h1s=";
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg \
+    substituteInPlace pyproject.toml \
       --replace-fail "--random-order-bucket=global" "" \
       --replace-fail "--random-order"               "" \
       --replace-fail "--force-sugar"                "" \

From b1a9acee94dfd70ca9f792fe108030e836e8e7f3 Mon Sep 17 00:00:00 2001
From: Christopher Crouse <mail@amz-x.com>
Date: Sat, 16 May 2026 12:58:49 +0200
Subject: [PATCH 15/43] pantheon.elementary-code: 8.2.0 -> 8.3.0

---
 pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 1c1da7c1e3b7..deaeaecdc258 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "8.2.0";
+  version = "8.3.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
     tag = version;
-    hash = "sha256-nLGjW7aVf+fkrYgqhj1fVhMU3aNpVUlPhBsSOAXGqWs=";
+    hash = "sha256-5ijVYfpr2SU0loPQ9L2vvxOVrNA67IhEMqIqoaf36iY=";
   };
 
   strictDeps = true;

From 6a619b65537a7ca86c634995899607c17a56b13e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 12:27:26 +0000
Subject: [PATCH 16/43] reaper: 7.71 -> 7.73

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

diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix
index a47fd3a92766..8a2fa53312c4 100644
--- a/pkgs/by-name/re/reaper/package.nix
+++ b/pkgs/by-name/re/reaper/package.nix
@@ -40,17 +40,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "reaper";
-  version = "7.71";
+  version = "7.73";
 
   src = fetchurl {
     url = url_for_platform finalAttrs.version stdenv.hostPlatform.qemuArch;
     hash =
       if stdenv.hostPlatform.isDarwin then
-        "sha256-78TB6NNr9KemIra8w/87suP9RrlWhrCAW6d5sTrEL4E="
+        "sha256-iEslm5gmkkCwCfwilgXgRrwpj6D6lNypDZnNIv1ZPKw="
       else
         {
-          x86_64-linux = "sha256-OozJHud6PMOkFU2wMmdOYS0PKfyaAV+HHhROJfSr0GM=";
-          aarch64-linux = "sha256-59Divnr+4NVml9sYlFSlL7FLk1uHRVirAThODLbeAjk=";
+          x86_64-linux = "sha256-tXyflaxx00SCqjo7xZFOigMwAc0i/i3Jakwr6BuasbQ=";
+          aarch64-linux = "sha256-+fbpuu0iAqEnchKwkct/FmooE0cpBUkSUyI3HCT+Nwg=";
         }
         .${stdenv.hostPlatform.system};
   };

From ab5899742fa5da3340fa26c0758f2a2d6cee8f3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 13:32:52 +0000
Subject: [PATCH 17/43] nwipe: 0.40 -> 0.41

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

diff --git a/pkgs/by-name/nw/nwipe/package.nix b/pkgs/by-name/nw/nwipe/package.nix
index 919568fefdb6..f1c3d43628c6 100644
--- a/pkgs/by-name/nw/nwipe/package.nix
+++ b/pkgs/by-name/nw/nwipe/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nwipe";
-  version = "0.40";
+  version = "0.41";
 
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Gx7i8jxnQm+5G65JFdZ7R54ulSrBq12MIrfFGJb2tW4=";
+    sha256 = "sha256-qVO2K9Ub0AxGK89Zxhg8g7VUdWBlNWMgmdUu1Tb9nRQ=";
   };
 
   nativeBuildInputs = [

From 429e2d88fb5f6594439304f57e0f1fdf41fc520a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 16 May 2026 21:58:32 +0700
Subject: [PATCH 18/43] python3Packages.cloudevents: skip pydantic v1 tests on
 python 3.14

---
 .../python-modules/cloudevents/default.nix            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cloudevents/default.nix b/pkgs/development/python-modules/cloudevents/default.nix
index 41a5945abea0..8e94b1846537 100644
--- a/pkgs/development/python-modules/cloudevents/default.nix
+++ b/pkgs/development/python-modules/cloudevents/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
   setuptools,
   deprecation,
   flask,
@@ -39,7 +40,15 @@ buildPythonPackage (finalAttrs: {
     sanic-testing
   ];
 
-  disabledTestPaths = [ "samples/http-image-cloudevents/image_sample_test.py" ];
+  disabledTestPaths = [
+    "samples/http-image-cloudevents/image_sample_test.py"
+  ]
+  # pydantic v1 doesn't work on python 3.14
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    "cloudevents/tests/test_pydantic_cloudevent.py"
+    "cloudevents/tests/test_pydantic_conversions.py"
+    "cloudevents/tests/test_pydantic_events.py"
+  ];
 
   __darwinAllowLocalNetworking = true;
 

From cfb8a6d6690f8cd3eeb7b7b62fba4972cad74d3c Mon Sep 17 00:00:00 2001
From: Linus Vettiger <linus4123@gmail.com>
Date: Sat, 16 May 2026 17:53:12 +0200
Subject: [PATCH 19/43] degate: Fix darwin build

---
 pkgs/applications/science/electronics/degate/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/applications/science/electronics/degate/default.nix
index 1d5c5d5b32c0..7f9e56ee9f68 100644
--- a/pkgs/applications/science/electronics/degate/default.nix
+++ b/pkgs/applications/science/electronics/degate/default.nix
@@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
       includes = [ "tests/catch2/catch.hpp" ];
       hash = "sha256-SbSA813QI8RRVy1lvAOGMGAC2KUQKjwYR2imqX40pvU=";
     })
+
+    (fetchpatch {
+      name = "memorymap-macos.patch";
+      url = "https://github.com/DegateCommunity/Degate/commit/04685b088f485b3b73c55b7bfb989d2f0c88e4ca.patch";
+      includes = [ "src/Core/Utils/MemoryMap.h" ];
+      hash = "sha256-5UfVLc4OoMBaDa0qwOCRpd+dOtdDh4kxHNVfTA50lPg=";
+    })
   ];
 
   postPatch = ''

From 9c17cdaa3cbe549d638477c148cda00b6463ce58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 19:14:10 +0000
Subject: [PATCH 20/43] slidev-cli: 52.15.1 -> 52.15.2

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

diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix
index a73a7378e8a5..ee8e8efcce62 100644
--- a/pkgs/by-name/sl/slidev-cli/package.nix
+++ b/pkgs/by-name/sl/slidev-cli/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "slidev-cli";
-  version = "52.15.1";
+  version = "52.15.2";
 
   src = fetchFromGitHub {
     owner = "slidevjs";
     repo = "slidev";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2SksaDC/OC53ZGyraS/WzySSbPEnlzdURGInZ2neQwU=";
+    hash = "sha256-h9gVfGMLTm8NDSAR/OKl5XJRBduAPHQ9mp+jtNYtxFI=";
   };
 
   pnpmWorkspaces = [ "@slidev/cli..." ];

From dc723ea7d4302c016849efa2b1267fa809c88946 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 19:33:34 +0000
Subject: [PATCH 21/43] officecli: 1.0.92 -> 1.0.93

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

diff --git a/pkgs/by-name/of/officecli/package.nix b/pkgs/by-name/of/officecli/package.nix
index d81ddaeeafd3..856e91b45d39 100644
--- a/pkgs/by-name/of/officecli/package.nix
+++ b/pkgs/by-name/of/officecli/package.nix
@@ -8,7 +8,7 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "officecli";
-  version = "1.0.92";
+  version = "1.0.93";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: {
     owner = "iOfficeAI";
     repo = "OfficeCLI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g4eCgVqlW3N+pwATIsZbmjWNQ4IScUv9e40eUH9rfQw=";
+    hash = "sha256-FCBq3Ua3mSvkIqmtwSi+j5Z76Pe/uGDUVVbDOMC/DaA=";
   };
 
   projectFile = "src/officecli/officecli.csproj";

From 17d6f0757eb6211f17ec5b442dde43443310d4a8 Mon Sep 17 00:00:00 2001
From: Alexis Praga <alexis@praga.dev>
Date: Sat, 16 May 2026 17:16:19 +0200
Subject: [PATCH 22/43] hap-py: fix python3 compatibility

pipes is no longer supported in python3 and require
a change of imports.
---
 pkgs/by-name/ha/hap-py/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ha/hap-py/package.nix b/pkgs/by-name/ha/hap-py/package.nix
index cba65d18d0ef..01bbb72a7572 100644
--- a/pkgs/by-name/ha/hap-py/package.nix
+++ b/pkgs/by-name/ha/hap-py/package.nix
@@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Insert missing include for uint64_t
     sed -i '/#include <vector>/a #include <cstdint>' src/c++/include/helpers/Roc.hh
+
+    # pipes module was removed in Python 3.13; shlex.quote is the replacement
+    find src/python -name "*.py" -exec sed -i \
+      -e 's/import pipes/import shlex/' \
+      -e 's/pipes\.quote/shlex.quote/g' {} \;
   '';
 
   patches = [

From 3c816b70d8d2a8f5a945fb08e4ee51441d0671c2 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 15 May 2026 22:14:00 -0300
Subject: [PATCH 23/43] gsd: init at 3.0.0

---
 pkgs/by-name/gs/gsd/package.nix | 83 +++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 pkgs/by-name/gs/gsd/package.nix

diff --git a/pkgs/by-name/gs/gsd/package.nix b/pkgs/by-name/gs/gsd/package.nix
new file mode 100644
index 000000000000..507db81baf98
--- /dev/null
+++ b/pkgs/by-name/gs/gsd/package.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  nodejs_22,
+  makeWrapper,
+  fd,
+  ripgrep,
+  gh,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "gsd";
+  version = "3.0.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "gsd-build";
+    repo = "gsd-2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IXdsW7rUE6TIaIVqLSzVDwYZE+plvRwCXfepoMj/wQQ=";
+  };
+
+  npmDepsHash = "sha256-qOrMx2yBywxjavt7g5253mcWmYhTO6bbS6eecn04Kew=";
+
+  webNpmDeps = fetchNpmDeps {
+    name = "${finalAttrs.pname}-web-${finalAttrs.version}-npm-deps";
+    inherit (finalAttrs) src;
+    sourceRoot = "${finalAttrs.src.name}/web";
+    hash = "sha256-K6WndhLeST6jDgCetvUDeiJVkdPDzg6gz7pJjBqSi34=";
+  };
+
+  nodejs = nodejs_22;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+
+  # buildNpmPackage's hooks read these as plain env vars; under
+  # __structuredAttrs they are bash variables that need to be exported.
+  prePatch = ''
+    export npmDeps webNpmDeps
+  '';
+
+  postPatch = ''
+    # The npm "files" array omits "extensions/" so workspace symlinks under
+    # node_modules/@gsd-extensions/* end up dangling after `npm pack`. Include
+    # the extensions sources so they ship with the package.
+    substituteInPlace package.json \
+      --replace-fail '"packages",' '"packages",
+        "extensions",'
+  '';
+
+  preBuild = ''
+    pushd web
+    makeCacheWritable=1 npmDeps="$webNpmDeps" npmConfigHook
+    popd
+  '';
+
+  postFixup =
+    let
+      binPath = lib.makeBinPath [
+        fd
+        ripgrep
+        gh
+      ];
+    in
+    ''
+      for bin in gsd gsd-cli; do
+        wrapProgram $out/bin/$bin --prefix PATH : ${binPath}
+      done
+    '';
+
+  meta = {
+    description = "Meta-prompting and spec-driven development system for autonomous coding agents";
+    homepage = "https://github.com/gsd-build/gsd-2";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ otavio ];
+    mainProgram = "gsd";
+  };
+})

From 6b6c085479c3cd02fa6fc8a69c2d287b40449811 Mon Sep 17 00:00:00 2001
From: Alexis Praga <alexis@praga.dev>
Date: Sat, 16 May 2026 17:16:19 +0200
Subject: [PATCH 24/43] rtg-tools: fix runtime error

On a new testing machine, dirname is not available
in the PATH  during execution.
---
 pkgs/by-name/rt/rtg-tools/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/rt/rtg-tools/package.nix b/pkgs/by-name/rt/rtg-tools/package.nix
index 572a115a1734..226cdc1d4bd7 100644
--- a/pkgs/by-name/rt/rtg-tools/package.nix
+++ b/pkgs/by-name/rt/rtg-tools/package.nix
@@ -50,7 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
        --replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${lib.getExe jdk}"' \
       --replace-fail uname ${lib.getExe' coreutils "uname"} \
       --replace-fail awk ${lib.getExe gawk} \
-      --replace-fail "hostname -s" "${lib.getExe hostname} -s"
+      --replace-fail "hostname -s" "${lib.getExe hostname} -s" \
+      --replace-fail dirname ${lib.getExe' coreutils "dirname"} \
+      --replace-fail readlink ${lib.getExe' coreutils "readlink"}
 
     sed -i '/USER_JAVA_OPTS=$RTG_JAVA_OPTS/a mkdir -p $HOME/.config/rtg-tools'  installer/rtg
   '';

From c55915de21d50e7958d1152fcb8c4421fd23560f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 27 Apr 2026 12:32:13 +0200
Subject: [PATCH 25/43] flint: 3.4.0 -> 3.5.0

https://flintlib.org/doc/history.html
---
 pkgs/by-name/fl/flint/checkPhase.patch | 26 --------------------------
 pkgs/by-name/fl/flint/package.nix      | 11 ++---------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/by-name/fl/flint/checkPhase.patch

diff --git a/pkgs/by-name/fl/flint/checkPhase.patch b/pkgs/by-name/fl/flint/checkPhase.patch
deleted file mode 100644
index 19de1b1f1e20..000000000000
--- a/pkgs/by-name/fl/flint/checkPhase.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/flintlib/flint/pull/2411
-
-From 9957b17e6b08bd57790f7da1344b4d92eefc0b38 Mon Sep 17 00:00:00 2001
-From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
-Date: Sun, 21 Sep 2025 15:58:57 -0400
-Subject: [PATCH] Fix duplicate symbols linker error
-
-When I run `make check` I get linker errors without
-this patch
----
- src/double_interval.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/double_interval.h b/src/double_interval.h
-index a423257db2..5f685c283f 100644
---- a/src/double_interval.h
-+++ b/src/double_interval.h
-@@ -13,7 +13,7 @@
- #define DOUBLE_INTERVAL_H
- 
- #ifdef DOUBLE_INTERVAL_INLINES_C
--#define DOUBLE_INTERVAL_INLINE
-+#define DOUBLE_INTERVAL_INLINE static
- #else
- #define DOUBLE_INTERVAL_INLINE static inline
- #endif
diff --git a/pkgs/by-name/fl/flint/package.nix b/pkgs/by-name/fl/flint/package.nix
index d66da719317a..2f26e91bd5a4 100644
--- a/pkgs/by-name/fl/flint/package.nix
+++ b/pkgs/by-name/fl/flint/package.nix
@@ -25,20 +25,13 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flint";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
     url = "https://flintlib.org/download/flint-${finalAttrs.version}.tar.gz";
-    hash = "sha256-lJdnmATerZJuOv/rjUxYc50cdoTWDCwSgnVQ0o5FSjM=";
+    hash = "sha256-OYLzhfAGEKlE4BUusKKYk7I2b6ZA6PXzB2xHVkz34qY=";
   };
 
-  patches = [
-    # Remove once/if https://github.com/flintlib/flint/pull/2411 is merged
-    # Required or else during the check phase the build fails while
-    # linking a test due to duplicate symbol errors
-    ./checkPhase.patch
-  ];
-
   strictDeps = true;
   nativeBuildInputs = [
     autoconf

From eea406900056aa72a93ab34af686146039f88422 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 12 May 2026 00:24:32 +0200
Subject: [PATCH 26/43] sage: add patch for flint 3.5.0

---
 pkgs/by-name/sa/sage/sage-src.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 1694721ef286..085ee20c9ad4 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -131,6 +131,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/sagemath/sage/commit/ff58afe27c80c067a8965e1d70966e25d0355aaf.patch?full_index=1";
       hash = "sha256-gWoXwhUVXL2RSVLPRbxtlP0LCSEkJ9z1PJ1wKLXef1k=";
     })
+
+    # https://github.com/sagemath/sage/pull/42089, landed in 10.10.beta0
+    (fetchpatch2 {
+      name = "flint-3.5.0-update.patch";
+      url = "https://github.com/sagemath/sage/commit/f1cf1552c2c7636fa069fbc47c5bfc937753f7b2.patch?full_index=1";
+      hash = "sha256-Z3SU6cSCnnaTZLcTh0LNb672HyBqhBd6+iYUEeK1cGQ=";
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

From cd36e3c87a0fcdc4c4d17e62e14d2bbac6f7fed0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 23:43:27 +0000
Subject: [PATCH 27/43] libretro.beetle-saturn: 0-unstable-2026-04-20 ->
 0-unstable-2026-05-17

---
 .../applications/emulators/libretro/cores/beetle-saturn.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix
index 9500a271ca2d..9041f476688d 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-saturn";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-05-17";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-saturn-libretro";
-    rev = "02503506566bed8f0d68c9267a1c6c57400870f2";
-    hash = "sha256-mssOkL2y7NRaoKXwIbllP0GUnrAR5/zHIAs4x9Q7UnM=";
+    rev = "c64a467e334cde47d74df6456748deb783522752";
+    hash = "sha256-np+zzuMDtanmlUVlDoS0D4Fm+2uuXo08qar/aoXwmUI=";
   };
 
   makefile = "Makefile";

From 561d538f9e9cd133f306115325a0c3552ff9a43f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 01:47:35 +0000
Subject: [PATCH 28/43] zerofs: 1.1.0 -> 1.1.7

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

diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix
index 40153cd72f7b..918cf70b30ea 100644
--- a/pkgs/by-name/ze/zerofs/package.nix
+++ b/pkgs/by-name/ze/zerofs/package.nix
@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zerofs";
-  version = "1.1.0";
+  version = "1.1.7";
 
   src = fetchFromGitHub {
     owner = "Barre";
     repo = "ZeroFS";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XTug8FytzAL1L9wNPlyKQBx/LnszLCFCfW9U5S0tark=";
+    hash = "sha256-DNdSrDlknZhUG7yQ5ckBcCJFktguDG1qfOtRz3MMmG4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/zerofs";
 
-  cargoHash = "sha256-X2Sd1N4BLRhbInownKsXXvZX39gtBy3CaKbW+xRx5UE=";
+  cargoHash = "sha256-rS40vg3x+tWhlPv3KfK0mpoUeYa5O9QpTxuZm2IYZ3k=";
 
   nativeBuildInputs = [ cmake ];
 

From d39f2c0fda1a945111e872a3a2ec01ba3f8c89db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 06:23:22 +0000
Subject: [PATCH 29/43] snac2: 2.91 -> 2.92

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

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index f067883c0ebd..de7e7b2d78a9 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.91";
+  version = "2.92";
 
   src = fetchFromCodeberg {
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-v7MKrGEvb4EyyEkRu7wd/uh4IJgfF0Uk6l0kS93NyHM=";
+    hash = "sha256-psZtNrw6EjN52Hpl3aePnPQ2F/WoPEc5JQbqFknUeQk=";
   };
 
   buildInputs = [

From f4bd7f07a44283b7df685e234e2902d190b6490a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 06:57:10 +0000
Subject: [PATCH 30/43] terraform-providers.hashicorp_local: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 994df17ef1b2..cdf4de884b42 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -616,13 +616,13 @@
     "vendorHash": "sha256-TvtStKCI11frbi1C1d4/f60XXJPUQBzSJIAkjN6LfBQ="
   },
   "hashicorp_local": {
-    "hash": "sha256-VYzy+/BniYU++pw9koLWotEJzsIzOjpLX4aRSRupV58=",
+    "hash": "sha256-qntV0gfxEVV24gqiVOvUai+pai4vvU+KtLmLBqOBQbY=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/local",
     "owner": "hashicorp",
     "repo": "terraform-provider-local",
-    "rev": "v2.8.0",
+    "rev": "v2.9.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3qnfKHionSfT2efCl0TcHWFFgrh1bPE6Maqg4MCRq0g="
+    "vendorHash": "sha256-qvJSzqGUHw1/Lu4XO7LWssA+TN8pCyTbzh6t1bz+y1g="
   },
   "hashicorp_nomad": {
     "hash": "sha256-O3dtOB+irsUeDq1yXxfqDSyz2jfPXS1UgiL+B4RFsW4=",

From af9869b8eae07d2ac183ba7d5306effa95d0d75d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 17 May 2026 10:31:15 +0300
Subject: [PATCH 31/43] netbird: 0.71.1 -> 0.71.2

Diff: https://github.com/netbirdio/netbird/compare/v0.71.1...v0.71.2

Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.71.2
---
 pkgs/by-name/ne/netbird/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 5eca510c1a9a..6d7a36dee66e 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -67,13 +67,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.71.1";
+  version = "0.71.2";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xU2P4COLufGdFrit8+IRn96FT1IJKGQ97R9eGv5cjqU=";
+    hash = "sha256-rmm9NdWNjcEmUp84lad709EoVCZz19/5/N5ssflWzt4=";
   };
 
   vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";

From f4ee2a10de4cc3836798814a34d99373ebcb99df Mon Sep 17 00:00:00 2001
From: dseum <me@denniseum.com>
Date: Sun, 17 May 2026 00:58:50 -0700
Subject: [PATCH 32/43] surelog: fix tcmalloc segfaulting on darwin

---
 pkgs/by-name/su/surelog/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/surelog/package.nix b/pkgs/by-name/su/surelog/package.nix
index 8c468f40e21b..81ed06ece3ca 100644
--- a/pkgs/by-name/su/surelog/package.nix
+++ b/pkgs/by-name/su/surelog/package.nix
@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libuuid
-    gperftools
     uhdm
     capnproto
     antlr4.runtime.cpp
     nlohmann_json
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gperftools ];
 
   cmakeFlags = [
     "-DSURELOG_USE_HOST_CAPNP=On"
@@ -57,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DSURELOG_USE_HOST_ANTLR=On"
     "-DSURELOG_USE_HOST_JSON=On"
     "-DANTLR_JAR_LOCATION=${antlr4.jarLocation}"
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DSURELOG_WITH_TCMALLOC=Off" ];
 
   doCheck = true;
   checkPhase = ''

From cf6c1aaa2250b037203892e48669b62b555e53d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 08:10:17 +0000
Subject: [PATCH 33/43] terraform-providers.checkly_checkly: 1.22.0 -> 1.23.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index c0b65b74389b..74e492f5b721 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -155,11 +155,11 @@
     "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o="
   },
   "checkly_checkly": {
-    "hash": "sha256-S83+rMPCN3Bt5kftmViYS2yUTsZsFtdiAE14WrBu+XA=",
+    "hash": "sha256-v9px/k2b6zUza8ZvoOfxQLNyofcIKOLYVmGAmkyA3TQ=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.22.0",
+    "rev": "v1.23.0",
     "spdx": null,
     "vendorHash": "sha256-fY1oLzNYYNmUvOVNCWZlo2pvn2SgGjc4JnMORZdt/ss="
   },

From f2e4bda308803f6017438ccaddff3a8cc34beb2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 08:14:07 +0000
Subject: [PATCH 34/43] SDL_image: 1.2.12-unstable-2026-04-29 ->
 1.2.12-unstable-2026-05-13

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

diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index 62ed2a1ecd73..f85e5ff2763e 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_image";
-  version = "1.2.12-unstable-2026-04-29";
+  version = "1.2.12-unstable-2026-05-13";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL_image";
-    rev = "5e690c3ff429025386837c4ff38e1761cd5e1d72";
-    hash = "sha256-BZz35PPW3UXfSyQEbYzpLD2HIZ+hCmDNVvvRypmecQY=";
+    rev = "822207ee09095b8f0a936f6f2d62e020f92a4c24";
+    hash = "sha256-a4WmLjsVC409UTbTVtMmRXaYuNN3fVwzz8F4XMV/cNI=";
   };
 
   configureFlags = [

From 3f83e0b6c94b348812589d3b694b43175bcbf2d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 08:57:39 +0000
Subject: [PATCH 35/43] uncrustify: 0.82.0 -> 0.83.0

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

diff --git a/pkgs/by-name/un/uncrustify/package.nix b/pkgs/by-name/un/uncrustify/package.nix
index 3a6fcadf0581..05a475933d39 100644
--- a/pkgs/by-name/un/uncrustify/package.nix
+++ b/pkgs/by-name/un/uncrustify/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uncrustify";
-  version = "0.82.0";
+  version = "0.83.0";
 
   src = fetchFromGitHub {
     owner = "uncrustify";
     repo = "uncrustify";
     rev = "uncrustify-${finalAttrs.version}";
-    sha256 = "sha256-sBIjBN3tP/gwTWHDLwonEIfk3OduqQtixn4sn28V7pI=";
+    sha256 = "sha256-EcT9A9rQCfSqJqqhfdSIZP/29W+I+PHbfvqQ4Bsq5mE=";
   };
 
   nativeBuildInputs = [

From f6c09427a7906364ead74b35d0514cd79705b4fe Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 17 May 2026 13:22:34 +0400
Subject: [PATCH 36/43] python3Packages.mapclassify: fix darwin build

---
 .../python-modules/mapclassify/default.nix    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix
index b5c1fabea97a..3700e9a85473 100644
--- a/pkgs/development/python-modules/mapclassify/default.nix
+++ b/pkgs/development/python-modules/mapclassify/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
@@ -56,6 +57,33 @@ buildPythonPackage rec {
     # depends on remote datasets
     "test_legendgram_map"
     "test_legendgram_most_recent_cmap"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
+    "test_legendgram_returns_axis"
+    "test_legendgram_standalone"
+    "test_legendgram_inset_false"
+    "test_legendgram_clip"
+    "test_legendgram_tick_params"
+    "test_legendgram_frameon"
+    "test_legendgram_default"
+    "test_legendgram_vlines"
+    "test_legendgram_cmap"
+    "test_legendgram_cmap_class"
+    "test_legendgram_position"
+    "test_legendgram_kwargs"
+    "test_histogram_plot"
+    "test_histogram_plot_despine"
+    "test_histogram_plot_linewidth"
+    "test_no_classify_default"
+    "test_pass_in_ax"
+    "test_classify_xy_redblue"
+    "test_divergent_revert_alpha_min_alpha"
+    "test_userdefined_colors"
+    "test_shifted_colormap"
+    "test_truncated_colormap"
+    "test_legend"
+    "test_legend_kwargs"
   ];
 
   pythonImportsCheck = [ "mapclassify" ];

From b094945dc7de37fbb100896c8373fcc3af2fec3d Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 17 May 2026 09:37:35 +0000
Subject: [PATCH 37/43] zenith: 0.14.3 -> 0.15.0

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

diff --git a/pkgs/by-name/ze/zenith/package.nix b/pkgs/by-name/ze/zenith/package.nix
index 612be65a8d60..ab062dcb4c43 100644
--- a/pkgs/by-name/ze/zenith/package.nix
+++ b/pkgs/by-name/ze/zenith/package.nix
@@ -8,21 +8,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zenith";
-  version = "0.14.3";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "bvaisvil";
     repo = "zenith";
     rev = finalAttrs.version;
-    hash = "sha256-D/o8JmKLiT8LhmJ6q2h7f5vJQNXAN5aCislxwDw9yqo=";
+    hash = "sha256-NOQ+LqymP1VQ80up6XR7kBYRfWey82wbDbGkf1NsQhc=";
   };
 
   # remove cargo config so it can find the linker on aarch64-linux
   postPatch = ''
-    rm .cargo/config
+    rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-/SRZWbsAvV4rgEsVj5WRgc5KJZm+JvIs1QTgaK/+l+g=";
+  cargoHash = "sha256-OABHxLLysx/atZBWCMJCcypugzs5OFtRp2KW3dkp2DE=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper;
 

From dd08ba33e01c2172eb41f488173d5d2d8b2fe0da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 09:43:09 +0000
Subject: [PATCH 38/43] sddm-astronaut: 0-unstable-2025-12-06 ->
 0-unstable-2026-05-12

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

diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix
index ebee2033d09d..a16a3063289d 100644
--- a/pkgs/by-name/sd/sddm-astronaut/package.nix
+++ b/pkgs/by-name/sd/sddm-astronaut/package.nix
@@ -15,13 +15,13 @@ let
 in
 stdenvNoCC.mkDerivation {
   pname = "sddm-astronaut";
-  version = "0-unstable-2025-12-06";
+  version = "0-unstable-2026-05-12";
 
   src = fetchFromGitHub {
     owner = "Keyitdev";
     repo = "sddm-astronaut-theme";
-    rev = "d73842c761f7d7859f3bdd80e4360f09180fad41";
-    hash = "sha256-+94WVxOWfVhIEiVNWwnNBRmN+d1kbZCIF10Gjorea9M=";
+    rev = "8c85b9c8d00ce70e39320f77071dca2040544f19";
+    hash = "sha256-+Z1igZ4BxRqXr/lxfHEr3I4n/sX8+AIwUr6JFO9yoWs=";
   };
 
   dontWrapQtApps = true;

From bd84a8d76666a11ce0b94cd38c2db67a33002adb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 12:41:06 +0000
Subject: [PATCH 39/43] python3Packages.llguidance: 1.7.4 -> 1.7.5

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

diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix
index 4d0ff0db3ba0..aeb2374729f6 100644
--- a/pkgs/development/python-modules/llguidance/default.nix
+++ b/pkgs/development/python-modules/llguidance/default.nix
@@ -23,19 +23,20 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llguidance";
-  version = "1.7.4";
+  version = "1.7.5";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "llguidance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vEF9+nlYP8LnlROgDU0HPg8H+OmZCQARoE6ngGIw7NM=";
+    hash = "sha256-AXTsa+ehQN46QxS4ciRMrv9wYksh6MFa1EDnuDIMsDw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src pname version;
-    hash = "sha256-5dJkC0Iz0IBXxSq5ZeorLta7WEd81ajagSoXt1Zsq7Q=";
+    hash = "sha256-rBc6cc76fELkXqpODh4IDXgjRKSZv1c9s8+VZVWjTvs=";
   };
 
   nativeBuildInputs = [

From 1cc50e7d13263c4b4cdc6f0df5f84c22d2d8d85b Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 17 May 2026 10:08:36 +0000
Subject: [PATCH 40/43] flare: 1.14 -> 1.15

---
 pkgs/by-name/fl/flare/engine.nix  | 11 ++---------
 pkgs/by-name/fl/flare/game.nix    | 13 +++----------
 pkgs/by-name/fl/flare/package.nix |  2 +-
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix
index afc85deac707..8b9e26d8e2d4 100644
--- a/pkgs/by-name/fl/flare/engine.nix
+++ b/pkgs/by-name/fl/flare/engine.nix
@@ -12,24 +12,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare-engine";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = "flare-engine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
+    hash = "sha256-QwrSMkJE8dNIODlmdi1c6qgTULhJP9HEV8wI7k5vHAA=";
   };
 
   patches = [
     ./desktop.patch
-
-    # cmake-4 compatibility patch
-    (fetchpatch {
-      name = "cmake-4.patch";
-      url = "https://github.com/flareteam/flare-engine/commit/9500379f886484382bba2f893faf49865de9f2c0.patch";
-      hash = "sha256-nUn54ZBEvvFkIhzE/UBbsvF0rFC9JAeQACTAPtsc1VI=";
-    })
   ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix
index 9a34465fbd36..c3868c8d2b3d 100644
--- a/pkgs/by-name/fl/flare/game.nix
+++ b/pkgs/by-name/fl/flare/game.nix
@@ -8,23 +8,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare-game";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = "flare-game";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
+    hash = "sha256-IsVfP8wmrublAqoVix7gOA4u8CRmXdyNzagnaXyFsxc=";
   };
 
-  patches = [
-    # cmake-4 compatibility patch
-    (fetchpatch {
-      name = "cmake-4.patch";
-      url = "https://github.com/flareteam/flare-game/commit/5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a.patch";
-      hash = "sha256-5Um6LWAWQyialzO3KSebmLju0VOuz1S5dzavO9EWlLE=";
-    })
-  ];
+  patches = [ ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/by-name/fl/flare/package.nix b/pkgs/by-name/fl/flare/package.nix
index 40816cf42efd..cd6b7b980c95 100644
--- a/pkgs/by-name/fl/flare/package.nix
+++ b/pkgs/by-name/fl/flare/package.nix
@@ -7,7 +7,7 @@
 
 buildEnv {
   pname = "flare";
-  version = "1.14";
+  version = "1.15";
 
   paths = [
     (callPackage ./engine.nix { })

From 20ec2c7f46e182ad3b9b3b6b9758bcc86649be90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 10:10:36 +0000
Subject: [PATCH 41/43] libretro.ppsspp: 0-unstable-2026-04-28 ->
 0-unstable-2026-05-17

---
 pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 8855e73d2d1c..1ac6a05856cb 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2026-04-28";
+  version = "0-unstable-2026-05-17";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "dbb34075bc5c72c18291547ff63d7b001ebb29ab";
-    hash = "sha256-YOOpjLUevYsQ2yWWuwqjPjaWXx2BAq7ZubbAZBtclbM=";
+    rev = "4fb74aa5a90c8eaededa5ad6883683e6a4271ef0";
+    hash = "sha256-5xgLQQye9LTQq1QLSphbmNb5vzG6m3MvUslHdeSHpZE=";
     fetchSubmodules = true;
   };
 

From c4a1cf246d9abc59c5c7882f37daac851781becf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 12:01:11 +0000
Subject: [PATCH 42/43] python3Packages.gliner: 0.2.26 -> 0.2.27

---
 .../python-modules/gliner/default.nix          | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/gliner/default.nix b/pkgs/development/python-modules/gliner/default.nix
index 30173893c70e..1c1423429ca2 100644
--- a/pkgs/development/python-modules/gliner/default.nix
+++ b/pkgs/development/python-modules/gliner/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -17,14 +18,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gliner";
-  version = "0.2.26";
+  version = "0.2.27";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "urchade";
     repo = "GLiNER";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tiQrb04SfloVJySyKu5XhOaE8Y3RcwBbW2l13UtZL0w=";
+    hash = "sha256-pM2JenMxBvCiDQyj9VFMYJGRckWJWna3gCdAlhBGR1U=";
   };
 
   build-system = [
@@ -43,7 +45,15 @@ buildPythonPackage (finalAttrs: {
     transformers
   ];
 
-  pythonImportsCheck = [ "gliner" ];
+  # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox:
+  # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
+  #
+  # -> Skip the import check
+  pythonImportsCheck =
+    lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64))
+      [
+        "gliner"
+      ];
 
   # All tests require internet
   doCheck = false;
@@ -57,7 +67,7 @@ buildPythonPackage (finalAttrs: {
     badPlatforms = [
       # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
       # Attempt to use DefaultLogger but none has been registered.
-      "aarch64-linux"
+      # "aarch64-linux"
     ];
   };
 })

From 2896f2cc14cb47984aa3a4a496b2b47441df08a9 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 29 Apr 2026 16:53:48 +0300
Subject: [PATCH 43/43] nixos/kea: fix path to dhcpd4 config file

Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
---
 nixos/modules/services/networking/kea.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix
index 9f3e5aec5c74..99d938c14036 100644
--- a/nixos/modules/services/networking/kea.nix
+++ b/nixos/modules/services/networking/kea.nix
@@ -393,7 +393,7 @@ in
                 [
                   (lib.getExe' cfg.package "kea-dhcp4")
                   "-c"
-                  "etc/kea/dhcp4-server.conf"
+                  "/etc/kea/dhcp4-server.conf"
                 ]
                 ++ cfg.dhcp4.extraArgs
               );