From 383aaa65d13b9fd6419cfd4c45f8c40c88a9259e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 22 Feb 2025 00:03:42 -0500
Subject: [PATCH 01/30] python3Packages.plux: 1.11.0 -> 1.12.0

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

diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix
index 3c726b7d3b36..7f63915d1aee 100644
--- a/pkgs/development/python-modules/plux/default.nix
+++ b/pkgs/development/python-modules/plux/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "plux";
-  version = "1.11.0";
+  version = "1.12.0";
   pyproject = true;
 
   # Tests are not available from PyPi
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "localstack";
     repo = "plux";
     tag = "v${version}";
-    hash = "sha256-M4N3Ccuw95OcLsWQVtITv4QShBJKliTh5QIoqji8x9o=";
+    hash = "sha256-2Sxn/LuiwTzByAAz7VlNLsxEiPIyJWXr86/76Anx+EU=";
   };
 
   build-system = [

From 5bdd046b805877f24bde2b94f8c59cf7f8135104 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 22 Feb 2025 00:00:35 -0500
Subject: [PATCH 02/30] localstack: promote to top-level attribute

This is a CLI
---
 .../lo/localstack/package.nix}                | 37 +++++++------------
 .../localstack-client/default.nix             |  6 +--
 .../python-modules/localstack-ext/default.nix |  6 +--
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 6 files changed, 20 insertions(+), 34 deletions(-)
 rename pkgs/{development/python-modules/localstack/default.nix => by-name/lo/localstack/package.nix} (76%)

diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/by-name/lo/localstack/package.nix
similarity index 76%
rename from pkgs/development/python-modules/localstack/default.nix
rename to pkgs/by-name/lo/localstack/package.nix
index a2f8e39b8531..f334bb2cc9d8 100644
--- a/pkgs/development/python-modules/localstack/default.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -1,29 +1,10 @@
 {
   lib,
-  buildPythonPackage,
+  python3,
   fetchFromGitHub,
-  apispec,
-  boto3,
-  build,
-  cachetools,
-  click,
-  cryptography,
-  localstack-client,
-  localstack-ext,
-  plux,
-  psutil,
-  python-dotenv,
-  pyyaml,
-  packaging,
-  requests,
-  rich,
-  semver,
-  setuptools,
-  setuptools-scm,
-  tailer,
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "localstack";
   version = "4.0.3";
   pyproject = true;
@@ -35,12 +16,12 @@ buildPythonPackage rec {
     hash = "sha256-BsmXhTJVvRKEubDQwehsrY2jRSfvDBSH5S35CNg8vrQ=";
   };
 
-  build-system = [
+  build-system = with python3.pkgs; [
     setuptools
     setuptools-scm
   ];
 
-  dependencies = [
+  propagatedBuildInputs = with python3.pkgs; [
     apispec
     boto3
     build
@@ -60,7 +41,9 @@ buildPythonPackage rec {
     tailer
   ];
 
-  pythonRelaxDeps = [ "dill" ];
+  pythonRelaxDeps = [
+    "dill"
+  ];
 
   pythonImportsCheck = [ "localstack" ];
 
@@ -76,6 +59,12 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  # Propagating dependencies leaks them through $PYTHONPATH which causes issues
+  # when used in nix-shell.
+  postFixup = ''
+    rm $out/nix-support/propagated-build-inputs
+  '';
+
   meta = with lib; {
     description = "Fully functional local Cloud stack";
     homepage = "https://github.com/localstack/localstack";
diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix
index 638f4328abf4..3c708507bf53 100644
--- a/pkgs/development/python-modules/localstack-client/default.nix
+++ b/pkgs/development/python-modules/localstack-client/default.nix
@@ -5,8 +5,8 @@
   boto3,
   pytestCheckHook,
 
-  # downstream dependencies
-  localstack,
+  # use for promoted localstack
+  pkgs,
 }:
 
 buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   passthru.tests = {
-    inherit localstack;
+    inherit (pkgs) localstack;
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix
index e7989ddfd1df..91a9c613925a 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -15,8 +15,8 @@
   python-dateutil,
   tabulate,
 
-  # Sensitive downstream dependencies
-  localstack,
+  # use for testing promoted localstack
+  pkgs,
 }:
 
 buildPythonPackage rec {
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   passthru.tests = {
-    inherit localstack;
+    inherit (pkgs) localstack;
   };
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e289c52ded44..aa0d6127305f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4137,8 +4137,6 @@ with pkgs;
 
   liquidctl = with python3Packages; toPythonApplication liquidctl;
 
-  localstack = with python3Packages; toPythonApplication localstack;
-
   xz = callPackage ../tools/compression/xz { };
 
   lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 95a0398eed80..61e98d425dd6 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -354,6 +354,7 @@ mapAliases ({
   livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14
   livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14
   lmcloud = pylamarzocco; # added 2024-11-26
+  localstack = throw "localstack was promoted to a top-level attribute"; # added 2025-02-21
   logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
   logilab_common = logilab-common; # added 2022-11-21
   loo-py = loopy; # added 2022-05-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c30a1d273f9..ac22f7007597 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7736,8 +7736,6 @@ self: super: with self; {
 
   localimport = callPackage ../development/python-modules/localimport { };
 
-  localstack = callPackage ../development/python-modules/localstack { };
-
   localstack-client = callPackage ../development/python-modules/localstack-client { };
 
   localstack-ext = callPackage ../development/python-modules/localstack-ext { };

From 7803c05f0c7ac6ecdf3c075850592ee440b00f37 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 22 Feb 2025 00:15:07 -0500
Subject: [PATCH 03/30] localstack: 4.0.3 -> 4.1.1

https://github.com/localstack/localstack/releases/tag/v4.1.0
https://github.com/localstack/localstack/releases/tag/v4.1.1
---
 pkgs/by-name/lo/localstack/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix
index f334bb2cc9d8..9f166f2c91d5 100644
--- a/pkgs/by-name/lo/localstack/package.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "localstack";
-  version = "4.0.3";
+  version = "4.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
     tag = "v${version}";
-    hash = "sha256-BsmXhTJVvRKEubDQwehsrY2jRSfvDBSH5S35CNg8vrQ=";
+    hash = "sha256-hITo6BAsFNGFG5N0b2N9nydGCsG7ged8/3g0sWovNYw=";
   };
 
   build-system = with python3.pkgs; [

From aa06c67367fc55a9d9faa7430d0b8f303e5a4761 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 22 Feb 2025 00:21:38 -0500
Subject: [PATCH 04/30] python3Packages.localstack-ext: 4.0.3 -> 4.1.1

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

diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix
index 91a9c613925a..78baef323e19 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -21,13 +21,13 @@
 
 buildPythonPackage rec {
   pname = "localstack-ext";
-  version = "4.0.3";
+  version = "4.1.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "localstack_ext";
     inherit version;
-    hash = "sha256-vivEdEk32wJln8jfhrAtygO5CEvtsdXI7sxrj0dqIdA=";
+    hash = "sha256-Fgblk8eL5JnF4yLeH73yGuOeH9anSu1o9H1UxcjTyco=";
   };
 
   build-system = [

From 814f9ca728ba383676881ea7448fb16afc53b211 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 22 Feb 2025 00:25:46 -0500
Subject: [PATCH 05/30] python3Packages.localstack-client: 1.38 -> 2.7

Switch to pypi so we can at least auto update properly
---
 .../python-modules/localstack-client/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix
index 3c708507bf53..e74b8daa7015 100644
--- a/pkgs/development/python-modules/localstack-client/default.nix
+++ b/pkgs/development/python-modules/localstack-client/default.nix
@@ -1,25 +1,23 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
   boto3,
   pytestCheckHook,
 
-  # use for promoted localstack
+  # use for testing promoted localstack
   pkgs,
 }:
 
 buildPythonPackage rec {
   pname = "localstack-client";
-  version = "1.39";
+  version = "2.7";
   format = "setuptools";
 
-  src = fetchFromGitHub {
-    owner = "localstack";
-    repo = "localstack-python-client";
-    # Request for proper tags: https://github.com/localstack/localstack-python-client/issues/38
-    rev = "f1e538ad23700e5b1afe98720404f4801475e470";
-    hash = "sha256-MBXTiTzCwkduJPPRN7OKaWy2q9J8xCX/GGu09tyac3A=";
+  src = fetchPypi {
+    pname = "localstack_client";
+    inherit version;
+    hash = "sha256-FJkxGZAaS8vvfDLYmbJPSliodaZ2VpPt8QZNZrimhAg=";
   };
 
   propagatedBuildInputs = [ boto3 ];

From 96c2125a8c56aad7a14b8d24e206fc0f61e2a520 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 4 Mar 2025 18:36:30 -0800
Subject: [PATCH 06/30] zig: 0.13 -> 0.14

---
 pkgs/development/compilers/zig/default.nix | 5 +++++
 pkgs/development/compilers/zig/generic.nix | 6 +++++-
 pkgs/top-level/all-packages.nix            | 6 ++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 77884dbbdb78..ba6db99f5f8b 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -4,6 +4,7 @@
   llvmPackages_16,
   llvmPackages_17,
   llvmPackages_18,
+  llvmPackages_19,
   zigVersions ? { },
 }:
 let
@@ -20,6 +21,10 @@ let
       llvmPackages = llvmPackages_18;
       hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM=";
     };
+    "0.14.0" = {
+      llvmPackages = llvmPackages_19;
+      hash = "sha256-VyteIp5ZRt6qNcZR68KmM7CvN2GYf8vj5hP+gHLkuVk=";
+    };
   } // zigVersions;
 
   mkPackage =
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 65959289cb6c..84f83b5aa709 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -111,7 +111,11 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   postBuild =
-    if lib.versionAtLeast finalAttrs.version "0.13" then
+    if lib.versionAtLeast finalAttrs.version "0.14" then
+      ''
+        stage3/bin/zig build langref --zig-lib-dir $(pwd)/stage3/lib/zig
+      ''
+    else if lib.versionAtLeast finalAttrs.version "0.13" then
       ''
         stage3/bin/zig build langref
       ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d57f2e59cd53..c4a82cdd1138 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10779,12 +10779,14 @@ with pkgs;
     zig_0_11 = zigPackages."0.11";
     zig_0_12 = zigPackages."0.12";
     zig_0_13 = zigPackages."0.13";
+    zig_0_14 = zigPackages."0.14";
   }) zigPackages
      zig_0_11
      zig_0_12
-     zig_0_13;
+     zig_0_13
+     zig_0_14;
 
-  zig = zig_0_13;
+  zig = zig_0_14;
 
   zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv;
 

From 75bc9487e45fbfc23ab6caf95dadde2ecca03d91 Mon Sep 17 00:00:00 2001
From: Ovyerus <ovy@ovyerus.com>
Date: Thu, 19 Dec 2024 10:50:44 +1100
Subject: [PATCH 07/30] garage: 1.0 and 0.9 is no longer broken on Darwin

0.8 failed build, but due to type mismatches within code, not a linker error like the others used to.
---
 pkgs/tools/filesystems/garage/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index d21d509e2416..2a7e4d5e5710 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -129,14 +129,12 @@ rec {
     hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
     cargoHash = "sha256-ittesFz1GUGipQecsmMA+GEaVoUY+C9DtEvsO0HFNCc=";
     cargoPatches = [ ./update-time.patch ];
-    broken = stdenv.hostPlatform.isDarwin;
   };
 
   garage_1_1_0 = generic {
     version = "1.1.0";
     hash = "sha256-ysf/GYR39trXTPRdw8uB6E4YDp4nAR8dbU9k9rQTxz0=";
     cargoHash = "sha256-SkDr/e9YZ3raTGucaiv/RV2zF9tEDIeqZeri6Xk3xEU=";
-    broken = stdenv.hostPlatform.isDarwin;
   };
 
   garage_0_8 = garage_0_8_7;

From 7b9b602322d35a2769beadb16d93eaffb588caad Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 00:42:42 -0800
Subject: [PATCH 08/30] ncdu: pin to zig 0.13

---
 pkgs/tools/misc/ncdu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 719d899e83bd..a0a724834b2b 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -4,7 +4,7 @@
   fetchurl,
   ncurses,
   pkg-config,
-  zig,
+  zig_0_13,
   zstd,
   installShellFiles,
   testers,
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    zig.hook
+    zig_0_13.hook
     installShellFiles
     pkg-config
   ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       pSub
       rodrgz
     ];
-    inherit (zig.meta) platforms;
+    inherit (zig_0_13.meta) platforms;
     mainProgram = "ncdu";
   };
 })

From bfb5bb7fe5f0783af486b33b8138100709b35958 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 00:43:11 -0800
Subject: [PATCH 09/30] poop: pin to zig 0.13

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

diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix
index 9b42801c5ebd..3edae8fb889b 100644
--- a/pkgs/by-name/po/poop/package.nix
+++ b/pkgs/by-name/po/poop/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  zig,
+  zig_0_13,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    zig.hook
+    zig_0_13.hook
   ];
 
   meta = with lib; {

From 8a35708b84f5046b860c0794f3ac9f642fe946f3 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 00:44:12 -0800
Subject: [PATCH 10/30] superhtml: pin to zig 0.13

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

diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix
index 8844a03e9416..eff91d54a5a1 100644
--- a/pkgs/by-name/su/superhtml/package.nix
+++ b/pkgs/by-name/su/superhtml/package.nix
@@ -3,7 +3,7 @@
   callPackage,
   fetchFromGitHub,
   stdenv,
-  zig,
+  zig_0_13,
 }:
 stdenv.mkDerivation rec {
   pname = "superhtml";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    zig.hook
+    zig_0_13.hook
   ];
 
   postPatch = ''

From f77a948f26cc7949214584c42a32da40914cb5a0 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 01:18:38 -0800
Subject: [PATCH 11/30] river: pin to zig 0.13

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

diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index b96f58a2fa7c..fb24693c0b45 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -37,7 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw=";
   };
 
-  deps = callPackage ./build.zig.zon.nix { };
+  deps = callPackage ./build.zig.zon.nix {
+    zig = zig_0_13;
+  };
 
   nativeBuildInputs = [
     pkg-config

From ed7c190d98a314df0c126f3daf71dfa0f6bd5072 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 01:19:40 -0800
Subject: [PATCH 12/30] ghostty: pin to zig 0.13

---
 pkgs/by-name/gh/ghostty/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index bf8359959186..eb48e995a235 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   deps = callPackage ./deps.nix {
     name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
+    zig = zig_0_13;
   };
 
   strictDeps = true;

From 1cc776321f86d48fbd77a9cb65ef465ec7b42209 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 01:20:06 -0800
Subject: [PATCH 13/30] flow-editor: pin to zig 0.13

---
 pkgs/by-name/fl/flow-editor/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fl/flow-editor/package.nix b/pkgs/by-name/fl/flow-editor/package.nix
index a5631a0bd4be..2186ffded5e0 100644
--- a/pkgs/by-name/fl/flow-editor/package.nix
+++ b/pkgs/by-name/fl/flow-editor/package.nix
@@ -17,7 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";
   };
   postPatch = ''
-    ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+    ln -s ${
+      callPackage ./build.zig.zon.nix {
+        zig = zig_0_13;
+      }
+    } $ZIG_GLOBAL_CACHE_DIR/p
   '';
 
   nativeBuildInputs = [

From c1a2b6279fa4041a7bcd007844989ef3e95eec96 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 01:21:18 -0800
Subject: [PATCH 14/30] waylock: pin to zig 0.13

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

diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix
index 53f8ff52e816..dce4eb51bfe6 100644
--- a/pkgs/by-name/wa/waylock/package.nix
+++ b/pkgs/by-name/wa/waylock/package.nix
@@ -26,7 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-jfMSar+Y3inu1Cly6rIDw+akBJIQ6huL0smAstgQmEo=";
   };
 
-  deps = callPackage ./build.zig.zon.nix { };
+  deps = callPackage ./build.zig.zon.nix {
+    zig = zig_0_13;
+  };
 
   nativeBuildInputs = [
     pkg-config

From 500eb29a69d1e45a5d7ff2aa9f79fdc4a7dcf7fa Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 01:21:59 -0800
Subject: [PATCH 15/30] cargo-lambda: pin to zig 0.13

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

diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix
index 006da2416bcd..c9a9bddfb301 100644
--- a/pkgs/by-name/ca/cargo-lambda/package.nix
+++ b/pkgs/by-name/ca/cargo-lambda/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   openssl,
   stdenv,
-  zig,
+  zig_0_13,
   nix-update-script,
 }:
 
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig ]}
+    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]}
   '';
 
   CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";

From 1c82ff0d024ef366108c695fd11baad967fc9d90 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 6 Mar 2025 01:23:21 -0800
Subject: [PATCH 16/30] ly: pin to zig 0.13

---
 pkgs/applications/display-managers/ly/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix
index 35221c4637c7..d7089ecee755 100644
--- a/pkgs/applications/display-managers/ly/default.nix
+++ b/pkgs/applications/display-managers/ly/default.nix
@@ -31,7 +31,11 @@ stdenv.mkDerivation {
   ];
 
   postPatch = ''
-    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+    ln -s ${
+      callPackage ./deps.nix {
+        zig = zig_0_12;
+      }
+    } $ZIG_GLOBAL_CACHE_DIR/p
   '';
 
   passthru.tests = { inherit (nixosTests) ly; };

From f7aa633b1f782cdfcc0e88100ef7c398b5a9ccca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Mar 2025 17:10:10 +0000
Subject: [PATCH 17/30] globalping-cli: 1.4.4 -> 1.5.0

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

diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix
index 50f5423d0898..d7703b016a5b 100644
--- a/pkgs/by-name/gl/globalping-cli/package.nix
+++ b/pkgs/by-name/gl/globalping-cli/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "globalping-cli";
-  version = "1.4.4";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "jsdelivr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pViqoycOh1RfSqaAEST6m1v3mEcTX76dbL80bCp5aKo=";
+    hash = "sha256-UB2vYdyJ2+H8rFyJn1KBNnWoGUlRjwYorWXqoB9WDu0=";
   };
 
-  vendorHash = "sha256-V6DwV2KukFfFK0PK9MacoHH0sB5qNV315jn0T+4rhfA=";
+  vendorHash = "sha256-dJAuN5srL5EvMaRg8rHaTsurjYrdH45p965DeubpB0E=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 3f9511fd8734c148f9a9827597af8a609aba9f21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Mar 2025 19:41:14 +0000
Subject: [PATCH 18/30] karp: 0-unstable-2025-02-21 -> 0-unstable-2025-03-05

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

diff --git a/pkgs/by-name/ka/karp/package.nix b/pkgs/by-name/ka/karp/package.nix
index 1732c9f35156..1a3af7a0087f 100644
--- a/pkgs/by-name/ka/karp/package.nix
+++ b/pkgs/by-name/ka/karp/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation {
   pname = "karp";
-  version = "0-unstable-2025-02-21";
+  version = "0-unstable-2025-03-05";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "graphics";
     repo = "karp";
-    rev = "1da7f1e3f9b291c5031916a213d9c71ed6c39323";
-    hash = "sha256-PxiwJ9SCq6uG2F5CJFp6ta5zPLp8FnRe1jcHIs7Eg6w=";
+    rev = "de6d42447c3ed15a102ec81c56c55ec5a0111a59";
+    hash = "sha256-5mXD4qOL+gJn0kCHpnp4kp0E2SCCYfeI7A3oScX1uf8=";
   };
 
   nativeBuildInputs = [

From e12d25eb50cbdf5a105f0b43eb9435df1f3961c3 Mon Sep 17 00:00:00 2001
From: Dmitrii Stepanidenko <dimitrij.stepanidenko@gmail.com>
Date: Thu, 6 Mar 2025 22:42:38 +0300
Subject: [PATCH 19/30] woodpecker_{server,agent,cli} 3.1.0 -> 3.3.0

---
 .../tools/continuous-integration/woodpecker/common.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 66f535b19b7c..fd106599fcaa 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "3.1.0";
-  srcHash = "sha256-RuO2n0kgx13DWuZIowsiS5RovSFvq0kqwaj5Uz7IykI=";
+  version = "3.3.0";
+  srcHash = "sha256-f0XQ3cbao8IM5toSkxvul7pp1L89N9oiEo3Yx3mkGhg=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

From ca13ff05b7fbf2470f1867e671b6ac67ca9fb86f Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 23:44:24 -0700
Subject: [PATCH 20/30] libinotify-kqueue: 20180201 -> 20240724

---
 pkgs/by-name/li/libinotify-kqueue/package.nix | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libinotify-kqueue/package.nix b/pkgs/by-name/li/libinotify-kqueue/package.nix
index f797660b0b79..130a3e803382 100644
--- a/pkgs/by-name/li/libinotify-kqueue/package.nix
+++ b/pkgs/by-name/li/libinotify-kqueue/package.nix
@@ -2,23 +2,42 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libinotify-kqueue";
-  version = "20180201";
+  version = "20240724";
 
   src = fetchFromGitHub {
     owner = "libinotify-kqueue";
     repo = "libinotify-kqueue";
     rev = version;
-    sha256 = "sha256-9A5s8rPGlRv3KbxOukk0VB2IQrDxVjklO5RB+IA1cDY=";
+    sha256 = "sha256-m59GWrx5C+JXDbhVdKx+SNSn8wwIKyW+KlXabNi17A0=";
   };
 
+  patches = [
+    # https://github.com/libinotify-kqueue/libinotify-kqueue/pull/23
+    (fetchpatch {
+      name = "add-configure-caching.patch";
+      url = "https://github.com/libinotify-kqueue/libinotify-kqueue/commit/81a8f05c1ce6df819dc898f3754c9c874ee24b10.patch";
+      hash = "sha256-imKS2DuQrHSMnJH1gOYrVSeWTe2nhcl8Gm9IX5B9ZqI=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
 
-  doCheck = true;
+  configureFlags =
+    lib.optionals (with stdenv; buildPlatform != hostPlatform && hostPlatform.isFreeBSD)
+      [
+        "ik_cv_have_note_extend_in=yes"
+        "ik_cv_have_note_extend_out=yes"
+        "ik_cv_have_o_path=yes"
+        "ik_cv_have_o_empty_path=yes"
+        "ik_cv_have_at_empty_path=yes"
+      ];
+
   checkFlags = [ "test" ];
 
   meta = with lib; {

From 1abe2c848b1405075c8b841182e8aad5f22393d1 Mon Sep 17 00:00:00 2001
From: Benno Bielmeier <nix@bbenno.com>
Date: Mon, 3 Mar 2025 10:46:27 +0100
Subject: [PATCH 21/30] vscode-extensions.castwide.solargraph: init at 0.24.1

---
 .../extensions/castwide.solargraph/default.nix  | 17 +++++++++++++++++
 .../editors/vscode/extensions/default.nix       |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix
new file mode 100644
index 000000000000..ad38fb0393ea
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix
@@ -0,0 +1,17 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "solargraph";
+    publisher = "castwide";
+    version = "0.24.1";
+    hash = "sha256-M96kGuCKo232rIwLovDU+C/rhEgZWT4s/zsR7CUYPnk=";
+  };
+  meta = {
+    description = "Ruby language server featuring code completion, intellisense, and inline documentation";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=castwide.solargraph";
+    homepage = "https://github.com/castwide/vscode-solargraph";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.bbenno ];
+  };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 383cef780207..c7fc632280bf 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -870,6 +870,8 @@ let
         };
       };
 
+      castwide.solargraph = callPackage ./castwide.solargraph { };
+
       catppuccin = {
         catppuccin-vsc = buildVscodeMarketplaceExtension {
           mktplcRef = {

From ee8941481b1d9dc6191d426fe508cc1f40809177 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Mar 2025 00:12:46 +0100
Subject: [PATCH 22/30] python312Packages.cf-xarray: 0.10.0 -> 0.10.1

Diff: https://github.com/xarray-contrib/cf-xarray/compare/refs/tags/v0.10.0...v0.10.1

Changelog: https://github.com/xarray-contrib/cf-xarray/releases/tag/v0.10.1
---
 pkgs/development/python-modules/cf-xarray/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix
index b18339a157e7..e1fe2594845c 100644
--- a/pkgs/development/python-modules/cf-xarray/default.nix
+++ b/pkgs/development/python-modules/cf-xarray/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "cf-xarray";
-  version = "0.10.0";
+  version = "0.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xarray-contrib";
     repo = "cf-xarray";
     tag = "v${version}";
-    hash = "sha256-lAVH2QGdMyU5A6QTLKujeAh8n1AkCsAtdyKQEqLahTk=";
+    hash = "sha256-rWTaVhRqmTwogqYQ+mesZY6ET9YnSiAqDItoZfVgpYg=";
   };
 
   build-system = [
@@ -64,6 +64,7 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Tests require network access
     "cf_xarray/tests/test_accessor.py"
+    "cf_xarray/tests/test_groupers.py"
     "cf_xarray/tests/test_helpers.py"
   ];
 

From 1a82a80a8159b5a81f3e4d19ec984833650c5bf9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Mar 2025 23:29:47 +0000
Subject: [PATCH 23/30] beam26Packages.ex_doc: 0.37.2 -> 0.37.3

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

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index b8039ad5a1cf..09cb50319027 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -3,12 +3,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.37.2";
+  version = "0.37.3";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-BQbqaZq8pCfXrxJh03uV/WpH07bGoVUciX1wh8hFlxM=";
+    hash = "sha256-2tam+3vYLC216Q78GIUI3fGnE5FJ/lECJAUQMSxz46w=";
   };
 in
 mixRelease {

From ccfa640cc5a309d180e064c9e99da72fc6b22f97 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 6 Mar 2025 23:42:49 +0100
Subject: [PATCH 24/30] mujoco: 3.2.7 -> 3.3.0

Diff:
https://github.com/google-deepmind/mujoco/compare/refs/tags/3.2.7...3.3.0

Changelog: https://mujoco.readthedocs.io/en/3.3.0/changelog.html
---
 pkgs/by-name/mu/mujoco/package.nix            | 58 +++++++++----------
 .../python-modules/mujoco/default.nix         | 16 ++---
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix
index e947a79ba881..c0bea6fdd240 100644
--- a/pkgs/by-name/mu/mujoco/package.nix
+++ b/pkgs/by-name/mu/mujoco/package.nix
@@ -18,14 +18,14 @@ let
     abseil-cpp = fetchFromGitHub {
       owner = "abseil";
       repo = "abseil-cpp";
-      rev = "4447c7562e3bc702ade25105912dce503f0c4010";
-      hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=";
+      rev = "9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f";
+      hash = "sha256-uOgUtF8gaEgcxFK9WAoAhv4GoS8P23IoUxHZZVZdpPk=";
     };
     benchmark = fetchFromGitHub {
       owner = "google";
       repo = "benchmark";
-      rev = "24e0bd827a8bec8121b128b0634cb34402fb3259";
-      hash = "sha256-h3QllJC/tiUzl5UlGCTIoDuDcKG6J538MCY2Pqe2IOE=";
+      rev = "049f6e79cc3e8636cec21bbd94ed185b4a5f2653";
+      hash = "sha256-VmSKKCsBvmvXSnFbw6GJRgiGjlne8rw22+RCLBV/kD4=";
     };
     ccd = fetchFromGitHub {
       owner = "danfis";
@@ -36,14 +36,14 @@ let
     eigen3 = fetchFromGitLab {
       owner = "libeigen";
       repo = "eigen";
-      rev = "7f2377859377da6f22152015c28b12c04752af77";
-      hash = "sha256-SmyvY/WlU9jryD9ZpSw73dQEc9jI4ySQPRnplg/BC4w=";
+      rev = "66f7f51b7e069d0a03a21157fa60b24aece69aeb";
+      hash = "sha256-/xd0GnXoW8vclIk8aKAziQwDx6AdlBmZD48p8aCX6TQ=";
     };
     googletest = fetchFromGitHub {
       owner = "google";
       repo = "googletest";
-      rev = "b514bdc898e2951020cbdca1304b75f5950d1f59";
-      hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
+      rev = "6910c9d9165801d8827d628cb72eb7ea9dd538c5";
+      hash = "sha256-01PK9LxqHno89gypd7ze5gDP4V3en2J5g6JZRqohDB0=";
     };
     lodepng = fetchFromGitHub {
       owner = "lvandeve";
@@ -76,28 +76,28 @@ let
       hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw=";
     };
 
-    tmd = stdenv.mkDerivation rec {
+    tmd = stdenv.mkDerivation {
       name = "TriangleMeshDistance";
 
       src = fetchFromGitHub {
         owner = "InteractiveComputerGraphics";
-        repo = name;
+        repo = "TriangleMeshDistance";
         rev = "e55a15c20551f36242fd6368df099a99de71d43a";
         hash = "sha256-vj6TMMT8mp7ciLa5nzVAhMWPcAHXq+ZwHlWsRA3uCmg=";
       };
 
       installPhase = ''
         mkdir -p $out/include/tmd
-        cp ${name}/include/tmd/${name}.h $out/include/tmd/
+        cp TriangleMeshDistance/include/tmd/TriangleMeshDistance.h $out/include/tmd/
       '';
     };
 
-    sdflib = stdenv.mkDerivation rec {
+    sdflib = stdenv.mkDerivation {
       name = "SdfLib";
 
       src = fetchFromGitHub {
         owner = "UPC-ViRVIG";
-        repo = name;
+        repo = "SdfLib";
         rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae";
         hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE=";
       };
@@ -105,13 +105,13 @@ let
       patches = [ ./sdflib-system-deps.patch ];
 
       cmakeFlags = [
-        "-DSDFLIB_USE_ASSIMP=OFF"
-        "-DSDFLIB_USE_OPENMP=OFF"
-        "-DSDFLIB_USE_ENOKI=OFF"
-        "-DSDFLIB_USE_SYSTEM_GLM=ON"
-        "-DSDFLIB_USE_SYSTEM_SPDLOG=ON"
-        "-DSDFLIB_USE_SYSTEM_CEREAL=ON"
-        "-DSDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE=ON"
+        (lib.cmakeBool "SDFLIB_USE_ASSIMP" false)
+        (lib.cmakeBool "SDFLIB_USE_OPENMP" false)
+        (lib.cmakeBool "SDFLIB_USE_ENOKI" false)
+        (lib.cmakeBool "SDFLIB_USE_SYSTEM_GLM" true)
+        (lib.cmakeBool "SDFLIB_USE_SYSTEM_SPDLOG" true)
+        (lib.cmakeBool "SDFLIB_USE_SYSTEM_CEREAL" true)
+        (lib.cmakeBool "SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE" true)
       ];
 
       nativeBuildInputs = [ cmake ];
@@ -130,17 +130,17 @@ let
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mujoco";
-  version = "3.2.7";
+  version = "3.3.0";
 
   # Bumping version? Make sure to look though the MuJoCo's commit
   # history for bumped dependency pins!
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "mujoco";
-    tag = version;
-    hash = "sha256-TAhgu3h7tCflIMscVS+jYuUfMmIYcCcI3JFxUlj8g9E=";
+    tag = finalAttrs.version;
+    hash = "sha256-6Mb50WD5ZQksKoG4FH3+iyy9qBqa1fKUPyt6McNDkGg=";
   };
 
   patches = [ ./mujoco-system-deps-dont-fetch.patch ];
@@ -158,9 +158,9 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DMUJOCO_USE_SYSTEM_sdflib=ON"
-    "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON"
-    "-DMUJOCO_SAMPLES_USE_SYSTEM_GLFW=ON"
+    (lib.cmakeBool "MUJOCO_USE_SYSTEM_sdflib" true)
+    (lib.cmakeBool "MUJOCO_SIMULATE_USE_SYSTEM_GLFW" true)
+    (lib.cmakeBool "MUJOCO_SAMPLES_USE_SYSTEM_GLFW" true)
   ];
 
   # Move things into place so that cmake doesn't try downloading dependencies.
@@ -190,7 +190,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Multi-Joint dynamics with Contact. A general purpose physics simulator";
     homepage = "https://mujoco.org/";
-    changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}";
+    changelog = "https://mujoco.readthedocs.io/en/${finalAttrs.version}/changelog.html";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       GaetanLepage
@@ -199,4 +199,4 @@ stdenv.mkDerivation rec {
     ];
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})
diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix
index 89a31e15a96b..40140ba110b4 100644
--- a/pkgs/development/python-modules/mujoco/default.nix
+++ b/pkgs/development/python-modules/mujoco/default.nix
@@ -20,6 +20,7 @@
   glfw,
   numpy,
   pyopengl,
+  typing-extensions,
 
   perl,
   python,
@@ -37,7 +38,7 @@ buildPythonPackage rec {
   # in the project's CI.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-a0ATRmtFV11J3T2HSNCZhfc0kAOu8yaHIW0rkCrHsTg=";
+    hash = "sha256-D7EqtxW8K20jlKYzC4w6HdlbDzuoEr/k9skeChyjrQ8=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -57,6 +58,7 @@ buildPythonPackage rec {
     glfw
     numpy
     pyopengl
+    typing-extensions
   ];
 
   pythonImportsCheck = [ "${pname}" ];
@@ -64,8 +66,8 @@ buildPythonPackage rec {
   env.MUJOCO_PATH = "${mujoco}";
   env.MUJOCO_PLUGIN_PATH = "${mujoco}/lib";
   env.MUJOCO_CMAKE_ARGS = lib.concatStringsSep " " [
-    "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON"
-    "-DMUJOCO_PYTHON_USE_SYSTEM_PYBIND11=ON"
+    (lib.cmakeBool "MUJOCO_SIMULATE_USE_SYSTEM_GLFW" true)
+    (lib.cmakeBool "MUJOCO_PYTHON_USE_SYSTEM_PYBIND11" true)
   ];
 
   preConfigure =
@@ -82,8 +84,8 @@ buildPythonPackage rec {
         platform = with stdenv.hostPlatform.parsed; "${kernel.name}-${cpu.name}";
       in
       ''
-        ${perl}/bin/perl -0777 -i -pe "s/GIT_REPO\n.*\n.*GIT_TAG\n.*\n//gm" mujoco/CMakeLists.txt
-        ${perl}/bin/perl -0777 -i -pe "s/(FetchContent_Declare\(\n.*lodepng\n.*)(GIT_REPO.*\n.*GIT_TAG.*\n)(.*\))/\1\3/gm" mujoco/simulate/CMakeLists.txt
+        ${lib.getExe perl} -0777 -i -pe "s/GIT_REPO\n.*\n.*GIT_TAG\n.*\n//gm" mujoco/CMakeLists.txt
+        ${lib.getExe perl} -0777 -i -pe "s/(FetchContent_Declare\(\n.*lodepng\n.*)(GIT_REPO.*\n.*GIT_TAG.*\n)(.*\))/\1\3/gm" mujoco/simulate/CMakeLists.txt
 
         build="/build/${pname}-${version}/build/temp.${platform}-cpython-${pythonVersionMajorMinor}/"
         mkdir -p $build/_deps
@@ -95,9 +97,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python bindings for MuJoCo: a general purpose physics simulator";
-    homepage = "https://mujoco.org/";
-    changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}";
-    license = lib.licenses.asl20;
+    inherit (mujoco.meta) homepage changelog license;
     maintainers = with lib.maintainers; [
       GaetanLepage
       tmplt

From de0fe301211c267807afd11b12613f5511ff7433 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Mar 2025 22:35:42 +0000
Subject: [PATCH 25/30] python312Packages.mplhep: 0.3.56 -> 0.3.57

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

diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
index a5c167aa603f..c51d1a925739 100644
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "mplhep";
-  version = "0.3.56";
+  version = "0.3.57";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "mplhep";
     tag = "v${version}";
-    hash = "sha256-sMJpJUEtIqmu7kCgZp43t9XLy/6nkDgKcxC4nFb+1po=";
+    hash = "sha256-R0H/gp/8q6bUB2jCZUKiywz1fNQbzzRsuvjTQz0DeAo=";
   };
 
   build-system = [
@@ -68,7 +68,7 @@ buildPythonPackage rec {
   meta = {
     description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";
     homepage = "https://github.com/scikit-hep/mplhep";
-    changelog = "https://github.com/scikit-hep/mplhep/releases/tag/v${version}";
+    changelog = "https://github.com/scikit-hep/mplhep/releases/tag/${src.tag}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ veprbl ];
   };

From 9154158bce496e92d6475285ee6914c1758f9c40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Mar 2025 02:04:32 +0000
Subject: [PATCH 26/30] python312Packages.google-genai: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
index 195db83d3cb9..ff0bb2113fdf 100644
--- a/pkgs/development/python-modules/google-genai/default.nix
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-genai";
-  version = "1.4.0";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-genai";
     tag = "v${version}";
-    hash = "sha256-aVn23g67PW3Qge6ZI0lFoozdoWVRrISy29k4uvBKTBQ=";
+    hash = "sha256-kw4RUcI8ARgVXsyqyo6jysjVn35yAs9//fv60PaOrXI=";
   };
 
   build-system = [ setuptools ];

From b215052b0bce39ee6593db32232f089525093d12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Mar 2025 02:04:32 +0000
Subject: [PATCH 27/30] python312Packages.gitingest: 0.1.3 -> 0.1.4

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

diff --git a/pkgs/development/python-modules/gitingest/default.nix b/pkgs/development/python-modules/gitingest/default.nix
index a7159ad43be9..30084817b05a 100644
--- a/pkgs/development/python-modules/gitingest/default.nix
+++ b/pkgs/development/python-modules/gitingest/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "gitingest";
-  version = "0.1.3";
+  version = "0.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cyclotruc";
     repo = "gitingest";
     tag = "v${version}";
-    hash = "sha256-RGrenW0modLH9h5pQOexPvEDQ9Bczoj1qInYmgUoGdo=";
+    hash = "sha256-2zt4pYgj5fieYS74QCMA9Kw9FUNb13ZJB/tX7WkMQew=";
   };
 
   build-system = [
@@ -71,7 +71,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/cyclotruc/gitingest/releases/tag/v${version}";
+    changelog = "https://github.com/cyclotruc/gitingest/releases/tag/${src.tag}";
     description = "Replace 'hub' with 'ingest' in any github url to get a prompt-friendly extract of a codebase";
     homepage = "https://github.com/cyclotruc/gitingest";
     license = lib.licenses.mit;

From 408f1f1ac662c44c1f9a6c6788eeb6930fefc9d1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 6 Mar 2025 21:38:36 -0500
Subject: [PATCH 28/30] beamPackages.ex_doc: add erlang builds to tests

---
 .../beam-modules/ex_doc/default.nix           | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 09cb50319027..e5ec87da1e16 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -1,4 +1,15 @@
-{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }:
+{
+  lib,
+  elixir,
+  fetchFromGitHub,
+  fetchMixDeps,
+  mixRelease,
+  nix-update-script,
+
+  # for tests
+  beam27Packages,
+  beam28Packages,
+}:
 # Based on ../elixir-ls/default.nix
 
 let
@@ -12,7 +23,12 @@ let
   };
 in
 mixRelease {
-  inherit pname version src elixir;
+  inherit
+    pname
+    version
+    src
+    elixir
+    ;
 
   stripDebug = true;
 
@@ -41,7 +57,15 @@ mixRelease {
     runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests = {
+      # ex_doc is the doc generation for OTP 27+, so let's make sure they build
+      erlang_27 = beam27Packages.erlang;
+      erlang_28 = beam28Packages.erlang;
+    };
+
+    updateScript = nix-update-script { };
+  };
 
   meta = with lib; {
     homepage = "https://github.com/elixir-lang/ex_doc";
@@ -51,6 +75,6 @@ mixRelease {
     license = licenses.asl20;
     platforms = platforms.unix;
     mainProgram = "ex_doc";
-    maintainers = with maintainers; [chiroptical];
+    maintainers = with maintainers; [ chiroptical ];
   };
 }

From a4414731640221444c64439eafc46134e6166677 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 3 Mar 2025 01:28:13 +0800
Subject: [PATCH 29/30] superlu_dist: init at 9.1.0

---
 .../su/superlu_dist/mc64ad_dist-stub.patch    |  31 ++++++
 pkgs/by-name/su/superlu_dist/package.nix      | 103 ++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 pkgs/by-name/su/superlu_dist/mc64ad_dist-stub.patch
 create mode 100644 pkgs/by-name/su/superlu_dist/package.nix

diff --git a/pkgs/by-name/su/superlu_dist/mc64ad_dist-stub.patch b/pkgs/by-name/su/superlu_dist/mc64ad_dist-stub.patch
new file mode 100644
index 000000000000..5de52014518d
--- /dev/null
+++ b/pkgs/by-name/su/superlu_dist/mc64ad_dist-stub.patch
@@ -0,0 +1,31 @@
+mc64ad_dist.c was removed (DFSG nonfree), create stubs
+--- /dev/null
++++ b/SRC/prec-independent/mc64ad_dist.c
+@@ -0,0 +1,27 @@
++/* The original mc64ad_dist.c is nonfree and has been removed.
++   We provide a stub interface here instead.
++*/
++
++#include <stdio.h>
++#include <stdlib.h>
++
++#include "superlu_ddefs.h"
++
++/* only mc64id_dist and mc64ad_dist are referenced by SuperLU-Dist code */
++
++/* Subroutine */ int_t mc64id_dist(int_t *icntl)
++{
++    fprintf(stderr, "SuperLU-Dist: MC64 functionality not available.\n(It uses code under a non-free HSL licence which does not permit redistribution).\nAborting mc64id_dist.\n");
++    abort();
++    return 0;
++}
++
++int_t mc64ad_dist(int_t *job, int_t *n, int_t *ne, int_t *
++	ip, int_t *irn, double *a, int_t *num, int_t *cperm,
++	int_t *liw, int_t *iw, int_t *ldw, double *dw, int_t *
++	icntl, int_t *info)
++{
++    fprintf(stderr, "SuperLU-Dist: MC64 functionality not available.\n(It uses code under a non-free HSL licence which does not permit redistribution).\nAborting mc64ad_dist.\n");
++    abort();
++    return 0;
++}
diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix
new file mode 100644
index 000000000000..61103a169eca
--- /dev/null
+++ b/pkgs/by-name/su/superlu_dist/package.nix
@@ -0,0 +1,103 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchDebianPatch,
+  cmake,
+  gfortran,
+  blas,
+  lapack,
+  mpi,
+  mpiCheckPhaseHook,
+  metis,
+  parmetis,
+
+  # Todo: ask for permission of unfree parmetis
+  withParmetis ? false,
+}:
+
+assert (!blas.isILP64) && (!lapack.isILP64);
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "superlu_dist";
+  version = "9.1.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "xiaoyeli";
+    repo = "superlu_dist";
+    tag = "v${finalAttrs.version}";
+    # Remove non‐free files.
+    postFetch = "rm $out/SRC/prec-independent/mc64ad_dist.c";
+    hash = "sha256-NMAEtTmTY189p8BlmsTugwMuxKZh+Bs1GyuwUHkLA1U=";
+  };
+
+  patches = [
+    ./mc64ad_dist-stub.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace SRC/prec-independent/util.c \
+      --replace-fail "LargeDiag_MC64" "NOROWPERM"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    gfortran
+  ];
+
+  buildInputs =
+    [
+      mpi
+      lapack
+    ]
+    ++ lib.optionals withParmetis [
+      metis
+      parmetis
+    ];
+
+  propagatedBuildInputs = [ blas ];
+
+  cmakeFlags =
+    [
+      (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+      (lib.cmakeBool "enable_fortran" true)
+      (lib.cmakeBool "enable_complex16" true)
+      (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false)
+      (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true)
+      (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis)
+    ]
+    ++ lib.optionals withParmetis [
+      (lib.cmakeFeature "TPL_PARMETIS_LIBRARIES" "-lmetis -lparmetis")
+      (lib.cmakeFeature "TPL_PARMETIS_INCLUDE_DIRS" "${lib.getDev parmetis}/include")
+    ];
+
+  doCheck = true;
+
+  nativeCheckInputs = [ mpiCheckPhaseHook ];
+
+  meta = {
+    homepage = "https://portal.nersc.gov/project/sparse/superlu/";
+    license = with lib.licenses; [
+      # Files: *
+      # Lawrence Berkeley National Labs BSD variant license
+      bsd3Lbnl
+
+      # Files: SRC/prec-independent/symbfact.c
+      # Xerox code; actually `Boehm-GC` variant.
+      mit
+
+      # Files: SRC/include/*colamd.h
+      # University of Florida code; permissive COLAMD licence.
+      free
+
+      # Files: SRC/include/wingetopt.*
+      # Microsoft code; Obtained from https://github.com/iotivity/iotivity/tree/master/resource/c_common/windows.
+      asl20
+    ];
+    description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations";
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ qbisi ];
+  };
+})

From 1246f9f50fa3eb3eca816843b484da14e290b389 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 11 Nov 2024 15:04:58 +0800
Subject: [PATCH 30/30] netgen: init at 6.2.2501

---
 pkgs/by-name/ne/netgen/package.nix | 169 +++++++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix |   2 +
 2 files changed, 171 insertions(+)
 create mode 100644 pkgs/by-name/ne/netgen/package.nix

diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix
new file mode 100644
index 000000000000..46086c442524
--- /dev/null
+++ b/pkgs/by-name/ne/netgen/package.nix
@@ -0,0 +1,169 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch2,
+  makeWrapper,
+  cmake,
+  python3Packages,
+  mpi,
+  mpiCheckPhaseHook,
+  metis,
+  opencascade-occt,
+  libGLU,
+  zlib,
+  tcl,
+  tk,
+  xorg,
+  libjpeg,
+  ffmpeg,
+  catch2,
+  avxSupport ? stdenv.hostPlatform.avxSupport,
+  avx2Support ? stdenv.hostPlatform.avx2Support,
+  avx512Support ? stdenv.hostPlatform.avx512Support,
+}:
+let
+  archFlags = toString (
+    lib.optional avxSupport "-mavx"
+    ++ lib.optional avx2Support "-mavx2"
+    ++ lib.optional avx512Support "-mavx512"
+  );
+  patchSource = "https://salsa.debian.org/science-team/netgen/-/raw/debian/6.2.2404+dfsg1-5/debian/patches";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "netgen";
+  version = "6.2.2501";
+
+  src = fetchFromGitHub {
+    owner = "ngsolve";
+    repo = "netgen";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IzYulT3bo7XZiEEy8vNCct0zqHCnbQaH+y4fHMorzZw=";
+  };
+
+  patches = [
+    # disable some platform specified code used by downstream ngsolve
+    # can be enabled with -march=armv8.3-a+simd when compiling ngsolve
+    # note compiling netgen itself is not influenced by this feature
+    (fetchpatch2 {
+      url = "https://github.com/NGSolve/netgen/pull/197/commits/1d93dfba00f224787cfc2cde1af2ab5d7f5b87f7.patch";
+      hash = "sha256-3Nom4uGhGLtSGn/k+qKKSxVxrGtGTHqPtcNn3D/gkZU";
+    })
+
+    (fetchpatch2 {
+      url = "${patchSource}/use-local-catch2.patch";
+      hash = "sha256-h4ob8tl6mvGt5B0qXRFNcl9MxPXxRhYw+PrGr5iRGGk=";
+    })
+    (fetchpatch2 {
+      url = "${patchSource}/ffmpeg_link_libraries.patch";
+      hash = "sha256-S02OPH9hbJjOnBm6JMh6uM5XptcubV24vdyEF0FusoM=";
+    })
+    (fetchpatch2 {
+      url = "${patchSource}/fix_nggui_tcl.patch";
+      hash = "sha256-ODDT67+RWBzPhhq/equWsu78x9L/Yrs3U8VQ1Uu0zZw=";
+    })
+    (fetchpatch2 {
+      url = "${patchSource}/include_stdlib.patch";
+      hash = "sha256-W+NgGBuy/UmzVbPTSqR8FRUlyN/9dl9l9e9rxKklmIc=";
+    })
+    (fetchpatch2 {
+      url = "${patchSource}/fix-version.patch";
+      hash = "sha256-CT98Wq3UufB81z/jYLiH9nXvt+QzoZ7210OeuFXCfmc=";
+    })
+  ];
+
+  # when generating python stub file utilizing system python pybind11_stubgen module
+  # cmake need to inherit pythonpath
+  postPatch = ''
+    substituteInPlace python/CMakeLists.txt \
+      --replace-fail ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}' \
+                     ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}'
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    python3Packages.pybind11-stubgen
+  ];
+
+  buildInputs = [
+    metis
+    opencascade-occt
+    zlib
+    tcl
+    tk
+    libGLU
+    xorg.libXmu
+    libjpeg
+    ffmpeg
+    mpi
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    packaging
+    pybind11
+    mpi4py
+    numpy
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "NETGEN_VERSION_GIT" "v${finalAttrs.version}-0")
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" archFlags)
+    (lib.cmakeBool "USE_MPI" true)
+    (lib.cmakeBool "USE_MPI4PY" true)
+    (lib.cmakeBool "PREFER_SYSTEM_PYBIND11" true)
+    (lib.cmakeBool "BUILD_STUB_FILES" true)
+    (lib.cmakeBool "USE_SUPERBUILD" false) # use system packages
+    (lib.cmakeBool "USE_NATIVE_ARCH" false)
+    (lib.cmakeBool "USE_JPEG" true)
+    (lib.cmakeBool "USE_MPEG" true)
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doInstallCheck)
+    (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doInstallCheck)
+  ];
+
+  # Tcl script used by netgen need to be aware of environment NETGENDIR
+  postInstall = ''
+    wrapProgram "$out/bin/netgen" --set NETGENDIR "$out/bin"
+  '';
+
+  # mesh generation differs on x86_64 and aarch64 platform
+  # tests will fail on aarch64 platform
+  doInstallCheck = stdenv.hostPlatform.isx86_64;
+
+  preInstallCheck = ''
+    export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH
+  '';
+
+  installCheckTarget = "test";
+
+  nativeInstallCheckInputs = [
+    catch2
+    python3Packages.pytest
+    python3Packages.pytest-check
+    python3Packages.pytest-mpi
+    mpiCheckPhaseHook
+  ];
+
+  passthru = {
+    inherit avxSupport avx2Support avx512Support;
+  };
+
+  meta = {
+    homepage = "https://ngsolve.org";
+    description = "Atomatic 3d tetrahedral mesh generator";
+    license = with lib.licenses; [
+      lgpl2Plus
+      lgpl21Plus
+      lgpl21Only
+      bsd3
+      boost
+      publicDomain
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    mainProgram = "netgen";
+    maintainers = with lib.maintainers; [ qbisi ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de00c9d97ee5..308034bcc43c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9395,6 +9395,8 @@ self: super: with self; {
 
   netdisco = callPackage ../development/python-modules/netdisco { };
 
+  netgen = toPythonModule (pkgs.netgen.override { python3Packages = self; });
+
   nethsm = callPackage ../development/python-modules/nethsm { };
 
   netifaces = callPackage ../development/python-modules/netifaces { };