From 5b99a1782fada32f5ebdc7b51aaa335723e9e035 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Apr 2025 12:36:25 +0200
Subject: [PATCH 01/84] python313Packages.lnkparse3: 1.5.1 -> 1.5.2

Diff: https://github.com/Matmaus/LnkParse3/compare/refs/tags/v1.5.1...refs/tags/v1.5.2

Changelog: https://github.com/Matmaus/LnkParse3/blob/1.5.2/CHANGELOG.md
---
 pkgs/development/python-modules/lnkparse3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix
index 2f1c74cb7100..8323bf9e0056 100644
--- a/pkgs/development/python-modules/lnkparse3/default.nix
+++ b/pkgs/development/python-modules/lnkparse3/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "lnkparse3";
-  version = "1.5.1";
+  version = "1.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Matmaus";
     repo = "LnkParse3";
     tag = "v${version}";
-    hash = "sha256-ebaKVl7GFoJiyQR7x4AN9Md8dtuYUchaN8ORbUrj5DY=";
+    hash = "sha256-z+qjPs7gHQMAUlnGLN06xZ0hyrAnBF8i0FbaiEpguNE=";
   };
 
   build-system = [ setuptools ];

From 185b3fcf1e4b9e9d8d0ef8d931618ae8df2fe291 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 27 Apr 2025 22:54:15 +0100
Subject: [PATCH 02/84] xwax: fix the build (missing alsa-lib input)

Without the change the build fails as
https://hydra.nixos.org/build/294945388:

    alsa.c:24:10: fatal error: alsa/asoundlib.h: No such file or directory
       24 | #include <alsa/asoundlib.h>
          |          ^~~~~~~~~~~~~~~~~~
---
 pkgs/by-name/xw/xwax/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/xw/xwax/package.nix b/pkgs/by-name/xw/xwax/package.nix
index ddfdcc9db07f..561a80a575ea 100644
--- a/pkgs/by-name/xw/xwax/package.nix
+++ b/pkgs/by-name/xw/xwax/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   SDL,
   SDL_ttf,
+  alsa-lib,
   jack2,
   libmpg123,
   ffmpeg,
@@ -38,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     SDL
     SDL_ttf
 
+    alsa-lib
+
     # audio server
     jack2
 

From 16049b27ca9496359db2dfacf99198441fbdc17d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 27 Apr 2025 22:56:25 +0100
Subject: [PATCH 03/84] xwax: enable parallel building

---
 pkgs/by-name/xw/xwax/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/xw/xwax/package.nix b/pkgs/by-name/xw/xwax/package.nix
index 561a80a575ea..5550e81df577 100644
--- a/pkgs/by-name/xw/xwax/package.nix
+++ b/pkgs/by-name/xw/xwax/package.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-jack"
   ];
 
+  enableParallelBuilding = true;
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "-h";
   doInstallCheck = true;

From 4696d0e045d8dd6c736c3ab173dc016f8d515ad6 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Wed, 30 Apr 2025 09:08:35 -0300
Subject: [PATCH 04/84] etcd_3_5: 3.5.19 -> 3.5.21

https://github.com/etcd-io/etcd/releases/tag/v3.5.21
---
 pkgs/servers/etcd/3.5/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix
index 5fdd4a33382c..a27fd3c750de 100644
--- a/pkgs/servers/etcd/3.5/default.nix
+++ b/pkgs/servers/etcd/3.5/default.nix
@@ -8,11 +8,11 @@
 }:
 
 let
-  version = "3.5.19";
-  etcdSrcHash = "sha256-UulUIjl4HS1UHJnlamhtgVqzyH+UroCQ9zarxO5Hp6M=";
-  etcdServerVendorHash = "sha256-0AXw44BpMlDQMML4HFQwdORetNrAZHlN2QG9aZwq5Ks=";
-  etcdUtlVendorHash = "sha256-RZEsk79wQJnv/8W7tVCehNsqK2awkycd6gV/4OwqdFM=";
-  etcdCtlVendorHash = "sha256-RESLrpgsWQV1Fm0vkQedlDowo+yWS4KipiwIcsCB34Y=";
+  version = "3.5.21";
+  etcdSrcHash = "sha256-0L/lA9/9SNKMz74R6UPF1I7gj03/e91EpNr4LxKoisw=";
+  etcdServerVendorHash = "sha256-JMxkcDibRcXhU+T7BQMAz95O7xDKefu1YPZK0GU7osk=";
+  etcdUtlVendorHash = "sha256-901QcnEQ8PWnkliqwL4CrbCD+0ja8vJlDke0P4ya8cA=";
+  etcdCtlVendorHash = "sha256-BJ924wRPQTqbqtNtXL3l/OSdQv1UmU1y6Zqu//EWTHI=";
 
   src = fetchFromGitHub {
     owner = "etcd-io";

From f14f0b843c684ce7113a4d8d5417aaaf37592130 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Wed, 30 Apr 2025 09:00:31 -0300
Subject: [PATCH 05/84] etcd_3_5: fix update script

- Version fetched is now limited to 3.5 (update script would break again when package 3.6
  released)
- Changes reference from directory to fixed version because directory is
  not normalized to nixpkgs standard (which is "_" instead of ".")
---
 pkgs/servers/etcd/3.5/update.sh | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/etcd/3.5/update.sh b/pkgs/servers/etcd/3.5/update.sh
index f3c0ea37fa7b..6c11ce1be748 100755
--- a/pkgs/servers/etcd/3.5/update.sh
+++ b/pkgs/servers/etcd/3.5/update.sh
@@ -1,21 +1,29 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnugrep gnused jq nix-prefetch
+#!nix-shell -i bash -p curl gnugrep gnused jq nurl
 
 set -x -eu -o pipefail
 
+MAJOR_VERSION=3
+MINOR_VERSION=5
+
 ETCD_PATH="$(dirname "$0")"
-ETCD_VERSION_MAJOR_MINOR="$(basename $ETCD_PATH)"
-ETCD_PKG_NAME=etcd_$(echo $ETCD_VERSION_MAJOR_MINOR | sed 's/[.]/_/g')
+ETCD_VERSION_MAJOR_MINOR=${MAJOR_VERSION}.${MINOR_VERSION}
+ETCD_PKG_NAME=etcd_${MAJOR_VERSION}_${MINOR_VERSION}
 NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
 
+LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
+    --silent https://api.github.com/repos/etcd-io/etcd/releases \
+    | jq -r 'map(select(.prerelease == false))' \
+    | jq -r 'map(.tag_name)' \
+    | grep "v${ETCD_VERSION_MAJOR_MINOR}." \
+    | sed 's|[", ]||g' \
+    | sort -rV | head -n1 )
+
+LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
+
 OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; \
     $ETCD_PKG_NAME.version or (builtins.parseDrvName $ETCD_PKG_NAME.name).version" | tr -d '"')"
 
-LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/etcd-io/etcd/releases \
-    | jq -r 'map(.tag_name)' | grep $ETCD_VERSION_MAJOR_MINOR | sed 's|[", ]||g' | sort -rV | head -n1)
-
-LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
-
 if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     echo "Attempting to update etcd from $OLD_VERSION to $LATEST_VERSION"
     ETCD_SRC_HASH=$(nix-prefetch-url --quiet --unpack https://github.com/etcd-io/etcd/archive/refs/tags/${LATEST_TAG}.tar.gz)
@@ -37,8 +45,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
         setKV $PKG_KEY $EMPTY_HASH
 
         set +e
-        VENDOR_HASH=$(nix-prefetch -I nixpkgs=$NIXPKGS_PATH "{ sha256 }: \
-            (import $NIXPKGS_PATH/. {}).$ETCD_PKG_NAME.passthru.$INNER_PKG.goModules.overrideAttrs (_: { vendorHash = sha256; })")
+        VENDOR_HASH=$(nurl -e "(import ${NIXPKGS_PATH}/. {}).$ETCD_PKG_NAME.passthru.$INNER_PKG.goModules")
         set -e
 
         if [ -n "${VENDOR_HASH:-}" ]; then
@@ -59,7 +66,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
         git add "$ETCD_PATH"/default.nix
         git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
 
-Release: https://github.com/etcd-io/etcd/releases/tag/v$LATEST_VERSION"
+Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"
     fi
 
 else

From c9a8d756d53d415a4ce031a8311225fd098e4f30 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 30 Apr 2025 17:08:56 +0200
Subject: [PATCH 06/84] ninja: refactor version,src

This patch fixes a problem with nix-prefetch (and thus a number of update
scripts) where it would throw the following error when run in nixpkgs:

```
error: attribute 'rev' missing
at pkgs/by-name/ni/ninja/package.nix:19:34:
   18|   pname = "ninja";
   19|   version = lib.removePrefix "v" finalAttrs.src.rev;
     |                                  ^
```

This seems to be caused by an oversight where nix-prefetch overrides
fetchFromGitHub in a weird way, where rev is not returned, but so far this
is the only package that is triggering this bug. The related issue in
nix-prefetch is still unhandled, hence this change.

See: msteen/nix-prefetch#54 #403032
---
 pkgs/by-name/ni/ninja/package.nix | 35 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix
index d776c546f1e4..fe89a9c1e670 100644
--- a/pkgs/by-name/ni/ninja/package.nix
+++ b/pkgs/by-name/ni/ninja/package.nix
@@ -17,26 +17,25 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ninja";
-  version = lib.removePrefix "v" finalAttrs.src.rev;
-
-  src =
+  version =
     {
-      # TODO: Remove Ninja 1.11 as soon as possible.
-      "1.11" = fetchFromGitHub {
-        owner = "ninja-build";
-        repo = "ninja";
-        rev = "v1.11.1";
-        hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
-      };
-
-      latest = fetchFromGitHub {
-        owner = "ninja-build";
-        repo = "ninja";
-        rev = "v1.12.1";
-        hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
-      };
+      "1.11" = "1.11.1";
+      latest = "1.12.1";
     }
-    .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
+    .${ninjaRelease};
+
+  src = fetchFromGitHub {
+    owner = "ninja-build";
+    repo = "ninja";
+    rev = "v${finalAttrs.version}";
+    hash =
+      {
+        # TODO: Remove Ninja 1.11 as soon as possible.
+        "1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
+        latest = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
+      }
+      .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
+  };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 

From 7c4ffbd2f57abff5018e6af98e8d531c75add5ac Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Thu, 27 Mar 2025 11:06:23 +0100
Subject: [PATCH 07/84] sqlite3-to-mysql: 2.3.2 -> 2.4.0

https://github.com/techouse/sqlite3-to-mysql/releases/tag/v2.4.0

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/by-name/sq/sqlite3-to-mysql/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
index 5ec42ba23d1d..f4993d52c1b5 100644
--- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
+++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
@@ -10,16 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sqlite3-to-mysql";
-  version = "2.3.2";
+  version = "2.4.0";
   format = "pyproject";
 
-  disabled = python3Packages.pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "techouse";
     repo = "sqlite3-to-mysql";
     tag = "v${version}";
-    hash = "sha256-2zylVnPlptPCxUFwU9j9g//T5fzPJgXc3hQc6iMoLLE=";
+    hash = "sha256-1XYDCHR1GitMr6wgpj+roCzf5q4tMr6eGLMWzZgzpBY=";
   };
 
   build-system = with python3Packages; [

From 4bdffb4a37fbf85c6f3b43a76a1f28c5e685c93f Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 8 May 2025 10:49:25 +0200
Subject: [PATCH 08/84] deepin.dde-api-proxy: 1.0.16 -> 1.0.20

Fixes CVE-2025-23222.
https://security.opensuse.org/2025/01/24/dde-api-proxy-privilege-escalation.html

https://github.com/linuxdeepin/dde-api-proxy/blob/1.0.20/debian/changelog
---
 pkgs/desktops/deepin/core/dde-api-proxy/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
index 9cc0942990e1..80af772b00c4 100644
--- a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
+++ b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-api-proxy";
-  version = "1.0.16";
+  version = "1.0.20";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-api-proxy";
     rev = version;
-    hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU=";
+    hash = "sha256-QE31BOh2LFlY6te+2+nSHGbhLsikSX8V7xSvcLzCWRA=";
   };
 
   postPatch = ''
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     libsForQt5.wrapQtAppsHook
+    libsForQt5.polkit-qt
   ];
 
   buildInputs = [

From da907e8923c28cfadc668e924663a02b679774ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 May 2025 17:37:00 +0000
Subject: [PATCH 09/84] python3Packages.jianpu-ly: 1.844 -> 1.853

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

diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix
index 42de6e62edf4..0ed3d33737b6 100644
--- a/pkgs/development/python-modules/jianpu-ly/default.nix
+++ b/pkgs/development/python-modules/jianpu-ly/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "jianpu-ly";
-  version = "1.844";
+  version = "1.853";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "jianpu_ly";
-    hash = "sha256-wHNTHj5e5K0QHs+NxULdJZCC6vkKd5FuLxt9Ir1m3aI=";
+    hash = "sha256-LNXFkcSTepbAC36lpeSbxZYHA9O6hOp4MRe6LgbpbZQ=";
   };
 
   dependencies = [ lilypond ];

From edf926f40f07d2544246c67edb95b52a47ce23b0 Mon Sep 17 00:00:00 2001
From: Siddhartha Sahu <dev@sdht.in>
Date: Thu, 8 May 2025 16:36:55 -0400
Subject: [PATCH 10/84] kuzu,python3Packages.kuzu: 0.9.0 -> 0.10.0

---
 pkgs/by-name/ku/kuzu/package.nix                 | 4 ++--
 pkgs/development/python-modules/kuzu/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix
index d4294d9a6caa..451dc05914bd 100644
--- a/pkgs/by-name/ku/kuzu/package.nix
+++ b/pkgs/by-name/ku/kuzu/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kuzu";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "kuzudb";
     repo = "kuzu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3B2E51PluPKl0OucmTPZYEa9BzYoU0Y8G1PQY86ynFA=";
+    hash = "sha256-mc9MLIdlxMTQjvpKAa2N8AlhWJDzydd70x/YU6xX6h0=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/kuzu/default.nix b/pkgs/development/python-modules/kuzu/default.nix
index 90b62a367ec3..7a14c128e681 100644
--- a/pkgs/development/python-modules/kuzu/default.nix
+++ b/pkgs/development/python-modules/kuzu/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "kuzu";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Llnz1NH8OF6ekNeuCfBy7C9M/v9QhYJSOgA0zrB29us=";
+    hash = "sha256-fH+XXQU3SSleqs96ysy9NFv4UiZPXtJTIwAbvZ1Aj0g=";
   };
 
   pyproject = true;

From dc67e303686e3237d334974aa4fb517ca459e7c7 Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Fri, 9 May 2025 00:02:39 +0300
Subject: [PATCH 11/84] python3Packages.llm-ollama: 0.9.1 -> 0.10.0

Diff: https://github.com/taketwo/llm-ollama/compare/0.9.1...0.10.0
Changelog: https://github.com/taketwo/llm-ollama/releases/tag/0.10.0
---
 pkgs/development/python-modules/llm-ollama/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix
index 6c255aa76c55..e8d13d4926c6 100644
--- a/pkgs/development/python-modules/llm-ollama/default.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -16,19 +16,20 @@
   # tests
   pytestCheckHook,
   pytest-asyncio,
+  pytest-mock,
   writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "llm-ollama";
-  version = "0.9.1";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "taketwo";
     repo = "llm-ollama";
     tag = version;
-    hash = "sha256-NAJ0tfGRQOxYVAi2X0AI2d9+wyUS3ro1bfMSViZjaR0=";
+    hash = "sha256-IA9Tb82XB+Gr6YwMVqzsw1dPtT3GWK2W/ZtuDVznF1A";
   };
 
   build-system = [
@@ -46,6 +47,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
+    pytest-mock
     writableTmpDirAsHomeHook
   ];
 

From 4be3eb812b7c4deb569cce4ac25a4d8e37b6b76a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 9 May 2025 00:22:16 +0200
Subject: [PATCH 12/84] python313Packages.pyocd: fetch from github

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

diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix
index bb10f1881118..4f5591e615c3 100644
--- a/pkgs/development/python-modules/pyocd/default.nix
+++ b/pkgs/development/python-modules/pyocd/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   fetchpatch,
   capstone_4,
   cmsis-pack-manager,
@@ -29,9 +29,11 @@ buildPythonPackage rec {
   version = "0.36.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-k3eCrMna/wVNUPt8b3iM2UqE+A8LhfJarKuZ3Jgihkg=";
+  src = fetchFromGitHub {
+    owner = "pyocd";
+    repo = "pyOCD";
+    tag = "v${version}";
+    hash = "sha256-CSdVWDiSe+xd0MzD9tsKs3DklNjnhchYFuI3Udi0O20=";
   };
 
   patches = [

From a67e736b164d22e3a944bd483e45e4b6d2bc9cd5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 9 May 2025 00:37:57 +0200
Subject: [PATCH 13/84] python313Packages.pyocd: relax and upgrade capstone

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

diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix
index 4f5591e615c3..65d7342f9edf 100644
--- a/pkgs/development/python-modules/pyocd/default.nix
+++ b/pkgs/development/python-modules/pyocd/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
-  capstone_4,
+  capstone,
   cmsis-pack-manager,
   colorama,
   importlib-metadata,
@@ -38,6 +38,7 @@ buildPythonPackage rec {
 
   patches = [
     # https://github.com/pyocd/pyOCD/pull/1332
+    # merged into develop
     (fetchpatch {
       name = "libusb-package-optional.patch";
       url = "https://github.com/pyocd/pyOCD/commit/0b980cf253e3714dd2eaf0bddeb7172d14089649.patch";
@@ -45,12 +46,13 @@ buildPythonPackage rec {
     })
   ];
 
+  pythonRelaxDeps = [ "capstone" ];
   pythonRemoveDeps = [ "libusb-package" ];
 
   build-system = [ setuptools-scm ];
 
   dependencies = [
-    capstone_4
+    capstone
     cmsis-pack-manager
     colorama
     importlib-metadata

From 369f44081519fcc9d0e07b904a06f518534b6c86 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 9 May 2025 00:04:19 +0200
Subject: [PATCH 14/84] python313Packages.openapi3: relax and upgrade pydantic

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

diff --git a/pkgs/development/python-modules/openapi3/default.nix b/pkgs/development/python-modules/openapi3/default.nix
index 1ddd3a9bbfb6..ee4a35dd011c 100644
--- a/pkgs/development/python-modules/openapi3/default.nix
+++ b/pkgs/development/python-modules/openapi3/default.nix
@@ -11,7 +11,7 @@
   uvloop,
   hypercorn,
   starlette,
-  pydantic_1,
+  pydantic,
 }:
 
 buildPythonPackage rec {
@@ -27,9 +27,12 @@ buildPythonPackage rec {
     hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  # pydantic==1.10.2 only affects checks
+  pythonRelaxDeps = [ "pydantic" ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     pyyaml
   ];
@@ -37,7 +40,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
-    pydantic_1
+    pydantic
     uvloop
     hypercorn
     starlette

From 50b0f60ba34992eafbb7120cf07006f34b762e10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 11:07:56 +0000
Subject: [PATCH 15/84] factoriolab: 3.13.3 -> 3.13.4

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

diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index 1fe6de31cb6e..e2e815415ae6 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.13.3";
+  version = "3.13.4";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     tag = "v${version}";
-    hash = "sha256-HYf6G06dK3wvCOLnKx1aDteQ0SxBDE+yulGJa9VZE9Q=";
+    hash = "sha256-Ml0fJPHIjtqeVmlFKKMteZx1c3Jq1BdEWA0vhxGFR70=";
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

From 5acfeab10f43c6eca4dee4e92a1df33ae4e27c7d Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 9 May 2025 20:37:31 +0800
Subject: [PATCH 16/84] gammaray: fix build for qt 6.9

---
 pkgs/development/tools/gammaray/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/development/tools/gammaray/default.nix
index a00ddf3cb699..c499416a7766 100644
--- a/pkgs/development/tools/gammaray/default.nix
+++ b/pkgs/development/tools/gammaray/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   qttools,
@@ -32,6 +33,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-mJw9yckbkFVYZlcakai/hH/gAD0xOQir5JqGMNnB/dE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-build-for-Qt-6_9.patch";
+      url = "https://github.com/KDAB/GammaRay/commit/750195c8172bc7c2e805cbf28d3993d65c17b5a0.patch";
+      hash = "sha256-HQLOOkNmrGMoBDAK5am/NePnAF3Jsa5F0WyUjaJ2tYw=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 565a8722a179d393c419b8d7a997719e12643a1a Mon Sep 17 00:00:00 2001
From: Willy <jemand771@gmx.net>
Date: Tue, 6 May 2025 00:40:07 +0200
Subject: [PATCH 17/84] python313Packages.pysmartdl: fix tests

python 3.13 drops `unittest.makeSuite` but provides an easy to use
alternative under `unittest.TestLoader`.
this alternative is old enough to work in all python 3 versions that
nixpkgs contains (currently 9..13), might aswell use it for all of them

even if it really doesn't matter functionally, `pythonAtLeast` would
introduce unnecessary differences between the packages built for
different python versions
---
 pkgs/development/python-modules/pysmartdl/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pysmartdl/default.nix b/pkgs/development/python-modules/pysmartdl/default.nix
index b4ce005ff063..d14850086ed9 100644
--- a/pkgs/development/python-modules/pysmartdl/default.nix
+++ b/pkgs/development/python-modules/pysmartdl/default.nix
@@ -22,6 +22,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  # https://docs.python.org/3/whatsnew/3.13.html#unittest
+  preCheck = ''
+    substituteInPlace test/test_pySmartDL.py \
+      --replace-fail 'unittest.makeSuite(' 'unittest.TestLoader().loadTestsFromTestCase('
+  '';
   disabledTests = [
     # touch the network
     "test_basic_auth"

From 1f705c53bd8db54bf09b0bfc485de2ce76f7576b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 9 May 2025 10:17:14 -0500
Subject: [PATCH 18/84] _1password-cli: 2.30.3 -> 2.31.0

---
 pkgs/by-name/_1/_1password-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index dc1b94fb24df..fbd1e8db8cc9 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -23,13 +23,13 @@ let
     if extension == "zip" then fetchzip args else fetchurl args;
 
   pname = "1password-cli";
-  version = "2.30.3";
+  version = "2.31.0";
   sources = rec {
-    aarch64-linux = fetch "linux_arm64" "sha256-dXhmRl48Uk4T4947Dwz6ZkaRkZlmcADXKt/m6d1VNe8=" "zip";
-    i686-linux = fetch "linux_386" "sha256-+B4fZ41DBe9TnIHOntBQDAvTYOckVwK5B+wwsIU6fAI=" "zip";
-    x86_64-linux = fetch "linux_amd64" "sha256-MsBSjJi7hJbS1wU3lVeywRrhGAZkoqxRb4FTg8fFN00=" "zip";
+    aarch64-linux = fetch "linux_arm64" "sha256-l42h6mGqcb7Wy1ryXM0gxnt2fUUDr8+4nc9qIG0nDgc=" "zip";
+    i686-linux = fetch "linux_386" "sha256-3oxBu0SAbWNgHZxirmKXm0Mk/uRZRPX/qCfYvkANTfM=" "zip";
+    x86_64-linux = fetch "linux_amd64" "sha256-hlktdQCGMtTIbd2j9x0aHKCIoIAydDj/caKaIWJfJTI=" "zip";
     aarch64-darwin =
-      fetch "apple_universal" "sha256-RVng7huZfRRR99TLKwmmun6woSiIhM5YnaEfWgdPJr4="
+      fetch "apple_universal" "sha256-PahPWQ4HpaOvEC1zda8X1Bft+8l/0qGWSJUEcfuWlxg="
         "pkg";
     x86_64-darwin = aarch64-darwin;
   };

From 410dafe6bcf98a955f01cb895867c546449dc42a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 9 May 2025 10:18:28 -0500
Subject: [PATCH 19/84] teams-for-linux: 2.0.11 -> 2.0.12

---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 449ac10f1454..8ab12c6eb5bf 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.0.11";
+  version = "2.0.12";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-vqeDzLImp0c9qPC8oNmjoTFLMCUJzJGHznALCbKdzWc=";
+    hash = "sha256-FTXwDwdXeXAa6Nk73WPPrxyrXvQ8Yg9tqtdkeekK4x8=";
   };
 
-  npmDepsHash = "sha256-3mXQ1InZGCsCCz1mVNSOE4tvA/qMW7eWZzES8yzriFQ=";
+  npmDepsHash = "sha256-uwohbVV6zNdLmLgSihJsqRxm5ZR8P8mHeZdbCYjA78w=";
 
   nativeBuildInputs = [
     makeWrapper

From 369dbaad3fc1d6b6b5bac24b1296b14ded4724b9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 9 May 2025 10:19:46 -0500
Subject: [PATCH 20/84] upgrade-assistant: 0.5.829 -> 0.5.1073

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

diff --git a/pkgs/by-name/up/upgrade-assistant/package.nix b/pkgs/by-name/up/upgrade-assistant/package.nix
index 06e361d74267..92958219cdf1 100644
--- a/pkgs/by-name/up/upgrade-assistant/package.nix
+++ b/pkgs/by-name/up/upgrade-assistant/package.nix
@@ -1,9 +1,9 @@
 { lib, buildDotnetGlobalTool }:
 buildDotnetGlobalTool {
   pname = "upgrade-assistant";
-  version = "0.5.829";
+  version = "0.5.1073";
 
-  nugetHash = "sha256-N0xEmPQ88jfirGPLJykeAJQYGwELFzKwUWdFxIgiwhY=";
+  nugetHash = "sha256-kk3SIv1gp9xtof0MkGkNUiqGuXgy1+YMGxLFZPFsw+0=";
 
   meta = {
     homepage = "https://github.com/dotnet/upgrade-assistant";

From 33cb12cd4534f019ed895fca79d4f246a1f525a4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 9 May 2025 10:38:21 -0500
Subject: [PATCH 21/84] yaziPlugins/update: allow updating different default
 branches

Some plugins will not use the `main` default branch and the script would
bomb out on that. Support fetching the default branch.
---
 pkgs/by-name/ya/yazi/plugins/update.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py
index 510d2e867a0a..4ad6135906c7 100755
--- a/pkgs/by-name/ya/yazi/plugins/update.py
+++ b/pkgs/by-name/ya/yazi/plugins/update.py
@@ -49,10 +49,25 @@ def get_github_headers() -> Dict[str, str]:
     return headers
 
 
+def get_default_branch(owner: str, repo: str, headers: Dict[str, str]) -> str:
+    """Get the default branch name for a GitHub repository"""
+    api_url = f"https://api.github.com/repos/{owner}/{repo}"
+
+    try:
+        response = requests.get(api_url, headers=headers)
+        response.raise_for_status()
+        repo_data = response.json()
+        return repo_data["default_branch"]
+    except requests.RequestException as e:
+        print(f"Error fetching repository data: {e}")
+        print("Falling back to 'main' as default branch")
+        return "main"
+
 def fetch_plugin_content(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> str:
     """Fetch the plugin's main.lua content from GitHub"""
+    default_branch = get_default_branch(owner, repo, headers)
     plugin_path = f"{plugin_pname}/" if owner == "yazi-rs" else ""
-    main_lua_url = f"https://raw.githubusercontent.com/{owner}/{repo}/main/{plugin_path}main.lua"
+    main_lua_url = f"https://raw.githubusercontent.com/{owner}/{repo}/{default_branch}/{plugin_path}main.lua"
 
     try:
         response = requests.get(main_lua_url, headers=headers)
@@ -81,12 +96,14 @@ def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_vers
 
 def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> Tuple[str, str]:
     """Get the latest commit hash and date for the plugin"""
+    default_branch = get_default_branch(owner, repo, headers)
+
     if owner == "yazi-rs":
         # For official plugins, get commit info for the specific plugin file
         api_url = f"https://api.github.com/repos/{owner}/{repo}/commits?path={plugin_pname}/main.lua&per_page=1"
     else:
-        # For third-party plugins, get latest commit on main branch
-        api_url = f"https://api.github.com/repos/{owner}/{repo}/commits/main"
+        # For third-party plugins, get latest commit on default branch
+        api_url = f"https://api.github.com/repos/{owner}/{repo}/commits/{default_branch}"
 
     try:
         response = requests.get(api_url, headers=headers)

From be1b2e06eb5a2777d485eadd3c5114ae08cb65b9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 9 May 2025 10:47:47 -0500
Subject: [PATCH 22/84] yaziPlugins.bypass: 0-unstable-2025-04-09 ->
 25.3.2-unstable-2025-04-22

---
 pkgs/by-name/ya/yazi/plugins/bypass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
index 244ca57fcaed..9574e9ff9bd9 100644
--- a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "bypass.yazi";
-  version = "0-unstable-2025-04-09";
+  version = "25.3.2-unstable-2025-04-22";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "bypass.yazi";
-    rev = "2ab6d84e8165985dd4d63ef0098e3a30feb3a41a";
-    hash = "sha256-6LiBUvHmN8q/ao1+QhCg75ypuf1i6MyRQiU16Lb8pEs=";
+    rev = "17e86529b2aa8ea7c08e117debf7c55044f9edb4";
+    hash = "sha256-Q5g23sCGx9Ecm350ZiGKA1OaRieECWtF1xe22WzTtdY=";
   };
 
   meta = {

From 03432cd2182264cceee631e0c6393075ba152ec8 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 8 May 2025 21:07:53 -0700
Subject: [PATCH 23/84] treewide: remove python = python3

---
 pkgs/applications/misc/ikiwiki/default.nix    |  4 +-
 .../science/biology/mrtrix/default.nix        |  8 +-
 .../i3/bumblebee-status/default.nix           | 12 +--
 pkgs/by-name/yc/ycmd/package.nix              | 10 +--
 .../development/libraries/libfive/default.nix | 20 ++---
 pkgs/development/libraries/libiio/default.nix | 10 +--
 .../libraries/libpwquality/default.nix        |  6 +-
 .../development/libraries/libxslt/default.nix |  8 +-
 pkgs/development/libraries/lief/default.nix   |  6 +-
 .../libraries/openbabel/default.nix           |  8 +-
 .../libraries/physics/lhapdf/default.nix      | 12 +--
 .../science/networking/ns-3/default.nix       |  6 +-
 .../libraries/sundials/default.nix            |  4 +-
 .../python-modules/sigrok/default.nix         |  2 +-
 pkgs/development/tools/libsigrok/default.nix  |  4 +-
 pkgs/games/mnemosyne/default.nix              |  8 +-
 pkgs/tools/admin/google-cloud-sdk/default.nix |  8 +-
 pkgs/tools/misc/brotab/default.nix            |  8 +-
 pkgs/tools/misc/calamares/default.nix         |  8 +-
 .../package-management/libcomps/default.nix   |  8 +-
 .../package-management/libdnf/default.nix     | 12 +--
 .../package-management/librepo/default.nix    |  8 +-
 pkgs/top-level/all-packages.nix               | 73 +++++--------------
 pkgs/top-level/python-packages.nix            | 21 +++---
 24 files changed, 120 insertions(+), 154 deletions(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index ef866eb7b541..c0c18b68af7b 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -12,7 +12,7 @@
   gitSupport ? false,
   git,
   docutilsSupport ? false,
-  python,
+  python3,
   docutils,
   monotoneSupport ? false,
   monotone,
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
       CryptSSLeay
     ])
     ++ lib.optionals docutilsSupport [
-      (python.withPackages (pp: with pp; [ pygments ]))
+      (python3.withPackages (pp: with pp; [ pygments ]))
       docutils
     ]
     ++ lib.optionals gitSupport [ git ]
diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix
index b098cd354ba5..0f75daf9c657 100644
--- a/pkgs/applications/science/biology/mrtrix/default.nix
+++ b/pkgs/applications/science/biology/mrtrix/default.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  python,
+  python3,
   makeWrapper,
   eigen_3_4_0,
   fftw,
@@ -20,7 +20,7 @@
   withGui ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "mrtrix";
   version = "3.0.4-unstable-2025-04-09";
 
@@ -35,14 +35,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     makeWrapper
     less
-    python
+    python3
   ] ++ lib.optional withGui qt5.wrapQtAppsHook;
 
   buildInputs =
     [
       ants
       eigen_3_4_0
-      python
+      python3
       fftw
       libtiff
       libpng
diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
index 7e789586cda9..c847a8a8f313 100644
--- a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
+++ b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
@@ -2,7 +2,7 @@
   pkgs,
   lib,
   glibcLocales,
-  python,
+  python3,
   fetchpatch,
   fetchFromGitHub,
   # Usage: bumblebee-status.override { plugins = p: [p.arandr p.bluetooth2]; };
@@ -13,13 +13,13 @@ let
 
   # { <name> = { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } }
   allPlugins = lib.mapAttrs (name: value: value // { inherit name; }) (
-    import ./plugins.nix { inherit pkgs python; }
+    import ./plugins.nix { inherit pkgs python3; }
   );
 
   # [ { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } ]
   selectedPlugins = plugins allPlugins;
 in
-python.pkgs.buildPythonPackage {
+python3.pkgs.buildPythonPackage {
   pname = "bumblebee-status";
   inherit version;
 
@@ -42,7 +42,7 @@ python.pkgs.buildPythonPackage {
   buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins;
   propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins;
 
-  checkInputs = with python.pkgs; [
+  checkInputs = with python3.pkgs; [
     freezegun
     netifaces
     psutil
@@ -60,7 +60,7 @@ python.pkgs.buildPythonPackage {
     # FIXME: We skip the `dunst` module tests, some of which fail with
     # `RuntimeError: killall -s SIGUSR2 dunst not found`.
     # This is not solved by adding `pkgs.killall` to `checkInputs`.
-    ${python.interpreter} -m pytest -k 'not test_dunst.py'
+    ${python3.interpreter} -m pytest -k 'not test_dunst.py'
 
     runHook postCheck
   '';
@@ -70,7 +70,7 @@ python.pkgs.buildPythonPackage {
     find $out -name "__pycache__" -type d | xargs rm -rv
 
     # Make themes available for bumblebee-status to detect them
-    cp -r ./themes $out/${python.sitePackages}
+    cp -r ./themes $out/${python3.sitePackages}
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix
index b506813ccf40..0626f3d2d196 100644
--- a/pkgs/by-name/yc/ycmd/package.nix
+++ b/pkgs/by-name/yc/ycmd/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   ninja,
-  python,
+  python3,
   withGodef ? true,
   godef,
   withGopls ? true,
@@ -22,7 +22,7 @@
 stdenv.mkDerivation {
   pname = "ycmd";
   version = "unstable-2023-11-06";
-  disabled = !python.isPy3k;
+  disabled = !python3.isPy3k;
 
   # required for third_party directory creation
   src = fetchFromGitHub {
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     ninja
   ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs =
-    with python.pkgs;
+    with python3.pkgs;
     with llvmPackages;
     [
       abseil-cpp
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true"
-    ${python.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja
+    ${python3.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja
   '';
 
   dontConfigure = true;
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
       find third_party -type d -name "test" -exec rm -rf {} +
 
       chmod +x ycmd/__main__.py
-      sed -i "1i #!${python.interpreter}\
+      sed -i "1i #!${python3.interpreter}\
       " ycmd/__main__.py
 
       mkdir -p $out/lib/ycmd
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index d53e7db1f763..c9c88e104ecd 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -12,7 +12,7 @@
   libpng,
   boost,
   guile,
-  python,
+  python3,
   qtbase,
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     cmake
     ninja
     pkg-config
-    python.pkgs.pythonImportsCheckHook
+    python3.pkgs.pythonImportsCheckHook
   ];
   buildInputs = [
     eigen_3_4_0
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     libpng
     boost
     guile
-    python
+    python3
     qtbase
   ];
 
@@ -59,11 +59,11 @@ stdenv.mkDerivation {
 
     substituteInPlace libfive/bind/python/CMakeLists.txt \
       --replace ' ''${PYTHON_SITE_PACKAGES_DIR}' \
-                " $out/${python.sitePackages}" \
+                " $out/${python3.sitePackages}" \
 
     substituteInPlace libfive/bind/python/libfive/ffi.py \
       --replace "os.path.join('libfive', folder)" \
-                "os.path.join('$out/${python.sitePackages}/libfive', folder)" \
+                "os.path.join('$out/${python3.sitePackages}/libfive', folder)" \
 
     export XDG_CACHE_HOME=$(mktemp -d)/.cache
   '';
@@ -91,14 +91,14 @@ stdenv.mkDerivation {
       ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
 
       # Create links since libfive looks for the library in a specific path.
-      mkdir -p "$out/${python.sitePackages}/libfive/src"
-      ln -s "$out"/lib/libfive.* "$out/${python.sitePackages}/libfive/src/"
-      mkdir -p "$out/${python.sitePackages}/libfive/stdlib"
-      ln -s "$out"/lib/libfive-stdlib.* "$out/${python.sitePackages}/libfive/stdlib/"
+      mkdir -p "$out/${python3.sitePackages}/libfive/src"
+      ln -s "$out"/lib/libfive.* "$out/${python3.sitePackages}/libfive/src/"
+      mkdir -p "$out/${python3.sitePackages}/libfive/stdlib"
+      ln -s "$out"/lib/libfive-stdlib.* "$out/${python3.sitePackages}/libfive/stdlib/"
 
       # Create links so Studio can find the bindings.
       mkdir -p "$out/libfive/bind"
-      ln -s "$out/${python.sitePackages}" "$out/libfive/bind/python"
+      ln -s "$out/${python3.sitePackages}" "$out/libfive/bind/python"
     '';
 
   pythonImportsCheck = [
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index 33e9e183c859..c63778c9b9d6 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -6,7 +6,7 @@
   bison,
   libxml2,
   pythonSupport ? stdenv.hostPlatform.hasSharedLibraries,
-  python,
+  python3,
   libusb1,
   avahiSupport ? true,
   avahi,
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals pythonSupport (
       [
-        python
+        python3
       ]
-      ++ lib.optional python.isPy3k python.pkgs.setuptools
+      ++ lib.optional python3.isPy3k python3.pkgs.setuptools
     );
 
   buildInputs =
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
       "-DOSX_FRAMEWORK=off"
     ]
     ++ lib.optionals pythonSupport [
-      "-DPython_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}"
+      "-DPython_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}"
       "-DPYTHON_BINDINGS=on"
     ]
     ++ lib.optionals (!avahiSupport) [
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
 
   postInstall = lib.optionalString pythonSupport ''
     # Move Python bindings into a separate output.
-    moveToOutput ${python.sitePackages} "$python"
+    moveToOutput ${python3.sitePackages} "$python"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index d80f4c8ab318..525738a09896 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -9,7 +9,7 @@
   enablePAM ? stdenv.hostPlatform.isLinux,
   pam,
   enablePython ? false,
-  python,
+  python3,
 }:
 
 # python binding generates a shared library which are unavailable with musl build
@@ -67,14 +67,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     perl
-  ] ++ lib.optionals enablePython [ (python.withPackages (ps: with ps; [ setuptools ])) ];
+  ] ++ lib.optionals enablePython [ (python3.withPackages (ps: with ps; [ setuptools ])) ];
   buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ];
 
   configureFlags =
     if enablePython then
       [
         "--enable-python-bindings=yes"
-        "--with-pythonsitedir=\"${python.sitePackages}\""
+        "--with-pythonsitedir=\"${python3.sitePackages}\""
       ]
     else
       # change to `--enable-python-bindings=no` in the future
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index eed74e3b8e3f..206fe487fd0a 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -7,7 +7,7 @@
   libxml2,
   findXMLCatalogs,
   gettext,
-  python,
+  python3,
   ncurses,
   libgcrypt,
   cryptoSupport ? false,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals pythonSupport [
       libxml2.py
-      python
+      python3
       ncurses
     ]
     ++ lib.optionals cryptoSupport [
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     (lib.withFeature pythonSupport "python")
-    (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}")
+    (lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
     (lib.withFeature cryptoSupport "crypto")
   ];
 
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString pythonSupport ''
       mkdir -p $py/nix-support
       echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
-      moveToOutput ${python.sitePackages} "$py"
+      moveToOutput ${python3.sitePackages} "$py"
     '';
 
   passthru = {
diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix
index da7ea8898fc7..72db93188371 100644
--- a/pkgs/development/libraries/lief/default.nix
+++ b/pkgs/development/libraries/lief/default.nix
@@ -2,13 +2,13 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python,
+  python3,
   cmake,
   ninja,
 }:
 
 let
-  pyEnv = python.withPackages (ps: [
+  pyEnv = python3.withPackages (ps: [
     ps.setuptools
     ps.tomli
     ps.pip
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Not in propagatedBuildInputs because only the $py output needs it; $out is
   # just the library itself (e.g. C/C++ headers).
-  buildInputs = with python.pkgs; [
+  buildInputs = with python3.pkgs; [
     python
     build
     pathspec
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 1b81bfa77520..aa0ebe26abd5 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -7,7 +7,7 @@
   zlib,
   libxml2,
   eigen,
-  python,
+  python3,
   cairo,
   pcre,
   pkg-config,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     zlib
     libxml2
     eigen
-    python
+    python3
     cairo
     pcre
     swig
@@ -57,14 +57,14 @@ stdenv.mkDerivation rec {
     cmakeFlagsArray+=(
       "-DRUN_SWIG=ON"
       "-DPYTHON_BINDINGS=ON"
-      "-DPYTHON_INSTDIR=$out/${python.sitePackages}"
+      "-DPYTHON_INSTDIR=$out/${python3.sitePackages}"
     )
   '';
 
   # Setuptools only accepts PEP 440 version strings. The "unstable" identifier
   # can not be used. Instead we pretend to be the 3.2 beta release.
   postFixup = ''
-    cat << EOF > $out/${python.sitePackages}/setup.py
+    cat << EOF > $out/${python3.sitePackages}/setup.py
     from setuptools import setup
 
     setup(
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index b1d42a3560db..962d437e2fc1 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   bash,
-  python,
+  python3,
   makeWrapper,
 }:
 
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
       bash
       makeWrapper
     ]
-    ++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [
-      python.pkgs.cython
+    ++ lib.optionals (python3 != null && lib.versionAtLeast python3.version "3.10") [
+      python3.pkgs.cython
     ];
-  buildInputs = [ python ];
+  buildInputs = [ python3 ];
 
-  configureFlags = lib.optionals (python == null) [ "--disable-python" ];
+  configureFlags = lib.optionals (python3 == null) [ "--disable-python" ];
 
-  preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") ''
+  preBuild = lib.optionalString (python3 != null && lib.versionAtLeast python3.version "3.10") ''
     rm wrappers/python/lhapdf.cpp
   '';
 
diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix
index 3864959ec3d4..a252d24f4bc9 100644
--- a/pkgs/development/libraries/science/networking/ns-3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   fetchFromGitLab,
-  python,
+  python3,
   libxml2,
   sqlite,
 
@@ -48,7 +48,7 @@
 }:
 
 let
-  pythonEnv = python.withPackages (
+  pythonEnv = python3.withPackages (
     ps:
     lib.optional withManual ps.sphinx
     ++ lib.optionals pythonSupport (
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
 
   # Make generated python bindings discoverable in customized python environment
   passthru = {
-    pythonModule = python;
+    pythonModule = python3;
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index c02d10409b6f..82fceb3ccad5 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   cmake,
   fetchurl,
-  python,
+  python3,
   blas,
   lapack,
   gfortran,
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      python
+      python3
     ]
     ++
       lib.optionals (lapackSupport)
diff --git a/pkgs/development/python-modules/sigrok/default.nix b/pkgs/development/python-modules/sigrok/default.nix
index 40253c5ad19c..5a0a6997df16 100644
--- a/pkgs/development/python-modules/sigrok/default.nix
+++ b/pkgs/development/python-modules/sigrok/default.nix
@@ -16,7 +16,7 @@
 # build libsigrok plus its Python bindings. Unfortunately it does not appear
 # to be possible to build them separately, at least not easily.
 toPythonModule (
-  (libsigrok.override { inherit python; }).overrideAttrs (orig: {
+  (libsigrok.override { python3 = python; }).overrideAttrs (orig: {
     pname = "${python.libPrefix}-sigrok";
 
     patches = orig.patches or [ ] ++ [
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
index d2390501fc18..fa291ee2a13e 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -12,7 +12,7 @@
   libserialport,
   doxygen,
   glibmm,
-  python,
+  python3,
   hidapi,
   libieee1284,
   bluez,
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     autoreconfHook
     doxygen
     pkg-config
-    python
+    python3
   ];
   buildInputs =
     [
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 5f1d03a3ed6f..eb7ee2a36853 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -1,10 +1,10 @@
 {
-  python,
+  python3Packages,
   fetchurl,
   anki,
 }:
 
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "mnemosyne";
   version = "2.10.1";
 
@@ -13,11 +13,11 @@ python.pkgs.buildPythonApplication rec {
     sha256 = "sha256-zI79iuRXb5S0Y87KfdG+HKc0XVNQOAcBR7Zt/OdaBP4=";
   };
 
-  nativeBuildInputs = with python.pkgs; [ pyqtwebengine.wrapQtAppsHook ];
+  nativeBuildInputs = with python3Packages; [ pyqtwebengine.wrapQtAppsHook ];
 
   buildInputs = [ anki ];
 
-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = with python3Packages; [
     cheroot
     cherrypy
     googletrans
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 8c2c62c12862..cafd07ffd1b8 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -12,7 +12,7 @@
   lib,
   fetchurl,
   makeWrapper,
-  python,
+  python3,
   openssl,
   jq,
   callPackage,
@@ -21,7 +21,7 @@
 }:
 
 let
-  pythonEnv = python.withPackages (
+  pythonEnv = python3.withPackages (
     p:
     with p;
     [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl (sources stdenv.hostPlatform.system);
 
-  buildInputs = [ python ];
+  buildInputs = [ python3 ];
 
   nativeBuildInputs = [
     jq
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
         wrapProgram "$programPath" \
             --set CLOUDSDK_PYTHON "${pythonEnv}/bin/python" \
             --set CLOUDSDK_PYTHON_ARGS "-S -W ignore" \
-            --prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}" \
+            --prefix PYTHONPATH : "${pythonEnv}/${python3.sitePackages}" \
             --prefix PATH : "${openssl.bin}/bin"
 
         mkdir -p $out/bin
diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix
index 8fe0143d9258..d91fafcaed13 100644
--- a/pkgs/tools/misc/brotab/default.nix
+++ b/pkgs/tools/misc/brotab/default.nix
@@ -2,10 +2,10 @@
   lib,
   fetchFromGitHub,
   fetchpatch,
-  python,
+  python3Packages,
 }:
 
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "brotab";
   version = "1.4.2";
   format = "setuptools";
@@ -26,7 +26,7 @@ python.pkgs.buildPythonApplication rec {
     })
   ];
 
-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = with python3Packages; [
     flask
     psutil
     requests
@@ -42,7 +42,7 @@ python.pkgs.buildPythonApplication rec {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeCheckInputs = with python.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
   ];
 
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 2562a7e7d65f..ecab0d9c0fab 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -14,7 +14,7 @@
   libpwquality,
   parted,
   polkit-qt,
-  python,
+  python3,
   qtbase,
   qtquickcontrols,
   qtsvg,
@@ -73,7 +73,7 @@ mkDerivation rec {
     libpwquality
     parted
     polkit-qt
-    python
+    python3
     qtbase
     qtquickcontrols
     qtsvg
@@ -83,8 +83,8 @@ mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so"
-    "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"
+    "-DPYTHON_LIBRARY=${python3}/lib/lib${python3.libPrefix}.so"
+    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
     "-DCMAKE_VERBOSE_MAKEFILE=True"
     "-DWITH_PYTHONQT:BOOL=ON"
   ];
diff --git a/pkgs/tools/package-management/libcomps/default.nix b/pkgs/tools/package-management/libcomps/default.nix
index 048c6af62c3a..e235974b773c 100644
--- a/pkgs/tools/package-management/libcomps/default.nix
+++ b/pkgs/tools/package-management/libcomps/default.nix
@@ -6,7 +6,7 @@
   expat,
   fetchFromGitHub,
   libxml2,
-  python,
+  python3,
   sphinx,
   stdenv,
   zlib,
@@ -35,14 +35,14 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace libcomps/src/python/src/CMakeLists.txt \
-      --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}"
+      --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
   '';
 
   nativeBuildInputs = [
     check
     cmake
     doxygen
-    python
+    python3
     sphinx
   ];
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     ls $out/lib
-    moveToOutput "lib/${python.libPrefix}" "$py"
+    moveToOutput "lib/${python3.libPrefix}" "$py"
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix
index 08794afd1821..37a904e477af 100644
--- a/pkgs/tools/package-management/libdnf/default.nix
+++ b/pkgs/tools/package-management/libdnf/default.nix
@@ -17,7 +17,7 @@
   rpm,
   zchunk,
   cppunit,
-  python,
+  python3,
   swig,
   pcre2,
   sphinx,
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     libyaml
     libmodulemd
     zchunk
-    python
+    python3
     swig
     sphinx
     pcre2.dev
@@ -80,21 +80,21 @@ stdenv.mkDerivation rec {
     substituteInPlace libdnf/libdnf.pc.in \
       --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
     substituteInPlace cmake/modules/FindPythonInstDir.cmake \
-      --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}"
+      --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
   '';
 
   cmakeFlags = [
     "-DWITH_GTKDOC=OFF"
     "-DWITH_HTML=OFF"
-    "-DPYTHON_DESIRED=${lib.head (lib.splitString [ "." ] python.version)}"
+    "-DPYTHON_DESIRED=${lib.head (lib.splitString [ "." ] python3.version)}"
   ];
 
   postInstall = ''
-    rm -r $out/${python.sitePackages}/hawkey/test
+    rm -r $out/${python3.sitePackages}/hawkey/test
   '';
 
   postFixup = ''
-    moveToOutput "lib/${python.libPrefix}" "$py"
+    moveToOutput "lib/${python3.libPrefix}" "$py"
   '';
 
   meta = {
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 6b9cb5a6b34f..30d45bb5ba57 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  python,
+  python3,
   pkg-config,
   libxml2,
   glib,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python
+    python3
     libxml2
     glib
     openssl
@@ -59,10 +59,10 @@ stdenv.mkDerivation rec {
     libxml2
   ];
 
-  cmakeFlags = [ "-DPYTHON_DESIRED=${lib.substring 0 1 python.pythonVersion}" ];
+  cmakeFlags = [ "-DPYTHON_DESIRED=${lib.substring 0 1 python3.pythonVersion}" ];
 
   postFixup = ''
-    moveToOutput "lib/${python.libPrefix}" "$py"
+    moveToOutput "lib/${python3.libPrefix}" "$py"
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aada23abf900..89e302bddf5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2021,7 +2021,6 @@ with pkgs;
     });
 
   calamares = libsForQt5.callPackage ../tools/misc/calamares {
-    python = python3;
     boost = boost.override {
       enablePython = true;
       python = python3;
@@ -2312,9 +2311,7 @@ with pkgs;
 
   lexicon = with python3Packages; toPythonApplication dns-lexicon;
 
-  lief = callPackage ../development/libraries/lief {
-    python = python3;
-  };
+  lief = callPackage ../development/libraries/lief { };
 
   # Less secure variant of lowdown for use inside Nix builds.
   lowdown-unsandboxed = lowdown.override {
@@ -3191,11 +3188,8 @@ with pkgs;
     isStereo = true;
   };
 
-  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk {
-    python = python3;
-  };
+  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
   google-cloud-sdk-gce = google-cloud-sdk.override {
-    python = python3;
     with-gce = true;
   };
 
@@ -7282,9 +7276,7 @@ with pkgs;
     else
       gcc.cc;
 
-  libsigrok = callPackage ../development/tools/libsigrok {
-    python = python3;
-  };
+  libsigrok = callPackage ../development/tools/libsigrok { };
 
   distcc = callPackage ../development/tools/misc/distcc {
     libiberty_static = libiberty.override { staticBuild = true; };
@@ -7802,10 +7794,6 @@ with pkgs;
 
   xxdiff-tip = xxdiff;
 
-  ycmd = callPackage ../by-name/yc/ycmd/package.nix {
-    python = python3;
-  };
-
   yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix {
     jre = jdk21;
   };
@@ -8701,7 +8689,7 @@ with pkgs;
 
   libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { };
 
-  libcomps = callPackage ../tools/package-management/libcomps { python = python3; };
+  libcomps = callPackage ../tools/package-management/libcomps { };
 
   libcxxrt = callPackage ../development/libraries/libcxxrt {
     stdenv =
@@ -8725,7 +8713,7 @@ with pkgs;
     withXorg = false;
   };
 
-  libdnf = callPackage ../tools/package-management/libdnf { python = python3; };
+  libdnf = callPackage ../tools/package-management/libdnf { };
 
   libdvdnav = callPackage ../development/libraries/libdvdnav { };
   libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix {
@@ -8750,17 +8738,13 @@ with pkgs;
     callPackage ../development/libraries/libgnome-games-support/2.0.nix
       { };
 
-  libiio = callPackage ../development/libraries/libiio {
-    python = python3;
-  };
+  libiio = callPackage ../development/libraries/libiio { };
 
   libextractor = callPackage ../development/libraries/libextractor {
     libmpeg2 = mpeg2dec;
   };
 
-  libfive = libsForQt5.callPackage ../development/libraries/libfive {
-    python = python3;
-  };
+  libfive = libsForQt5.callPackage ../development/libraries/libfive { };
 
   # Use Apple’s fork of libffi by default, which provides APIs and trampoline functionality that is not yet
   # merged upstream. This is needed by some packages (such as cffi).
@@ -8797,9 +8781,7 @@ with pkgs;
 
   libremines = qt6.callPackage ../games/libremines { };
 
-  librepo = callPackage ../tools/package-management/librepo {
-    python = python3;
-  };
+  librepo = callPackage ../tools/package-management/librepo { };
 
   libretranslate = with python3.pkgs; toPythonApplication libretranslate;
 
@@ -8923,9 +8905,7 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  libpwquality = callPackage ../development/libraries/libpwquality {
-    python = python3;
-  };
+  libpwquality = callPackage ../development/libraries/libpwquality { };
 
   libsigcxx = callPackage ../development/libraries/libsigcxx { };
 
@@ -9038,9 +9018,7 @@ with pkgs;
   libxmlxx = callPackage ../development/libraries/libxmlxx { };
   libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { };
 
-  libxslt = callPackage ../development/libraries/libxslt {
-    python = python3;
-  };
+  libxslt = callPackage ../development/libraries/libxslt { };
 
   libwpe = callPackage ../development/libraries/libwpe { };
 
@@ -9232,9 +9210,7 @@ with pkgs;
 
   openbabel2 = callPackage ../development/libraries/openbabel/2.nix { };
 
-  openbabel3 = callPackage ../development/libraries/openbabel {
-    python = python3;
-  };
+  openbabel3 = callPackage ../development/libraries/openbabel { };
 
   opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec {
     pname = "opencascade-occt";
@@ -9739,9 +9715,7 @@ with pkgs;
 
   structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
 
-  sundials = callPackage ../development/libraries/sundials {
-    python = python3;
-  };
+  sundials = callPackage ../development/libraries/sundials { };
 
   svxlink = libsForQt5.callPackage ../applications/radio/svxlink { };
 
@@ -12107,13 +12081,9 @@ with pkgs;
 
   cdparanoia = cdparanoiaIII;
 
-  brotab = callPackage ../tools/misc/brotab {
-    python = python3;
-  };
+  brotab = callPackage ../tools/misc/brotab { };
 
-  bumblebee-status = callPackage ../applications/window-managers/i3/bumblebee-status {
-    python = python3;
-  };
+  bumblebee-status = callPackage ../applications/window-managers/i3/bumblebee-status { };
 
   chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or { });
 
@@ -12893,7 +12863,6 @@ with pkgs;
   };
 
   ikiwiki = callPackage ../applications/misc/ikiwiki {
-    python = python3;
     inherit
       (perlPackages.override {
         pkgs = pkgs // {
@@ -15201,9 +15170,7 @@ with pkgs;
   luanti-client = luanti.override { buildServer = false; };
   luanti-server = luanti.override { buildClient = false; };
 
-  mnemosyne = callPackage ../games/mnemosyne {
-    python = python3;
-  };
+  mnemosyne = callPackage ../games/mnemosyne { };
 
   mrrescue = callPackage ../games/mrrescue { love = love_0_10; };
 
@@ -15676,7 +15643,7 @@ with pkgs;
     useRx3d = true;
   };
 
-  mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; };
+  mrtrix = callPackage ../applications/science/biology/mrtrix { };
 
   minc_tools = callPackage ../applications/science/biology/minc-tools {
     inherit (perlPackages) perl TextFormat;
@@ -15862,7 +15829,7 @@ with pkgs;
     stdenv = gccStdenv;
     lhapdf = lhapdf.override {
       stdenv = gccStdenv;
-      python = null;
+      python3 = null;
     };
   };
 
@@ -16186,7 +16153,7 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };
 
-  ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
+  ns-3 = callPackage ../development/libraries/science/networking/ns-3 { };
 
   spyder = with python3.pkgs; toPythonApplication spyder;
 
@@ -16202,9 +16169,7 @@ with pkgs;
     python = null;
   };
 
-  lhapdf = callPackage ../development/libraries/physics/lhapdf {
-    python = python3;
-  };
+  lhapdf = callPackage ../development/libraries/physics/lhapdf { };
 
   pythia = callPackage ../development/libraries/physics/pythia {
     hepmc = hepmc2;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1df25bc30548..bfacfa638ff2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7717,7 +7717,7 @@ self: super: with self; {
 
   lexilang = callPackage ../development/python-modules/lexilang { };
 
-  lhapdf = toPythonModule (pkgs.lhapdf.override { inherit python; });
+  lhapdf = toPythonModule (pkgs.lhapdf.override { python3 = python; });
 
   lib4package = callPackage ../development/python-modules/lib4package { };
 
@@ -7753,7 +7753,7 @@ self: super: with self; {
         };
       })
     )
-    (p: p.override { inherit python; })
+    (p: p.override { python3 = python; })
     (p: p.py)
   ];
 
@@ -7769,7 +7769,7 @@ self: super: with self; {
         };
       })
     )
-    (p: p.override { inherit python; })
+    (p: p.override { python3 = python; })
     (p: p.py)
   ];
 
@@ -7782,7 +7782,7 @@ self: super: with self; {
     }
   );
 
-  libfive = toPythonModule (pkgs.libfive.override { inherit python; });
+  libfive = toPythonModule (pkgs.libfive.override { python3 = python; });
 
   libgpiod = callPackage ../development/python-modules/libgpiod { inherit (pkgs) libgpiod; };
 
@@ -7792,7 +7792,7 @@ self: super: with self; {
     (toPythonModule (
       pkgs.libiio.override {
         pythonSupport = true;
-        inherit python;
+        python3 = python;
       }
     )).python;
 
@@ -7856,7 +7856,7 @@ self: super: with self; {
       p:
       p.override {
         enablePython = true;
-        inherit python;
+        python3 = python;
       }
     )
     (p: p.py)
@@ -7885,7 +7885,7 @@ self: super: with self; {
         };
       })
     )
-    (p: p.override { inherit python; })
+    (p: p.override { python3 = python; })
     (p: p.py)
   ];
 
@@ -7963,7 +7963,8 @@ self: super: with self; {
     (toPythonModule (
       pkgs.libxslt.override {
         pythonSupport = true;
-        inherit (self) python libxml2;
+        python3 = python;
+        inherit (self) libxml2;
       }
     )).py;
 
@@ -7973,7 +7974,7 @@ self: super: with self; {
 
   lida = callPackage ../development/python-modules/lida { };
 
-  lief = (toPythonModule (pkgs.lief.override { inherit python; })).py;
+  lief = (toPythonModule (pkgs.lief.override { python3 = python; })).py;
 
   life360 = callPackage ../development/python-modules/life360 { };
 
@@ -10309,7 +10310,7 @@ self: super: with self; {
   openapi3 = callPackage ../development/python-modules/openapi3 { };
 
   openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings {
-    openbabel = callPackage ../development/libraries/openbabel { inherit (self) python; };
+    openbabel = pkgs.openbabel.override { python3 = python; };
   };
 
   opencamlib = callPackage ../development/python-modules/opencamlib { };

From f84332310829a23e4c5ef3567b932e2643f12fe8 Mon Sep 17 00:00:00 2001
From: Martin Schwaighofer <3856390+mschwaig@users.noreply.github.com>
Date: Fri, 9 May 2025 19:55:16 +0200
Subject: [PATCH 24/84] pythonPackages.tuf: update to get sigstore working

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

diff --git a/pkgs/development/python-modules/tuf/default.nix b/pkgs/development/python-modules/tuf/default.nix
index 2e36e0b3b56e..a20a1f10e0cf 100644
--- a/pkgs/development/python-modules/tuf/default.nix
+++ b/pkgs/development/python-modules/tuf/default.nix
@@ -2,17 +2,19 @@
   lib,
   buildPythonPackage,
   ed25519,
+  freezegun,
   fetchFromGitHub,
   hatchling,
   pytestCheckHook,
   pythonOlder,
+  flit-core,
   requests,
   securesystemslib,
 }:
 
 buildPythonPackage rec {
   pname = "tuf";
-  version = "5.1.0";
+  version = "6.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,10 +23,13 @@ buildPythonPackage rec {
     owner = "theupdateframework";
     repo = "python-tuf";
     tag = "v${version}";
-    hash = "sha256-Qv9SH4ObC7bgPLd2Wu5XynBddlW6pycwLwaKhZ+l61k=";
+    hash = "sha256-CPbZOpUYi7MWKLMj7kwTsmEkxLCf4wU7IOCcbzMkPlU=";
   };
 
-  build-system = [ hatchling ];
+  build-system = [
+    flit-core
+    hatchling
+  ];
 
   dependencies =
     [
@@ -34,6 +39,10 @@ buildPythonPackage rec {
     ++ securesystemslib.optional-dependencies.pynacl
     ++ securesystemslib.optional-dependencies.crypto;
 
+  checkInputs = [
+    freezegun
+  ];
+
   nativeCheckInputs = [
     ed25519
     pytestCheckHook

From a71bffa6868cabf4626e209d4d4a1c29dec7e43d Mon Sep 17 00:00:00 2001
From: Martin Schwaighofer <3856390+mschwaig@users.noreply.github.com>
Date: Fri, 9 May 2025 19:58:26 +0200
Subject: [PATCH 25/84] pythonPackages.sigstore: fix this by bumping the
 version

---
 .../python-modules/sigstore-protobuf-specs/default.nix        | 4 ++--
 pkgs/development/python-modules/sigstore/default.nix          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
index 32dc3059947f..29b10ba1e85a 100644
--- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
+++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "sigstore-protobuf-specs";
-  version = "0.4.0";
+  version = "0.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "sigstore_protobuf_specs";
     inherit version;
-    hash = "sha256-XrWiz2xAvGDrRwPqMcDfm0EKkhU70i3eWj8bT2bvCpA=";
+    hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 2bcc833a541a..8825a90af7d0 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "sigstore-python";
-  version = "3.6.1";
+  version = "3.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "sigstore";
     repo = "sigstore-python";
     tag = "v${version}";
-    hash = "sha256-BdVX2LWCsMx9r0bDTJjMdrvy4Hqn6hrw9wAcub0nRMk=";
+    hash = "sha256-fghieYu5TDYwJCwesXbqRiuYCaTTDZhmHWvCwSbIO6w=";
   };
 
   pythonRelaxDeps = [

From 2d61a6f2a6df2c95550d27a203374f98362f2b6a Mon Sep 17 00:00:00 2001
From: Martin Schwaighofer <3856390+mschwaig@users.noreply.github.com>
Date: Fri, 9 May 2025 20:18:09 +0200
Subject: [PATCH 26/84] pythonPackages.sigstore-protobuf-specs: do not
 auto-update this

Since only sigstore depends on it, and it usually does not depend on the latest version,
the bulk update just ends up breaking sigstore.
---
 .../python-modules/sigstore-protobuf-specs/default.nix          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
index 29b10ba1e85a..9e65def1d162 100644
--- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
+++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
@@ -33,6 +33,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "sigstore_protobuf_specs" ];
 
+  passthru.skipBulkUpdate = true;
+
   meta = with lib; {
     description = "Library for serializing and deserializing Sigstore messages";
     homepage = "https://pypi.org/project/sigstore-protobuf-specs/";

From 9f4d5af6082f7396e994bfb4729aa399f9246c84 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 9 May 2025 14:02:03 -0400
Subject: [PATCH 27/84] anubis: 1.17.1 -> 1.18.0

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

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 06568312e16f..b8acffe0a7a3 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "anubis";
-  version = "1.17.1";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${version}";
-    hash = "sha256-8b2rVVuxhsY0+5IZvzMm7ki3HGbJAnUUoAqpD1PuqZ4=";
+    hash = "sha256-grtzkNxgShbldjm+lnANbKVhkUrbwseAT1NaBL85mHg=";
   };
 
   anubisXess = buildNpmPackage {
     inherit version src;
     pname = "${pname}-xess";
 
-    npmDepsHash = "sha256-jiLrqn0jenug2ff/mqhOIfc7f+CsQja5g2K9n+W1kVM=";
+    npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk=";
 
     buildPhase = ''
       runHook preBuild
@@ -44,7 +44,7 @@ in
 buildGoModule (finalAttrs: {
   inherit pname version src;
 
-  vendorHash = "sha256-v9GsTUzBYfjh6/ETBbFpN5dqMzMaOz8w39Xz1omaPJE=";
+  vendorHash = "sha256-EOT/sdVINj9oO1jZHPYB3jQ+XApf9eCUKuMY0tV+vpg=";
 
   nativeBuildInputs = [
     esbuild

From 7a5080241174cd241809b1091af6e2b589ff2440 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 1 May 2025 00:02:10 +0800
Subject: [PATCH 28/84] libsupermesh: init at 2025.3.0

---
 pkgs/by-name/li/libsupermesh/package.nix      | 77 +++++++++++++++++++
 .../python-modules/libsupermesh/default.nix   | 48 ++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 127 insertions(+)
 create mode 100644 pkgs/by-name/li/libsupermesh/package.nix
 create mode 100644 pkgs/development/python-modules/libsupermesh/default.nix

diff --git a/pkgs/by-name/li/libsupermesh/package.nix b/pkgs/by-name/li/libsupermesh/package.nix
new file mode 100644
index 000000000000..ea15c72ccf21
--- /dev/null
+++ b/pkgs/by-name/li/libsupermesh/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  validatePkgConfig,
+  gfortran,
+  mpi,
+  cmake,
+  ninja,
+  libspatialindex,
+  mpiCheckPhaseHook,
+  testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libsupermesh";
+  version = "2025.3.0";
+
+  src = fetchFromGitHub {
+    owner = "firedrakeproject";
+    repo = "libsupermesh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RKBi89bUhkbRATaSB8629D+/NeYE3YNDIMEGzSK8z04=";
+  };
+
+  strictDeps = true;
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    mpi
+    gfortran
+    cmake
+    ninja
+    validatePkgConfig
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+  ];
+
+  buildInputs = [
+    libspatialindex
+    gfortran.cc.lib
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeCheckInputs = [ mpiCheckPhaseHook ];
+
+  # On aarch64-darwin platform, the test program segfault at the line
+  # https://github.com/firedrakeproject/libsupermesh/blob/09af7c9a3beefc715fbdc23e46fdc96da8169ff6/src/tests/test_parallel_p1_inner_product_2d.F90#L164
+  # in defining the lambda subroutine pack_data_b with variable field_b.
+  # This error is test source and compiler related and does not indicate broken functionality of libsupermesh.
+  doCheck = !(stdenv.hostPlatform.system == "aarch64-darwin");
+
+  passthru = {
+    tests = {
+      pkg-config = testers.hasPkgConfigModules {
+        package = finalAttrs.finalPackage;
+      };
+    };
+  };
+
+  meta = {
+    homepage = "https://github.com/firedrakeproject/libsupermesh";
+    description = "Parallel supermeshing library";
+    changelog = "https://github.com/firedrakeproject/libsupermesh/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ qbisi ];
+    pkgConfigModules = [ "libsupermesh" ];
+  };
+})
diff --git a/pkgs/development/python-modules/libsupermesh/default.nix b/pkgs/development/python-modules/libsupermesh/default.nix
new file mode 100644
index 000000000000..bed0e1607932
--- /dev/null
+++ b/pkgs/development/python-modules/libsupermesh/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  pkgs,
+  buildPythonPackage,
+  fetchFromGitHub,
+  scikit-build-core,
+  gfortran,
+  cmake,
+  ninja,
+  mpi,
+  libspatialindex,
+  rtree,
+}:
+
+buildPythonPackage rec {
+  inherit (pkgs.libsupermesh)
+    pname
+    version
+    src
+    meta
+    ;
+  pyproject = true;
+
+  build-system = [
+    scikit-build-core
+  ];
+
+  nativeBuildInputs = [
+    gfortran
+    cmake
+    ninja
+    mpi
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [
+    libspatialindex
+    gfortran.cc.lib
+  ];
+
+  dependencies = [
+    rtree
+  ];
+
+  # Only build tests if not built by scikit-build-core
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1613dfd9e0b5..c64b96ca9116 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7912,6 +7912,8 @@ self: super: with self; {
 
   libsoundtouch = callPackage ../development/python-modules/libsoundtouch { };
 
+  libsupermesh = callPackage ../development/python-modules/libsupermesh { };
+
   libthumbor = callPackage ../development/python-modules/libthumbor { };
 
   libtmux = callPackage ../development/python-modules/libtmux { };

From 91f06db7c872bfbd60747344f4f887c133c4a49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 10 May 2025 12:08:22 +0700
Subject: [PATCH 29/84] open-relay-typefaces: init at 2025-03-20, subsumes
 kreative-square-fonts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reference open-relay’s monorepo typefaces from a central location.
Refactor kreative-square-fonts to fall under this umbrella.
---
 .../kr/kreative-square-fonts/package.nix      | 34 -------
 pkgs/data/fonts/open-relay/default.nix        | 95 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  7 ++
 4 files changed, 103 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/kr/kreative-square-fonts/package.nix
 create mode 100644 pkgs/data/fonts/open-relay/default.nix

diff --git a/pkgs/by-name/kr/kreative-square-fonts/package.nix b/pkgs/by-name/kr/kreative-square-fonts/package.nix
deleted file mode 100644
index d27fbea98034..000000000000
--- a/pkgs/by-name/kr/kreative-square-fonts/package.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "kreative-square-fonts";
-  version = "unstable-2021-01-29";
-
-  src = fetchFromGitHub {
-    owner = "kreativekorp";
-    repo = "open-relay";
-    rev = "084f05af3602307499981651eca56851bec01fca";
-    hash = "sha256-+ihosENczaGal3BGDIaJ/de0pf8txdtelSYMxPok6ww=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf
-    install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters";
-    homepage = "https://www.kreativekorp.com/software/fonts/ksquare.shtml";
-    license = licenses.ofl;
-    platforms = platforms.all;
-    maintainers = [ maintainers.linus ];
-  };
-}
diff --git a/pkgs/data/fonts/open-relay/default.nix b/pkgs/data/fonts/open-relay/default.nix
new file mode 100644
index 000000000000..15c591cab3bc
--- /dev/null
+++ b/pkgs/data/fonts/open-relay/default.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+
+let
+  mkOpenRelayTypeface =
+    name:
+    { directory, meta }:
+    stdenvNoCC.mkDerivation (finalAttrs: {
+      pname = "open-relay-${name}";
+      version = "2025-03-20";
+
+      src = fetchFromGitHub {
+        owner = "kreativekorp";
+        repo = "open-relay";
+        tag = finalAttrs.version;
+        hash = "sha256-OQpZHPbNL3rxXH89lwtHvm7eENl8fS0M0i8IBn4m2hI=";
+      };
+
+      installPhase = ''
+        runHook preInstall
+
+        install -D -m444 -t "$out/share/fonts/truetype" "${directory}/*.ttf"
+        install -D -m644 -t "$out/share/doc/${finalAttrs.pname}-${finalAttrs.version}" "${directory}/OFL.txt"
+
+        runHook postInstall
+      '';
+
+      meta = {
+        homepage = "https://www.kreativekorp.com/software/fonts/index.shtml";
+        description = "Free and open source fonts from Kreative Software";
+        license = lib.licenses.ofl;
+        platforms = lib.platforms.all;
+        maintainers = with lib.maintainers; [
+          linus
+          toastal
+        ];
+      } // meta;
+    });
+in
+lib.mapAttrs mkOpenRelayTypeface {
+  constructium = {
+    directory = "Constructium";
+    meta = {
+      homepage = "https://www.kreativekorp.com/software/fonts/constructium/";
+      description = "fork of SIL Gentium designed specifically to support constructed scripts as encoded in the Under-ConScript Unicode Registry";
+      longDescription = ''
+        Constructium is a fork of SIL Gentium designed specifically to support
+        constructed scripts as encoded in the Under-ConScript Unicode Registry.
+        It is ideal for mixed Latin, Greek, Cyrillic, IPA, and conlang text in
+        web sites and documents.
+      '';
+    };
+  };
+
+  fairfax = {
+    directory = "Fairfax";
+    meta = {
+      homepage = "https://www.kreativekorp.com/software/fonts/fairfax/";
+      description = "6×12 bitmap font supporting many Unicode blocks & scripts as well as constructed scripts";
+      longDescription = ''
+        Fairfax is a 6×12 bitmap font for terminals, text editors, IDEs, etc. It
+        supports many scripts and a large number of Unicode blocks as well as
+        constructed scripts as encoded in the Under-ConScript Unicode Registry,
+        pseudographics and semigraphics, and tons of private use characters. It
+        has been superceded by Fairfax HD but is still maintained.
+      '';
+    };
+  };
+
+  fairfax-hd = {
+    directory = "FairfaxHD";
+    meta = {
+      homepage = "https://www.kreativekorp.com/software/fonts/fairfaxhd/";
+      description = "halfwidth scalable monospace font supporting many Unicode blocks & script as well as constructed scripts";
+      longDescription = ''
+        Fairfax HD is a halfwidth scalable monospace font for terminals, text
+        editors, IDEs, etc. It supports many scripts and a large number of
+        Unicode blocks as well as constructed scripts as encoded in the
+        Under-ConScript Unicode Registry, pseudographics and semigraphics, and
+        tons of private use characters.
+      '';
+    };
+  };
+
+  kreative-square = {
+    directory = "KreativeSquare";
+    meta = {
+      homepage = "https://www.kreativekorp.com/software/fonts/ksquare/";
+      description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters";
+    };
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c275304bfee..3268931b6a28 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -929,6 +929,7 @@ mapAliases {
   kodiPlugins = kodiPackages; # Added 2021-03-09;
   kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17
   krb5Full = krb5;
+  kreative-square-fonts = throw "'kreative-square-fonts' has been renamed to 'kreative-square'"; # Added 2025-04-16
   krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17
   krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01
   kubei = kubeclarity; # Added 2023-05-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43ecd33124f6..c4d12b8a6731 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13642,6 +13642,13 @@ with pkgs;
     vm = callPackage ../applications/audio/open-music-kontrollers/vm.nix { };
   };
 
+  inherit (callPackages ../data/fonts/open-relay { })
+    constructium
+    fairfax
+    fairfax-hd
+    kreative-square
+    ;
+
   openscad = libsForQt5.callPackage ../applications/graphics/openscad { };
 
   opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { };

From 22691a7f99e10f7a000295cd52681ba0e58331ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 06:39:09 +0000
Subject: [PATCH 30/84] clash-meta: 1.19.5 -> 1.19.6

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

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index faee35475e39..04cfe3d893d1 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.19.5";
+  version = "1.19.6";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-eINcvVnWMDbviqNpD+SmtDYVQjLZgjaAdX9NrRAf0Ww=";
+    hash = "sha256-eVqV7Dt6V4fAT0yGF8D7niZevMmX6WggSpA5J+LU7jY=";
   };
 
-  vendorHash = "sha256-xGaJ9iAP6Q8L6oC6LqEwi69Bd7H+bjSykGXckkZL92k=";
+  vendorHash = "sha256-8LATtCrQs7rDiEWKep9xPlzKw413DpS1FGJsLiWriIQ=";
 
   excludedPackages = [ "./test" ];
 

From 0770a4b332129874cbe960d36c0388a5f656ef78 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 10 May 2025 14:12:04 +0800
Subject: [PATCH 31/84] python3Packages.mslex: init at 1.3.0

---
 .../python-modules/mslex/default.nix          | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/mslex/default.nix

diff --git a/pkgs/development/python-modules/mslex/default.nix b/pkgs/development/python-modules/mslex/default.nix
new file mode 100644
index 000000000000..e9cd5d10bda7
--- /dev/null
+++ b/pkgs/development/python-modules/mslex/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytest,
+}:
+
+buildPythonPackage rec {
+  pname = "mslex";
+  version = "1.3.0";
+  pyproject = true; # fallback to setup.py if pyproject.toml is not present
+
+  src = fetchFromGitHub {
+    owner = "smoofra";
+    repo = "mslex";
+    tag = "v${version}";
+    hash = "sha256-vr36OTCTJFZRXlkeGgN4UOlH+6uAkMvqTEO9qL8X98w=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "mslex"
+  ];
+
+  nativeCheckInputs = [
+    pytest
+  ];
+
+  meta = {
+    description = "Like shlex, but for windows";
+    homepage = "https://github.com/smoofra/mslex";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d983296bd8a6..e714a1944221 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9189,6 +9189,8 @@ self: super: with self; {
 
   msldap = callPackage ../development/python-modules/msldap { };
 
+  mslex = callPackage ../development/python-modules/mslex { };
+
   msmart-ng = callPackage ../development/python-modules/msmart-ng { };
 
   msoffcrypto-tool = callPackage ../development/python-modules/msoffcrypto-tool { };

From 066b2a319c736c6bb213b4569674f332b5f58651 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 10 May 2025 14:14:37 +0800
Subject: [PATCH 32/84] python3Packages.oslex: init at 0.1.3

---
 .../python-modules/oslex/default.nix          | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/oslex/default.nix

diff --git a/pkgs/development/python-modules/oslex/default.nix b/pkgs/development/python-modules/oslex/default.nix
new file mode 100644
index 000000000000..5eeec6baab23
--- /dev/null
+++ b/pkgs/development/python-modules/oslex/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  mslex,
+}:
+
+buildPythonPackage rec {
+  pname = "oslex";
+  version = "0.1.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "petamas";
+    repo = "oslex";
+    tag = "release/v${version}";
+    hash = "sha256-OcmBtxGS1Cq2kEcxF0Il62LUGbAAcG4lieokr/nK2/4=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    mslex
+  ];
+
+  pythonImportsCheck = [
+    "oslex"
+  ];
+
+  meta = {
+    description = "OS-independent wrapper for shlex and mslex";
+    homepage = "https://github.com/petamas/oslex";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e714a1944221..f9ec706f9e8e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10613,6 +10613,8 @@ self: super: with self; {
 
   oset = callPackage ../development/python-modules/oset { };
 
+  oslex = callPackage ../development/python-modules/oslex { };
+
   oslo-concurrency = callPackage ../development/python-modules/oslo-concurrency { };
 
   oslo-config = callPackage ../development/python-modules/oslo-config { };

From 8a4e9efc859b24b5398e663a4d3ca584560283fa Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 10 May 2025 14:19:13 +0800
Subject: [PATCH 33/84] aider-chat: 0.82.2 -> 0.83.0

---
 .../python-modules/aider-chat/default.nix     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index a8026968d470..bc7db45ddf89 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -19,6 +19,7 @@
   attrs,
   backoff,
   beautifulsoup4,
+  cachetools,
   certifi,
   cffi,
   charset-normalizer,
@@ -33,8 +34,11 @@
   fsspec,
   gitdb,
   gitpython,
+  google-ai-generativelanguage,
+  google-generativeai,
   grep-ast,
   h11,
+  hf-xet,
   httpcore,
   httpx,
   huggingface-hub,
@@ -54,6 +58,7 @@
   networkx,
   numpy,
   openai,
+  oslex,
   packaging,
   pathspec,
   pexpect,
@@ -78,6 +83,7 @@
   rich,
   rpds-py,
   scipy,
+  shtab,
   smmap,
   sniffio,
   sounddevice,
@@ -124,7 +130,7 @@ let
     ];
   };
 
-  version = "0.82.2";
+  version = "0.83.0";
   aider-chat = buildPythonPackage {
     pname = "aider-chat";
     inherit version;
@@ -137,7 +143,7 @@ let
       owner = "Aider-AI";
       repo = "aider";
       tag = "v${version}";
-      hash = "sha256-lV0d6/cT/B3zmn8/uEyAc3D0n6oFsLoWa/qYmGv3EiI=";
+      hash = "sha256-hXKrjo/9Y3WLgluwEK2q123QcfBVA0ByEKaq8Rtd70E=";
     };
 
     pythonRelaxDeps = true;
@@ -153,6 +159,7 @@ let
       attrs
       backoff
       beautifulsoup4
+      cachetools
       certifi
       cffi
       charset-normalizer
@@ -167,8 +174,11 @@ let
       fsspec
       gitdb
       gitpython
+      google-ai-generativelanguage
+      google-generativeai
       grep-ast
       h11
+      hf-xet
       httpcore
       httpx
       huggingface-hub
@@ -188,6 +198,7 @@ let
       networkx
       numpy
       openai
+      oslex
       packaging
       pathspec
       pexpect
@@ -212,6 +223,7 @@ let
       rich
       rpds-py
       scipy
+      shtab
       smmap
       sniffio
       sounddevice
@@ -273,6 +285,9 @@ let
         "test_main_exit_calls_version_check"
         # AssertionError: assert 2 == 1
         "test_simple_send_non_retryable_error"
+        # Broken tests (Aider-AI/aider#3679)
+        "test_language_ocaml"
+        "test_language_ocaml_interface"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Tests fails on darwin

From 9cba8f1356423f4a688b630cca4369d382abe119 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 10 May 2025 14:21:06 +0800
Subject: [PATCH 34/84] aider-chat: enable for python 3.10 and 3.11

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

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index bc7db45ddf89..ea161664371e 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -136,8 +136,8 @@ let
     inherit version;
     pyproject = true;
 
-    # needs exactly Python 3.12
-    disabled = pythonOlder "3.12" || pythonAtLeast "3.13";
+    # dont support python 3.13 (Aider-AI/aider#3037)
+    disabled = pythonOlder "3.10" || pythonAtLeast "3.13";
 
     src = fetchFromGitHub {
       owner = "Aider-AI";

From 0c6ffe2504403175dd2d53a6f60b9e2577ce5bf6 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 10 May 2025 14:21:53 +0800
Subject: [PATCH 35/84] aider-chat: add maintainer

---
 pkgs/development/python-modules/aider-chat/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index ea161664371e..6e898e581d96 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -393,7 +393,10 @@ let
       homepage = "https://github.com/paul-gauthier/aider";
       changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md";
       license = lib.licenses.asl20;
-      maintainers = with lib.maintainers; [ happysalada ];
+      maintainers = with lib.maintainers; [
+        happysalada
+        yzx9
+      ];
       mainProgram = "aider";
     };
   };

From 841728f7c4d6fa14bb70184f9b354b8a03d9cb50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 07:17:15 +0000
Subject: [PATCH 36/84] rebuilderd: 0.22.1 -> 0.23.1

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

diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix
index 31b05abbb910..303677626ab2 100644
--- a/pkgs/by-name/re/rebuilderd/package.nix
+++ b/pkgs/by-name/re/rebuilderd/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rebuilderd";
-  version = "0.22.1";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "rebuilderd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YMBq+Z9yMQRXOM3U679g2lnBZlH/h0VLjoxySxi4SCo=";
+    hash = "sha256-ARm81++VByh/erog1aDQTOaxd60M9OuTbJGdgHx24pw=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-MjFQ5d9VWHodjj+hIsKgAIUdaiarXIi5GCS+47n5MGU=";
+  cargoHash = "sha256-O+1ARimSN26geZanLV5E94vnZk0HsE4pyjNS3dADg8Y=";
 
   nativeBuildInputs = [
     pkg-config

From d1e0e1b88bc6e9013d0dbfe2731885d450c0908f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 07:26:45 +0000
Subject: [PATCH 37/84] tinfoil-cli: 0.0.11 -> 0.0.13

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

diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix
index ab1d9cb6b375..de001a2d83e9 100644
--- a/pkgs/by-name/ti/tinfoil-cli/package.nix
+++ b/pkgs/by-name/ti/tinfoil-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tinfoil-cli";
-  version = "0.0.11";
+  version = "0.0.13";
 
   src = fetchFromGitHub {
     owner = "tinfoilsh";
     repo = "tinfoil-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zHtF6tKptru3OFU5w93pT9B+mbVxqFB++OMleHk7Q5Q=";
+    hash = "sha256-/VjhInen6f+PYQENhGZ31q51r5J/lyG4rzXI3ZEPUAg=";
   };
 
   vendorHash = "sha256-EN6IYOSYuSlKpQKcdKvPjFa9A51uwqSzHNuwlrzYsfI=";

From f8d8c4d4e68191a552f6614c6835157feac59abd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 10:51:00 +0200
Subject: [PATCH 38/84] python312Packages.mypy-boto3-athena: 1.38.0 -> 1.38.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5fda034a1feb..d0efc9e7d142 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -142,8 +142,8 @@ rec {
       "sha256-ksKIbASQfKzf67Pkdv5HUipoep/8Qv7jVcjC4KCqAoI=";
 
   mypy-boto3-athena =
-    buildMypyBoto3Package "athena" "1.38.0"
-      "sha256-SiR/6d9mfd7nTd4aPtyknkBDhYTClMUkNLsNudW534o=";
+    buildMypyBoto3Package "athena" "1.38.13"
+      "sha256-1Fonc55fVM8ksqCTBwXVHeqhypgsYegoW8PEEPqcTF4=";
 
   mypy-boto3-auditmanager =
     buildMypyBoto3Package "auditmanager" "1.38.0"

From 73c93d3e7eb6af09eda27f88f73efec5c3a0e047 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 10:51:41 +0200
Subject: [PATCH 39/84] python312Packages.mypy-boto3-logs: 1.38.6 -> 1.38.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d0efc9e7d142..5a30e673177e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -810,8 +810,8 @@ rec {
       "sha256-uypKW3Cqj98SLeWmSwCXVKhKpXWXEvwdUexqqFgXeEc=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.38.6"
-      "sha256-Fpe+7mXJQHikCVyn/hcRvFPu/U+wvDL0JmDN0/Vvxwc=";
+    buildMypyBoto3Package "logs" "1.38.13"
+      "sha256-VOkEcgDn4G1v1DB/Berg5yP+PYUf7YBfQ+T4yvATVBs=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.38.0"

From db16bd86488bb483356e66b2258c15bd51c6c7f2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 10:52:12 +0200
Subject: [PATCH 40/84] python312Packages.mypy-boto3-synthetics: 1.38.11 ->
 1.38.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5a30e673177e..9457c0b6c7f4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1346,8 +1346,8 @@ rec {
       "sha256-b6TgvxWdQI5TAI/OsJzmzlte1v30NdJucdedKgCb9LY=";
 
   mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.38.11"
-      "sha256-t9gwrPdz8QSB6pDeOZgB+Jl/I91vG58et5XzTXXqZuA=";
+    buildMypyBoto3Package "synthetics" "1.38.13"
+      "sha256-goFpYJQHLzYybY8gt9FTUVXXMX+8k58YNxZ8VsNfwr4=";
 
   mypy-boto3-textract =
     buildMypyBoto3Package "textract" "1.38.0"

From c7d8d460e13465e90b7a7bf4f977e93f0f34cfbc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 10:52:17 +0200
Subject: [PATCH 41/84] python312Packages.mypy-boto3-workspaces: 1.38.0 ->
 1.38.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9457c0b6c7f4..49812b7a2b3d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1426,8 +1426,8 @@ rec {
       "sha256-naClNCiAqHalhT/+8cI510kBzYxpY3Z+wppDpQbZtdg=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.38.0"
-      "sha256-Xcp58ZVmnGNDx3vnt2Nb27ipDKoTArbWa6MwkoTlR+k=";
+    buildMypyBoto3Package "workspaces" "1.38.13"
+      "sha256-j4ccEWcU2RBS9TZvVzmPwI2n58JkRFkmyVRyovMtKS4=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.38.0"

From 5424be232d39e6095b3c60f5d6b0179d77afafbc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 10:52:20 +0200
Subject: [PATCH 42/84] python313Packages.botocore-stubs: 1.38.12 -> 1.38.13

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 23814df88032..e5f55369f333 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.38.12";
+  version = "1.38.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-2GVra+ICCPu/1C/e6BuMU3TIrjF6AEbfbBVRQKYGpX4=";
+    hash = "sha256-x2bLqukcE3oc5RYGAfTMIzEuvWCece16Pbz2qJazs1A=";
   };
 
   nativeBuildInputs = [ setuptools ];

From b5dabd4acc8d29bf3ac8a52fbd781df0b8cb33bb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 10:52:23 +0200
Subject: [PATCH 43/84] python313Packages.boto3-stubs: 1.38.12 -> 1.38.13

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 59e68ead0e79..4124b6c723de 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.38.12";
+  version = "1.38.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-QJSYymyeTOnzLhFTUhe5f6xc1BPlYDOfQAHAJuu3mVI=";
+    hash = "sha256-j3OnRXRdXtOiBkJ/9GroLEjDf4bQ0mQ5WJi98OVWNSA=";
   };
 
   build-system = [ setuptools ];

From dbc17fa048ee1f75496e0fbe2da48f27ff4c49dc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 11:01:26 +0200
Subject: [PATCH 44/84] python313Packages.meshtastic: 2.6.2 -> 2.6.3

Diff: https://github.com/meshtastic/python/compare/refs/tags/2.6.2...refs/tags/2.6.3

Changelog: https://github.com/meshtastic/python/releases/tag/2.6.3
---
 pkgs/development/python-modules/meshtastic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index dd4e259f65f7..a83bd159d285 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.6.2";
+  version = "2.6.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "python";
     tag = version;
-    hash = "sha256-v9Fr3J829x1KtzplzXF2yDYwra70xNcJfaHpyiNP4ME=";
+    hash = "sha256-pco8io8MzbK7Jv9rkzSK0A9UDLSyvfoZarFFjBLBNoM=";
   };
 
   pythonRelaxDeps = [

From 6998c3d4b723cf3efb78742a07be13f922dc3600 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 11:01:51 +0200
Subject: [PATCH 45/84] python313Packages.publicsuffixlist: 1.0.2.20250503 ->
 1.0.2.20250509

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250509-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 3f8242db65bb..fa5fec3fb2ed 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250503";
+  version = "1.0.2.20250509";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RHby2R/iEK7zUK4lKq+zTWKVHClZ8+zJ+EK2WxCT9Gw=";
+    hash = "sha256-T6N0QEVucZie4HkUSuJ5Bo3LHMViXRJq/8yLvAEv2l0=";
   };
 
   build-system = [ setuptools ];

From d82d668e6d13c35fcb1163b99fdc7b061293836d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 May 2025 14:50:25 +0200
Subject: [PATCH 46/84] python313Packages.tencentcloud-sdk-python: 3.0.1373 ->
 3.0.1374

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1373...refs/tags/3.0.1374

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1374/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index b4e5d8221bbe..df7177823bea 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1373";
+  version = "3.0.1374";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-VaQLJWhfzo39LyC0XB7iL7YReOXqsaIeKFFdqqhfD+4=";
+    hash = "sha256-ydDyaqgX+r8JklMrtd2ujo2AoDkB0LkR3ZSdYzlHxiw=";
   };
 
   build-system = [ setuptools ];

From 7273984afda058e7b71965dc35497fa6e8e78fa8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 May 2025 11:03:03 +0200
Subject: [PATCH 47/84] python313Packages.tencentcloud-sdk-python: 3.0.1374 ->
 3.0.1375

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1374...refs/tags/3.0.1375

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1375/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index df7177823bea..07d61ed76fcb 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1374";
+  version = "3.0.1375";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-ydDyaqgX+r8JklMrtd2ujo2AoDkB0LkR3ZSdYzlHxiw=";
+    hash = "sha256-FVFN0qnyOuAfs10Lee9S2CkwtBWoBMTjLFw2hnwO9E4=";
   };
 
   build-system = [ setuptools ];

From 91df2cd7d672a316ed40ad0aacfd8a22904d13a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 09:12:52 +0000
Subject: [PATCH 48/84] jp-zip-codes: 0-unstable-2025-04-01 ->
 0-unstable-2025-05-01

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

diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix
index 7c7a6ef175c4..a3f8e8c8bc49 100644
--- a/pkgs/by-name/jp/jp-zip-codes/package.nix
+++ b/pkgs/by-name/jp/jp-zip-codes/package.nix
@@ -7,15 +7,15 @@
 
 stdenvNoCC.mkDerivation {
   pname = "jp-zip-code";
-  version = "0-unstable-2025-04-01";
+  version = "0-unstable-2025-05-01";
 
   # This package uses a mirror as the source because the
   # original provider uses the same URL for updated content.
   src = fetchFromGitHub {
     owner = "musjj";
     repo = "jp-zip-codes";
-    rev = "b8a350701688cfa61cb2994937cd84e612e0abf3";
-    hash = "sha256-+YE0EINrhRhdqkJyPzXlBPp18TGECaGddVrBlQITYi8=";
+    rev = "3c1c1db248113ad37fac18ede96b5936866a9726";
+    hash = "sha256-BAS7Iqzoxbt77uRh99n0rUC+0+OVgkB7OEIEgZMoDAk=";
   };
 
   installPhase = ''

From a394a72a6cfa7e5c4e1eb0b396f001285d4abff6 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 10 May 2025 11:53:36 +0200
Subject: [PATCH 49/84] frei0r: remove unused pcre dependency

the pcre dependency for frei0r was unused.
It was introduced in #136395, with no mentions of pcre in the upstream repo.
I suspect it might have been necessary for OpenCV at the time.
---
 pkgs/by-name/fr/frei0r/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix
index 77df045e964d..e9ebe6fd03d8 100644
--- a/pkgs/by-name/fr/frei0r/package.nix
+++ b/pkgs/by-name/fr/frei0r/package.nix
@@ -6,7 +6,6 @@
   cairo,
   cmake,
   opencv,
-  pcre,
   pkg-config,
   cudaSupport ? config.cudaSupport,
   cudaPackages,
@@ -31,7 +30,6 @@ stdenv.mkDerivation rec {
     [
       cairo
       opencv
-      pcre
     ]
     ++ lib.optionals cudaSupport [
       cudaPackages.cuda_cudart

From 6610d57665ebbf939ba2ff51f369197ae5f40bc8 Mon Sep 17 00:00:00 2001
From: langsjo <roylangsjo@gmail.com>
Date: Fri, 9 May 2025 16:28:38 +0300
Subject: [PATCH 50/84] dap: drop

---
 pkgs/by-name/da/dap/package.nix | 38 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/da/dap/package.nix

diff --git a/pkgs/by-name/da/dap/package.nix b/pkgs/by-name/da/dap/package.nix
deleted file mode 100644
index f8f2177b4fa9..000000000000
--- a/pkgs/by-name/da/dap/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dap";
-  version = "3.10";
-
-  src = fetchurl {
-    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "Bk5sty/438jLb1PpurMQ5OqMbr6JqUuuQjcg2bejh2Y=";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  meta = with lib; {
-    homepage = "https://www.gnu.org/software/dap";
-    description = "Small statistics and graphics package based on C";
-    longDescription = ''
-      Dap is a small statistics and graphics package based on C. Version 3.0 and
-      later of Dap can read SBS programs (based on the utterly famous, industry
-      standard statistics system with similar initials - you know the one I
-      mean)! The user wishing to perform basic statistical analyses is now freed
-      from learning and using C syntax for straightforward tasks, while
-      retaining access to the C-style graphics and statistics features provided
-      by the original implementation. Dap provides core methods of data
-      management, analysis, and graphics that are commonly used in statistical
-      consulting practice (univariate statistics, correlations and regression,
-      ANOVA, categorical data analysis, logistic regression, and nonparametric
-      analyses).
-    '';
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 19a7a1e53627..ce47bb4bcdd7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -496,6 +496,7 @@ mapAliases {
 
   ### D ###
 
+  dap = throw "'dap' has been removed because it doesn't compile and has been unmaintained since 2014"; # Added 2025-05-10
   dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
   dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself.";
   dat = nodePackages.dat;

From b3434b499c74b0d0b1f58f07156f49e26ae173e9 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 10 May 2025 13:07:16 +0200
Subject: [PATCH 51/84] moonlight-qt: avoid linking to both SDL2_classic and
 sdl3

SDL2_ttf links to SDL3 via sdl2-compat, this used to be an issue for pygame on darwin.
---
 pkgs/by-name/mo/moonlight-qt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix
index 48b68de0d3b2..2a30e68918aa 100644
--- a/pkgs/by-name/mo/moonlight-qt/package.nix
+++ b/pkgs/by-name/mo/moonlight-qt/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   vulkan-headers,
   SDL2_classic,
-  SDL2_ttf,
+  SDL2_classic_ttf,
   ffmpeg,
   libopus,
   libplacebo,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     [
       (SDL2_classic.override { drmSupport = stdenv.hostPlatform.isLinux; })
-      SDL2_ttf
+      SDL2_classic_ttf
       ffmpeg
       libopus
       libplacebo

From 62dac8ab6ae3b4759c84780b2c884b04da0961e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 11:16:06 +0000
Subject: [PATCH 52/84] beam26Packages.ex_doc: 0.37.3 -> 0.38.0

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

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 5313ef4b7d53..cd7b12a7549d 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -14,12 +14,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.37.3";
+  version = "0.38.0";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-2tam+3vYLC216Q78GIUI3fGnE5FJ/lECJAUQMSxz46w=";
+    hash = "sha256-NyRvEN07PBk1ZCXLu/lu+d1SYO8fXyiUEcpFZ8cSEng=";
   };
 in
 mixRelease {
@@ -37,7 +37,7 @@ mixRelease {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version elixir;
-    hash = "sha256-s4b6wuBJPdN0FPn76zbLCHzqJNEZ6E4nOyB1whUM2VY=";
+    hash = "sha256-TknrENa0Nb1Eobd4oTBl6TilPVEsw9+XjPdF3Ntq+DI=";
   };
 
   passthru = {

From 984126ddb194a6f943fc64a1059ad5c54a92accc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 11:22:12 +0000
Subject: [PATCH 53/84] python3Packages.universal-silabs-flasher: 0.0.30 ->
 0.0.31

---
 .../python-modules/universal-silabs-flasher/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index c5ec09a67989..e4f1d582f328 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "universal-silabs-flasher";
-  version = "0.0.30";
+  version = "0.0.31";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = "universal-silabs-flasher";
     tag = "v${version}";
-    hash = "sha256-AAF3MswdhGgSVS6efUp+QylWykbNqHz2ThfBdD8E/ew=";
+    hash = "sha256-yE6tY0hxslv0nZEX63miegQJHGKD/wp2W4aaj3y74i4=";
   };
 
   postPatch = ''

From a15e88b58b50e1d72a66f377a115e92d74b20d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Pomyka=C5=82a?=
 <168227269+dpomykala@users.noreply.github.com>
Date: Sat, 10 May 2025 13:02:00 +0200
Subject: [PATCH 54/84] vimPlugins.avante-nvim: v0.0.23 ->
 0.0.23-unstable-2025-05-09

Currently, the package is built based on version tags. This is not
ideal, as the version tags in the avante.nvim repo refer to the Rust
libs used by the plugin, not to the plugin itself. This results in an
outdated version of the plugin.

This is changed now, so the latest revision from the main branch is
tracked instead of version tags.
---
 .../vim/plugins/non-generated/avante-nvim/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index d0eccec6bd57..671af8b357ac 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.23";
+  version = "0.0.23-unstable-2025-05-09";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    tag = "v${version}";
-    hash = "sha256-Ud4NkJH7hze5796KjVe5Nj9DzxwQkDQErCJDDiBzAIY=";
+    rev = "8f96d4319df662c8069ce82307d03bb1da2d0554";
+    hash = "sha256-7cPhnuSpZ1WKJtQiTFhI7y//vR1qPDc7EZeeyewfxxU=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
@@ -73,6 +73,7 @@ vimUtils.buildVimPlugin {
 
   passthru = {
     updateScript = nix-update-script {
+      extraArgs = [ "--version=branch" ];
       attrPath = "vimPlugins.avante-nvim.avante-nvim-lib";
     };
 
@@ -84,6 +85,10 @@ vimUtils.buildVimPlugin {
     # Requires setup with corresponding provider
     "avante.providers.azure"
     "avante.providers.copilot"
+    "avante.providers.gemini"
+    "avante.providers.ollama"
+    "avante.providers.vertex"
+    "avante.providers.vertex_claude"
   ];
 
   meta = {

From e4bae9b0b146391f4dfe6a839302664132780c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 11:53:39 +0000
Subject: [PATCH 55/84] python3Packages.reolink-aio: 0.13.2 -> 0.13.3

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

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 798ba7ea9ab4..bc9da18d8115 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.13.2";
+  version = "0.13.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-khO8mu2aWBU9TiorKkMd1e54r5C7ovv6eWyJ61dzOJw=";
+    hash = "sha256-VOVVUDcjSn8BkXEIRJKHiPkDoFE+4w2iI/uNkY7I8Yg=";
   };
 
   build-system = [ setuptools ];

From fe741c3acf7388065b1864784bc2924761a6aa8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 12:16:21 +0000
Subject: [PATCH 56/84] python3Packages.llama-cloud: 0.1.19 -> 0.1.21

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

diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix
index a6223a15c50d..670cea5f4b5f 100644
--- a/pkgs/development/python-modules/llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud";
-  version = "0.1.19";
+  version = "0.1.21";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_cloud";
     inherit version;
-    hash = "sha256-sKVCSuAJnKJ98qLX5a7JkGbenKhgq2WYfJ+THx6nq/8=";
+    hash = "sha256-VnbVTkZQ0pNpH1ztFZfXTUibM/1B9R1nez/TX1bfaT4=";
   };
 
   build-system = [ poetry-core ];

From 484137521e3981a92ee43064562078aad2928a9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 May 2025 22:01:32 +0000
Subject: [PATCH 57/84] python3Packages.python-docs-theme: 2025.2 -> 2025.4.1

---
 .../python-modules/python-docs-theme/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix
index dabe52ca149a..aae200d48d77 100644
--- a/pkgs/development/python-modules/python-docs-theme/default.nix
+++ b/pkgs/development/python-modules/python-docs-theme/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "python-docs-theme";
-  version = "2025.2";
+  version = "2025.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "python";
     repo = "python-docs-theme";
     tag = version;
-    hash = "sha256-+QOtlgWGPcuKZOfuE0l08GUetR0DZvMzsk8Xl8KaZcQ=";
+    hash = "sha256-fHhgr8JPNLpATAGOBE1lJYA5rBNKZg5paY+MQsgWXqQ=";
   };
 
   build-system = [ flit-core ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Sphinx theme for CPython project";
     homepage = "https://github.com/python/python-docs-theme";
-    changelog = "https://github.com/python/python-docs-theme/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/python/python-docs-theme/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.psfl;
     maintainers = with maintainers; [ kaction ];
   };

From c365f2831e3427304229b1c8da77bf0d42b2865b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 00:45:30 +0000
Subject: [PATCH 58/84] python3Packages.hy: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix
index a8c25ff8ce33..8659970f32d1 100644
--- a/pkgs/development/python-modules/hy/default.nix
+++ b/pkgs/development/python-modules/hy/default.nix
@@ -14,16 +14,14 @@
 
 buildPythonPackage rec {
   pname = "hy";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "hylang";
     repo = "hy";
     tag = version;
-    hash = "sha256-o6txdC8TOdaILAJP9LDAhJ587p+mw0bUEGLneQQYW9c=";
+    hash = "sha256-zaTe9sRmW+lzpbNVrnj5ccp1xIbN10FD1Jst/hM78Lw=";
   };
 
   # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10
@@ -31,7 +29,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ funcparserlib ] ++ lib.optionals (pythonOlder "3.9") [ astor ];
+  dependencies = [ funcparserlib ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -61,7 +59,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "LISP dialect embedded in Python";
     homepage = "https://hylang.org/";
-    changelog = "https://github.com/hylang/hy/releases/tag/${version}";
+    changelog = "https://github.com/hylang/hy/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [
       mazurel

From 847f7769f98d5bfcc45edcea9f688de6dd5a6144 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 10 May 2025 21:36:22 +0900
Subject: [PATCH 59/84] python3Packages.jianpu-ly: add meta.changelog

---
 pkgs/development/python-modules/jianpu-ly/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix
index 0ed3d33737b6..fb689cc503c4 100644
--- a/pkgs/development/python-modules/jianpu-ly/default.nix
+++ b/pkgs/development/python-modules/jianpu-ly/default.nix
@@ -29,6 +29,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://ssb22.user.srcf.net/mwrhome/jianpu-ly.html";
     description = "Assists with printing jianpu";
+    changelog = "https://github.com/ssb22/jianpu-ly/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ifurther ];
   };

From 4719d31ebab750951f891963216c44c0e1ce4ba0 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 10 May 2025 14:34:26 +0200
Subject: [PATCH 60/84] noah: drop

The package doesn't build, hasn't had a release since 2017, is archived by upstream and doesn't have a nixpkgs maintainer
---
 pkgs/by-name/no/noah/package.nix | 33 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/no/noah/package.nix

diff --git a/pkgs/by-name/no/noah/package.nix b/pkgs/by-name/no/noah/package.nix
deleted file mode 100644
index fe149c20ac72..000000000000
--- a/pkgs/by-name/no/noah/package.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "noah";
-  version = "0.5.1";
-
-  src = fetchFromGitHub {
-    owner = "linux-noah";
-    repo = pname;
-    rev = version;
-    sha256 = "0bivfsgb56kndz61lzjgdcnqlhjikqw89ma0h6f6radyvfzy0vis";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    description = "Bash on Ubuntu on macOS";
-    homepage = "https://github.com/linux-noah/noah";
-    license = [
-      licenses.mit
-      licenses.gpl2Only
-    ];
-    maintainers = [ ];
-    platforms = platforms.darwin;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c275304bfee..931cd09977ee 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1312,6 +1312,7 @@ mapAliases {
 
   nixosTest = testers.nixosTest; # Added 2022-05-05
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
+  noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
   nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
   nodejs-slim_18 = nodejs_18; # Added 2025-04-23
   corepack_18 = nodejs_18; # Added 2025-04-23

From 71f07d6854ee13808a981b50243e11fd57fc298a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 10 May 2025 14:54:29 +0200
Subject: [PATCH 61/84] lxqt.lxqt-build-tools: remove unused dependency on pcre

The upstream repository lists no references to pcre.
`nix-check-deps` flags pcre as unused and the build succeeds without it.
---
 pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 556901cbad0e..5c5631e48587 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  pcre,
   qtbase,
   glib,
   perl,
@@ -46,7 +45,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     glib
-    pcre
   ];
 
   propagatedBuildInputs = [

From 17b8d165fa84aa79ee3ce18d30b0c0f4fbdcff9f Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 10 May 2025 15:03:24 +0200
Subject: [PATCH 62/84] n98-magerun2: 8.0.0 -> 8.1.1

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

diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix
index 1856863cf74d..41892a382a82 100644
--- a/pkgs/by-name/n9/n98-magerun2/package.nix
+++ b/pkgs/by-name/n9/n98-magerun2/package.nix
@@ -7,16 +7,16 @@
 
 php83.buildComposerProject2 (finalAttrs: {
   pname = "n98-magerun2";
-  version = "8.0.0";
+  version = "8.1.1";
 
   src = fetchFromGitHub {
     owner = "netz98";
     repo = "n98-magerun2";
     tag = finalAttrs.version;
-    hash = "sha256-MzJJkbT3AgSX+lLEfKlfg0zTY/79CcFelOK83NnSWI0=";
+    hash = "sha256-GnyIYgVNPumX+GLgPotSzD6BcUiUTlsfYFwFMX94hEk=";
   };
 
-  vendorHash = "sha256-4w4HqYSSeVZnsgMGt+m8XN98RuAv7XmVo1vHtEXA0Uk=";
+  vendorHash = "sha256-kF8VXE0K/Gzho5K40H94hXtgSS2rogCtMow2ET8PinU=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 813ce4bcd00ee9760a254cc388d2e949a4c257de Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 10 May 2025 15:03:46 +0200
Subject: [PATCH 63/84] pgf1: drop

This version of pgf was released in 2007. We also have pgf2 (from 2010...) and pgf3 in nixpkgs. There's nothing that depends on it. Let it be free :)
---
 pkgs/by-name/pg/pgf1/package.nix | 38 --------------------------------
 pkgs/top-level/aliases.nix       |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/pg/pgf1/package.nix

diff --git a/pkgs/by-name/pg/pgf1/package.nix b/pkgs/by-name/pg/pgf1/package.nix
deleted file mode 100644
index fb5e7a9a420f..000000000000
--- a/pkgs/by-name/pg/pgf1/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-}:
-
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "pgf";
-  version = "1.18";
-
-  src = fetchFromGitHub {
-    owner = "pgf-tikz";
-    repo = "pgf";
-    tag = "version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-WZ/191iEDd5VK1bnV9JZx2BZfACUeAUhAqrlyx+ZvA4=";
-  };
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/texmf-nix
-    cp -prd context doc generic latex plain $out/share/texmf-nix/
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/pgf-tikz/pgf";
-    description = "Portable Graphic Format for TeX - version ${finalAttrs.version}";
-    branch = lib.versions.major version;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c275304bfee..af3bda2322ea 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1465,13 +1465,13 @@ mapAliases {
   powerdns = pdns; # Added 2022-03-28
   projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10
 
-  # postgresql plugins
   cstore_fdw = postgresqlPackages.cstore_fdw;
   pg_cron = postgresqlPackages.pg_cron;
   pg_hll = postgresqlPackages.pg_hll;
   pg_repack = postgresqlPackages.pg_repack;
   pg_similarity = postgresqlPackages.pg_similarity;
   pg_topn = postgresqlPackages.pg_topn;
+  pgf1 = throw "'pgf1' has been removed since it is unmaintained. Consider using 'pgf' instead"; # Added 2025-05-10
   pgjwt = postgresqlPackages.pgjwt;
   pgroonga = postgresqlPackages.pgroonga;
   pgtap = postgresqlPackages.pgtap;

From fba4b8d5bfe57f16606f932abbd531678fd0c0a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 13:07:03 +0000
Subject: [PATCH 64/84] python3Packages.llama-index-graph-stores-nebula: 0.4.1
 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
index 3bd998529e48..b89b802b0d77 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-nebula";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_nebula";
     inherit version;
-    hash = "sha256-0U5DsgojS8i0temD2ehGSOroGwUPIZtUlMDeg4XJaGA=";
+    hash = "sha256-0CooGtmDz9OAJ+B543eFbrFTzii5iXwmo0dV4c/E/es=";
   };
 
   build-system = [ poetry-core ];

From 520534e533fee6f2460632d0b8e7e7a2617e1b2b Mon Sep 17 00:00:00 2001
From: Ingo Reitz <9l@9lo.re>
Date: Fri, 9 May 2025 13:23:00 +0200
Subject: [PATCH 65/84] ventoy*: mark unfree, mark insecure

---
 pkgs/by-name/ve/ventoy/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix
index af5c8f3f95c6..e6e97b1cddde 100644
--- a/pkgs/by-name/ve/ventoy/package.nix
+++ b/pkgs/by-name/ve/ventoy/package.nix
@@ -213,7 +213,16 @@ stdenv.mkDerivation (finalAttrs: {
       800+ image files are tested.  90%+ distros in DistroWatch supported.
     '';
     changelog = "https://www.ventoy.net/doc_news.html";
-    license = lib.licenses.gpl3Plus;
+    knownVulnerabilities = [
+      ''
+        Ventoy uses binary blobs which can't be trusted to be free of malware or compliant to their licenses.
+        https://github.com/NixOS/nixpkgs/issues/404663
+        See the following Issues for context:
+        https://github.com/ventoy/Ventoy/issues/2795
+        https://github.com/ventoy/Ventoy/issues/3224
+      ''
+    ];
+    license = lib.licenses.unfree;
     mainProgram = "ventoy";
     maintainers = with lib.maintainers; [
       johnrtitor

From 54608c53f880969b09217ce092400e7764cf482f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 13:18:56 +0000
Subject: [PATCH 66/84] ghostfolio: 2.156.0 -> 2.161.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 51a71bdf213a..7fcc7a04514b 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.156.0";
+  version = "2.161.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-UD44PzJPCzxSocC/znCpiMTwbwivvJawORxRBNXbCA8=";
+    hash = "sha256-fN901bpiFz1sAEBv9MKzpgfr7TFa6s3ghT9v44bXZzM=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-ot+shh2fuZHY0hVRFZpHs1qRN6OaLZlsCuG1RuuTkEc=";
+  npmDepsHash = "sha256-vaIQ6SdsBGfiIkvz+dE9wR/KToobFyWaZOuFHPgLk94=";
 
   nativeBuildInputs = [
     prisma

From 8f426128c45b89c0c1c5f8a7980c330a1b52aca0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 13:35:57 +0000
Subject: [PATCH 67/84] grafana-alloy: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 5fbdc21fcd10..236d6ea97f4e 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,17 +17,17 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-xbMbCxgwH3Ea3SBKZXzCIEv+AX7OQJmIqAx9PZkmkHo=";
+    hash = "sha256-Uec8DnT6tZcHYchDJr5F0t5kkEjKPOKPkdbr4Rtm51c=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-Vqhdc+WZC8IACEzox5c4PsOvYwQ2WFL3lDM+hB1foE0=";
+  vendorHash = "sha256-b0byafxHXnrYg2dQ0hoNvo0+jmCOJ4/hVMV8J7g7MBc=";
 
   nativeBuildInputs = [
     fixup-yarn-lock

From f3bd454d3556eea6f2218146424fb620204e2bfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 13:45:00 +0000
Subject: [PATCH 68/84] python3Packages.casbin: 1.41.0 -> 1.43.0

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

diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index b66fe8586925..d2919c59cfbb 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "casbin";
-  version = "1.41.0";
+  version = "1.43.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "casbin";
     repo = "pycasbin";
     tag = "v${version}";
-    hash = "sha256-axW09wU/xywVui1fZKoTTIeHL0ooV1KsMhynqxiy2dI=";
+    hash = "sha256-vRT8Z0XHDPOnAxy67j88vBX6W20mRWY7O/IrGLM/vuQ=";
   };
 
   build-system = [ setuptools ];
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Authorization library that supports access control models like ACL, RBAC and ABAC";
     homepage = "https://github.com/casbin/pycasbin";
-    changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/casbin/pycasbin/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = [ ];
   };

From 89d314dfbdaca17c5ba2aed10c389ffb9cef6b40 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 10 May 2025 15:42:01 +0200
Subject: [PATCH 69/84] premake3: drop

The code from this version is from 2008. We also package premake version 4 and 5. There's nothing that depends on premake3. :wave:
---
 pkgs/development/tools/misc/premake/3.nix | 33 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/all-packages.nix           |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/premake/3.nix

diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
deleted file mode 100644
index 7eabdae30648..000000000000
--- a/pkgs/development/tools/misc/premake/3.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  unzip,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "premake";
-  version = "3.7";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/premake/premake-src-${version}.zip";
-    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  installPhase = ''
-    install -Dm755 bin/premake $out/bin/premake
-  '';
-
-  premake_cmd = "premake";
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = "https://premake.github.io/";
-    description = "Simple build configuration and project generation tool using lua";
-    mainProgram = "premake";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c275304bfee..96f140cbb1bf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1522,6 +1522,7 @@ mapAliases {
   pocket-updater-utility = pupdate; # Added 2024-01-25
   poppler_utils = poppler-utils; # Added 2025-02-27
   powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
+  premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10
   prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20
   prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20
   probe-rs = probe-rs-tools; # Added 2024-05-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87e8e3032f93..b36a8a52b50d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7578,8 +7578,6 @@ with pkgs;
 
   pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree;
 
-  premake3 = callPackage ../development/tools/misc/premake/3.nix { };
-
   premake4 = callPackage ../development/tools/misc/premake { };
 
   premake5 = callPackage ../development/tools/misc/premake/5.nix { };

From 7dd8c5b602de90f8fb8d7381438fb4ab12b100d7 Mon Sep 17 00:00:00 2001
From: Gary Guo <gary@garyguo.net>
Date: Sat, 10 May 2025 14:37:29 +0100
Subject: [PATCH 70/84] unifi8: drop

This was an alias to the unifi package, which has been updated to v9.
To avoid confusion, remove this alias.
---
 nixos/doc/manual/release-notes/rl-2505.section.md | 3 +++
 nixos/modules/services/networking/unifi.nix       | 6 ++----
 pkgs/top-level/aliases.nix                        | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 453e0ed450bd..2ccfdcb4118b 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -382,6 +382,9 @@
 - `forgejo` and `forgejo-lts` have been updated to v11.
   See upstreams [release blog post](https://forgejo.org/2025-04-release-v11-0/) for more information.
 
+- `unifi` has been updated to v9.1.
+  This version should be backward compatible with v8.x, however as a result, `unifi8` package has been removed.
+
 - The behavior of `services.hostapd.radios.<name>.networks.<name>.authentication.enableRecommendedPairwiseCiphers` was changed to not include `CCMP-256` anymore.
   Since all configured pairwise ciphers have to be supported by the radio, this caused startup failures on many devices which is hard to debug in hostapd.
 
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 8f05634f566b..50f8f844188a 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -47,9 +47,7 @@ in
       '';
     };
 
-    services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi" {
-      default = "unifi8";
-    };
+    services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi" { };
 
     services.unifi.mongodbPackage = lib.mkPackageOption pkgs "mongodb" {
       default = "mongodb-7_0";
@@ -116,7 +114,7 @@ in
           only supports migrating one major version at a time; therefore, you
           may wish to set `services.unifi.mongodbPackage = pkgs.mongodb-6_0;`
           and activate your configuration before upgrading again to the default
-          `mongodb-7_0` supported by `unifi8`.
+          `mongodb-7_0` supported by `unifi`.
 
           For more information, see the MongoDB upgrade notes:
           <https://www.mongodb.com/docs/manual/release-notes/7.0-upgrade-standalone/#upgrade-recommendations-and-checklists>
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 931cd09977ee..85f73b1da528 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1862,7 +1862,7 @@ mapAliases {
   unifi5 = throw "'unifi5' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
   unifi6 = throw "'unifi6' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
   unifi7 = throw "'unifi7' has been removed since it is vulnerable to CVE-2024-42025 and its required MongoDB version is EOL."; # Added 2024-10-01
-  unifi8 = unifi; # Added 2024-11-15
+  unifi8 = throw "'unifi8' has been removed. Use `pkgs.unifi` instead."; # Converted to throw 2025-05-10
   unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11
   unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11
   unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead."; # Removed 2024-12-20

From b08c07c4fbf99907a8ac44a9eca632875809fd3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 14:01:08 +0000
Subject: [PATCH 71/84] libretro.puae: 0-unstable-2025-04-22 ->
 0-unstable-2025-05-10

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

diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix
index a622395fa399..c38ebe25e960 100644
--- a/pkgs/applications/emulators/libretro/cores/puae.nix
+++ b/pkgs/applications/emulators/libretro/cores/puae.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "puae";
-  version = "0-unstable-2025-04-22";
+  version = "0-unstable-2025-05-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-uae";
-    rev = "7dd724eaa48f05f02d9d2f1bfa131c34b6ab5351";
-    hash = "sha256-i046+gZa8u/nmGGlF/uA2Lz5VZJTgwXz9aK2C/2l470=";
+    rev = "d3c925ef4fadee6c25bcef20d1f165141ba18ac3";
+    hash = "sha256-Wo58+4XSxEVtlKsHmW90Qhm+kdUHmDvN3d2gASNiIrw=";
   };
 
   makefile = "Makefile";

From e1dadb0c51972d9401924a54f6fb37a8aeac80dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 08:27:43 +0000
Subject: [PATCH 72/84] python3Packages.flowjax: 17.1.1 -> 17.1.2

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

diff --git a/pkgs/development/python-modules/flowjax/default.nix b/pkgs/development/python-modules/flowjax/default.nix
index c8a3a4ebd1f6..48cc10ee2233 100644
--- a/pkgs/development/python-modules/flowjax/default.nix
+++ b/pkgs/development/python-modules/flowjax/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "flowjax";
-  version = "17.1.1";
+  version = "17.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "danielward27";
     repo = "flowjax";
     tag = "v${version}";
-    hash = "sha256-CLtkO7Lr+FpC/RHnqDSmevpJ3/3EfuILrQSbcdNTqsI=";
+    hash = "sha256-NTP5QFJDe4tSAuHsQB4ZWyCcqLgW6uUaABfOG/TFgu0=";
   };
 
   build-system = [

From 3a9db26426bceda4769b77d722ca129370d0bb01 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 9 May 2025 10:49:07 -0500
Subject: [PATCH 73/84] yaziPlugins.mediainfo: 25.2.7-unstable-2025-04-05 ->
 25.2.7-unstable-2025-04-17

---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 7cd544dfc927..452a40de6bd5 100644
--- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "25.2.7-unstable-2025-04-05";
+  version = "25.2.7-unstable-2025-04-17";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "436cb5f04d6e5e86ddc0386527254d87b7751ec8";
-    hash = "sha256-oFp8mJ62FsJX46mKQ7/o6qXPC9qx3+oSfqS0cKUZETI=";
+    rev = "9629b1e85c3757c834ec83fb7d931982c55f4c3f";
+    hash = "sha256-EDEIiZJy/RfXVaLNsKDeklH4qY2h+js2m0y6VSAjPkk=";
   };
 
   meta = {

From 4b6f79551348ca6dc2fb3a54f12c86b7e15ee04f Mon Sep 17 00:00:00 2001
From: Tarow <niklastasler@gmail.com>
Date: Thu, 6 Mar 2025 16:06:17 +0100
Subject: [PATCH 74/84] homepage-dashboard: unmark as broken on darwin

---
 pkgs/by-name/ho/homepage-dashboard/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index a3271d8ee315..d746cd5bd228 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -111,6 +111,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ jnsgruk ];
     platforms = lib.platforms.all;
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From 3a12cf6135bfc16d38f0e80e4019158431a63928 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 10 May 2025 09:39:52 -0500
Subject: [PATCH 75/84] vimPlugins.avante-nvim: 0.0.23-unstable-2025-05-09 ->
 0.0.23-unstable-2025-05-10

---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index 671af8b357ac..c8e73a2f51b9 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.23-unstable-2025-05-09";
+  version = "0.0.23-unstable-2025-05-10";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "8f96d4319df662c8069ce82307d03bb1da2d0554";
-    hash = "sha256-7cPhnuSpZ1WKJtQiTFhI7y//vR1qPDc7EZeeyewfxxU=";
+    rev = "adae032f5fbc611d59545792d3c5bb1c9ddc3fdb";
+    hash = "sha256-v99yu5LvwdmHBcH61L6JIqjQkZR8Lm2fR/uzQZNPo38=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From 95fa8bd4f48d798b8e82fcb2cf4b201544409837 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 10 May 2025 09:50:30 -0500
Subject: [PATCH 76/84] yaziPlugins.smart-paste: init at 0-unstable-2025-04-27

---
 .../ya/yazi/plugins/smart-paste/default.nix   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix

diff --git a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
new file mode 100644
index 000000000000..46267c784215
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "smart-paste.yazi";
+  version = "0-unstable-2025-04-27";
+
+  src = fetchFromGitHub {
+    owner = "yazi-rs";
+    repo = "plugins";
+    rev = "864a0210d9ba1e8eb925160c2e2a25342031d8d3";
+    hash = "sha256-m3709h7/AHJAtoJ3ebDA40c77D+5dCycpecprjVqj/k=";
+  };
+
+  meta = {
+    description = "Previewing archive contents with smart-filter";
+    homepage = "https://github.com/yazi-rs/plugins/tree/main/smart-paste.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ khaneliman ];
+  };
+}

From cc357fbf4affc256f19fb7c807f8f1b94da2a82b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 10 May 2025 10:00:45 -0500
Subject: [PATCH 77/84] yaziPlugins: yazi-rs homepage population

Use the mkYaziPlugin to populate the homepage easier for all the bundled
plugins.
---
 pkgs/by-name/ya/yazi/plugins/chmod/default.nix        | 1 -
 pkgs/by-name/ya/yazi/plugins/default.nix              | 5 +++++
 pkgs/by-name/ya/yazi/plugins/diff/default.nix         | 1 -
 pkgs/by-name/ya/yazi/plugins/full-border/default.nix  | 1 -
 pkgs/by-name/ya/yazi/plugins/git/default.nix          | 1 -
 pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix | 1 -
 pkgs/by-name/ya/yazi/plugins/lsar/default.nix         | 1 -
 pkgs/by-name/ya/yazi/plugins/mactag/default.nix       | 1 -
 pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix     | 1 -
 pkgs/by-name/ya/yazi/plugins/mount/default.nix        | 1 -
 pkgs/by-name/ya/yazi/plugins/no-status/default.nix    | 1 -
 pkgs/by-name/ya/yazi/plugins/piper/default.nix        | 1 -
 pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix  | 1 -
 pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix | 1 -
 pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix  | 1 -
 pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix  | 1 -
 pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix    | 1 -
 17 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix
index ea34d479322e..925e7d5cc1c8 100644
--- a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Execute chmod on the selected files to change their mode";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/default.nix b/pkgs/by-name/ya/yazi/plugins/default.nix
index 170dedda57b6..95a96de7c653 100644
--- a/pkgs/by-name/ya/yazi/plugins/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/default.nix
@@ -50,6 +50,11 @@ let
         meta = meta // {
           description = meta.description or "";
           platforms = meta.platforms or lib.platforms.all;
+          homepage =
+            if (src ? owner && src.owner == "yazi-rs") then
+              "https://github.com/yazi-rs/plugins/tree/main/${pname}"
+            else
+              meta.homepage or null;
         };
         passthru = (args.passthru or { }) // {
           updateScript = {
diff --git a/pkgs/by-name/ya/yazi/plugins/diff/default.nix b/pkgs/by-name/ya/yazi/plugins/diff/default.nix
index f8500fc742c1..a4a0f8c904ab 100644
--- a/pkgs/by-name/ya/yazi/plugins/diff/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/diff/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Diff the selected file with the hovered file, create a living patch, and copy it to the clipboard";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
index 90bbaf5f64ec..858e0a8a8cc6 100644
--- a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Add a full border to Yazi to make it look fancier";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix
index 10b6b29acd8b..a0fad2d1a1e9 100644
--- a/pkgs/by-name/ya/yazi/plugins/git/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Show the status of Git file changes as linemode in the file list";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
index 55269a5e7b04..c40755193b8b 100644
--- a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Switch the preview pane between hidden and shown";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
index 95dbfcdf8aa1..b9a2c7f7d1cc 100644
--- a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with lsar";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
index 991d71f97c7c..61e0b326fa6c 100644
--- a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with mactag";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
index 59a92e126702..bf82462f36c5 100644
--- a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with mime-ext";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index 062c728c49bd..8f11fe0b381c 100644
--- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with mount";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix
index bf66c5235d47..03b4fab01188 100644
--- a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with no-status";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/piper/default.nix b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
index 69be53911025..e2955f4ba695 100644
--- a/pkgs/by-name/ya/yazi/plugins/piper/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Pipe any shell command as a previewer";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
index 7e54ccdd12bf..5bd33f0d676d 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with smart-enter";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
index 417147a95e70..95becd9e7181 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with smart-filter";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
index 46267c784215..07d525f22814 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with smart-filter";
-    homepage = "https://github.com/yazi-rs/plugins/tree/main/smart-paste.yazi";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
index c01ac9a097da..ec3503c71f20 100644
--- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with toggle-pane";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
index e4dec9f79c42..e02b886c0f37 100644
--- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
@@ -16,7 +16,6 @@ mkYaziPlugin {
 
   meta = {
     description = "Previewing archive contents with vcs-files";
-    homepage = "https://yazi-rs.github.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };

From 86534aafc36a7fcb7f90e83bb44e924f0c89acb6 Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Sat, 10 May 2025 08:26:49 +0200
Subject: [PATCH 78/84] kdePackages.karousel: 0.12 -> 0.13

---
 pkgs/kde/third-party/karousel/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix
index fc2b17df547f..be4179438951 100644
--- a/pkgs/kde/third-party/karousel/default.nix
+++ b/pkgs/kde/third-party/karousel/default.nix
@@ -10,17 +10,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "karousel";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "peterfajdiga";
     repo = "karousel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-BfEMLn49LN5e2TT0e9jPtfJNrvUC92D66HyvmDPJrV4=";
+    hash = "sha256-kwj0G4px9Mmv2TdGJsRuj+29Qvg4ZfSYnxCDgf+54bg=";
   };
 
   postPatch = ''
     patchShebangs run-ts.sh
+    substituteInPlace Makefile \
+      --replace-fail "build: lint tests" "build: tests"
   '';
 
   nativeBuildInputs = [

From 2b9c4e45cc93861f9250efd0ae3e72706503c3a4 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 10 May 2025 17:09:16 +0200
Subject: [PATCH 79/84] psstop: drop

Upstream has archived the project and the release is 8 years old. The functionality it provides can be easily gotten through other means
---
 pkgs/by-name/ps/psstop/package.nix | 35 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/by-name/ps/psstop/package.nix

diff --git a/pkgs/by-name/ps/psstop/package.nix b/pkgs/by-name/ps/psstop/package.nix
deleted file mode 100644
index 67968128d828..000000000000
--- a/pkgs/by-name/ps/psstop/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  glib,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "psstop";
-  version = "1.3";
-
-  src = fetchFromGitHub {
-    owner = "clearlinux";
-    repo = "psstop";
-    rev = "v${version}";
-    sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [ glib ];
-
-  meta = with lib; {
-    homepage = "https://github.com/clearlinux/psstop";
-    description = "Show processes' memory usage by looking into pss"; # upstream summary
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ dtzWill ];
-    mainProgram = "psstop";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c275304bfee..5f15e702810a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1543,6 +1543,7 @@ mapAliases {
   ); # Added 2025-04-23
   proxmark3-rrg = proxmark3; # Added 2023-07-25
   psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
+  psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10
   pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
   pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
   pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28

From 88eae73897d681c24fabfcf198928375de5645b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 01:20:19 +1000
Subject: [PATCH 80/84] cargo-bolero: 0.13.2 -> 0.13.3 (#405869)

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

diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix
index b5a8feb9b7ab..547eb68f1078 100644
--- a/pkgs/by-name/ca/cargo-bolero/package.nix
+++ b/pkgs/by-name/ca/cargo-bolero/package.nix
@@ -10,15 +10,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-bolero";
-  version = "0.13.2";
+  version = "0.13.3";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-X8C4bNGjJx1VxE5X7ntIsbpMPKHVLU1HSQb7vRdivdg=";
+    hash = "sha256-xU7a5xEFSrFsQ1K5DIYgACuf+34QeCvGmWvlSSwI03I=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-z1JxoJ4D9GRDsD08kn0WZgaqgTmdL57MgwQ+vFghIpY=";
+  cargoHash = "sha256-FMpM42D3h42NfDzH+EVs6NB2RVehFNFAYTMvzRQVt/s=";
 
   buildInputs = [
     libbfd

From 80bfdb151694fd4f0852e588902393ae422c0941 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 10 May 2025 17:34:25 +0200
Subject: [PATCH 81/84] ptask: drop

Upstream is dead, but still builds because the source tarball is cached. The release is from 2017
---
 pkgs/by-name/pt/ptask/json_c_is_error.patch | 13 ------
 pkgs/by-name/pt/ptask/package.nix           | 50 ---------------------
 pkgs/by-name/pt/ptask/tw-version.patch      | 11 -----
 pkgs/top-level/aliases.nix                  |  1 +
 4 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 pkgs/by-name/pt/ptask/json_c_is_error.patch
 delete mode 100644 pkgs/by-name/pt/ptask/package.nix
 delete mode 100644 pkgs/by-name/pt/ptask/tw-version.patch

diff --git a/pkgs/by-name/pt/ptask/json_c_is_error.patch b/pkgs/by-name/pt/ptask/json_c_is_error.patch
deleted file mode 100644
index 435c8b26e6f7..000000000000
--- a/pkgs/by-name/pt/ptask/json_c_is_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tw.c b/src/tw.c
-index 602f7b3..ca601cd 100644
---- a/src/tw.c
-+++ b/src/tw.c
-@@ -163,7 +163,7 @@ static struct json_object *task_exec_json(const char *opts)
- 
- 	free(cmd);
- 
--	if (o && is_error(o))
-+	if (!o)
- 		return NULL;
- 
- 	return o;
diff --git a/pkgs/by-name/pt/ptask/package.nix b/pkgs/by-name/pt/ptask/package.nix
deleted file mode 100644
index 88fff269fc71..000000000000
--- a/pkgs/by-name/pt/ptask/package.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  makeWrapper,
-  gtk3,
-  json_c,
-  taskwarrior2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ptask";
-  version = "1.0.0";
-
-  src = fetchurl {
-    url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz";
-    sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
-  };
-
-  buildInputs = [
-    gtk3
-    json_c
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    makeWrapper
-  ];
-
-  patches = [
-    ./tw-version.patch
-    ./json_c_is_error.patch
-  ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/ptask" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-      --prefix PATH : "${taskwarrior2}/bin"
-  '';
-
-  meta = with lib; {
-    homepage = "http://wpitchoune.net/ptask/";
-    description = "GTK-based GUI for taskwarrior";
-    mainProgram = "ptask";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.spacefrogg ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/pt/ptask/tw-version.patch b/pkgs/by-name/pt/ptask/tw-version.patch
deleted file mode 100644
index 995fffeda2f8..000000000000
--- a/pkgs/by-name/pt/ptask/tw-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/tw.c	2017-02-21 22:56:19.289037608 +0100
-+++ b/src/tw.c	2017-02-21 22:57:04.726814256 +0100
-@@ -116,7 +116,7 @@
- 	    || !strcmp(ver, "2.3.0")
- 	    || !strcmp(ver, "2.4.0")
- 	    || !strcmp(ver, "2.4.1")
--	    || !strcmp(ver, "2.5.0"))
-+	    || !strcmp(ver, "2.5.1"))
- 		return 1;
- 	else
- 		return 0;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08350e4c731c..d2b3b641ad1b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1546,6 +1546,7 @@ mapAliases {
   proxmark3-rrg = proxmark3; # Added 2023-07-25
   psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
   psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10
+  ptask = throw "'ptask' has been removed because its upstream is unavailable"; # Added 2025-05-10
   pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
   pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
   pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28

From 4f4d09f68d3e205109bd52128f4f0d68894f56ca Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 10 May 2025 17:57:51 +0200
Subject: [PATCH 82/84] omping: drop

Upstream is archived and this release is from 2016
---
 pkgs/by-name/om/omping/package.nix | 42 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/om/omping/package.nix

diff --git a/pkgs/by-name/om/omping/package.nix b/pkgs/by-name/om/omping/package.nix
deleted file mode 100644
index 4e39e8294d83..000000000000
--- a/pkgs/by-name/om/omping/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "omping";
-  version = "0.0.5";
-
-  src = fetchFromGitHub {
-    owner = "troglobit";
-    repo = "omping";
-    rev = version;
-    sha256 = "1f0vsbnhxp7bbgdnfqshryx3nhz2sqdnxdj068s0nmzsh53ckbf7";
-  };
-
-  patches = [
-    # This can go in 0.0.6+
-    (fetchpatch {
-      url = "https://github.com/troglobit/omping/commit/08a31ec1a6eb4e8f88c301ef679c3b6f9893f333.patch";
-      sha256 = "1xafyvd46bq53w2zvjw8bdw7vjqbrcrr21cyh6d0zfcn4gif1k0f";
-      name = "fix_manpage_install.patch";
-    })
-  ];
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    inherit (src.meta) homepage;
-    mainProgram = "omping";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08350e4c731c..bc1a71828ba1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1382,6 +1382,7 @@ mapAliases {
   opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
   openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
   orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17
+  omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10
   onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
   onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
   onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03

From 02c22c235870529fe566a9ad6056862ae3dde558 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 10 May 2025 18:28:13 +0200
Subject: [PATCH 83/84] quickserve: drop

Upstream is dead since somewhere in 2021. There are many alternatives for 'simple HTTP server'
---
 pkgs/by-name/qu/quickserve/package.nix | 44 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/by-name/qu/quickserve/package.nix

diff --git a/pkgs/by-name/qu/quickserve/package.nix b/pkgs/by-name/qu/quickserve/package.nix
deleted file mode 100644
index 8c4535b16c84..000000000000
--- a/pkgs/by-name/qu/quickserve/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  makeWrapper,
-  fetchzip,
-  python3,
-  python3Packages,
-}:
-let
-  threaded_servers = python3Packages.buildPythonPackage {
-    name = "threaded_servers";
-    src = fetchzip {
-      url = "https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz";
-      sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf";
-    };
-
-    # stuff we don't care about pacserve
-    doCheck = false;
-  };
-  wrappedPython = python3.withPackages (_: [ threaded_servers ]);
-in
-stdenv.mkDerivation {
-  pname = "quickserve";
-  version = "2018";
-
-  dontUnpack = true;
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-    makeWrapper ${wrappedPython}/bin/python $out/bin/quickserve \
-      --add-flags -mThreadedServers.PeeredQuickserve
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Simple HTTP server for quickly sharing files";
-    homepage = "https://xyne.archlinux.ca/projects/quickserve/";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ lassulus ];
-    mainProgram = "quickserve";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08350e4c731c..39d4ad33e042 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1581,6 +1581,7 @@ mapAliases {
   quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
+  quickserve = throw "'quickserve' has been removed because its upstream is unavailable"; # Added 2025-05-10
   qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
 
   ### R ###

From ce8e2c978b9417d6fae52cc6360ff7bee6ef1ae8 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 10 May 2025 09:45:17 +0200
Subject: [PATCH 84/84] apparmor: fix cross for different bit depths between
 build and host

Fixes #405780

Void also does not attempt to enable python on cross for armv7 [1].
This means apparmor-parser will never work on cross.

[1] https://github.com/void-linux/void-packages/blob/f8130e11caa853e434dc0ecdfb229d8fcd29c7de/srcpkgs/apparmor/template#L32-L36
---
 pkgs/by-name/li/libapparmor/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix
index 99aa886a8eaa..b7c4b3db494e 100644
--- a/pkgs/by-name/li/libapparmor/package.nix
+++ b/pkgs/by-name/li/libapparmor/package.nix
@@ -12,7 +12,11 @@
     stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl,
   perl,
   withPython ?
-    !stdenv.hostPlatform.isStatic && lib.meta.availableOn stdenv.hostPlatform python3Packages.python,
+    # static can't load python libraries
+    !stdenv.hostPlatform.isStatic
+    && lib.meta.availableOn stdenv.hostPlatform python3Packages.python
+    # m4 python include script fails if cpu bit depth is different across machines
+    && stdenv.hostPlatform.parsed.cpu.bits == stdenv.buildPlatform.parsed.cpu.bits,
   python3Packages,
   swig,
   ncurses,