From 07a1d5542750c1ebc13862db73e147978bf32383 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 20 Mar 2025 12:59:31 -0400
Subject: [PATCH 01/61] ants: use wrapProgram with --prefix not --set

In this way coreutils is not removed from PATH.

Fixes #391554
---
 pkgs/applications/science/biology/ants/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index fabcfbd708dd..fea8bdeef15e 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     for file in $out/bin/*; do
-      wrapProgram $file --set PATH "$out/bin"
+      wrapProgram $file --prefix PATH : "$out/bin"
     done
   '';
 

From 6e7e61cc0c4503b09eaca2dfce4dd5521921dff4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 23 Mar 2025 13:47:57 +0100
Subject: [PATCH 02/61] {bambootracker,bambootracker-qt6}: 0.6.4 -> 0.6.5

---
 .../audio/bambootracker/default.nix           | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix
index 5bf7445d2682..66f3059ddcd8 100644
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   gitUpdater,
   pkg-config,
   qmake,
@@ -17,17 +18,40 @@
 assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null;
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "bambootracker";
-  version = "0.6.4";
+  pname = "bambootracker" + lib.optionalString (lib.versionAtLeast qtbase.version "6.0") "-qt6";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "BambooTracker";
     repo = "BambooTracker";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-tFUliKR55iZybNyYIF1FXh8RGf8jKEsGrWBuldB277g=";
+    hash = "sha256-WoyOqInOOOIEwsMOc2yoTdh9UhJOvFKE1GfkxOuXDe0=";
   };
 
+  patches = [
+    # Remove when version > 0.6.5
+    (fetchpatch {
+      name = "0001-bambootracker-Fix-compiler-warnings.patch";
+      url = "https://github.com/BambooTracker/BambooTracker/commit/d670cf8b6113318cd938cf19be76b6b14d3635f1.patch";
+      hash = "sha256-yyOMaOYKSc1hbbCL7wjFNPDmX2oMYo10J4hjZJss2zs=";
+    })
+
+    # Remove when version > 0.6.5
+    (fetchpatch {
+      name = "0002-bambootracker-Fix-GCC15-compat.patch";
+      url = "https://github.com/BambooTracker/BambooTracker/commit/92c0a7d1cfb05d1c6ae9482181c5c378082b772c.patch";
+      hash = "sha256-6K0RZD0LevggxFr92LaNmq+eMgOFJgFX60IgAw7tYdM=";
+    })
+
+    # Remove when version > 0.6.5
+    (fetchpatch {
+      name = "0003-bambootracker-Drop-unused-property.patch";
+      url = "https://github.com/BambooTracker/BambooTracker/commit/de4459f0315f099d3e0a2d20b938ec76285f2d46.patch";
+      hash = "sha256-zTh6i+hgQZ3kEid0IzQaR/PsrYlnhplccdlaS5g8FeA=";
+    })
+  ];
+
   postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") ''
     # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path
     # https://github.com/NixOS/nixpkgs/issues/214765
@@ -60,9 +84,9 @@ stdenv.mkDerivation (finalAttrs: {
       "CONFIG+=system_rtaudio"
       "CONFIG+=system_rtmidi"
     ]
-    ++ lib.optionals (stdenv.cc.isClang || (lib.versionAtLeast qtbase.version "6.0")) [
+    ++ lib.optionals stdenv.cc.isClang [
       # Clang is extra-strict about some deprecations
-      # Latest Qt6 deprecated QCheckBox::stateChanged(int)
+      # https://github.com/BambooTracker/BambooTracker/issues/506
       "CONFIG+=no_warnings_are_errors"
     ];
 
@@ -84,12 +108,12 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
     mainProgram = "BambooTracker";
     homepage = "https://bambootracker.github.io/BambooTracker/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ OPNA2608 ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
   };
 })

From 44fa0d91d7c909f294003538670102b9427cacb0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 23 Mar 2025 13:49:01 +0100
Subject: [PATCH 03/61] {bambootracker,bambootracker-qt6}: Migrate to
 pkgs/by-name

---
 .../ba/bambootracker/package.nix}             | 52 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 30 insertions(+), 25 deletions(-)
 rename pkgs/{applications/audio/bambootracker/default.nix => by-name/ba/bambootracker/package.nix} (83%)

diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/by-name/ba/bambootracker/package.nix
similarity index 83%
rename from pkgs/applications/audio/bambootracker/default.nix
rename to pkgs/by-name/ba/bambootracker/package.nix
index 66f3059ddcd8..5b96caa3e842 100644
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/by-name/ba/bambootracker/package.nix
@@ -4,21 +4,19 @@
   fetchFromGitHub,
   fetchpatch,
   gitUpdater,
+  libsForQt5,
   pkg-config,
-  qmake,
-  qt5compat ? null,
-  qtbase,
-  qttools,
-  qtwayland,
+  qt6Packages,
   rtaudio_6,
   rtmidi,
-  wrapQtAppsHook,
+  withQt6 ? false,
 }:
 
-assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null;
-
+let
+  qtPackages = if withQt6 then qt6Packages else libsForQt5;
+in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "bambootracker" + lib.optionalString (lib.versionAtLeast qtbase.version "6.0") "-qt6";
+  pname = "bambootracker" + lib.optionalString withQt6 "-qt6";
   version = "0.6.5";
 
   src = fetchFromGitHub {
@@ -52,32 +50,40 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") ''
+  postPatch = lib.optionalString withQt6 ''
     # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path
     # https://github.com/NixOS/nixpkgs/issues/214765
     substituteInPlace BambooTracker/lang/lang.pri \
       --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)'
   '';
 
-  nativeBuildInputs = [
-    pkg-config
-    qmake
-    qttools
-    wrapQtAppsHook
-  ];
+  nativeBuildInputs =
+    [
+      pkg-config
+    ]
+    ++ (with qtPackages; [
+      qmake
+      qttools
+      wrapQtAppsHook
+    ]);
 
   buildInputs =
     [
-      qtbase
       rtaudio_6
       rtmidi
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ]
-    ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [
-      qt5compat
-    ];
+    ++ (
+      with qtPackages;
+      [
+        qtbase
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        qtwayland
+      ]
+      ++ lib.optionals withQt6 [
+        qt5compat
+      ]
+    );
 
   qmakeFlags =
     [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c58ea108f2c7..dbf63c9f8488 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12830,8 +12830,7 @@ with pkgs;
 
   av-98 = callPackage ../applications/networking/browsers/av-98 { };
 
-  bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
-  bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { };
+  bambootracker-qt6 = bambootracker.override { withQt6 = true; };
 
   schismtracker = callPackage ../applications/audio/schismtracker {
     inherit (darwin.apple_sdk.frameworks) Cocoa;

From 20dad1493ffbaf3d75dfbfa1e3b9aa566fa811dd Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 31 Mar 2025 14:18:17 +0200
Subject: [PATCH 04/61] dbus-cpp: 5.0.3 -> 5.0.4

---
 pkgs/by-name/db/dbus-cpp/package.nix | 53 ++++++++++------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index b9ab77c35dd5..976125f91625 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   boost186,
@@ -20,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dbus-cpp";
-  version = "5.0.3";
+  version = "5.0.4";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/dbus-cpp";
-    rev = finalAttrs.version;
-    hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s=";
+    tag = finalAttrs.version;
+    hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4=";
   };
 
   outputs = [
@@ -36,39 +35,22 @@ stdenv.mkDerivation (finalAttrs: {
     "examples"
   ];
 
-  patches = [
-    # Handle already-stolen dbus call better
-    # Remove when version > 5.0.3
-    (fetchpatch {
-      name = "0001-dbus-cpp-src-Dont-steal-a-pending-dbus-call-more-then-once.patch";
-      url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/9f3d1ff2b1c6c732285949c3dbb35e40cf55ea92.patch";
-      hash = "sha256-xzOCIJVsK2J+X9RsV930R9uw6h4UxqwSaNOgv8v4qQU=";
-    })
-
-    # Fix GCC13 compilation
-    # Remove when version > 5.0.3
-    (fetchpatch {
-      name = "0002-dbus-cpp-Add-missing-headers-for-GCC13.patch";
-      url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/c761b1eec084962dbe64d35d7f7b86dcbe57a3f7.patch";
-      hash = "sha256-/tKe3iHWxP9jWtpdgwwRynj8565u9LxCt4WXJDXzgX4=";
-    })
-  ];
-
   postPatch =
     ''
       substituteInPlace doc/CMakeLists.txt \
-        --replace 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
+        --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
 
       # Warning on aarch64-linux breaks build due to -Werror
       substituteInPlace CMakeLists.txt \
-        --replace '-Werror' ""
+        --replace-fail '-Werror' ""
 
       # pkg-config output patching hook expects prefix variable here
       substituteInPlace data/dbus-cpp.pc.in \
-        --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
+        --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
     ''
     + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
+      substituteInPlace CMakeLists.txt \
+        --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)'
     '';
 
   strictDeps = true;
@@ -98,11 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DDBUS_CPP_ENABLE_DOC_GENERATION=ON"
+    (lib.cmakeBool "DBUS_CPP_ENABLE_DOC_GENERATION" true)
   ];
 
-  # Too flaky on ARM CI & for some amd64 users
-  doCheck = false;
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   # DBus, parallelism messes with communication
   enableParallelChecking = false;
@@ -112,17 +93,21 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      versionCheck = true;
+    };
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Dbus-binding leveraging C++-11";
     homepage = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ OPNA2608 ];
+    changelog = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/blob/${finalAttrs.version}/ChangeLog";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
     mainProgram = "dbus-cppc";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     pkgConfigModules = [
       "dbus-cpp"
     ];

From 3ade643fd4a66c0fcce71e3e866e701bca3e83c8 Mon Sep 17 00:00:00 2001
From: kiria-moe <aegisa7280@gmail.com>
Date: Tue, 1 Apr 2025 18:24:56 +0800
Subject: [PATCH 05/61] trojan-go: fix

Trojan-go's all functionalities need to be enabled explicitly.
---
 pkgs/by-name/tr/trojan-go/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix
index 40087b8834b7..7d75473ce924 100644
--- a/pkgs/by-name/tr/trojan-go/package.nix
+++ b/pkgs/by-name/tr/trojan-go/package.nix
@@ -19,6 +19,15 @@ buildGoModule rec {
 
   vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4=";
 
+  tags = [
+    "api"
+    "client"
+    "server"
+    "forward"
+    "nat"
+    "other"
+  ];
+
   # tests fail due to requiring networking
   doCheck = false;
 

From 381aa66c682ed747cff7d9f79bab923dd9ccbc9e Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Thu, 20 Mar 2025 21:13:11 +0100
Subject: [PATCH 06/61] mum: init at 0.5.1

---
 pkgs/by-name/mu/mum/package.nix | 68 +++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 pkgs/by-name/mu/mum/package.nix

diff --git a/pkgs/by-name/mu/mum/package.nix b/pkgs/by-name/mu/mum/package.nix
new file mode 100644
index 000000000000..0cc9ce86e3ab
--- /dev/null
+++ b/pkgs/by-name/mu/mum/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  cmake,
+  pkg-config,
+  alsa-lib,
+  gdk-pixbuf,
+  glib,
+  libnotify,
+  libopus,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+  installShellFiles,
+
+  withNotifications ? true,
+  withOgg ? true,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mum";
+  version = "0.5.1";
+  src = fetchFromGitHub {
+    owner = "mum-rs";
+    repo = "mum";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-r2isuwXq79dOQQWB+CsofYCLQYu9VKm7kzoxw103YV4=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-ey3nT6vZ5YOZGk08HykK9RxI7li+Sz+sER3HioGSXP0=";
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    installShellFiles
+  ];
+
+  buildInputs = [
+    alsa-lib
+    gdk-pixbuf
+    glib
+    libopus
+    openssl
+  ] ++ lib.optional withNotifications libnotify;
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = lib.optional withNotifications "notifications" ++ lib.optional withOgg "ogg";
+
+  postInstall = ''
+    installManPage documentation/*.{1,5}
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/mumctl";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Daemon/cli mumble client";
+    homepage = "https://github.com/mum-rs/mum";
+    changelog = "https://github.com/mum-rs/mum/releases/tag/v${finalAttrs.version}";
+    maintainers = with lib.maintainers; [ lykos153 ];
+    license = lib.licenses.mit;
+  };
+})

From 97da8b0cf41a22bf24d52e1df8d496889d4571b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 12:47:25 +0000
Subject: [PATCH 07/61] mathgl: 8.0.2 -> 8.0.3

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

diff --git a/pkgs/by-name/ma/mathgl/package.nix b/pkgs/by-name/ma/mathgl/package.nix
index 45095e7f2bf7..6d5f8cee965a 100644
--- a/pkgs/by-name/ma/mathgl/package.nix
+++ b/pkgs/by-name/ma/mathgl/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "mathgl";
-  version = "8.0.2";
+  version = "8.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz";
-    sha256 = "sha256-cWYJlWhKawooI/Z49sQ4q6ukdKEVJGzfX5sLRgq/ysE=";
+    sha256 = "sha256-m7qe5qD4bRuPPzugN008t3b3ctu28aAWhMpsC9ViBNY=";
   };
 
   nativeBuildInputs = [

From 2621c21a2a840a5bf9d7677899062d98eeb25bdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 02:59:32 +0000
Subject: [PATCH 08/61] python312Packages.marimo: 0.11.20 -> 0.12.2

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

diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 58400d0aba6d..af0d1d4639ef 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -33,13 +33,13 @@
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.11.20";
+  version = "0.12.2";
   pyproject = true;
 
   # The github archive does not include the static assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-94UP5kDKQ5JS9egEOuMQQoewSTctIRRPt0b50yYg+r8=";
+    hash = "sha256-FrOuujO0YUneQYQdnVKKzJIGqfcUoHDWpf28SJlAgOY=";
   };
 
   build-system = [ hatchling ];

From bf1c61d16adf3ba583d4bdeafa309b01a9e15edf Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 3 Apr 2025 13:47:00 +0300
Subject: [PATCH 09/61] netexec: fix eval

---
 pkgs/tools/security/netexec/default.nix | 67 +++++++++++++++----------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix
index f3145427148f..4b507161da47 100644
--- a/pkgs/tools/security/netexec/default.nix
+++ b/pkgs/tools/security/netexec/default.nix
@@ -2,30 +2,44 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python3,
+  buildPythonApplication,
+  pytestCheckHook,
+  # Deps
+  poetry-core,
+  poetry-dynamic-versioning,
+  aardwolf,
+  aioconsole,
+  aiosqlite,
+  argcomplete,
+  asyauth,
+  beautifulsoup4,
+  bloodhound-py,
+  dploot,
+  dsinternals,
+  lsassy,
+  masky,
+  minikerberos,
+  msgpack,
+  msldap,
+  neo4j,
+  paramiko,
+  pyasn1-modules,
+  pylnk3,
+  pynfsclient,
+  pypsrp,
+  pypykatz,
+  python-dateutil,
+  python-libnmap,
+  pywerview,
+  requests,
+  rich,
+  sqlalchemy,
+  termcolor,
+  terminaltables,
+  xmltodict,
+  impacket,
 }:
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      impacket = super.impacket.overridePythonAttrs {
-        version = "0.12.0.dev1-unstable-2023-11-30";
-        src = fetchFromGitHub {
-          owner = "Pennyw0rth";
-          repo = "impacket";
-          rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38";
-          hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E=";
-        };
-        # Fix version to be compliant with Python packaging rules
-        postPatch = ''
-          substituteInPlace setup.py \
-            --replace 'version="{}.{}.{}.{}{}"' 'version="{}.{}.{}"'
-        '';
-      };
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+buildPythonApplication rec {
   pname = "netexec";
   version = "1.3.0";
   pyproject = true;
@@ -50,12 +64,12 @@ python.pkgs.buildPythonApplication rec {
       --replace-fail '{ git = "https://github.com/Pennyw0rth/NfsClient" }' '"*"'
   '';
 
-  build-system = with python.pkgs; [
+  build-system = [
     poetry-core
     poetry-dynamic-versioning
   ];
 
-  dependencies = with python.pkgs; [
+  dependencies = [
     aardwolf
     aioconsole
     aiosqlite
@@ -65,7 +79,6 @@ python.pkgs.buildPythonApplication rec {
     bloodhound-py
     dploot
     dsinternals
-    impacket
     lsassy
     masky
     minikerberos
@@ -89,7 +102,7 @@ python.pkgs.buildPythonApplication rec {
     xmltodict
   ];
 
-  nativeCheckInputs = with python.pkgs; [ pytestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   # Tests no longer works out-of-box with 1.3.0
   doCheck = false;

From e7a3460b0af54517e59433b535a0ca5037ab962f Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 3 Apr 2025 13:48:43 +0300
Subject: [PATCH 10/61] netexec: modernize

Since finalAttrs is not supported, this is just removing \with lib;`
---
 pkgs/tools/security/netexec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix
index 4b507161da47..c8741909129e 100644
--- a/pkgs/tools/security/netexec/default.nix
+++ b/pkgs/tools/security/netexec/default.nix
@@ -111,12 +111,12 @@ buildPythonApplication rec {
     export HOME=$(mktemp -d)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Network service exploitation tool (maintained fork of CrackMapExec)";
     homepage = "https://github.com/Pennyw0rth/NetExec";
     changelog = "https://github.com/Pennyw0rth/NetExec/releases/tag/v${version}";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ vncsb ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ vncsb ];
     mainProgram = "nxc";
     # FIXME: failing fixupPhase:
     # $ Rewriting #!/nix/store/<hash>-python3-3.11.7/bin/python3.11 to #!/nix/store/<hash>-python3-3.11.7

From b0637e8470aa027965309d1513534cd714edb9c7 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Thu, 3 Apr 2025 13:37:00 +0100
Subject: [PATCH 11/61] sbom-utility: Fix version, add shell completions

---
 pkgs/by-name/sb/sbom-utility/name.patch   | 13 +++++
 pkgs/by-name/sb/sbom-utility/package.nix  | 41 +++++++++++++-
 pkgs/by-name/sb/sbom-utility/stderr.patch | 67 +++++++++++++++++++++++
 3 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/sb/sbom-utility/name.patch
 create mode 100644 pkgs/by-name/sb/sbom-utility/stderr.patch

diff --git a/pkgs/by-name/sb/sbom-utility/name.patch b/pkgs/by-name/sb/sbom-utility/name.patch
new file mode 100644
index 000000000000..0edbb05706d4
--- /dev/null
+++ b/pkgs/by-name/sb/sbom-utility/name.patch
@@ -0,0 +1,13 @@
+diff --git a/cmd/root.go b/cmd/root.go
+index 5ef5d46..e99b245 100644
+--- a/cmd/root.go
++++ b/cmd/root.go
+@@ -139,7 +139,7 @@ const (
+ )
+ 
+ var rootCmd = &cobra.Command{
+-	Use:           fmt.Sprintf("%s [command] [flags]", utils.GlobalFlags.Project),
++	Use:           fmt.Sprintf("sbom-utility [command] [flags]"),
+ 	SilenceErrors: false,
+ 	SilenceUsage:  false,
+ 	Short:         MSG_APP_NAME,
diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix
index e6f4ac7a5701..6ebfbcbfe73d 100644
--- a/pkgs/by-name/sb/sbom-utility/package.nix
+++ b/pkgs/by-name/sb/sbom-utility/package.nix
@@ -2,11 +2,18 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  fetchpatch,
+  versionCheckHook,
+  installShellFiles,
+  stdenv,
 }:
 
-buildGoModule rec {
-  pname = "sbom-utility";
+let
   version = "0.17.0";
+in
+buildGoModule {
+  pname = "sbom-utility";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
@@ -17,10 +24,40 @@ buildGoModule rec {
 
   vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM=";
 
+  patches = [
+    # work around https://github.com/CycloneDX/sbom-utility/issues/121, which otherwise
+    # breaks shell completions
+    ./name.patch
+    # Output logs to stderr rather than stdout.
+    # Patch of https://github.com/CycloneDX/sbom-utility/pull/122, adapted to apply
+    # against v0.17.0
+    ./stderr.patch
+  ];
+
+  ldflags = [
+    "-X main.Version=${version}"
+  ];
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   preCheck = ''
     cd test
   '';
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    for shell in bash fish zsh; do
+      installShellCompletion --cmd sbom-utility \
+        --$shell <($out/bin/sbom-utility -q completion $shell)
+    done
+  '';
+
   meta = with lib; {
     description = "Utility that provides an API platform for validating, querying and managing BOM data";
     homepage = "https://github.com/CycloneDX/sbom-utility";
diff --git a/pkgs/by-name/sb/sbom-utility/stderr.patch b/pkgs/by-name/sb/sbom-utility/stderr.patch
new file mode 100644
index 000000000000..779c53d624d9
--- /dev/null
+++ b/pkgs/by-name/sb/sbom-utility/stderr.patch
@@ -0,0 +1,67 @@
+diff --git a/log/log.go b/log/log.go
+index 2615f0a..c82b6c5 100644
+--- a/log/log.go
++++ b/log/log.go
+@@ -104,7 +104,7 @@ func NewDefaultLogger() *MiniLogger {
+ 		tagEnter:        DEFAULT_ENTER_TAG,
+ 		tagExit:         DEFAULT_EXIT_TAG,
+ 		tagColor:        color.New(color.FgMagenta),
+-		outputFile:      os.Stdout,
++		outputFile:      os.Stderr,
+ 		maxStrLength:    64,
+ 	}
+ 
+@@ -361,7 +361,7 @@ func (log MiniLogger) dumpInterface(lvl Level, tag string, value interface{}, sk
+ 			}
+ 
+ 			// TODO: use a general output writer (set to stdout, stderr, or file stream)
+-			fmt.Println(sb.String())
++			fmt.Fprintln(log.outputFile, sb.String())
+ 		} else {
+ 			os.Stderr.WriteString("Error: Unable to retrieve call stack. Exiting...")
+ 			os.Exit(-2)
+@@ -370,7 +370,7 @@ func (log MiniLogger) dumpInterface(lvl Level, tag string, value interface{}, sk
+ }
+ 
+ func (log MiniLogger) DumpString(value string) {
+-	fmt.Print(value)
++	fmt.Fprint(log.outputFile, value)
+ }
+ 
+ func (log MiniLogger) DumpStruct(structName string, field interface{}) error {
+@@ -389,7 +389,7 @@ func (log MiniLogger) DumpStruct(structName string, field interface{}) error {
+ 	}
+ 
+ 	// TODO: print to output stream
+-	fmt.Println(sb.String())
++	fmt.Fprintln(log.outputFile, sb.String())
+ 
+ 	return nil
+ }
+@@ -398,8 +398,8 @@ func (log MiniLogger) DumpArgs() {
+ 	args := os.Args
+ 	for i, a := range args {
+ 		// TODO: print to output stream
+-		fmt.Print(log.indentRunes)
+-		fmt.Printf("os.Arg[%d]: `%v`\n", i, a)
++		fmt.Fprint(log.outputFile, log.indentRunes)
++		fmt.Fprintf(log.outputFile, "os.Arg[%d]: `%v`\n", i, a)
+ 	}
+ }
+ 
+@@ -409,7 +409,7 @@ func (log MiniLogger) DumpSeparator(sep byte, repeat int) (string, error) {
+ 		for i := 0; i < repeat; i++ {
+ 			sb.WriteByte(sep)
+ 		}
+-		fmt.Println(sb.String())
++		fmt.Fprintln(log.outputFile, sb.String())
+ 		return sb.String(), nil
+ 	} else {
+ 		return "", errors.New("invalid repeat length (>80)")
+@@ -417,5 +417,5 @@ func (log MiniLogger) DumpSeparator(sep byte, repeat int) (string, error) {
+ }
+ 
+ func (log *MiniLogger) DumpStackTrace() {
+-	fmt.Println(string(debug.Stack()))
++	fmt.Fprintln(log.outputFile, string(debug.Stack()))
+ }

From 04520fadfc23c177beb177504aa6a0267ca59a4e Mon Sep 17 00:00:00 2001
From: Haylin Moore <me@haylinmoore.com>
Date: Sat, 5 Apr 2025 19:39:09 -0400
Subject: [PATCH 12/61] html-minifier: remove dangling symlinks

---
 pkgs/by-name/ht/html-minifier/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ht/html-minifier/package.nix b/pkgs/by-name/ht/html-minifier/package.nix
index 81bf3e65fdf8..45d4e247bebb 100644
--- a/pkgs/by-name/ht/html-minifier/package.nix
+++ b/pkgs/by-name/ht/html-minifier/package.nix
@@ -19,6 +19,10 @@ buildNpmPackage rec {
 
   npmFlags = [ "--ignore-scripts" ];
 
+  postInstall = ''
+    find $out/lib/node_modules -xtype l -delete
+  '';
+
   dontNpmBuild = true;
 
   meta = {

From 30348fd24e823e94c9845c61b4a9f68b63e4d687 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sun, 6 Apr 2025 13:05:22 +0800
Subject: [PATCH 13/61] anvil-editor: 0.4 -> 0.6

---
 pkgs/by-name/an/anvil-editor/extras.nix  | 14 ----------
 pkgs/by-name/an/anvil-editor/package.nix | 34 +++++++++++++-----------
 2 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/by-name/an/anvil-editor/extras.nix

diff --git a/pkgs/by-name/an/anvil-editor/extras.nix b/pkgs/by-name/an/anvil-editor/extras.nix
deleted file mode 100644
index 4e130565fe4c..000000000000
--- a/pkgs/by-name/an/anvil-editor/extras.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  buildGoModule,
-  anvil-editor,
-}:
-
-buildGoModule {
-  inherit (anvil-editor) version src meta;
-
-  pname = "anvil-editor-extras";
-
-  modRoot = "anvil-extras";
-
-  vendorHash = "sha256-PH7HSMlCAHn4L1inJDbDcj6n+i6LXakIOqwdUkRjf9E=";
-}
diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
index 2466eb283aa0..918554209356 100644
--- a/pkgs/by-name/an/anvil-editor/package.nix
+++ b/pkgs/by-name/an/anvil-editor/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  buildGoModule,
+  buildGo123Module,
   fetchzip,
   pkg-config,
   copyDesktopItems,
@@ -12,26 +12,31 @@
   vulkan-headers,
   libGL,
   xorg,
-  callPackage,
   buildPackages,
-  anvilExtras ? callPackage ./extras.nix { },
 }:
 
-buildGoModule rec {
+buildGo123Module (finalAttrs: {
   pname = "anvil-editor";
-  version = "0.4";
+  version = "0.6";
 
   # has to update vendorHash of extra package manually
   # nixpkgs-update: no auto update
   src = fetchzip {
-    url = "https://anvil-editor.net/releases/anvil-src-v${version}.tar.gz";
-    hash = "sha256-0fi6UeppWC9KbWibjQYlPlRqsl9xsvij8YpJUS0S/wY=";
+    url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz";
+    hash = "sha256-i0S5V3j6OPpu4z1ljDKP3WYa9L+EKwo/MBNgW2ENYk8=";
   };
 
   modRoot = "anvil/src/anvil";
 
   vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk=";
 
+  anvilExtras = buildGo123Module {
+    pname = "anvil-editor-extras";
+    inherit (finalAttrs) version src meta;
+    vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo=";
+    modRoot = "anvil-extras";
+  };
+
   nativeBuildInputs =
     [
       pkg-config
@@ -60,8 +65,11 @@ buildGoModule rec {
       exec = "anvil";
       icon = "anvil";
       desktopName = "Anvil";
-      comment = meta.description;
-      categories = [ "TextEditor" ];
+      comment = finalAttrs.meta.description;
+      categories = [
+        "Utility"
+        "TextEditor"
+      ];
       startupWMClass = "anvil";
     })
   ];
@@ -76,13 +84,9 @@ buildGoModule rec {
         install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png
       done
     popd
-    cp ${anvilExtras}/bin/* $out/bin
+    cp ${finalAttrs.anvilExtras}/bin/* $out/bin
   '';
 
-  passthru = {
-    inherit anvilExtras;
-  };
-
   meta = {
     description = "Graphical, multi-pane tiling editor inspired by Acme";
     homepage = "https://anvil-editor.net";
@@ -91,4 +95,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = with lib.platforms; unix ++ windows;
   };
-}
+})

From 2426aaa7c59b32ca125582a4b5676824f60b72e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 09:17:22 +0000
Subject: [PATCH 14/61] cargo-expand: 1.0.104 -> 1.0.106

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

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index bdf13f371b85..33a053d1e725 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "1.0.104";
+  version = "1.0.106";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-expand";
     rev = version;
-    hash = "sha256-PSiuTw3H3vl4Tnts5eOTd1v8SLPvYZCkuQ/pTSa3O18=";
+    hash = "sha256-7j8i0wvbbAFPNgHamy+lybQpz1ht+n90oidVGSXP6MA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-apFOBEao2DKsdjdth+vGzzRa9Mw7fTb/88TetY0vp6E=";
+  cargoHash = "sha256-e6K97VUsCYx56Y9r7QPVBV3eMwWnjEhZoEKpmuKmkJk=";
 
   meta = with lib; {
     description = "Cargo subcommand to show result of macro expansion";

From be0d4cf7207c26f9b93078148657cef3333d52ba Mon Sep 17 00:00:00 2001
From: Tanya <tanyaarora1866@gmail.com>
Date: Tue, 8 Apr 2025 00:16:54 +0530
Subject: [PATCH 15/61] tpnote: 1.25.6 -> 1.25.7

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 30ed1b44393a..0a46eeb6575e 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tpnote";
-  version = "1.25.6";
+  version = "1.25.7";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${version}";
-    hash = "sha256-9mj88mUCpMPBIUrwAL61/XAtn3OQ3EtdP8ZlQBHE4/I=";
+    hash = "sha256-lTUS3sAMq5FPxC8Moi6a+S71XtG+9AlBTO/cDVTrncM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-K/vtA6Gr015xwuJBge+QDW3MQMJNyKyfxtkV6fs/zmE=";
+  cargoHash = "sha256-3oallbuiRrBDAWsIl8vGz3xbjPIb5ceBmQsNHVOWbTE=";
 
   nativeBuildInputs = [
     cmake

From ce09231d904a8366d33689bc35376ee31f6b1fdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 18:51:23 +0000
Subject: [PATCH 16/61] sundials: 7.2.1 -> 7.3.0

---
 pkgs/development/libraries/sundials/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index d06696d71709..c02d10409b6f 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "sundials";
-  version = "7.2.1";
+  version = "7.3.0";
 
   outputs = [
     "out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
-    hash = "sha256-N4Hj983zcsoS9/vmT1Yai5pQe4qLLE1s4o2OTfS+++o=";
+    hash = "sha256-/ZcKkCP46je4HFBlwGe/Fyb2VrOfWQe0gWmm+Y0wa6c=";
   };
 
   nativeBuildInputs = [

From 460cbc8c6cf0c11cc849e719c90ff9000ae9ed3c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 7 Apr 2025 21:51:59 +0300
Subject: [PATCH 17/61] prefetch-yarn-deps: don't explicitly depend on
 nixForLinking

See: https://github.com/NixOS/nixpkgs/pull/395147
---
 pkgs/build-support/node/fetch-yarn-deps/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix
index 11497db66ecb..16cdee665d0d 100644
--- a/pkgs/build-support/node/fetch-yarn-deps/default.nix
+++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix
@@ -18,7 +18,6 @@
   makeSetupHook,
   cacert,
   callPackage,
-  nixForLinking,
 }:
 
 let
@@ -55,7 +54,6 @@ in
           lib.makeBinPath [
             coreutils
             nix-prefetch-git
-            nixForLinking
           ]
         }
 

From 46a0f9f9004b216c225a1ec58fb22d5fa5f90469 Mon Sep 17 00:00:00 2001
From: Nicolas Goudry <goudry.nicolas@gmail.com>
Date: Tue, 1 Apr 2025 17:43:24 +0200
Subject: [PATCH 18/61] sou: init at 0.2.0

---
 pkgs/by-name/so/sou/package.nix | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/so/sou/package.nix

diff --git a/pkgs/by-name/so/sou/package.nix b/pkgs/by-name/so/sou/package.nix
new file mode 100644
index 000000000000..0ee536e93a07
--- /dev/null
+++ b/pkgs/by-name/so/sou/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "sou";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "knqyf263";
+    repo = "sou";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-uGYCmW60OvEfserujQMXC9r8S8W+EN+w9EXUGjk1vtw=";
+  };
+
+  vendorHash = "sha256-6kgiZx/g1PA7R50z7noG+ql+S9wSgTuVTkY5DIqeJHY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${finalAttrs.version}"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheck = [ versionCheckHook ];
+
+  # Some of the tests use localhost networking
+  __darwinAllowLocalNetworking = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for exploring files in container image layers";
+    homepage = "https://github.com/knqyf263/sou";
+    changelog = "https://github.com/knqyf263/sou/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nicolas-goudry ];
+    mainProgram = "sou";
+  };
+})

From c191828d588b2aed59da8179388a37c5b4cef6f4 Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Mon, 7 Apr 2025 21:17:09 +0000
Subject: [PATCH 19/61] protonup-qt: refactor

---
 .../applications/misc/protonup-qt/default.nix | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix
index ac0fd3ad52f3..2034a0f939af 100644
--- a/pkgs/applications/misc/protonup-qt/default.nix
+++ b/pkgs/applications/misc/protonup-qt/default.nix
@@ -1,39 +1,45 @@
 {
+  lib,
   appimageTools,
   fetchurl,
-  lib,
+  makeWrapper,
 }:
-let
+
+appimageTools.wrapAppImage rec {
   pname = "protonup-qt";
   version = "2.12.0";
-  src = fetchurl {
-    url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
-    hash = "sha256-8MeHSy3XW1oXAD2xrDSIB0ZLJxtk5UBIMpDRTPF9ksU=";
+
+  src = appimageTools.extractType2 {
+    inherit pname version;
+    src = fetchurl {
+      url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
+      hash = "sha256-8MeHSy3XW1oXAD2xrDSIB0ZLJxtk5UBIMpDRTPF9ksU=";
+    };
   };
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
+
+  nativeBuildInputs = [ makeWrapper ];
 
   extraInstallCommands = ''
-    mkdir -p $out/share/{applications,pixmaps}
-    cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop
-    cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=net.davidotek.pupgui2' 'Exec=${pname}' \
-      --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}'
+    install -Dm644 ${src}/net.davidotek.pupgui2.desktop $out/share/applications/protonup-qt.desktop
+    install -Dm644 ${src}/net.davidotek.pupgui2.png $out/share/pixmaps/protonup-qt.png
+    substituteInPlace $out/share/applications/protonup-qt.desktop \
+      --replace-fail "Exec=net.davidotek.pupgui2" "Exec=protonup-qt" \
+      --replace-fail "Icon=net.davidotek.pupgui2" "Icon=protonup-qt"
+    wrapProgram $out/bin/protonup-qt \
+      --unset QT_PLUGIN_PATH \
+      --unset QML2_IMPORT_PATH
   '';
 
   extraPkgs = pkgs: with pkgs; [ zstd ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://davidotek.github.io/protonup-qt/";
     description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface";
-    license = licenses.gpl3;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.gpl3Plus;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "protonup-qt";
     changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}";
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ michaelBelsanti ];
+    maintainers = with lib.maintainers; [ michaelBelsanti ];
   };
 }

From af52943bd3467b33d0c500a77c86847e87c6fb39 Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Mon, 7 Apr 2025 22:02:38 +0000
Subject: [PATCH 20/61] protonup-qt: move to by-name

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

diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/by-name/pr/protonup-qt/package.nix
similarity index 100%
rename from pkgs/applications/misc/protonup-qt/default.nix
rename to pkgs/by-name/pr/protonup-qt/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bb21e64bf6d..b814a369a58a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14766,8 +14766,6 @@ with pkgs;
 
   pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { };
 
-  protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { };
-
   inherit (callPackage ../applications/virtualization/singularity/packages.nix { })
     apptainer
     singularity

From 5e43e13598fdf2581f66ac13b08cdc8b07b6e75e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 00:43:05 +0000
Subject: [PATCH 21/61] ants: 2.5.4 -> 2.6.0

---
 pkgs/applications/science/biology/ants/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index fabcfbd708dd..f0492ad07fe8 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ANTs";
-  version = "2.5.4";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "ANTsX";
     repo = "ANTs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7df9RcZZwfSkokG8dMQg65bCOk2atDGkJpPo8SrRrfY=";
+    hash = "sha256-3k9EOylOAUwxBNpzi6U/XZGarCZlbh9PdecKyJh81Yk=";
   };
 
   nativeBuildInputs = [

From 272c66c1dd00e9a5348b88875e0ad025c8848050 Mon Sep 17 00:00:00 2001
From: BirdeeHub <robindbor@gmail.com>
Date: Mon, 7 Apr 2025 19:56:11 -0700
Subject: [PATCH 22/61] vimPlugins.lze: 0.11.0 -> 0.11.1

---
 pkgs/development/lua-modules/generated-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index ac310bb2e652..ee881ae10d02 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -3564,15 +3564,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lze";
-      version = "0.11.0-1";
+      version = "0.11.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lze-0.11.0-1.rockspec";
-          sha256 = "05465ndcfvvyvvxz8h7xm9vrcfbfhvs6sbrcy73cl5s44r46ym00";
+          url = "mirror://luarocks/lze-0.11.1-1.rockspec";
+          sha256 = "1wikzksjz7nqshnc6pbdaq5yfa4cxc5kh06shvahfxxwz2n3q7i4";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/BirdeeHub/lze/archive/v0.11.0.zip";
-        sha256 = "1awqix5xx4pkv09gba5xwv67qyi2qzf9aji48bk2xr431vshz5jv";
+        url = "https://github.com/BirdeeHub/lze/archive/v0.11.1.zip";
+        sha256 = "14lx8addmi1zr57141gvwlv0i7rgachybfynmmw8bqkadhwaz470";
       };
 
       disabled = luaOlder "5.1";

From 4fab0561c6e4ba4aba02575d4616f9d500b03f8e Mon Sep 17 00:00:00 2001
From: BirdeeHub <robindbor@gmail.com>
Date: Mon, 7 Apr 2025 20:04:35 -0700
Subject: [PATCH 23/61] vimPlugins.lzextras: 0.3.0 -> 0.4.0

---
 pkgs/development/lua-modules/generated-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index ac310bb2e652..0ce090b6b24e 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -3595,15 +3595,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lzextras";
-      version = "0.3.0-1";
+      version = "0.4.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lzextras-0.3.0-1.rockspec";
-          sha256 = "1w8ar8qi1hnbnj70f3lhrzf0hp1d0jbvya9v318pqcd16wh7x6ii";
+          url = "mirror://luarocks/lzextras-0.4.0-1.rockspec";
+          sha256 = "12s4jy3xqzb1dcan0gmgza6c9wyh44h348f4m3zzj29icffx4vyv";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/BirdeeHub/lzextras/archive/v0.3.0.zip";
-        sha256 = "0942wnlk7cf74z2ni3dhv2zm8ld4nazs9ciaql00vvbswh4a9z2w";
+        url = "https://github.com/BirdeeHub/lzextras/archive/v0.4.0.zip";
+        sha256 = "1c92vm5q9vrr1imc3h9z9vvpkhlayywgk1n3wfkqbfi37ni066kw";
       };
 
       disabled = luaOlder "5.1";

From 7d55c1b7fc4e2179f6476cbb719935564b6bd8f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 06:24:35 +0000
Subject: [PATCH 24/61] fanficfare: 4.43.0 -> 4.44.0

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

diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix
index 3b9290e1bb51..5593fbf59678 100644
--- a/pkgs/by-name/fa/fanficfare/package.nix
+++ b/pkgs/by-name/fa/fanficfare/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "fanficfare";
-  version = "4.43.0";
+  version = "4.44.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uaYMmb896gJ31nbcGJs42jlSpvHUTvpLlD00r1icXRY=";
+    hash = "sha256-3+2T3qUk9tbQD+GxM2S+iDWNlKE+f3GplBoYIJGAJKE=";
   };
 
   nativeBuildInputs = with python3Packages; [

From 9e3064456be83d8ab772d9380e7ce445b7d534f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 07:23:11 +0000
Subject: [PATCH 25/61] zircolite: 2.30.1 -> 2.40.0

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

diff --git a/pkgs/by-name/zi/zircolite/package.nix b/pkgs/by-name/zi/zircolite/package.nix
index ba0623617869..687126aa0187 100644
--- a/pkgs/by-name/zi/zircolite/package.nix
+++ b/pkgs/by-name/zi/zircolite/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "zircolite";
-  version = "2.30.1";
+  version = "2.40.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "wagga40";
     repo = "Zircolite";
     tag = version;
-    hash = "sha256-9stQa0EMNA/qEN+bU7qBOdcwUR1vMGk70Br6wxRK8cs=";
+    hash = "sha256-11jNd7Ids2aB+R+Hv6n8Wfm2hDuKCxC0EMZSBWJfDos=";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "SIGMA-based detection tool for EVTX, Auditd, Sysmon and other logs";
     mainProgram = "zircolite";
     homepage = "https://github.com/wagga40/Zircolite";
-    changelog = "https://github.com/wagga40/Zircolite/releases/tag/${version}";
+    changelog = "https://github.com/wagga40/Zircolite/releases/tag/${src.tag}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ fab ];
   };

From 37e3374ebc6b76c6684c8e81e4e2928b57b4a4f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 11:39:24 +0000
Subject: [PATCH 26/61] pscale: 0.230.0 -> 0.236.0

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

diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index ffbd140a6627..2fc8cc93982b 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "pscale";
-  version = "0.230.0";
+  version = "0.236.0";
 
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-aWml3iTcci1V8RkiCrvv+E7zmW5JJCDzDNv2RaDhjAg=";
+    sha256 = "sha256-sL/TBcUtHYqZuUp5JlcKshwlyVSf0t0XukMmRkWRyvk=";
   };
 
-  vendorHash = "sha256-soDM7IfgTKWZnFNfGSlKH4aScGr1A26OZrgqiJ5UAlA=";
+  vendorHash = "sha256-Uw4A6RBq0OiBHWRfmj9wKI2FenDN6C8CWEsKicGS/1Q=";
 
   ldflags = [
     "-s"

From 771c552508d250cb54f385c39c6e721dfc76693c Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Tue, 8 Apr 2025 09:56:55 -0300
Subject: [PATCH 27/61] planarity: 3.0.2.0 -> 4.0.0.0

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

diff --git a/pkgs/by-name/pl/planarity/package.nix b/pkgs/by-name/pl/planarity/package.nix
index c7e11394511b..32c19c891b0d 100644
--- a/pkgs/by-name/pl/planarity/package.nix
+++ b/pkgs/by-name/pl/planarity/package.nix
@@ -3,21 +3,23 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
   pname = "planarity";
-  version = "3.0.2.0";
+  version = "4.0.0.0";
 
   src = fetchFromGitHub {
     owner = "graph-algorithms";
     repo = "edge-addition-planarity-suite";
     rev = "Version_${version}";
-    sha256 = "sha256-cUAh2MXCSmtxFtV6iTHgSRgsq/26DjWwxhWJH1+367A=";
+    sha256 = "sha256-A7huHvMgUyvw2zM9qA7Ax/1Ai5VZ6A1PZIo3eiCpu44=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
+    pkg-config
   ];
 
   doCheck = true;

From 2694e87a3a61cc796d0af6d2af555062f698b511 Mon Sep 17 00:00:00 2001
From: kiria-moe <aegisa7280@gmail.com>
Date: Tue, 1 Apr 2025 18:36:55 +0800
Subject: [PATCH 28/61] trojan-go: chore

Set the version and commit id.
---
 pkgs/by-name/tr/trojan-go/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix
index 7d75473ce924..7724ca0924a6 100644
--- a/pkgs/by-name/tr/trojan-go/package.nix
+++ b/pkgs/by-name/tr/trojan-go/package.nix
@@ -19,6 +19,11 @@ buildGoModule rec {
 
   vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4=";
 
+  ldflags = [
+    "-X github.com/p4gefau1t/trojan-go/constant.Version=v${version}"
+    "-X github.com/p4gefau1t/trojan-go/constant.Commit=v${version}"
+  ];
+
   tags = [
     "api"
     "client"

From deed74a325bed9e4abe7859d2c9865ebfd6123ad Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Tue, 8 Apr 2025 11:05:54 -0300
Subject: [PATCH 29/61] nauty: 2.8.8 -> 2.8.9

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

diff --git a/pkgs/by-name/na/nauty/package.nix b/pkgs/by-name/na/nauty/package.nix
index 0963586a049d..bff4157ce7b8 100644
--- a/pkgs/by-name/na/nauty/package.nix
+++ b/pkgs/by-name/na/nauty/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nauty";
-  version = "2.8.8";
+  version = "2.8.9";
 
   src = fetchurl {
     url = "https://pallini.di.uniroma1.it/nauty${
       builtins.replaceStrings [ "." ] [ "_" ] version
     }.tar.gz";
-    sha256 = "sha256-FZ0hVoEKa7JAQQzWHrZBrdhQiNnxXIiM2qN7hoH5Kc4=";
+    sha256 = "sha256-yXq0K/SHlqhqWYvOPpJpBHyisywU/CPgcgiiRP5SxO4=";
   };
 
   outputs = [
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
+  # HACK: starting from 2.8.9, the makefile tries to copy .libs/*.a files unconditionally
+  dontDisableStatic = true;
+
   configureFlags = [
     # Prevent nauty from sniffing some cpu features. While those are very
     # widely available, it can lead to nasty bugs when they are not available:

From 14beb986226f569506f4cbbfc3dbae05feaa2bdd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 13:51:48 +0000
Subject: [PATCH 30/61] kargo: 1.3.2 -> 1.4.0

Co-authored-by: dtomvan <18gatenmaker6@gmail.com>
---
 pkgs/by-name/ka/kargo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix
index 64e66069958e..cb74557dc06a 100644
--- a/pkgs/by-name/ka/kargo/package.nix
+++ b/pkgs/by-name/ka/kargo/package.nix
@@ -11,22 +11,22 @@
 
 buildGoModule rec {
   pname = "kargo";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "akuity";
     repo = "kargo";
     tag = "v${version}";
-    hash = "sha256-sLcNY6TopRObyU+TAFsX8odRJTo9BufCKb/pKhg9pwA=";
+    hash = "sha256-1zPSYvAhobhcZWIeIh0zTYPMg32r4PATvBIfKEcg9IU=";
   };
 
-  vendorHash = "sha256-Xb+9zu2uivOYETtz3ryMnBUJ3gJ/1ta1dLEpsD00jpU=";
+  vendorHash = "sha256-+c7cUCI6Yy3qzDOWWvqEGss6QvTrS3gYScm8M48rGVA=";
 
   subPackages = [ "cmd/cli" ];
 
   ldflags =
     let
-      package_url = "github.com/akuity/kargo/internal/version";
+      package_url = "github.com/akuity/kargo/pkg/x/version";
     in
     [
       "-s"

From 0fee537cae4534a894acfc6bc88b8481cc4ab61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danilo=20B=C3=BCrger?= <danilo.buerger@helsing.ai>
Date: Tue, 8 Apr 2025 19:03:56 +0100
Subject: [PATCH 31/61] maintainers: add danilobuerger

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe8b6b20dd04..aadbcd60b29b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5392,6 +5392,12 @@
     githubId = 64467514;
     name = "Daniel Krywult";
   };
+  danilobuerger = {
+    email = "info@danilobuerger.de";
+    github = "danilobuerger";
+    githubId = 996231;
+    name = "Danilo Bürger";
+  };
   daniyalsuri6 = {
     email = "daniyal.suri@gmail.com";
     github = "daniyalsuri6";

From 98ec4b1a824dcba01fd65ac8de8082d9f2ead662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danilo=20B=C3=BCrger?= <danilo.buerger@helsing.ai>
Date: Tue, 8 Apr 2025 19:04:13 +0100
Subject: [PATCH 32/61] buffrs: init at 0.9.0

Co-authored-by: Pierre-Etienne Meunier <pe@pijul.org>
---
 pkgs/by-name/bu/buffrs/package.nix | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/bu/buffrs/package.nix

diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
new file mode 100644
index 000000000000..0b17c5e9d2cd
--- /dev/null
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "buffrs";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "helsing-ai";
+    repo = "buffrs";
+    tag = "v${version}";
+    hash = "sha256-c9GjSqVp2wEFgoy8j+Gy5FA3SG4JYEfeSwPWjW81w3Y=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-E7kskULt2eOY+mZjh6jAftj8ciExUF7d1z1pePTBzvQ=";
+
+  # Disabling tests meant to work over the network, as they will fail
+  # inside the builder.
+  checkFlags = [
+    "--skip=cmd::install::upgrade::fixture"
+    "--skip=cmd::publish::lib::fixture"
+    "--skip=cmd::publish::local::fixture"
+    "--skip=cmd::tuto::fixture"
+  ];
+
+  meta = {
+    description = "Modern protobuf package management";
+    homepage = "https://github.com/helsing-ai/buffrs";
+    license = lib.licenses.asl20;
+    mainProgram = "buffrs";
+    maintainers = with lib.maintainers; [ danilobuerger ];
+  };
+}

From 57af7751e818a835168c5efd82b9e4b59a655156 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 14 Mar 2025 18:57:10 -0400
Subject: [PATCH 33/61] ecryptfs-helper: remove package

---
 pkgs/tools/security/ecryptfs/helper.nix | 36 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  2 --
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/tools/security/ecryptfs/helper.nix

diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
deleted file mode 100644
index 4f2070f8bd28..000000000000
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  makeWrapper,
-  python2,
-}:
-
-stdenv.mkDerivation {
-  pname = "ecryptfs-helper";
-  version = "20160722";
-
-  src = fetchurl {
-    url = "https://gist.githubusercontent.com/obadz/ec053fdb00dcb48441d8313169874e30/raw/4b657a4b7c3dc684e4d5e3ffaf46ced1b7675163/ecryptfs-helper.py";
-    sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg";
-  };
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin
-  installPhase = ''
-    mkdir -p $out/bin $out/libexec
-    cp $src $out/libexec/ecryptfs-helper.py
-    makeWrapper "${python2.interpreter}" "$out/bin/ecryptfs-helper" --add-flags "$out/libexec/ecryptfs-helper.py"
-  '';
-
-  meta = with lib; {
-    description = "Helper script to create/mount/unemount encrypted directories using eCryptfs without needing root permissions";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ obadz ];
-    platforms = platforms.linux;
-    hydraPlatforms = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f218415ab6b6..7257b0705ac9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -533,6 +533,7 @@ mapAliases {
   ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
 
+  ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08
   edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
   edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
   elasticsearch7Plugins = elasticsearchPlugins;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 736be54a296b..7d59ca8260fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3265,8 +3265,6 @@ with pkgs;
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
-  ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { };
-
   eid-mw = callPackage ../tools/security/eid-mw {
     autoreconfHook = buildPackages.autoreconfHook269;
   };

From d4a8babe9037722c5fe0f40068ba496d59c49492 Mon Sep 17 00:00:00 2001
From: Liam Murphy <liampm32@gmail.com>
Date: Wed, 9 Apr 2025 13:12:12 +1000
Subject: [PATCH 34/61] judy: revert Darwin reproducibility fixes

It was already reproducible: the only reason it seemed not to be was due
to a quirk of how `--rebuild` works on macOS. Since the implementation
of the Nix sandbox on macOS is unable to change the meaning of paths,
when rebuilding a derivation, it can't be done at the same path as the
original. Instead, the rebuild occurs with a different output path, and
the output is scanned for instances of that path so that they can be
replaced with the correct one afterwards (ala ca-derivations).

Unfortunately, macOS's codesigning system seems to include the hash of
the signed binary as part of its signature, including any incorrect
paths it contains. This results in the binaries still being different
after the path replacement step has occured.

The reason to go out of our way to revert this is that the workaround to
avoid including the output path in any binaries includes replacing the
install name of judy with `@rpath/*` rather than its absolute path,
which breaks at least one dependency that doesn't add it to RPATH
(gtkwave), and possibly others.

To confirm that it's reproducible:

```
drv=$(nix eval .#judy --apply "pkg: (pkg.overrideAttrs { __REBUILD = true; }).drvPath" --raw)
out=$(nix derivation show "$drv" | jq -r ".[].outputs.out.path")

nix build "$drv^*" --no-link
cp -r "$out" rebuild-1

nix store delete "$out" --option keep-outputs false
nix build "$drv^*" --no-link
cp -r "$out" rebuild-2

diff -r rebuild-1 rebuild-2
```
---
 pkgs/by-name/ju/judy/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/ju/judy/package.nix b/pkgs/by-name/ju/judy/package.nix
index df21e56c30ba..df3e01552303 100644
--- a/pkgs/by-name/ju/judy/package.nix
+++ b/pkgs/by-name/ju/judy/package.nix
@@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
     ./fix-source-date.patch
   ];
 
-  # fixes non-determinism between builds on macos
-  preConfigure = lib.optional stdenv.hostPlatform.isDarwin ''
-    export LDFLAGS="$LDFLAGS -Wl,-no_uuid -Wl,-install_name,@rpath/libJudy.1.dylib"
-  '';
-
   # Disable parallel builds as manpages lack some dependencies:
   #    ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[   ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
   #    make[2]: *** No rule to make target 'man/man3/JSLD', needed by 'all-am'.  Stop.

From 4d62c8546862064d30282eab7423456fbe08d97f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 26 Mar 2025 13:58:56 +0100
Subject: [PATCH 35/61] python3Packages.pytinyrenderer: init at 0.0.14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 .../python-modules/pytinyrenderer/default.nix | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytinyrenderer/default.nix

diff --git a/pkgs/development/python-modules/pytinyrenderer/default.nix b/pkgs/development/python-modules/pytinyrenderer/default.nix
new file mode 100644
index 000000000000..c2dc075095de
--- /dev/null
+++ b/pkgs/development/python-modules/pytinyrenderer/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pytinyrenderer";
+  version = "0.0.14";
+  pyproject = true;
+
+  # github has no tags
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-X+20eYUJy5EaA6O8no3o1NWqNrHeUuuHjv7xBLlaPRU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "pytinyrenderer"
+  ];
+
+  # There are no tests in the pypi archive
+  doCheck = false;
+
+  meta = {
+    description = "Python bindings for Tiny Renderer";
+    homepage = "https://pypi.org/project/pytinyrenderer/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9abac7174fad..01db0f0e07f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14898,6 +14898,8 @@ self: super: with self; {
 
   pytimeparse2 = callPackage ../development/python-modules/pytimeparse2 { };
 
+  pytinyrenderer = callPackage ../development/python-modules/pytinyrenderer { };
+
   pytlv = callPackage ../development/python-modules/pytlv { };
 
   pytm = callPackage ../development/python-modules/pytm { };

From 114d8ce7a6d4e2583b18610b26a3957d1aca1352 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Apr 2025 09:11:11 +0000
Subject: [PATCH 36/61] python312Packages.pyghmi: 1.5.76 -> 1.5.77

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

diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
index 5919b94fbeb9..002585da278f 100644
--- a/pkgs/development/python-modules/pyghmi/default.nix
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "pyghmi";
-  version = "1.5.76";
+  version = "1.5.77";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nJEL9x/+fZT/vpAKL5qVLXYVPcMvUXT9WSEvHzOrGZU=";
+    hash = "sha256-RGV3d944MKrbuBM/eX9NIyHiasmLkkHH+zyeEjkIt7U=";
   };
 
   build-system = [

From fef3407120d6cd8e259f4eb3a611e6690be9559c Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 31 Mar 2025 12:45:00 +0200
Subject: [PATCH 37/61] onionshare: use writableTmpDirAsHomeHook

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

diff --git a/pkgs/by-name/on/onionshare/package.nix b/pkgs/by-name/on/onionshare/package.nix
index d025d96e35a6..640caf9ed2a1 100644
--- a/pkgs/by-name/on/onionshare/package.nix
+++ b/pkgs/by-name/on/onionshare/package.nix
@@ -15,6 +15,7 @@
   versionCheckHook,
   gitUpdater,
   onionshare-gui,
+  writableTmpDirAsHomeHook,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "onionshare-cli";
@@ -95,16 +96,12 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs =
     [
       versionCheckHook
+      writableTmpDirAsHomeHook
     ]
     ++ (with python3Packages; [
       pytestCheckHook
     ]);
 
-  preCheck = ''
-    # Tests use the home directory
-    export HOME="$(mktemp -d)"
-  '';
-
   disabledTests =
     lib.optionals stdenv.hostPlatform.isLinux [
       "test_get_tor_paths_linux" # expects /usr instead of /nix/store

From 971422df5b81f2f5dd3882c258e993f7577fde37 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 31 Mar 2025 11:30:00 +0200
Subject: [PATCH 38/61] gops: use finalAttrs pattern and
 writableTmpDirAsHomeHook

---
 pkgs/by-name/go/gops/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix
index 2aeb490fa3f6..0975a213b853 100644
--- a/pkgs/by-name/go/gops/package.nix
+++ b/pkgs/by-name/go/gops/package.nix
@@ -2,22 +2,23 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  writableTmpDirAsHomeHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gops";
   version = "0.3.28";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "gops";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU=";
   };
 
   vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0=";
 
-  preCheck = "export HOME=$(mktemp -d)";
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
   meta = with lib; {
     description = "Tool to list and diagnose Go processes currently running on your system";
@@ -26,4 +27,4 @@ buildGoModule rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ pborzenkov ];
   };
-}
+})

From 28fb02b42d33e07f441e4475f8aa0381c2983366 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Wed, 9 Apr 2025 07:23:13 -0500
Subject: [PATCH 39/61] bstone: fix hardware acceleration issues

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

diff --git a/pkgs/by-name/bs/bstone/package.nix b/pkgs/by-name/bs/bstone/package.nix
index f0bf4886ae6f..667d52a09088 100644
--- a/pkgs/by-name/bs/bstone/package.nix
+++ b/pkgs/by-name/bs/bstone/package.nix
@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  SDL2,
-  libGL,
+  sdl2-compat,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,8 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libGL
-    SDL2
+    sdl2-compat
   ];
 
   postInstall = ''

From 9a6297dc5e8197d53fe7aa02ee847babdbfbb628 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 26 Mar 2025 13:53:16 +0100
Subject: [PATCH 40/61] python3Packages.mujoco-mjx: init at 3.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 .../python-modules/mujoco-mjx/default.nix     | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/mujoco-mjx/default.nix

diff --git a/pkgs/development/python-modules/mujoco-mjx/default.nix b/pkgs/development/python-modules/mujoco-mjx/default.nix
new file mode 100644
index 000000000000..7073dc4484d1
--- /dev/null
+++ b/pkgs/development/python-modules/mujoco-mjx/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+
+  # src / metadata
+  mujoco-main,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  absl-py,
+  etils,
+  importlib-resources,
+  jax,
+  jaxlib,
+  mujoco,
+  scipy,
+  trimesh,
+}:
+
+buildPythonPackage {
+  pname = "mujoco-mjx";
+  inherit (mujoco-main) src version;
+
+  pyproject = true;
+
+  sourceRoot = "${mujoco-main.src.name}/mjx";
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    absl-py
+    etils
+    importlib-resources
+    jax
+    jaxlib
+    mujoco
+    scipy
+    trimesh
+  ] ++ etils.optional-dependencies.epath;
+
+  pythonImportsCheck = [ "mujoco.mjx" ];
+
+  meta = {
+    description = "MuJoCo XLA (MJX)";
+    inherit (mujoco.meta) homepage changelog license;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 01db0f0e07f1..704825453925 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10123,6 +10123,8 @@ self: super: with self; {
 
   mujoco = callPackage ../development/python-modules/mujoco { inherit (pkgs) mujoco; };
 
+  mujoco-mjx = callPackage ../development/python-modules/mujoco-mjx { mujoco-main = pkgs.mujoco; };
+
   mujson = callPackage ../development/python-modules/mujson { };
 
   mullvad-api = callPackage ../development/python-modules/mullvad-api { };

From 555d7ca7db059977b7a8150a8950752a2cdaeead Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 26 Mar 2025 12:36:00 +0100
Subject: [PATCH 41/61] python3Packages.brax: init at 0.12.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 .../python-modules/brax/default.nix           | 113 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 115 insertions(+)
 create mode 100644 pkgs/development/python-modules/brax/default.nix

diff --git a/pkgs/development/python-modules/brax/default.nix b/pkgs/development/python-modules/brax/default.nix
new file mode 100644
index 000000000000..5610ee08f322
--- /dev/null
+++ b/pkgs/development/python-modules/brax/default.nix
@@ -0,0 +1,113 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  stdenv,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  absl-py,
+  dm-env,
+  etils,
+  flask,
+  flask-cors,
+  flax,
+  grpcio,
+  gym,
+  jax,
+  jaxlib,
+  jaxopt,
+  jinja2,
+  ml-collections,
+  mujoco,
+  mujoco-mjx,
+  numpy,
+  optax,
+  orbax-checkpoint,
+  pillow,
+  pytinyrenderer,
+  scipy,
+  tensorboardx,
+  trimesh,
+
+  # tests
+  pytestCheckHook,
+  pytest-xdist,
+  transforms3d,
+}:
+
+buildPythonPackage rec {
+  pname = "brax";
+  version = "0.12.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "brax";
+    tag = "v${version}";
+    hash = "sha256-whkkqTTy5CY6soyS5D7hWtBZuVHc6si1ArqwLgzHDkw=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    absl-py
+    # TODO: remove dm_env after dropping legacy v1 code
+    dm-env
+    etils
+    flask
+    flask-cors
+    flax
+    # TODO: remove grpcio and gym after dropping legacy v1 code
+    grpcio
+    gym
+    jax
+    jaxlib
+    jaxopt
+    jinja2
+    ml-collections
+    mujoco
+    mujoco-mjx
+    numpy
+    optax
+    orbax-checkpoint
+    pillow
+    # TODO: remove pytinyrenderer after dropping legacy v1 code
+    pytinyrenderer
+    scipy
+    tensorboardx
+    trimesh
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-xdist
+    transforms3d
+  ];
+
+  disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [
+    # Flaky:
+    # AssertionError: Array(-0.00135638, dtype=float32) != 0.0 within 0.001 delta (Array(0.00135638, dtype=float32) difference)
+    "test_pendulum_period2"
+  ];
+
+  disabledTestPaths = [
+    # ValueError: matmul: Input operand 1 has a mismatch in its core dimension
+    "brax/generalized/constraint_test.py"
+  ];
+
+  pythonImportsCheck = [
+    "brax"
+  ];
+
+  meta = {
+    description = "Massively parallel rigidbody physics simulation on accelerator hardware";
+    homepage = "https://github.com/google/brax";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 704825453925..d09c74ea223f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2010,6 +2010,8 @@ self: super: with self; {
 
   bravia-tv = callPackage ../development/python-modules/bravia-tv { };
 
+  brax = callPackage ../development/python-modules/brax { };
+
   breathe = callPackage ../development/python-modules/breathe { };
 
   breezy = callPackage ../development/python-modules/breezy { };

From 95a8624fab3afe16c73eaf7602ef29cc3f2d2104 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 9 Apr 2025 17:06:14 +0200
Subject: [PATCH 42/61] mujoco: passthru test python3Packages.mujoco-mjx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/by-name/mu/mujoco/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix
index c0bea6fdd240..50bf731bdeae 100644
--- a/pkgs/by-name/mu/mujoco/package.nix
+++ b/pkgs/by-name/mu/mujoco/package.nix
@@ -184,6 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
     };
     tests = {
       pythonMujoco = python3Packages.mujoco;
+      pythonMujocoMjx = python3Packages.mujoco-mjx;
     };
   };
 

From f33a4d26226c05d501b9d4d3e5e60a3a59991921 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 27 Jan 2025 18:37:29 +0100
Subject: [PATCH 43/61] peertube: move to by-name

---
 .../peertube/default.nix => by-name/pe/peertube/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{servers/peertube/default.nix => by-name/pe/peertube/package.nix} (99%)

diff --git a/pkgs/servers/peertube/default.nix b/pkgs/by-name/pe/peertube/package.nix
similarity index 99%
rename from pkgs/servers/peertube/default.nix
rename to pkgs/by-name/pe/peertube/package.nix
index e62bf9005deb..62cf67072afa 100644
--- a/pkgs/servers/peertube/default.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -10,7 +10,7 @@
   fixup-yarn-lock,
   jq,
   fd,
-  nodejs,
+  nodejs_18,
   which,
   yarn,
 }:
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     fd
   ];
 
-  buildInputs = [ nodejs ];
+  buildInputs = [ nodejs_18 ];
 
   buildPhase = ''
     # Build node modules
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df389f32233d..55fdf3f29722 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15782,10 +15782,6 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  peertube = callPackage ../servers/peertube {
-    nodejs = nodejs_18;
-  };
-
   photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
 
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };

From 1a076fc58b3a363c956a273036c15b6a2ba68749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 9 Apr 2025 19:51:05 +0200
Subject: [PATCH 44/61] gitea: 1.23.6 -> 1.23.7

Diff: https://github.com/go-gitea/gitea/compare/refs/tags/v1.23.6...refs/tags/v1.23.7
---
 pkgs/by-name/gi/gitea/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index 5420ca4ae351..36806807c20e 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -35,13 +35,13 @@ let
 in
 buildGoModule rec {
   pname = "gitea";
-  version = "1.23.6";
+  version = "1.23.7";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${gitea.version}";
-    hash = "sha256-psVny0qmx2wPiNK1qIXQiW0gdRsZs16MEfIgBXTWgFI=";
+    hash = "sha256-pdmRujcLnQBIQXc26MPpoLbbV00KMaVHPY4xTsitaCA=";
   };
 
   proxyVendor = true;

From 3095a14cf03c9ca2917a0e18ae51d8acb58677e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Apr 2025 22:56:20 +0000
Subject: [PATCH 45/61] pdi: 1.8.3 -> 1.9.0

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

diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix
index a759cf478556..3e78fa6de6c9 100644
--- a/pkgs/by-name/pd/pdi/package.nix
+++ b/pkgs/by-name/pd/pdi/package.nix
@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdi";
-  version = "1.8.3";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "pdidev";
     repo = "pdi";
     tag = finalAttrs.version;
-    hash = "sha256-oiHkCXQZGeijoJf8XpbBPdxmxClWyCsnv6laDdMXk6U=";
+    hash = "sha256-eWBbhHBDS2NbY74vbeD/+UDdpam4XiX7loYb1chjryo=";
   };
 
   # Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :')

From db305a78b79dd05ef6099e1b1f3cb33f3a012da4 Mon Sep 17 00:00:00 2001
From: Thomas Berryhill <thomas@berryhill.me>
Date: Fri, 4 Apr 2025 23:10:29 -0400
Subject: [PATCH 46/61] dotnetCorePackages.combinePackages: add "metadata" to
 linked paths

This enables users of `dotnetCorePackages.combinePackages` to install
.NET workloads.
---
 pkgs/development/compilers/dotnet/combine-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix
index d040faab1069..f755c1065410 100644
--- a/pkgs/development/compilers/dotnet/combine-packages.nix
+++ b/pkgs/development/compilers/dotnet/combine-packages.nix
@@ -26,6 +26,7 @@ mkWrapper "sdk" (
     paths = dotnetPackages;
     pathsToLink = map (x: "/share/dotnet/${x}") [
       "host"
+      "metadata"
       "packs"
       "sdk"
       "sdk-manifests"

From 43c291d22e19acda1e2a2619356af7f517abde64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 01:56:48 +0000
Subject: [PATCH 47/61] updatecli: 0.96.0 -> 0.97.0

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

diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index 66ef766b6532..6fc2ca44b045 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "updatecli";
-  version = "0.96.0";
+  version = "0.97.0";
 
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
     rev = "v${version}";
-    hash = "sha256-znl0yUqnN9eQHY18wPfcYiUnsGw349tLSkZNa/Wz2KA=";
+    hash = "sha256-3I7SRtbMKPm/j8bdIvVHkRy/5Jq8goZ0hyREsfsM5OU=";
   };
 
-  vendorHash = "sha256-jUVoNTA1wVHNjxkLBgERo8650dxpzmuVBGiAw5sUql0=";
+  vendorHash = "sha256-LUc73GyBj72kwQXUEnwkkGPmkIXhAhiKJiLcc1IiAps=";
 
   # tests require network access
   doCheck = false;

From f024d54d49646d624d1d91ba27c3302e085806dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 04:29:24 +0000
Subject: [PATCH 48/61] plasma-panel-colorizer: 2.4.1 -> 2.4.2

---
 pkgs/by-name/pl/plasma-panel-colorizer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
index 8e5de5a58e6d..c656b6c5f7fd 100644
--- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-colorizer";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YDYVjAbizmo1+E1DVeyISKM4Jb/HkKY/On9RanJBuvI=";
+    hash = "sha256-SQ2jf0YWmDN0Yce2lmTpD11zLdUz2otm98TO/agaY28=";
   };
 
   nativeBuildInputs = [

From 6c11654908e9ea39f0c185f1ec3e36e8ab53f487 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 10 Apr 2025 08:28:42 +0200
Subject: [PATCH 49/61] openroad: move to by-name

---
 .../openroad/default.nix => by-name/op/openroad/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{applications/science/electronics/openroad/default.nix => by-name/op/openroad/package.nix} (98%)

diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/by-name/op/openroad/package.nix
similarity index 98%
rename from pkgs/applications/science/electronics/openroad/default.nix
rename to pkgs/by-name/op/openroad/package.nix
index ef9db55ef3f5..98e2bee74f38 100644
--- a/pkgs/applications/science/electronics/openroad/default.nix
+++ b/pkgs/by-name/op/openroad/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  mkDerivation,
   fetchFromGitHub,
   bison,
   cmake,
@@ -44,7 +43,7 @@ let
     ];
   });
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "openroad";
   version = "2.0-unstable-2025-03-01";
 
@@ -65,6 +64,7 @@ mkDerivation rec {
     gtest
     pkg-config
     swig
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 079d5f75203f..c7986003936d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18505,8 +18505,6 @@ with pkgs;
     qcsxcad = libsForQt5.qcsxcad;
   };
 
-  openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { };
-
   qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { };
 
   xyce = callPackage ../applications/science/electronics/xyce { };

From f3f1f9fd0398a98d47c95761b0105ec5e90962dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 08:18:30 +0000
Subject: [PATCH 50/61] pkg: 2.0.6 -> 2.1.0

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

diff --git a/pkgs/by-name/pk/pkg/package.nix b/pkgs/by-name/pk/pkg/package.nix
index 8a3739410c4c..af42943ebc52 100644
--- a/pkgs/by-name/pk/pkg/package.nix
+++ b/pkgs/by-name/pk/pkg/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pkg";
-  version = "2.0.6";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "freebsd";
     repo = "pkg";
     rev = finalAttrs.version;
-    hash = "sha256-NTjAhqCUN2bN4ilijoeHHIkl58XXP5nSj/yLUL0N2fw=";
+    hash = "sha256-tOHt5Ra628qg/4N7fkUnL/xq4qV6Vmv2vsJpwSaDba8=";
   };
 
   setOutputFlags = false;

From de68ba78026199a44e1d74179ef279860c149095 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 10 Apr 2025 08:33:04 +0200
Subject: [PATCH 51/61] openroad: cleanup

---
 pkgs/by-name/op/openroad/package.nix | 118 ++++++++++++++-------------
 1 file changed, 60 insertions(+), 58 deletions(-)

diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix
index 98e2bee74f38..2023f2606825 100644
--- a/pkgs/by-name/op/openroad/package.nix
+++ b/pkgs/by-name/op/openroad/package.nix
@@ -1,48 +1,44 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
+
+  # nativeBuildInputs
   bison,
   cmake,
   doxygen,
   flex,
-  git,
-  python3,
+  gitMinimal,
+  gtest,
+  libsForQt5,
+  pkg-config,
   swig,
+
+  # buildInputs
   boost186, # 1.87.0 broken https://github.com/boostorg/asio/issues/442
   cbc, # for clp
   cimg,
   clp, # for or-tools
   cudd,
   eigen,
-  gtest,
   glpk,
   lcov,
   lemon-graph,
-  libsForQt5,
   libjpeg,
   or-tools,
   pcre,
-  pkg-config,
+  python3,
   re2, # for or-tools
   readline,
   spdlog,
   tcl,
   tclPackages,
-  xorg,
   yosys,
   zlib,
+  xorg,
   llvmPackages,
-  stdenv,
 }:
 
-let
-  or-tools-static = or-tools.overrideAttrs (oldAttrs: {
-    cmakeFlags = oldAttrs.cmakeFlags ++ [
-      # https://github.com/google/or-tools/issues/3709
-      "-DBUILD_SHARED_LIBS=OFF"
-    ];
-  });
-in
 stdenv.mkDerivation rec {
   pname = "openroad";
   version = "2.0-unstable-2025-03-01";
@@ -60,40 +56,42 @@ stdenv.mkDerivation rec {
     cmake
     doxygen
     flex
-    git
+    gitMinimal
     gtest
+    libsForQt5.wrapQtAppsHook
     pkg-config
     swig
-    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    boost186
-    cbc
-    cimg
-    clp
-    cudd
-    eigen
-    glpk
-    lcov
-    lemon-graph
-    libjpeg
-    or-tools-static
-    pcre
-    python3
-    libsForQt5.qtbase
-    libsForQt5.qtcharts
-    libsForQt5.qtsvg
-    libsForQt5.qtdeclarative
-    re2
-    readline
-    spdlog
-    tcl
-    tclPackages.tclreadline
-    yosys
-    xorg.libX11
-    zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
+  buildInputs =
+    [
+      boost186
+      cbc
+      cimg
+      clp
+      cudd
+      eigen
+      glpk
+      lcov
+      lemon-graph
+      libjpeg
+      libsForQt5.qtbase
+      libsForQt5.qtcharts
+      libsForQt5.qtdeclarative
+      libsForQt5.qtsvg
+      or-tools
+      pcre
+      python3
+      re2
+      readline
+      spdlog
+      tcl
+      tclPackages.tclreadline
+      yosys
+      zlib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
 
   postPatch = ''
     patchShebangs --build etc/find_messages.py
@@ -103,18 +101,18 @@ stdenv.mkDerivation rec {
 
   cmakeFlags =
     [
-      "-DENABLE_TESTS=ON"
-      "-DUSE_SYSTEM_BOOST=ON"
-      "-DUSE_SYSTEM_ABC=OFF"
-      "-DABC_SKIP_TESTS=ON" # it attempts to download gtest
-      "-DUSE_SYSTEM_OPENSTA=OFF"
-      "-DOPENROAD_VERSION=${version}_${src.rev}"
-      "-DCMAKE_RULE_MESSAGES=OFF"
-      "-DTCL_HEADER=${tcl}/include/tcl.h"
-      "-DTCL_LIBRARY=${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}"
+      (lib.cmakeBool "ENABLE_TESTS" true)
+      (lib.cmakeBool "USE_SYSTEM_BOOST" true)
+      (lib.cmakeBool "USE_SYSTEM_ABC" false)
+      (lib.cmakeBool "ABC_SKIP_TESTS" true) # it attempts to download gtest
+      (lib.cmakeBool "USE_SYSTEM_OPENSTA" false)
+      (lib.cmakeFeature "OPENROAD_VERSION" "${version}_${src.rev}")
+      (lib.cmakeBool "CMAKE_RULE_MESSAGES" false)
+      (lib.cmakeFeature "TCL_HEADER" "${tcl}/include/tcl.h")
+      (lib.cmakeFeature "TCL_LIBRARY" "${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}")
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_CXX_FLAGS=-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED"
+      (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED")
     ];
 
   # Resynthesis needs access to the Yosys binaries.
@@ -130,18 +128,22 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = true;
   installCheckPhase = ''
+    runHook preInstallCheck
+
     $out/bin/openroad -version
     $out/bin/sta -version
+
+    runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "OpenROAD's unified application implementing an RTL-to-GDS flow";
     homepage = "https://theopenroadproject.org";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       trepetti
       hzeller
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From d35b44a477bb1cf519c4c45e9f886ca795dd2eba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 08:06:24 +0000
Subject: [PATCH 52/61] morgen: 3.6.10 -> 3.6.11

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

diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix
index af0a0de53770..048c9ed7710e 100644
--- a/pkgs/by-name/mo/morgen/package.nix
+++ b/pkgs/by-name/mo/morgen/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "3.6.10";
+  version = "3.6.11";
 
   src = fetchurl {
     name = "morgen-${version}.deb";
     url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
-    hash = "sha256-//HXWx0vi2lbCeZr+QMfif6B8MiCAdRDullQ1QlIZu8=";
+    hash = "sha256-vn3V7TXWMPesZt+65FAeNzUo8n4P9XfSIFnCDvLaZOI=";
   };
 
   nativeBuildInputs = [

From d7fe60b4ef7c9b9b0412413633da825c7cae396d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 9 Apr 2025 18:20:46 +0200
Subject: [PATCH 53/61] peertube: 6.3.3 -> 7.0.1

---
 pkgs/by-name/pe/peertube/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index 62cf67072afa..0f99e03bab15 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -48,33 +48,33 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peertube";
-  version = "6.3.3";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
     tag = "v${version}";
-    hash = "sha256-kPZcCJtnoqE1g0fAuM98IhuDy1E9QBDkFNWrWIpFIDA=";
+    hash = "sha256-DoUSzqb8lrU+s5R95rxCN/5A8sgb11edAhv0T6YACRo=";
   };
 
   yarnOfflineCacheServer = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-I6TC5KO+NQ0NAtoJzYQPLelp8/hYUtIeof+UI45qpdk=";
+    hash = "sha256-WLaIIyz6SEekLFeVO39Swpny5/x5Jc1zoxy/6bmOXTk=";
   };
 
   yarnOfflineCacheClient = fetchYarnDeps {
     yarnLock = "${src}/client/yarn.lock";
-    hash = "sha256-ADck9+5TDZ3OGInZ+NYYpBg9XXHugtiwyxYCYqSIOzM=";
+    hash = "sha256-/ZdORSnwk29ubsgKKB7RfHCetODNOH9DzkflQdDsMz0=";
   };
 
   yarnOfflineCacheAppsCli = fetchYarnDeps {
     yarnLock = "${src}/apps/peertube-cli/yarn.lock";
-    hash = "sha256-t5MwysPVLbtIfDhvnwWoGocck1ntP8OP9Vf9DF6L7Cg=";
+    hash = "sha256-lcWtZGE/6XGm8KXmzSowCHAb/vGwBoqkwk32Ru3mMYU=";
   };
 
   yarnOfflineCacheAppsRunner = fetchYarnDeps {
     yarnLock = "${src}/apps/peertube-runner/yarn.lock";
-    hash = "sha256-x5qFCprn8q0xC88HudLV7W53X1Nkbz3F52RMp2PxIu8=";
+    hash = "sha256-R7oXJUT698l2D1WkQGTWfkmbC7bC1XJ04xT0O8bwuI8=";
   };
 
   outputs = [

From 92ad8c1e2cbb1294a105be44c50b4d292beb644d Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@slow.janky.email>
Date: Mon, 17 Feb 2025 21:28:06 +0300
Subject: [PATCH 54/61] syndicate-server: 0.48.0 -> 0.50.1

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

diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix
index 51df682001f9..480de7622fed 100644
--- a/pkgs/by-name/sy/syndicate-server/package.nix
+++ b/pkgs/by-name/sy/syndicate-server/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "syndicate-server";
-  version = "0.48.0";
+  version = "0.50.1";
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "syndicate-lang";
     repo = "syndicate-rs";
     rev = "${pname}-v${version}";
-    hash = "sha256-DVgFlJCqaTmQ7eL2LQ8rkIbvaEfwx+NDeXRA8qB+/Qo=";
+    hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-P/NYyoH/9kkyBwCGORK9bxEjyye12SP3hRDnL9c6i78=";
+  cargoHash = "sha256-lR36UAMedPdfvX613adxxRzJe+Ri09hiZYanyu7xbLU=";
   nativeBuildInputs = [
     pkg-config
     versionCheckHook
@@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec {
 
   RUSTC_BOOTSTRAP = 1;
 
+  doCheck = false;
   doInstallCheck = true;
 
   meta = {

From 57c4b0c0d2de4dd7d3fcd1d4c30e2d0fdc53add1 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 10 Apr 2025 10:38:15 +0200
Subject: [PATCH 55/61] icestudio: fix maintainers

---
 pkgs/by-name/ic/icestudio/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix
index c1f3d027e7b4..37255829871d 100644
--- a/pkgs/by-name/ic/icestudio/package.nix
+++ b/pkgs/by-name/ic/icestudio/package.nix
@@ -118,7 +118,7 @@ buildNpmPackage rec {
         rcoeurjoly
         amerino
       ]
-      ++ [ lib.teams.ngi ];
+      ++ lib.teams.ngi.members;
     mainProgram = "icestudio";
     platforms = lib.platforms.linux;
   };

From 9eb5812580413a61a32f1fd08c3c4076ff8f8e9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 22:05:06 +0000
Subject: [PATCH 56/61] crosvm: 0-unstable-2025-03-27 -> 0-unstable-2025-04-07

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

diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index 16aa5fd8d4f5..5453a266f42e 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,12 +21,12 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2025-03-27";
+  version = "0-unstable-2025-04-07";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "779126e8670cb471fc35e07c9f6a958638bbd9e3";
-    hash = "sha256-xYd4KSLcuc1u6JV67UgW9FgkQGwQZLjlvpmngnWc0ew=";
+    rev = "7cb0f63341ca728c2d0f53c94fadfd20dd307186";
+    hash = "sha256-xEKOEEGyfrfCGzI2+brkVwHcKKKLctNU+adgzVNGses=";
     fetchSubmodules = true;
   };
 

From e448c5584c1527d5e7b8f52ef9ffbc048379b15a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 10 Apr 2025 11:22:11 +0200
Subject: [PATCH 57/61] Revert "netexec: fix eval"

This reverts commit bf1c61d16adf3ba583d4bdeafa309b01a9e15edf.
---
 pkgs/tools/security/netexec/default.nix | 67 ++++++++++---------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix
index c8741909129e..0b7913cd8657 100644
--- a/pkgs/tools/security/netexec/default.nix
+++ b/pkgs/tools/security/netexec/default.nix
@@ -2,44 +2,30 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildPythonApplication,
-  pytestCheckHook,
-  # Deps
-  poetry-core,
-  poetry-dynamic-versioning,
-  aardwolf,
-  aioconsole,
-  aiosqlite,
-  argcomplete,
-  asyauth,
-  beautifulsoup4,
-  bloodhound-py,
-  dploot,
-  dsinternals,
-  lsassy,
-  masky,
-  minikerberos,
-  msgpack,
-  msldap,
-  neo4j,
-  paramiko,
-  pyasn1-modules,
-  pylnk3,
-  pynfsclient,
-  pypsrp,
-  pypykatz,
-  python-dateutil,
-  python-libnmap,
-  pywerview,
-  requests,
-  rich,
-  sqlalchemy,
-  termcolor,
-  terminaltables,
-  xmltodict,
-  impacket,
+  python3,
 }:
-buildPythonApplication rec {
+let
+  python = python3.override {
+    self = python;
+    packageOverrides = self: super: {
+      impacket = super.impacket.overridePythonAttrs {
+        version = "0.12.0.dev1-unstable-2023-11-30";
+        src = fetchFromGitHub {
+          owner = "Pennyw0rth";
+          repo = "impacket";
+          rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38";
+          hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E=";
+        };
+        # Fix version to be compliant with Python packaging rules
+        postPatch = ''
+          substituteInPlace setup.py \
+            --replace 'version="{}.{}.{}.{}{}"' 'version="{}.{}.{}"'
+        '';
+      };
+    };
+  };
+in
+python.pkgs.buildPythonApplication rec {
   pname = "netexec";
   version = "1.3.0";
   pyproject = true;
@@ -64,12 +50,12 @@ buildPythonApplication rec {
       --replace-fail '{ git = "https://github.com/Pennyw0rth/NfsClient" }' '"*"'
   '';
 
-  build-system = [
+  build-system = with python.pkgs; [
     poetry-core
     poetry-dynamic-versioning
   ];
 
-  dependencies = [
+  dependencies = with python.pkgs; [
     aardwolf
     aioconsole
     aiosqlite
@@ -79,6 +65,7 @@ buildPythonApplication rec {
     bloodhound-py
     dploot
     dsinternals
+    impacket
     lsassy
     masky
     minikerberos
@@ -102,7 +89,7 @@ buildPythonApplication rec {
     xmltodict
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = with python.pkgs; [ pytestCheckHook ];
 
   # Tests no longer works out-of-box with 1.3.0
   doCheck = false;

From 9589938fa52cbcb06caed88467ca0311fd99e254 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 10 Apr 2025 11:22:36 +0200
Subject: [PATCH 58/61] netexec: migrate to by-name

---
 .../netexec/default.nix => by-name/ne/netexec/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/netexec/default.nix => by-name/ne/netexec/package.nix} (100%)

diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/by-name/ne/netexec/package.nix
similarity index 100%
rename from pkgs/tools/security/netexec/default.nix
rename to pkgs/by-name/ne/netexec/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad4ad32cc674..a92e18259565 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4181,8 +4181,6 @@ with pkgs;
 
   nanoemoji = with python3Packages; toPythonApplication nanoemoji;
 
-  netexec = callPackage ../tools/security/netexec { };
-
   netdata = callPackage ../tools/system/netdata {
     protobuf = protobuf_21;
   };

From 50de181003666e89a828e0fae59a83044d012292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Thu, 10 Apr 2025 10:45:53 +0100
Subject: [PATCH 59/61] cachix: 1.7.7 -> 1.7.8

---
 .../haskell-modules/configuration-common.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 40ba605fe792..c3ec333ba589 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -549,24 +549,24 @@ self: super:
 
   # Manually maintained
   cachix-api = overrideCabal (drv: {
-    version = "1.7.7";
+    version = "1.7.8";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
-      rev = "v1.7.7";
-      hash = "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=";
+      tag = "v1.7.8";
+      hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=";
     };
     postUnpack = "sourceRoot=$sourceRoot/cachix-api";
   }) super.cachix-api;
   cachix = (
     overrideCabal
       (drv: {
-        version = "1.7.7";
+        version = "1.7.8";
         src = pkgs.fetchFromGitHub {
           owner = "cachix";
           repo = "cachix";
-          rev = "v1.7.7";
-          hash = "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=";
+          tag = "v1.7.8";
+          hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=";
         };
         postUnpack = "sourceRoot=$sourceRoot/cachix";
       })

From af130992bae9cc56e799512812b85b0fa118f17a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 09:35:11 +0000
Subject: [PATCH 60/61] vscode-extensions.rooveterinaryinc.roo-cline: 3.11.9 ->
 3.11.12

---
 .../vscode/extensions/rooveterinaryinc.roo-cline/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
index e4562b1713e7..1056575f1476 100644
--- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "RooVeterinaryInc";
     name = "roo-cline";
-    version = "3.11.9";
-    hash = "sha256-+Bi9nHRXXZGKGvTS8o0CbtS6KBJmQz+Wiiinqs16vZA=";
+    version = "3.11.12";
+    hash = "sha256-f7IPxeF/UxywMm8yVEZV/sHTKILZ3n788bhwH4xx89I=";
   };
 
   passthru.updateScript = vscode-extensions-update-script { };

From c14ed78ea34831e8fbc3614b9aa98c3319e6aca3 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Thu, 10 Apr 2025 17:07:43 +0530
Subject: [PATCH 61/61] cosmic-osd: substitue path for
 `audio-volume-change.oga` file

The path `/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga`
is not accessible on NixOS because the directory `/usr` does not exist
on NixOS. But the `audio-volume-change.oga` file is available in the
`sound-theme-freedesktop` package. So substitute the full, FHS-compliant
path with the path of the `sound-theme-freedesktop` package from the Nix
store.
---
 pkgs/by-name/co/cosmic-osd/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 31be64525d5e..bef80f5a04bb 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  sound-theme-freedesktop,
   rustPlatform,
   libcosmicAppHook,
   pulseaudio,
@@ -20,6 +21,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-ezOeRgqI/GOWFknUVZI7ZLEy1GYaBI+/An83HWKL6ho=";
   };
 
+  postPatch = ''
+    substituteInPlace src/components/app.rs \
+      --replace-fail '/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga' '${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga'
+  '';
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-vYehF2RjPrTZiuGcRUe4XX3ftRo7f+SIoKizD/kOtR8=";