From 39526ab98d8c396a334cf8424b7d2f6b448bb7cb Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 10 Apr 2025 11:22:36 +0200
Subject: [PATCH 0001/1386] python3Packages.pymdown-extensions: fix pyyaml
 dependency

---
 pkgs/development/python-modules/pymdown-extensions/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix
index ceaaba469762..0e393859820e 100644
--- a/pkgs/development/python-modules/pymdown-extensions/default.nix
+++ b/pkgs/development/python-modules/pymdown-extensions/default.nix
@@ -60,11 +60,11 @@ buildPythonPackage rec {
   dependencies = [
     markdown
     pygments
+    pyyaml
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
-    pyyaml
   ];
 
   disabledTests = [

From edc1ab046eb34d122315ea27de413237744c19a3 Mon Sep 17 00:00:00 2001
From: John Mark Gabriel Caguicla <jmg.caguicla@guarandoo.me>
Date: Thu, 26 Jun 2025 20:14:00 +0800
Subject: [PATCH 0002/1386] maintainer: add caguiclajmg

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d44936743b44..747f6ab0391b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4006,6 +4006,12 @@
       { fingerprint = "8916 F727 734E 77AB 437F  A33A 19AB 76F5 CEE1 1392"; }
     ];
   };
+  caguiclajmg = {
+    email = "jmg.caguicla@guarandoo.me";
+    github = "caguiclajmg";
+    githubId = 32662060;
+    name = "John Mark Gabriel Caguicla";
+  };
   CaiqueFigueiredo = {
     email = "public@caiquefigueiredo.me";
     github = "caiquefigueiredo";

From 9313f5c5fe259ed722008ec54abad18733ba423d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 17 Dec 2025 17:06:02 +0800
Subject: [PATCH 0003/1386] git2cl: modernize & unstable-2008-08-27 -> 3.0

---
 pkgs/by-name/gi/git2cl/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gi/git2cl/package.nix b/pkgs/by-name/gi/git2cl/package.nix
index 35ad49505986..4dd5912ec30a 100644
--- a/pkgs/by-name/gi/git2cl/package.nix
+++ b/pkgs/by-name/gi/git2cl/package.nix
@@ -1,24 +1,25 @@
 {
-  fetchgit,
+  fetchFromGitLab,
   lib,
-  stdenv,
   perl,
+  stdenv,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "git2cl";
-  version = "unstable-2008-08-27";
+  version = "3.0";
 
-  src = fetchgit {
-    url = "git://repo.or.cz/git2cl.git";
-    rev = "8373c9f74993e218a08819cbcdbab3f3564bbeba";
-    sha256 = "b0d39379640c8a12821442431e2121f7908ce1cc88ec8ec6bede218ea8c21f2f";
+  src = fetchFromGitLab {
+    owner = "jas";
+    repo = "git2cl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KEEUKSP7+05VIb/EhuCy0t1qP/UU0iqNzU4AacbdpTg=";
   };
 
   buildInputs = [ perl ];
   installPhase = ''
     install -D -m755 git2cl $out/bin/git2cl
-    install -D -m644 README $out/share/doc/git2cl/README
+    install -D -m644 README.md $out/share/doc/git2cl/README.md
   '';
 
   meta = {
@@ -27,4 +28,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.unix;
     mainProgram = "git2cl";
   };
-}
+})

From f3fcd71c7abdf5c993e73632fc2326473c271470 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 4 Jan 2026 09:33:21 +0000
Subject: [PATCH 0004/1386] python3Packages.libapparmor: fix cross compilation

the previous code was supplying unspliced `python` (as a buildInput)
and `setuptools` (as a nativeBuildInput) all from the same package set.
in the case of
`pkgsCross.aarch64-multiplatform.python3Packages.libapparmor`, that
results in an aarch64 `setuptools` hook attempting to be run on the
(x86_64) build machine.

by going through `callPackage`, we can supply `pkgs.libapparmor` with
spliced versions of these inputs that are suitable for either
buildInputs/nativeBuildInputs/etc.
---
 pkgs/top-level/python-packages.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9f0fc43bfae..92b31b853389 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8433,11 +8433,18 @@ self: super: with self; {
 
   libais = callPackage ../development/python-modules/libais { };
 
-  libapparmor = toPythonModule (
-    pkgs.libapparmor.override {
-      python3Packages = self;
-    }
-  );
+  libapparmor = callPackage (
+    {
+      python,
+      pythonImportsCheckHook,
+      setuptools,
+    }@python3Packages:
+    toPythonModule (
+      pkgs.libapparmor.override {
+        inherit python3Packages;
+      }
+    )
+  ) { };
 
   libarchive-c = callPackage ../development/python-modules/libarchive-c {
     inherit (pkgs) libarchive;

From eedfe72ee29fe6f1bc645a99e6fc0b39094d6a39 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake@waksbaum.com>
Date: Thu, 22 Jan 2026 12:56:39 -0500
Subject: [PATCH 0005/1386] tangara-cli: 0.4.3 -> 0.5.2

---
 pkgs/by-name/ta/tangara-cli/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tangara-cli/package.nix b/pkgs/by-name/ta/tangara-cli/package.nix
index 16f1ae629d35..a31da708d33a 100644
--- a/pkgs/by-name/ta/tangara-cli/package.nix
+++ b/pkgs/by-name/ta/tangara-cli/package.nix
@@ -5,26 +5,28 @@
 
   pkg-config,
   udev,
+  openssl,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tangara-cli";
-  version = "0.4.3";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "haileys";
     repo = "tangara-companion";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pTE+xlXWIOOt1oiKosnbXTCLYoAqP3CfXA283a//Ds0=";
+    hash = "sha256-x/xB+itr1GVcaTEre3u6Lchg9VcSzWiNyWVGv5Aczgw=";
   };
 
-  cargoHash = "sha256-C7Q3Oo/aBBH6pW1zSFQ2nD07+wu8uXfRSwNif2pVlW0=";
+  cargoHash = "sha256-PVTfAG2AOioW1zVXtXB5SBJX2sJoWVRQO3NafUOAleo=";
 
   nativeBuildInputs = [
     pkg-config
   ];
 
   buildInputs = [
+    openssl
     udev
   ];
 

From 59b42c632c8a8a6be3a848e89c202e984815a5e9 Mon Sep 17 00:00:00 2001
From: brudel <brudel13742@gmail.com>
Date: Thu, 19 Mar 2026 17:59:06 -0300
Subject: [PATCH 0006/1386] hubstaff: fix missing desktop item icon

- Symlinked the `hubstaff-color.png` files directly into `$out/share/icons/hicolor/` for all provided resolutions so desktop environments can properly locate the application icon.
- Updated the `icon` attribute in `makeDesktopItem` from `hubstaff` to `hubstaff-color` to accurately match the filenames provided in the package.
---
 pkgs/by-name/hu/hubstaff/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index d1a490cc76c9..d4f97a31b95a 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
       name = "netsoft-com.netsoft.hubstaff";
       desktopName = "Hubstaff";
       exec = "HubstaffClient";
-      icon = "hubstaff";
+      icon = "hubstaff-color";
       comment = "Time tracking software";
       categories = [
         "Office"
@@ -119,6 +119,13 @@ stdenv.mkDerivation {
 
     # Why is this needed? SEGV otherwise.
     ln -s $opt/data/resources $opt/x86_64/resources
+
+    # Link icons to the standard directory
+    for dir in $opt/data/resources/hicolor/[0-9]*x[0-9]*; do
+      size=$(basename "$dir")
+      mkdir -p $out/share/icons/hicolor/$size/apps
+      ln -s $dir/apps/hubstaff-color.png $out/share/icons/hicolor/$size/apps/hubstaff-color.png
+    done
     runHook postInstall
   '';
 

From 017d9ee23684ac222e40028238a2fcf287edc4c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 08:26:13 +0000
Subject: [PATCH 0007/1386] seclists: 2025.3 -> 2026.1

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

diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix
index bc205ace8cc3..8d1907d70676 100644
--- a/pkgs/by-name/se/seclists/package.nix
+++ b/pkgs/by-name/se/seclists/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "seclists";
-  version = "2025.3";
+  version = "2026.1";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "SecLists";
-    rev = "2025.3";
-    hash = "sha256-o4Va+OJCrDwHhmuN3HbURAOhPLCJGHnJW7RcOkaYPOQ=";
+    rev = "2026.1";
+    hash = "sha256-S1C+/gX3mvCC9OVxzCO6PrzbvxCz5mTWEXrBqzSuKps=";
   };
 
   installPhase = ''

From ff73638f0bce6e9b8d3c7e9f9f9bf9917de549bc Mon Sep 17 00:00:00 2001
From: Nick Blumenauer <nicknb@posteo.com>
Date: Fri, 6 Feb 2026 15:47:30 +0100
Subject: [PATCH 0008/1386] keyfinder-cli: 1.1.2 -> 1.2.0

Upstream switched to CMake, for which parallel building is enabled by
default. No need to specify that manually anymore.
---
 pkgs/by-name/ke/keyfinder-cli/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ke/keyfinder-cli/package.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix
index 55f600863587..884874fed958 100644
--- a/pkgs/by-name/ke/keyfinder-cli/package.nix
+++ b/pkgs/by-name/ke/keyfinder-cli/package.nix
@@ -5,29 +5,32 @@
   ffmpeg,
   libkeyfinder,
   fftw,
+  cmake,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyfinder-cli";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
     owner = "EvanPurkhiser";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
+    hash = "sha256-WdZ5jiq5bfwiq1RK4XDRhqh2gAukq3hLCA56K/f+84g=";
   };
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
   buildInputs = [
     ffmpeg
     libkeyfinder
     fftw
   ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  enableParallelBuilding = true;
-
   meta = {
     inherit (finalAttrs.src.meta) homepage;
     description = "Musical key detection for digital audio (command-line tool)";

From 0184f0f648d4331c3f76a08feaddc3b029cc5ae4 Mon Sep 17 00:00:00 2001
From: ConstantConstantin <paul.hertel@aol.de>
Date: Tue, 31 Mar 2026 15:29:44 +0200
Subject: [PATCH 0009/1386] maintainers: add conny

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dfbb691ef8b2..e3e561597fa6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5393,6 +5393,11 @@
     githubId = 5953003;
     name = "Connor Nelson";
   };
+  conny = {
+    github = "ConstantConstantin";
+    githubId = 162139822;
+    name = "Constantin-Paul Hertel";
+  };
   conradmearns = {
     email = "conradmearns+github@pm.me";
     github = "ConradMearns";

From d0e4a4b1df9ed9672143c025e0102f0352c540ee Mon Sep 17 00:00:00 2001
From: ConstantConstantin <paul.hertel@aol.de>
Date: Tue, 31 Mar 2026 15:41:25 +0200
Subject: [PATCH 0010/1386] python3Packages.spectral-derivatives: init at 0.10

Initial packaging of spectral-derivatives.

Python library for computing spectral derivatives using Chebyshev, Fourier and Legendre.
Fetched from GitHub since PyPI source does not contain tests.
---
 .../spectral-derivatives/default.nix          | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/spectral-derivatives/default.nix

diff --git a/pkgs/development/python-modules/spectral-derivatives/default.nix b/pkgs/development/python-modules/spectral-derivatives/default.nix
new file mode 100644
index 000000000000..c29fa4892db4
--- /dev/null
+++ b/pkgs/development/python-modules/spectral-derivatives/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  numpy,
+  scipy,
+  matplotlib,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "spectral_derivatives";
+  version = "0.10";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pavelkomarov";
+    repo = "spectral-derivatives";
+    tag = "v${version}";
+    hash = "sha256-KSx3aW2DgVr1nhtGqIO85s6c5p+1rjnrpMY4e63LLiE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    numpy
+    scipy
+    matplotlib
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "specderiv" ];
+
+  meta = {
+    description = "Derivatives by spectral methods";
+    license = lib.licenses.bsd3;
+    homepage = "https://pavelkomarov.com/spectral-derivatives/specderiv.html";
+    maintainers = with lib.maintainers; [ conny ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7dab8f398c4..71d5586068b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18090,6 +18090,8 @@ self: super: with self; {
 
   spectral-cube = callPackage ../development/python-modules/spectral-cube { };
 
+  spectral-derivatives = callPackage ../development/python-modules/spectral-derivatives { };
+
   speechbrain = callPackage ../development/python-modules/speechbrain { };
 
   speechrecognition = callPackage ../development/python-modules/speechrecognition { };

From ffb60950ded2883d2bd4068234f8aa1c54f64d1a Mon Sep 17 00:00:00 2001
From: ConstantConstantin <paul.hertel@aol.de>
Date: Tue, 31 Mar 2026 17:05:05 +0200
Subject: [PATCH 0011/1386] python3Packages.derivative: init at 0.6.3

Python library for numerical differentiation of noisy data.

Fetched from GitHub since PyPI source does not contain tests.
---
 .../python-modules/derivative/default.nix     | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/derivative/default.nix

diff --git a/pkgs/development/python-modules/derivative/default.nix b/pkgs/development/python-modules/derivative/default.nix
new file mode 100644
index 000000000000..9079b9aeda13
--- /dev/null
+++ b/pkgs/development/python-modules/derivative/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  numpy,
+  scipy,
+  scikit-learn,
+  spectral-derivatives,
+  importlib-metadata,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "derivative";
+  version = "0.6.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "andgoldschmidt";
+    repo = "derivative";
+    tag = "v${version}";
+    hash = "sha256-vsN1zlD9x0CEOtRIwr/DrtkV+OjiyrI8QL9Z8pB3wrY=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    numpy
+    scipy
+    scikit-learn
+    spectral-derivatives
+    importlib-metadata
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Numerical differentiation of noisy time series data";
+    license = lib.licenses.mit;
+    homepage = "https://derivative.readthedocs.io/en/latest/";
+    maintainers = with lib.maintainers; [ conny ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71d5586068b7..04ea44722856 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3840,6 +3840,8 @@ self: super: with self; {
 
   depyf = callPackage ../development/python-modules/depyf { };
 
+  derivative = callPackage ../development/python-modules/derivative { };
+
   derpconf = callPackage ../development/python-modules/derpconf { };
 
   desktop-entry-lib = callPackage ../development/python-modules/desktop-entry-lib { };

From 56b6284f7500afc71247d53d6f5e961cfa19ee58 Mon Sep 17 00:00:00 2001
From: ConstantConstantin <paul.hertel@aol.de>
Date: Tue, 31 Mar 2026 17:13:34 +0200
Subject: [PATCH 0012/1386] python3Packages.pysindy: init at 2.1.0

Initial packaging of pysindy.

Tests disabled due to optional dependencies (e.g. jax).
---
 .../python-modules/pysindy/default.nix        | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/pysindy/default.nix

diff --git a/pkgs/development/python-modules/pysindy/default.nix b/pkgs/development/python-modules/pysindy/default.nix
new file mode 100644
index 000000000000..f038e83eff94
--- /dev/null
+++ b/pkgs/development/python-modules/pysindy/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  scikit-learn,
+  numpy,
+  derivative,
+  scipy,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "pysindy";
+  version = "2.1.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-NpZZ22MucuZwtkz9ef08C578jjo28MNfTxG4ROhjuwg=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    scikit-learn
+    numpy
+    derivative
+    scipy
+    typing-extensions
+  ];
+
+  # Tests require optional dependencies like jax
+  doCheck = false;
+
+  pythonImportsCheck = [ "pysindy" ];
+
+  meta = {
+    description = "Sparse identification of nonlinear dynamical systems";
+    license = lib.licenses.mit;
+    homepage = "https://pysindy.readthedocs.io/en/latest/";
+    maintainers = with lib.maintainers; [ conny ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04ea44722856..bc8f4a42735a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14997,6 +14997,8 @@ self: super: with self; {
 
   pysimplesoap = callPackage ../development/python-modules/pysimplesoap { };
 
+  pysindy = callPackage ../development/python-modules/pysindy { };
+
   pysingleton = callPackage ../development/python-modules/pysingleton { };
 
   pyskyqhub = callPackage ../development/python-modules/pyskyqhub { };

From 64fc246e66aaf5e2f6afce653cb5576deb21e938 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 03:41:12 +0000
Subject: [PATCH 0013/1386] python3Packages.tree-sitter-c-sharp: 0.23.1 ->
 0.23.5

---
 .../python-modules/tree-sitter-c-sharp/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix b/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix
index 4514a8cc258b..dbb7d60eef0c 100644
--- a/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-c-sharp";
-  version = "0.23.1";
+  version = "0.23.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter-c-sharp";
     tag = "v${version}";
-    hash = "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=";
+    hash = "sha256-N5AAlwQFGGi47cj0m7Te08bA486gwY6NBOx4Qcy4lpo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-IogdMRj1eHRLtdNFdGNInpEQAAbRpM248GqkY+Mgu10=";
+    hash = "sha256-fPjCguwWE+beoOiLR2EyMtogiv1JRXI8NP4vCuvGHss=";
   };
 
   build-system = [

From cd8fc556356d4f0f655e7e7bbc86ffaea80196be Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Mon, 20 Apr 2026 10:48:54 +0200
Subject: [PATCH 0014/1386] pi-coding-agent: add bryanhonof as a maintainer

I use this myself, so I'd like to keep it up-to-date as well. :)
---
 pkgs/by-name/pi/pi-coding-agent/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index c9d806f2d530..f7f79bc8b074 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -85,7 +85,10 @@ buildNpmPackage (finalAttrs: {
     downloadPage = "https://www.npmjs.com/package/@mariozechner/pi-coding-agent";
     changelog = "https://github.com/badlogic/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ munksgaard ];
+    maintainers = with lib.maintainers; [
+      munksgaard
+      bryanhonof
+    ];
     mainProgram = "pi";
   };
 })

From 38a4e6b7f0a22520d134015a13a91639234c97db Mon Sep 17 00:00:00 2001
From: rsahwe <rsahwe@gmx.net>
Date: Mon, 13 Apr 2026 19:35:23 +0200
Subject: [PATCH 0015/1386] maintainers: add rsahwe

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 720795fe5e52..c5f79250185e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23647,6 +23647,12 @@
     githubId = 20300874;
     name = "Mohammad Rafiq";
   };
+  rsahwe = {
+    email = "rsahwe@gmx.net";
+    github = "rsahwe";
+    githubId = 201613730;
+    name = "rsahwe";
+  };
   rseichter = {
     email = "nixos.org@seichter.de";
     github = "rseichter";

From dc94bc1059a6d1a94364c3524c98445842aecfab Mon Sep 17 00:00:00 2001
From: rsahwe <rsahwe@gmx.net>
Date: Mon, 13 Apr 2026 20:02:15 +0200
Subject: [PATCH 0016/1386] piskel: init at 0.15.2-SNAPSHOT-unstable-2026-04-09

---
 pkgs/by-name/pi/piskel/package.nix | 70 ++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/pi/piskel/package.nix

diff --git a/pkgs/by-name/pi/piskel/package.nix b/pkgs/by-name/pi/piskel/package.nix
new file mode 100644
index 000000000000..ef95c4c1bd8d
--- /dev/null
+++ b/pkgs/by-name/pi/piskel/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildNpmPackage,
+  makeDesktopItem,
+  makeWrapper,
+
+  nwjs,
+}:
+
+let
+  desktopItem = makeDesktopItem {
+    desktopName = "Piskel";
+    comment = "Easy-to-use sprite editor";
+    name = "piskel";
+    exec = "piskel";
+    icon = "piskel";
+    terminal = false;
+    categories = [ "Graphics" ];
+  };
+in
+buildNpmPackage rec {
+  pname = "piskel";
+  # Newest version is 0.15.0 and is years old already (also doesn't build correctly)
+  version = "0.15.2-SNAPSHOT-unstable-2026-04-09";
+
+  src = fetchFromGitHub {
+    owner = "piskelapp";
+    repo = "piskel";
+    rev = "a6b9c02daefceb10093f71e92d52d16920ccb16e";
+    hash = "sha256-AorkV1mqZJ9coRMRCCdYIdAwhedrBRG8GR7Y0/zPPHo=";
+  };
+  npmDepsHash = "sha256-tu0A5Xcz2V12pRF0LxHA48czkPR/0SslA3SEGdhdqMQ=";
+
+  env = {
+    "PUPPETEER_SKIP_DOWNLOAD" = "1";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/site/dest/
+
+    cp -r dest/prod $out/site/dest/
+    cp package.json $out/site/
+
+    install -Dm644 ${desktopItem}/share/applications/piskel.desktop -t $out/share/applications
+    install -Dm644 src/logo.png $out/share/icons/hicolor/64x64/apps/piskel.png
+
+    makeWrapper ${nwjs}/bin/nw $out/bin/${pname} \
+      --add-flags $out/site
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Easy-to-use sprite editor";
+    homepage = "https://github.com/piskelapp/piskel";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      rsahwe
+    ];
+    mainProgram = "piskel";
+    platforms = nwjs.meta.platforms;
+  };
+
+  __structuredAttrs = true;
+}

From 673f2e677f45c7e78bd4a575253a1c6aed61e827 Mon Sep 17 00:00:00 2001
From: Pascal Jungblut <pascal.jungblut@guardsquare.com>
Date: Mon, 27 Apr 2026 09:00:30 +0200
Subject: [PATCH 0017/1386] ideviceinstaller: 1.1.1+date=2023-04-30 -> 1.2.0

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

diff --git a/pkgs/by-name/id/ideviceinstaller/package.nix b/pkgs/by-name/id/ideviceinstaller/package.nix
index 37bb21b9a909..42939866de7c 100644
--- a/pkgs/by-name/id/ideviceinstaller/package.nix
+++ b/pkgs/by-name/id/ideviceinstaller/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
+  gitUpdater,
   usbmuxd,
   libimobiledevice,
   libzip,
@@ -11,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ideviceinstaller";
-  version = "1.1.1+date=2023-04-30";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "ideviceinstaller";
-    rev = "71ec5eaa30d2780c2614b6b227a2229ea3aeb1e9";
-    hash = "sha256-YsQwAlt71vouYJzXl0P7b3fG/MfcwI947GtvN4g3/gM=";
+    tag = finalAttrs.version;
+    hash = "sha256-V4zJ85wF3jjBlWOY+oxo6veNeiSHVAUBipmokzhRgaI=";
   };
 
   nativeBuildInputs = [
@@ -40,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
     export RELEASE_VERSION=${finalAttrs.version}
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://github.com/libimobiledevice/ideviceinstaller";
     description = "List/modify installed apps of iOS devices";

From 5a78b0a092383218bd5a40a77fd22f9e5c645b23 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <brodriguesco@protonmail.com>
Date: Wed, 22 Apr 2026 15:11:27 +0200
Subject: [PATCH 0018/1386] jpmml-evaluator: init at 1.7.7

---
 pkgs/by-name/jp/jpmml-evaluator/package.nix | 56 +++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 pkgs/by-name/jp/jpmml-evaluator/package.nix

diff --git a/pkgs/by-name/jp/jpmml-evaluator/package.nix b/pkgs/by-name/jp/jpmml-evaluator/package.nix
new file mode 100644
index 000000000000..3ca614f03a80
--- /dev/null
+++ b/pkgs/by-name/jp/jpmml-evaluator/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  maven,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  jre_headless,
+  nix-update-script,
+}:
+
+let
+  pname = "jpmml-evaluator";
+  version = "1.7.7";
+in
+maven.buildMavenPackage {
+  inherit pname version;
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jpmml";
+    repo = "jpmml-evaluator";
+    tag = version;
+    hash = "sha256-DtI/cHmiKVH0IAp3mWJr2sDDjAzM5d9/cBx4KJm74WM=";
+  };
+
+  mvnHash = "sha256-PBkRDMPF/btYROGs4bl71wl2em05N6T2Klf1qFZLHDI=";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/java $out/bin
+    cp pmml-evaluator-example/target/pmml-evaluator-example-executable-*.jar $out/share/java/jpmml-evaluator.jar
+
+    makeBinaryWrapper ${jre_headless}/bin/java $out/bin/jpmml-evaluator \
+      --add-flags "-jar $out/share/java/jpmml-evaluator.jar"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Java Evaluator API for PMML";
+    homepage = "https://github.com/jpmml/jpmml-evaluator";
+    changelog = "https://github.com/jpmml/jpmml-evaluator/releases/tag/${version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = [ lib.maintainers.b-rodrigues ];
+    mainProgram = "jpmml-evaluator";
+    platforms = lib.platforms.all;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+  };
+}

From 4c802b67ad534def924a250699c4e5c7b9f9c32c Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 4 May 2026 07:06:47 +0000
Subject: [PATCH 0019/1386] sh earlybird: 4.0.0 -> 4.6.0

---
 pkgs/by-name/ea/earlybird/package.nix | 39 +++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix
index d9b50c704da9..d9a0d8cf3769 100644
--- a/pkgs/by-name/ea/earlybird/package.nix
+++ b/pkgs/by-name/ea/earlybird/package.nix
@@ -2,32 +2,61 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  gitMinimal,
+  poppler-utils,
+  wv,
+  unrtf,
+  html-tidy,
+  makeWrapper,
+  # TODO add justext when github.com/JalfResi/justext becomes available
+  # justext
 }:
 
 buildGoModule (finalAttrs: {
   pname = "earlybird";
-  version = "4.0.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "americanexpress";
     repo = "earlybird";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-P8kA9MJA+2jtVOYLBu0oG9xTUTGCtiX4R+4ecmXDAAw=";
   };
 
-  vendorHash = "sha256-39jXqCXAwg/C+9gEXiS1X58OD61nMNQifnhgVGEF6ck=";
+  vendorHash = "sha256-pQ8gSDHsdDT/cgvRB0OSqnMZz2W5vAzFBzph0xksC2o=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  nativeBuildInputs = [
+    makeWrapper
+    gitMinimal
+  ];
+
+  checkFlags = [
+    "--skip=Test_parseGitFiles"
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/earlybird \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          poppler-utils
+          wv
+          unrtf
+          html-tidy
+        ]
+      }
+  '';
+
   meta = {
     description = "Sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more";
     mainProgram = "earlybird";
     homepage = "https://github.com/americanexpress/earlybird";
     changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tbutter ];
   };
 })

From 68810bdac48287887d8d4ba14bac67acc9fe1a70 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 27 Apr 2026 19:29:09 +0000
Subject: [PATCH 0020/1386] kapow: 1.5.10 -> 1.7.0

---
 pkgs/by-name/ka/kapow/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ka/kapow/package.nix b/pkgs/by-name/ka/kapow/package.nix
index 6e6405a9106a..539003480d7f 100644
--- a/pkgs/by-name/ka/kapow/package.nix
+++ b/pkgs/by-name/ka/kapow/package.nix
@@ -1,28 +1,30 @@
 {
   lib,
   stdenv,
+  cmake,
   fetchFromGitHub,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kapow";
-  version = "1.5.10";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "gottcode";
     repo = "kapow";
     rev = "v${finalAttrs.version}";
-    sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw";
+    hash = "sha256-IWkvAXDcWodrV23/wv3GEQXWdNcaIZDsU3LUtxsD+cA=";
   };
 
   nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
+    cmake
+    qt6.qmake
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [ libsForQt5.qtbase ];
+  buildInputs = [ qt6.qtbase ];
 
   meta = {
     description = "Punch clock to track time spent on projects";

From a0292217fcd5803d8ebb74ef3d5edcc6eb79a445 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 4 May 2026 19:19:29 +0000
Subject: [PATCH 0021/1386] kapow: add tbutter as maintainer

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

diff --git a/pkgs/by-name/ka/kapow/package.nix b/pkgs/by-name/ka/kapow/package.nix
index 539003480d7f..9790db08bf28 100644
--- a/pkgs/by-name/ka/kapow/package.nix
+++ b/pkgs/by-name/ka/kapow/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Punch clock to track time spent on projects";
     mainProgram = "kapow";
     homepage = "https://gottcode.org/kapow/";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tbutter ];
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3Plus;
   };

From e12a370861423059a62592f7057601d7a9269216 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 02:47:28 +0000
Subject: [PATCH 0022/1386] tree-sitter-grammars.tree-sitter-ocaml: 0.24.2 ->
 0.25.0

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 42f674918f5c..30d82be8a756 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1760,9 +1760,9 @@
   };
 
   ocaml = {
-    version = "0.24.2";
+    version = "0.25.0";
     url = "github:tree-sitter/tree-sitter-ocaml";
-    hash = "sha256-e08lrKCyQRpb8pnLV6KK4ye53YBjxQ52nnDIzH+7ONc=";
+    hash = "sha256-fRC7sd/INCESwYCiRsuOJkOnqWnNUpjwrNoEzlaOscA=";
     meta = {
       license = lib.licenses.mit;
     };
@@ -1772,7 +1772,7 @@
     language = "ocaml_interface";
     version = "0.24.2";
     url = "github:tree-sitter/tree-sitter-ocaml";
-    hash = "sha256-e08lrKCyQRpb8pnLV6KK4ye53YBjxQ52nnDIzH+7ONc=";
+    hash = "sha256-fRC7sd/INCESwYCiRsuOJkOnqWnNUpjwrNoEzlaOscA=";
     meta = {
       license = lib.licenses.mit;
     };

From f67c9cd6a6e5311e0b4aef663c38376eb89bc4cd Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 13 May 2026 01:09:42 +0200
Subject: [PATCH 0023/1386] chkcrontab: migration to pyproject

---
 pkgs/by-name/ch/chkcrontab/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chkcrontab/package.nix b/pkgs/by-name/ch/chkcrontab/package.nix
index 2205eefcc159..55445ae320a3 100644
--- a/pkgs/by-name/ch/chkcrontab/package.nix
+++ b/pkgs/by-name/ch/chkcrontab/package.nix
@@ -9,13 +9,21 @@ with python3.pkgs;
 buildPythonApplication (finalAttrs: {
   pname = "chkcrontab";
   version = "1.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     sha256 = "0gmxavjkjkvjysgf9cf5fcpk589gb75n1mn20iki82wifi1pk1jn";
   };
 
+  postPatch = ''
+    # cannot install the manpage as it is not present in the wheel
+    substituteInPlace setup.py \
+      --replace-fail "'doc/chkcrontab.1'" ""
+  '';
+
+  build-system = [ setuptools ];
+
   meta = {
     description = "Tool to detect crontab errors";
     mainProgram = "chkcrontab";

From 9d3cf9f9562099013124cf51b72be6af406a595e Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 18 May 2026 12:05:40 +0000
Subject: [PATCH 0024/1386] v2rayn: 7.19.4 -> 7.22.2, dotnet 8 -> 10

---
 pkgs/by-name/v2/v2rayn/deps.json   | 232 ++++++++++++-----------------
 pkgs/by-name/v2/v2rayn/package.nix |   8 +-
 2 files changed, 100 insertions(+), 140 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index b04ffc1014eb..3cce808bb830 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -6,8 +6,8 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.1.5",
-    "hash": "sha256-2wgJepxpJfO26gCgqnf4NZjj7j+OIyka9BKd3p44tR8="
+    "version": "11.1.0",
+    "hash": "sha256-HVcwSKc+f69vuRHJ9CT0QL46WFM/gggnY6Wn8IUQq+U="
   },
   {
     "pname": "Avalonia",
@@ -16,8 +16,18 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.3.7",
-    "hash": "sha256-FsBz3mwSn+JZvSACEFZGzYBdX+4rFHSFQfl9RYT7BAM="
+    "version": "11.3.13",
+    "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.3.14",
+    "hash": "sha256-HOC9J/SzIMQnVSWepH2CroVZl+mNLmluwKiF5Lb2c8c="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.3.15",
+    "hash": "sha256-6fhS6WGCHGw0jLloKmdE7BDilTPvoPwBZgwNT7p+GbM="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -34,16 +44,6 @@
     "version": "0.0.28",
     "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
   },
-  {
-    "pname": "Avalonia.BuildServices",
-    "version": "0.0.29",
-    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
-  },
-  {
-    "pname": "Avalonia.BuildServices",
-    "version": "11.3.1",
-    "hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg="
-  },
   {
     "pname": "Avalonia.BuildServices",
     "version": "11.3.2",
@@ -51,33 +51,33 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.12",
-    "hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
+    "version": "11.3.15",
+    "hash": "sha256-gvL+wVIT8K6LL2Uf2WJmhlOXO1EE8oo4O4aX6FiYLvg="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.12",
-    "hash": "sha256-xuAL5FOvonyaY9CwEhjtMnurPcA0lYe0dyLLK0GEzd8="
+    "version": "11.3.13",
+    "hash": "sha256-uqpRip0O+DUk/zsytLdJhZz103har19xPqMq0hI/Ppg="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.12",
-    "hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA="
+    "version": "11.3.15",
+    "hash": "sha256-I5/WDxRBq7zKag/V62SgDEdsphqvenicAfUMr3FGbaY="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.12",
-    "hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
+    "version": "11.3.15",
+    "hash": "sha256-7kjJ6Oajamsrdbzpp4sHVEEWlO9utrjSb5LFtNfdGnA="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.12",
-    "hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
+    "version": "11.3.15",
+    "hash": "sha256-+YHaPVp/CtCuEBy/3PxjpTM1POfP6I0mMJQStvr/zQM="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.12",
-    "hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q="
+    "version": "11.3.15",
+    "hash": "sha256-zbSkAdgILVoN8+mfnd7wy9LAHW33nDxVgvPz/QKjAiM="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -86,58 +86,53 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.1.5",
-    "hash": "sha256-yahGv3P65/QLSsYpnbV7/zu1zPtB0v2LS5dWPqLrd+8="
+    "version": "11.3.13",
+    "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.12",
-    "hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
-  },
-  {
-    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.7",
-    "hash": "sha256-A3FubRH8Li81pYhEUGQatM0etli5lSkDf2+iPxD95gs="
+    "version": "11.3.15",
+    "hash": "sha256-0up4wo1Mzg6cWCsUTjARFtRYBGrASa9CofEIjqOnEus="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.12",
-    "hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
+    "version": "11.3.15",
+    "hash": "sha256-EB0DTwoH/W4JjRphNr61X4dSNZyBNxbKzJmCC+6ImOo="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.12",
-    "hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
+    "version": "11.3.15",
+    "hash": "sha256-D+x2e2hmP5gO4ch8LdahT/ehNB7lGmd7JJnMqyRY+9s="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.12",
-    "hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc="
+    "version": "11.3.15",
+    "hash": "sha256-QbS7lyT4Wp8tecRDZ4ghTryzfELg4JoIoOzaaRTNWWQ="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.12",
-    "hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
+    "version": "11.3.15",
+    "hash": "sha256-vGSx23Ir5iuCUBa1h3G8nBmgWltjMDpRKKdkE5bCHhw="
   },
   {
     "pname": "CliWrap",
-    "version": "3.10.0",
-    "hash": "sha256-XMGTr0gkZxSOC72hrCjpIChpN0c0A19X3TqOAdBtgb4="
+    "version": "3.10.1",
+    "hash": "sha256-uH4SXiMkUIPw5RRyKtDTTCSkkr3BhBAPrxnC4O4ES4c="
   },
   {
     "pname": "DialogHost.Avalonia",
-    "version": "0.8.1",
-    "hash": "sha256-5gMb8Ap53YFIyFYfpceAd53RzlK0OF5PbiQtyCT5hew="
+    "version": "0.11.0",
+    "hash": "sha256-3CfFR6TD+LULRtFnStJmXqkvQUTKC+tgdeThtfpOyWI="
   },
   {
     "pname": "Downloader",
-    "version": "5.1.0",
-    "hash": "sha256-c5D5G3BYm79UrOsBX2UJahVrRYAvSi44o1uRDob4ZoI="
+    "version": "5.5.0",
+    "hash": "sha256-+pS/YafeAO4Uv8cpZLhxNQJY89McnNQGcuLCkc4c7Pg="
   },
   {
     "pname": "DynamicData",
-    "version": "9.4.1",
-    "hash": "sha256-CX4NQj2LTk/8f4xDE5rUVBsqcY74H/1qUHFTrVX+9/0="
+    "version": "9.4.31",
+    "hash": "sha256-//0EwmfDJFDeZSDf9xOPs+Qz0CEUPEiKZS6bIBhsHdw="
   },
   {
     "pname": "Fody",
@@ -169,11 +164,6 @@
     "version": "8.3.1.1",
     "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
   },
-  {
-    "pname": "MessageBox.Avalonia",
-    "version": "3.3.1.1",
-    "hash": "sha256-UvWCbuMuCxFpHvuUqJIfcOS/Vw57+ZdrZfSKRgPiNm0="
-  },
   {
     "pname": "MicroCom.Runtime",
     "version": "0.11.0",
@@ -181,18 +171,13 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.3",
-    "hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
+    "version": "10.0.7",
+    "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.3",
-    "hash": "sha256-lIStSIPTxaoCRoUBHsBPXZbuVj5io02390Wkyepyflw="
-  },
-  {
-    "pname": "Microsoft.Win32.Registry",
-    "version": "5.0.0",
-    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
+    "version": "10.0.7",
+    "hash": "sha256-/ITLUXgcs5tRDdeileNlmNB92V25CRd1FGBocChJj0g="
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
@@ -201,18 +186,18 @@
   },
   {
     "pname": "NLog",
-    "version": "6.1.1",
-    "hash": "sha256-4pxy5z5FyRxBmZNBw+n32SjgEQzMsgSHTuSSn+vxLzk="
+    "version": "6.1.3",
+    "hash": "sha256-s0sxfQ1tiWRSFVh/m/eIzEe4+ZgT02e9GZiwDAi7xp4="
   },
   {
     "pname": "QRCoder",
-    "version": "1.7.0",
-    "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU="
+    "version": "1.8.0",
+    "hash": "sha256-UvOeFFxUZ/bddmDs6IamiYGDIfgxybE/CSpPyy5DMxI="
   },
   {
     "pname": "ReactiveUI",
-    "version": "23.1.8",
-    "hash": "sha256-Of17kTxTQGTKUFv0fx7V90i06y9jQY9q5zkauPKZ+YQ="
+    "version": "23.2.27",
+    "hash": "sha256-OxGSNLvdO6pGqcPx1cQC8WG7GtsZVm1fFG6M0w2SbnM="
   },
   {
     "pname": "ReactiveUI.Avalonia",
@@ -224,10 +209,15 @@
     "version": "19.5.41",
     "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="
   },
+  {
+    "pname": "Repobot.SQLite.Unofficial",
+    "version": "3.53.1.4",
+    "hash": "sha256-gEHursGBAhc0IH1fAUK3Cz1i+SwzBtSTymf4KvKF/u0="
+  },
   {
     "pname": "Semi.Avalonia",
-    "version": "11.3.7.3",
-    "hash": "sha256-oIkE57AGb6FlUiFMnQZ/9uwwPxHaE8VsWHzYtEEvYQo="
+    "version": "11.3.14",
+    "hash": "sha256-NrkZJgJtVGrGhDffnX+TJgDNKEDqgLEqIApuRUDLxUM="
   },
   {
     "pname": "Semi.Avalonia.AvaloniaEdit",
@@ -239,31 +229,31 @@
     "version": "11.3.7.3",
     "hash": "sha256-++8ksHadX5MO42CIU2GoC2Cub+9J4NstBUrbRk/4MjM="
   },
-  {
-    "pname": "SkiaSharp",
-    "version": "2.88.7",
-    "hash": "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="
-  },
   {
     "pname": "SkiaSharp",
     "version": "2.88.9",
     "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
   {
-    "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.9",
-    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+    "pname": "SkiaSharp",
+    "version": "3.119.1",
+    "hash": "sha256-TIVr52NpQ9cab5eJCcH/OYHjNOTKhwCqpClK2c8S4TM="
   },
   {
-    "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.7",
-    "hash": "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "3.119.4-preview.1.1",
+    "hash": "sha256-jcf0FhUgOzxpJ4ENn1q5uPe8dT+kXl0/yUWJs+hDYNA="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
     "version": "2.88.9",
     "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
   },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.119.1",
+    "hash": "sha256-0QJGcO91MWLSeQpE4ZNn/KUVoHRcrPeDbKklxCVB00o="
+  },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
     "version": "2.88.9",
@@ -271,13 +261,13 @@
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.7",
-    "hash": "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.9",
-    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+    "version": "3.119.1",
+    "hash": "sha256-ySPkn8SrShOqhihC33EJ4HJt9desDISC4gAI4FQBi2U="
   },
   {
     "pname": "Splat",
@@ -300,40 +290,30 @@
     "hash": "sha256-rTXD2bqIa/IjeN/mFv9n9mkL2rujEg1iIUPimVpYLBQ="
   },
   {
-    "pname": "sqlite-net-pcl",
-    "version": "1.9.172",
-    "hash": "sha256-0PTcOwm4k8bMeLm5+z0iWjy379KYdQXjqkaBGBR20cc="
+    "pname": "sqlite-net-e",
+    "version": "1.11.0",
+    "hash": "sha256-djZ4mINVETOXoh1oAUDDuuxJQQNgYIAs63FGR1z5ED4="
   },
   {
-    "pname": "SQLitePCLRaw.bundle_green",
-    "version": "2.1.2",
-    "hash": "sha256-7858BCblsCoALR11Q7ejjPKHk7johTjWxgndHwUYNws="
+    "pname": "SQLitePCLRaw.config.e_sqlite3",
+    "version": "3.0.2",
+    "hash": "sha256-Q8wi2rEqnE1n53DZ1wnaM8Dr5h/Bic1/EiytK3XQzrU="
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "2.1.2",
-    "hash": "sha256-bbymML2TTQJDKZbYXoiyYJnF6mh/PjKrzDkqWhLaHaY="
-  },
-  {
-    "pname": "SQLitePCLRaw.lib.e_sqlite3",
-    "version": "2.1.2",
-    "hash": "sha256-34lJgnGvODwrjn9WTkkBIg2jzYph/ARi1QSiKedCyUo="
+    "version": "3.0.2",
+    "hash": "sha256-AK1Yc78ykY3H0Jq1INq3O1x278CtcWH7dF9heKhWvno="
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "2.1.2",
-    "hash": "sha256-e56+FgxEHqV3SGQx0ZAqzlscPxNUPXJ8Ls9rtqET1S4="
+    "version": "3.0.2",
+    "hash": "sha256-LOD39Pqx58tMjP4uc4j8BvzhnsIRFocX9e5a8I1ZgPg="
   },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "4.5.0",
     "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "10.0.3",
-    "hash": "sha256-YQzu50E7/1slw8IcFkVpQd33/IyWw1hJapTIscnoF5Q="
-  },
   {
     "pname": "System.Diagnostics.EventLog",
     "version": "6.0.0",
@@ -344,31 +324,11 @@
     "version": "6.0.0",
     "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
   },
-  {
-    "pname": "System.IO.Pipelines",
-    "version": "8.0.0",
-    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.3",
-    "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
-  },
   {
     "pname": "System.Reactive",
     "version": "6.1.0",
     "hash": "sha256-zACYoZmKxHo0qKY8FOVa7jIsw7dN7WjdXdRRV95qY2Y="
   },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "6.0.1",
-    "hash": "sha256-Ri4m95ZBfopDUGVahbvUIzuUy9D3FQwcXprP2I6IUUE="
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "5.0.0",
-    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
-  },
   {
     "pname": "TaskScheduler",
     "version": "2.12.2",
@@ -376,8 +336,8 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.21.2",
-    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+    "version": "0.21.3",
+    "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI="
   },
   {
     "pname": "WebDav.Client",
@@ -386,17 +346,17 @@
   },
   {
     "pname": "YamlDotNet",
-    "version": "16.3.0",
-    "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
+    "version": "17.1.0",
+    "hash": "sha256-Zdlw62rVud2U94BQKqrp5OFQiDcQ9rRrKeaVnNxREjY="
   },
   {
     "pname": "ZXing.Net",
-    "version": "0.16.9",
-    "hash": "sha256-ACVKyq6gaSYuaxA9I/GpNOlT1QPqQ6/illJycYOI8y4="
+    "version": "0.16.11",
+    "hash": "sha256-fTkjTWaOVYs9N00YEW7VcCHXwN9IKAHx4dtPHbkxTsM="
   },
   {
     "pname": "ZXing.Net.Bindings.SkiaSharp",
-    "version": "0.16.14",
-    "hash": "sha256-B9q6dI+JvjwMLMMQVlPsiGtLltS0cFLtJZ9IaUn4yy4="
+    "version": "0.16.22",
+    "hash": "sha256-WAfHkROShzkMEDkDVtawztHmro+ZiPElDSbLj5pC9xY="
   }
 ]
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 9f4f27c148ac..2d19afbc481c 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -26,13 +26,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "v2rayn";
-  version = "7.19.4";
+  version = "7.22.2";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = finalAttrs.version;
-    hash = "sha256-MkLJi+rMHhLjZ1huappvdxziYCNlKkoWTjjmvSPznFg=";
+    hash = "sha256-MRhJ5l+G97mBBRQzir2s5TQhgzuIeGnOIFszVK1po3w=";
     fetchSubmodules = true;
   };
 
@@ -57,9 +57,9 @@ buildDotnetModule (finalAttrs: {
 
   dotnetBuildFlags = [ "-p:PublishReadyToRun=false" ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
 
-  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_10_0;
 
   executables = [ "v2rayN" ];
 

From 05eb5e1867bf6655de744edd2adf26db7943d25e Mon Sep 17 00:00:00 2001
From: Ben Merritt <ben@haradion.net>
Date: Fri, 8 May 2026 12:33:52 -0700
Subject: [PATCH 0025/1386] p4v: 2024.2/2606884 -> 2026.1/2933292

---
 pkgs/by-name/p4/p4v/libs.patch  | 54 +++++++++++++++++++++++++++++++++
 pkgs/by-name/p4/p4v/linux.nix   |  4 +++
 pkgs/by-name/p4/p4v/package.nix | 10 +++---
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/p4/p4v/libs.patch

diff --git a/pkgs/by-name/p4/p4v/libs.patch b/pkgs/by-name/p4/p4v/libs.patch
new file mode 100644
index 000000000000..7afa37c63ac8
--- /dev/null
+++ b/pkgs/by-name/p4/p4v/libs.patch
@@ -0,0 +1,54 @@
+diff -ru bin-before/p4admin bin-after/p4admin
+--- before/bin/p4admin	2026-05-05 13:38:26.865099841 -0700
++++ after/bin/p4admin	2026-05-05 13:40:01.377761574 -0700
+@@ -43,14 +43,6 @@
+             progname=`basename "$realfullprogname"`
+               prefix=`topdir   "$realfullprogname"`
+ 
+-    # check for symbolic links for libssl.so and libcrypto.so
+-    if [ ! -f $prefix/lib/libssl.so ]; then
+-        p4vlibssl=$( find $prefix/lib/libssl.so.* )
+-        ln -s $p4vlibssl $prefix/lib/libssl.so;
+-        p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* )
+-        ln -s $p4vlibcrypto $prefix/lib/libcrypto.so;
+-    fi
+-
+     XDG_SESSION_TYPE=
+     QT_QPA_PLATFORM=xcb
+     P4VRES=$prefix/lib/P4VResources
+diff -ru bin-before/p4merge bin-after/p4merge
+--- before/bin/p4merge	2026-05-05 13:38:26.865161794 -0700
++++ after/bin/p4merge	2026-05-05 13:39:51.100750813 -0700
+@@ -43,14 +43,6 @@
+             progname=`basename "$realfullprogname"`
+               prefix=`topdir   "$realfullprogname"`
+ 
+-    # check for symbolic links for libssl.so and libcrypto.so
+-    if [ ! -f $prefix/lib/libssl.so ]; then
+-        p4vlibssl=$( find $prefix/lib/libssl.so.* )
+-        ln -s $p4vlibssl $prefix/lib/libssl.so;
+-        p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* )
+-        ln -s $p4vlibcrypto $prefix/lib/libcrypto.so;
+-    fi
+-
+     XDG_SESSION_TYPE=
+     QT_QPA_PLATFORM=xcb
+     P4VRES=$prefix/lib/P4VResources
+diff -ru bin-before/p4v bin-after/p4v
+--- before/bin/p4v	2026-05-05 13:38:26.865192103 -0700
++++ after/bin/p4v	2026-05-05 13:39:20.028718286 -0700
+@@ -43,14 +43,6 @@
+             progname=`basename "$realfullprogname"`
+               prefix=`topdir   "$realfullprogname"`
+ 
+-    # check for symbolic links for libssl.so and libcrypto.so
+-    if [ ! -f $prefix/lib/libssl.so ]; then
+-        p4vlibssl=$( find $prefix/lib/libssl.so.* )
+-        ln -s $p4vlibssl $prefix/lib/libssl.so;
+-        p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* )
+-        ln -s $p4vlibcrypto $prefix/lib/libcrypto.so;
+-    fi
+-
+     XDG_SESSION_TYPE=
+     QT_QPA_PLATFORM=xcb
+     P4VRES=$prefix/lib/P4VResources
diff --git a/pkgs/by-name/p4/p4v/linux.nix b/pkgs/by-name/p4/p4v/linux.nix
index df6d516e1cbe..665bf22da20f 100644
--- a/pkgs/by-name/p4/p4v/linux.nix
+++ b/pkgs/by-name/p4/p4v/linux.nix
@@ -77,6 +77,10 @@ let
     # Don't wrap the Qt apps; upstream has its own wrapper scripts.
     dontWrapQtApps = true;
 
+    patches = [
+      ./libs.patch # Fixes issues with bundled libraries that we've stripped out
+    ];
+
     postPatch = ''
       rm -r lib/plugins lib/libQt6* lib/libssl* lib/libicu* lib/libcrypto*
     '';
diff --git a/pkgs/by-name/p4/p4v/package.nix b/pkgs/by-name/p4/p4v/package.nix
index 5466a29ecb0a..5192bb10b033 100644
--- a/pkgs/by-name/p4/p4v/package.nix
+++ b/pkgs/by-name/p4/p4v/package.nix
@@ -10,12 +10,12 @@ let
   # Upstream replaces minor versions, so use archived URLs.
   srcs = rec {
     x86_64-linux = fetchurl {
-      url = "https://web.archive.org/web/20240612193642id_/https://ftp.perforce.com/perforce/r24.2/bin.linux26x86_64/p4v.tgz";
-      sha256 = "sha256-HA99fHcmgli/vVnr0M8ZJEsaZ2ZLzpG3M8S77oDYJyE=";
+      url = "https://web.archive.org/web/20260414052921/https://filehost.perforce.com/perforce/r26.1/bin.linux26x86_64/p4v.tgz";
+      sha256 = "sha256-89Xz9dxAeLGOOr90K0CdlxjrfIf9vUmyZV3tzWspWdQ=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://web.archive.org/web/20240612194532id_/https://ftp.perforce.com/perforce/r24.2/bin.macosx12u/P4V.dmg";
-      sha256 = "sha256-PS7gfDdWspyL//YWLkrsGi5wh6SIeAry2yef1/V0d6o=";
+      url = "https://web.archive.org/web/20260414052748/https://filehost.perforce.com/perforce/r26.1/bin.macosx12u/P4V.dmg";
+      sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY=";
     };
     # this is universal
     x86_64-darwin = aarch64-darwin;
@@ -29,7 +29,7 @@ let
 in
 mkDerivation {
   pname = "p4v";
-  version = "2024.2/2606884";
+  version = "2026.1/2933292";
 
   src =
     srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From 15c26c48517a05065163bf55d5d6513154febfb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 17:24:57 +0000
Subject: [PATCH 0026/1386] python3Packages.visions: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix
index c922b0be801b..a4cf6471cc02 100644
--- a/pkgs/development/python-modules/visions/default.nix
+++ b/pkgs/development/python-modules/visions/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "visions";
-  version = "0.8.1";
+  version = "0.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dylan-profiler";
     repo = "visions";
     tag = "v${version}";
-    hash = "sha256-MHseb1XJ0t7jQ45VXKQclYPgddrzmJAC7cde8qqYhNQ=";
+    hash = "sha256-GcudMUF1N2W4OV9SYRiG7XN1RXJj/5zHPng3cRk+FnA=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 5b38f3020078df01e26e094847d0d57bc0fc6868 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jun 2026 10:44:10 +0000
Subject: [PATCH 0027/1386] nushell-plugin-bson: 26.1100.0 -> 26.1130.0

---
 pkgs/by-name/nu/nushell-plugin-bson/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nushell-plugin-bson/package.nix b/pkgs/by-name/nu/nushell-plugin-bson/package.nix
index df0ab8b9d969..2b2b89d144e1 100644
--- a/pkgs/by-name/nu/nushell-plugin-bson/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-bson/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_bson";
-  version = "26.1100.0";
+  version = "26.1130.0";
 
   src = fetchFromGitHub {
     owner = "Kissaki";
     repo = "nu_plugin_bson";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3Uu2YF5fnNvRP4+9GpLYjzZt7lg0kCbBl4bk4l5rEuY=";
+    hash = "sha256-H+pgAckWFW/jPnIL6i90BBothX5zT3/hbcDhmdvdZmY=";
   };
 
-  cargoHash = "sha256-iORPlIP9kDLlJkm09SZn2lO3bWcj/Q/g+dBd2CPWiOg=";
+  cargoHash = "sha256-aGUlItPfrr3Uz/t1XEXBtGM285up3A5Wva1QMKwBrg0=";
 
   nativeBuildInputs = [
     llvmPackages.libclang

From ef9e453bf36a1faab2d203e3d8da6590f43e91f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Jun 2026 00:38:36 +0000
Subject: [PATCH 0028/1386] voxtype-onnx: 0.7.2 -> 0.7.5

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

diff --git a/pkgs/by-name/vo/voxtype/package.nix b/pkgs/by-name/vo/voxtype/package.nix
index c6eefd51c52f..ab0ec524c6c6 100644
--- a/pkgs/by-name/vo/voxtype/package.nix
+++ b/pkgs/by-name/vo/voxtype/package.nix
@@ -52,16 +52,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "voxtype";
-  version = "0.7.2";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "peteonrails";
     repo = "voxtype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CpG/5ws9VX8ZQjwtJMxyUF0L90u+j0veHHLHGqTvoIw=";
+    hash = "sha256-zsOG1mBTXN4gdsTb1pUPKXATfhV5ZjgEsIUk07asaGo=";
   };
 
-  cargoHash = "sha256-gHnYssFZixWt7F8oa1yYyfqThCrRsv0U7ezgZUcq1nk=";
+  cargoHash = "sha256-YK5xZWPo7KAeWZeuMxNxHA3k6RR/MT2MIfEPcgMND00=";
 
   buildFeatures =
     [ ]

From 95654b8d44175d1a5b42909f0d67fb6b38467830 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:15:41 +0700
Subject: [PATCH 0029/1386] python3Packages.bap: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index a00924865711..b1ca8888542c 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   bap,
   requests,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "bap";
   version = "1.3.1";
-  format = "setuptools";
+  pyproject = true;
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     bap
     requests
   ];

From 78d7d740c9fa83d4e67cadafd1b94e3265b56a31 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:26:18 +0700
Subject: [PATCH 0030/1386] python3Packages.bap: modernize

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

diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index b1ca8888542c..4767c63c4216 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -7,15 +7,18 @@
   requests,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bap";
   version = "1.3.1";
   pyproject = true;
+
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
-    rev = version;
-    sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
+    tag = finalAttrs.version;
+    hash = "sha256-d9HST4AF5Jxycfbv/033GAtcU+Moqxf03VHhY1nNE6o=";
   };
 
   build-system = [ setuptools ];
@@ -33,4 +36,4 @@ buildPythonPackage rec {
     maintainers = [ lib.maintainers.maurer ];
     license = lib.licenses.mit;
   };
-}
+})

From 5acc851f6a88f7a6504af20f543f22d8e6c58713 Mon Sep 17 00:00:00 2001
From: Mirko Lenz <mirko@mirkolenz.com>
Date: Mon, 8 Jun 2026 10:32:03 +0200
Subject: [PATCH 0031/1386] nixos/homer: add caching headers and compression to
 caddy vhost

---
 nixos/modules/services/web-apps/homer.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/homer.nix b/nixos/modules/services/web-apps/homer.nix
index e34e43435d12..a89f51dd832d 100644
--- a/nixos/modules/services/web-apps/homer.nix
+++ b/nixos/modules/services/web-apps/homer.nix
@@ -169,11 +169,25 @@ in
       enable = true;
       virtualHosts."${cfg.virtualHost.domain}".extraConfig = ''
         root * ${cfg.package}
-        file_server
+        encode zstd gzip
+
+        @immutable path /resources/*
+        header @immutable Cache-Control "public, max-age=31536000, immutable"
+
+        @html not path /resources/*
+        header @html Cache-Control "no-store"
+
+        header {
+          -ETag
+          -Last-Modified
+        }
+
         handle_path /assets/config.yml {
           root * ${configFile}
           file_server
         }
+
+        file_server
       '';
     };
   };

From d39131d8b5ad9c0f6f6dc4bff733f85f7e4de1c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 01:55:51 +0000
Subject: [PATCH 0032/1386] libtorrent-rasterbar: 2.0.12 -> 2.0.13

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

diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
index 82626adf9740..36329fdabc7b 100644
--- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
+++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
@@ -17,14 +17,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtorrent-rasterbar";
-  version = "2.0.12";
+  version = "2.0.13";
 
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-JbNOKzB830VQkZjC8ZAmzbu/7nkAgyD8cOr22uYbIGQ=";
+    hash = "sha256-0L7C3IY/XA+/vLJjZr47aFdYypevhMn1tzZNvDtOjbw=";
   };
 
   nativeBuildInputs = [

From 810a37520c64b056129c00c43ac0da9d412a4934 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Mon, 8 Jun 2026 23:04:04 -0400
Subject: [PATCH 0033/1386] navidromePlugins.discord-rich-presence: 1.0.0 ->
 2.0.0

changelog: https://github.com/navidrome/discord-rich-presence-plugin/releases/tag/v2.0.0
---
 .../na/navidrome/plugins/discord-rich-presence/package.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix b/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix
index 07ebe9440af5..1aee85c00051 100644
--- a/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix
+++ b/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix
@@ -5,16 +5,16 @@
 }:
 buildNavidromePlugin rec {
   pname = "discord-rich-presence-plugin";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = pkgs.fetchFromGitHub {
     owner = "navidrome";
     repo = "discord-rich-presence-plugin";
     tag = "v${version}";
-    hash = "sha256-YH1K6uagIloQQ4gdezKMAfx9KbGL9chiTx/i8CiH4io=";
+    hash = "sha256-j4iGymXH9JstPGdpPl5TFLiH8ShfE46U+BZk1n7a2yQ=";
   };
 
-  vendorHash = "sha256-M5dI0gNfy2x9IVN1284pdvUaCui0sgxFCC+9weq2ipM=";
+  vendorHash = "sha256-5ZlqyUa+UcLCBdLQaYAlb818Y8sOENjIFfb2hpRsbpQ=";
 
   meta = {
     description = "Displays your currently playing track in your Discord status";

From 14403d56305e7592b7c9f7f08ae06439bdffd466 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 19 May 2026 01:17:34 +0300
Subject: [PATCH 0034/1386] makePythonWriter: remove a useless pypy check

---
 pkgs/build-support/writers/scripts.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index 01afb249d407..572409a45f31 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -1192,15 +1192,12 @@ rec {
       ])
       // {
         interpreter =
-          if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then
-            if libraries == [ ] then
-              python.interpreter
-            else if (lib.isFunction libraries) then
-              (python.withPackages libraries).interpreter
-            else
-              (python.withPackages (ps: libraries)).interpreter
+          if libraries == [ ] then
+            python.interpreter
+          else if (lib.isFunction libraries) then
+            (python.withPackages libraries).interpreter
           else
-            python.interpreter;
+            (python.withPackages (ps: libraries)).interpreter;
         check = optionalString (python.isPy3k && doCheck) (
           writeDash "pythoncheck.sh" ''
             exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"

From 908c0cff7eb0bfb9e5d68a3f69bfc48b84611217 Mon Sep 17 00:00:00 2001
From: Adrian Grucza <adrian.grucza@iress.com>
Date: Tue, 9 Jun 2026 15:55:35 +1000
Subject: [PATCH 0035/1386] sonar-scanner-cli-minimal: add required modules

---
 pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix b/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
index 5b31c0da9048..3066332879b9 100644
--- a/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
+++ b/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
@@ -10,8 +10,11 @@ sonar-scanner-cli.override {
     jdk = jdk_headless;
     modules = [
       "java.base"
+      "java.desktop"
       "java.logging"
+      "java.management"
       "java.naming"
+      "java.net.http"
       "java.sql"
       "java.xml"
       "jdk.crypto.ec"

From 3af751c6de5a576aebbe2f3f8ae902e754bfa2d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 08:22:51 +0000
Subject: [PATCH 0036/1386] nushell-plugin-highlight: 1.4.12+0.110.0 ->
 1.4.15+0.113.1

---
 pkgs/by-name/nu/nushell-plugin-highlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
index 716eba425c10..3b6ac7f9588c 100644
--- a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_highlight";
-  version = "1.4.12+0.110.0";
+  version = "1.4.15+0.113.1";
 
   src = fetchFromGitHub {
     owner = "cptpiepmatz";
     repo = "nu-plugin-highlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-20b+EiB95BzDVWibWQuG8ozPRV8LbxG7fHEbyTk3xTE=";
+    hash = "sha256-zJYbtGpQU0CrAu7sEQWv06hJj/PCD/iYCLOLrNmsL5U=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-pkLcTjZYLERMhK18zPdfldHrECHXQpcg5i6rsyxw7nQ=";
+  cargoHash = "sha256-oJtmmKRylOZQjBBifvWBx7ikwK2inGg8rGb/rPZ/t/s=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 

From 26a3758f4b27f2aa91efaaf6410fb030891d6604 Mon Sep 17 00:00:00 2001
From: lubsch <33580245+Lubsch@users.noreply.github.com>
Date: Sun, 7 Jun 2026 02:05:20 +0200
Subject: [PATCH 0037/1386] maintainers: add lubsch

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c7ea2f7c7263..2821690d84d9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16147,6 +16147,11 @@
     githubId = 83420438;
     name = "Lewis";
   };
+  lubsch = {
+    github = "lubsch";
+    githubId = 33580245;
+    name = "Benjamin Lohmar";
+  };
   luc65r = {
     email = "lucas@ransan.fr";
     github = "luc65r";

From 35e1e78480a9dd7378e8f5c6632431aad6d534ba Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Sat, 23 May 2026 21:34:50 +0200
Subject: [PATCH 0038/1386] git-gamble: wrap the other binary

---
 pkgs/by-name/gi/git-gamble/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix
index 3ce94ac84e06..ca03570da246 100644
--- a/pkgs/by-name/gi/git-gamble/package.nix
+++ b/pkgs/by-name/gi/git-gamble/package.nix
@@ -31,13 +31,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    installShellFiles
     makeWrapper
+    installShellFiles
   ];
   postInstall = ''
     wrapProgram $out/bin/git-gamble \
       --prefix PATH : "${lib.makeBinPath [ gitMinimal ]}"
 
+    wrapProgram $out/bin/git-time-keeper \
+      --prefix PATH : "${lib.makeBinPath [ gitMinimal ]}"
+
     export PATH="$PATH:$out/bin/"
 
     sh ./script/generate_completion.sh target/release/shell_completions/

From af6d7654ee0a1b1f3c829e7b4d2e7edc56f150b1 Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Sat, 23 May 2026 21:38:18 +0200
Subject: [PATCH 0039/1386] git-gamble: flaky test has been ignored upstream
 but another one appeared

---
 pkgs/by-name/gi/git-gamble/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix
index ca03570da246..42352d3cdf53 100644
--- a/pkgs/by-name/gi/git-gamble/package.nix
+++ b/pkgs/by-name/gi/git-gamble/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
   checkFlags = [
     # this test can be flaky ; help is needed to stabilize it in upstream
-    "--skip=git_time_keeper::white_box::lock_file::create_as_many_as_lock_files_when_starting_several_times"
+    "--skip=git_gamble::cancel_command_with_signal::fail_when_git_is_killed"
   ];
 
   nativeBuildInputs = [

From d32dfb6cc83467614a72b222c77e8240fe385d38 Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Sun, 14 Jun 2026 18:44:00 +0200
Subject: [PATCH 0040/1386] git-gamble: change changelog's URL

---
 pkgs/by-name/gi/git-gamble/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix
index 42352d3cdf53..9283a6660d7f 100644
--- a/pkgs/by-name/gi/git-gamble/package.nix
+++ b/pkgs/by-name/gi/git-gamble/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Tool that blends TDD (Test Driven Development) + TCR (`test && commit || revert`)";
     homepage = "https://git-gamble.is-cool.dev";
-    changelog = "https://gitlab.com/pinage404/git-gamble/-/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://git-gamble.is-cool.dev/changelog/${finalAttrs.version}.html";
     license = lib.licenses.isc;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
     maintainers = [ lib.maintainers.pinage404 ];

From d855cc16b5eb1827a6b9ee8d394c8359d6f77072 Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Sun, 14 Jun 2026 19:15:41 +0200
Subject: [PATCH 0041/1386] git-gamble: 2.14.2 -> 2.14.4

Changelog: https://git-gamble.is-cool.dev/changelog/2.14.4.html
---
 pkgs/by-name/gi/git-gamble/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix
index 9283a6660d7f..80b21f663197 100644
--- a/pkgs/by-name/gi/git-gamble/package.nix
+++ b/pkgs/by-name/gi/git-gamble/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "git-gamble";
-  version = "2.14.2";
+  version = "2.14.4";
 
   src = fetchFromGitLab {
     owner = "pinage404";
     repo = "git-gamble";
-    rev = "version/${finalAttrs.version}";
-    hash = "sha256-UPiktBeMPZf9vrKz5XFyMzBJtxCe0ojJabeIwhyo9/g=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-DjwdoM9/W1UeD/XqVMXTyzjdcJLfHiAqRA3r//rkn1U=";
   };
 
-  cargoHash = "sha256-yMlb3c2V3NUFw/GDPyCqTCSz+YLn3F9wmeP12jTySCI=";
+  cargoHash = "sha256-X3kJT0pscCH9sQxV3NkX0hL2sccTJHgMj0UeIpJOWJ4=";
 
   nativeCheckInputs = [ gitMinimal ];
   preCheck = ''
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
-      "version/(.*)"
+      "v(.*)"
     ];
   };
 

From a2808548304ec9485b95e4a4f0f16bd01b42cac8 Mon Sep 17 00:00:00 2001
From: Johan Herland <johan.herland@tweag.io>
Date: Mon, 15 Jun 2026 10:24:46 +0200
Subject: [PATCH 0042/1386] python3Packages.liger-kernel: init at 0.8.0

---
 .../python-modules/liger-kernel/default.nix   | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/liger-kernel/default.nix

diff --git a/pkgs/development/python-modules/liger-kernel/default.nix b/pkgs/development/python-modules/liger-kernel/default.nix
new file mode 100644
index 000000000000..8454e6933a35
--- /dev/null
+++ b/pkgs/development/python-modules/liger-kernel/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  torch,
+  triton,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "liger-kernel";
+  version = "0.8.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "linkedin";
+    repo = "liger-kernel";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MAJ0goMxi8qA+ODd/kLIO7hp4dmNIOPLpSdkrm7hnnQ=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    torch
+    triton
+  ];
+
+  # Requires NVIDIA driver.
+  doCheck = false;
+
+  pythonImportsCheck = [ "liger_kernel" ];
+
+  meta = {
+    description = "Efficient Triton Kernels for LLM Training";
+    homepage = "https://github.com/linkedin/liger-kernel";
+    changelog = "https://github.com/linkedin/liger-kernel/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jherland ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11071cbaf5cc..44e64630d788 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9102,6 +9102,8 @@ self: super: with self; {
 
   lifx-emulator-core = callPackage ../development/python-modules/lifx-emulator-core { };
 
+  liger-kernel = callPackage ../development/python-modules/liger-kernel { };
+
   lightgbm = callPackage ../development/python-modules/lightgbm { };
 
   lightify = callPackage ../development/python-modules/lightify { };

From e589e6ad5dee25c7dbe232b8cbd14c3c60c3f4cc Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jun 2026 22:31:08 +0200
Subject: [PATCH 0043/1386] reddsaver: fix erroned attribute

---
 pkgs/by-name/re/reddsaver/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/re/reddsaver/package.nix b/pkgs/by-name/re/reddsaver/package.nix
index c3536d8a9c7a..e37100aafe6d 100644
--- a/pkgs/by-name/re/reddsaver/package.nix
+++ b/pkgs/by-name/re/reddsaver/package.nix
@@ -22,9 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
-  # package does not contain tests as of v0.3.3
-  docCheck = false;
-
   meta = {
     description = "CLI tool to download saved media from Reddit";
     homepage = "https://github.com/manojkarthick/reddsaver";

From 044b1b8fea44cbff7ecd579841e45ae4847c093b Mon Sep 17 00:00:00 2001
From: coolcuber <rpgeorg@clemson.edu>
Date: Tue, 16 Jun 2026 12:54:28 -0400
Subject: [PATCH 0044/1386] nixos/plymouth: add showDelay option

---
 nixos/modules/system/boot/plymouth.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 3636503992c5..f4923c55e149 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -68,7 +68,7 @@ let
 
   configFile = pkgs.writeText "plymouthd.conf" ''
     [Daemon]
-    ShowDelay=0
+    ShowDelay=${toString cfg.showDelay}
     DeviceTimeout=8
     Theme=${cfg.theme}
     ${cfg.extraConfig}
@@ -166,6 +166,15 @@ in
         '';
       };
 
+      showDelay = mkOption {
+        type = types.numbers.nonnegative;
+        default = 0;
+        example = 0.5;
+        description = ''
+          Time (in seconds) to delay the splash screen.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";

From d6fd925cb64a30e1440c6c04c13ba0e75a981ae0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 14:57:31 +0000
Subject: [PATCH 0045/1386] python3Packages.glean-parser: 19.2.0 -> 20.0.1

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

diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index 920a7f412a6b..a0ab401a3321 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "glean-parser";
-  version = "19.2.0";
+  version = "20.0.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-oL2vnZWvaoZUPJb1IML0egeTU/ND/TsJqzC4fLnWyDY=";
+    hash = "sha256-e6d4QMqOR8/7F/Tstk7cH/aj1s4AZyI+BS5AnewePKk=";
   };
 
   build-system = [

From dbc8e73a26128e5645acece52b8890dad70ed01b Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Thu, 18 Jun 2026 11:25:30 +0200
Subject: [PATCH 0046/1386] ccextractor: 0.94-unstable-2025-05-20 -> 0.96.6

---
 .../cc/ccextractor/fix-avcodec-close.patch    | 13 -----
 pkgs/by-name/cc/ccextractor/package.nix       | 22 ++-------
 .../remove-default-commit-hash.patch          | 14 ------
 .../remove-vendored-libraries.patch           | 49 +++++--------------
 .../cc/ccextractor/use-rsmpeg-0.15.patch      | 42 ----------------
 5 files changed, 18 insertions(+), 122 deletions(-)
 delete mode 100644 pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch
 delete mode 100644 pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch
 delete mode 100644 pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch

diff --git a/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch b/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch
deleted file mode 100644
index c000d1eed8a9..000000000000
--- a/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/lib_ccx/hardsubx.c b/src/lib_ccx/hardsubx.c
-index 20b4388..fa6b5fa 100644
---- a/src/lib_ccx/hardsubx.c
-+++ b/src/lib_ccx/hardsubx.c
-@@ -125,7 +125,7 @@ int hardsubx_process_data(struct lib_hardsubx_ctx *ctx, struct lib_ccx_ctx *ctx_
- 	if (ctx->frame)
- 		av_frame_free(&ctx->frame);
- 	if (ctx->rgb_frame)
- 		av_frame_free(&ctx->rgb_frame);
--	avcodec_close(ctx->codec_ctx);
-+	avcodec_free_context(&ctx->codec_ctx);
- 	avformat_close_input(&ctx->format_ctx);
- }
diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix
index 0db6e5fc7165..6a9502ee0b17 100644
--- a/pkgs/by-name/cc/ccextractor/package.nix
+++ b/pkgs/by-name/cc/ccextractor/package.nix
@@ -31,24 +31,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ccextractor";
-  version = "0.94-unstable-2025-05-20";
+  version = "0.96.6";
 
   src = fetchFromGitHub {
     owner = "CCExtractor";
     repo = "ccextractor";
-    rev = "407d0f4e93611c5b0ceb14b7fc01d4a4c2e90433";
-    hash = "sha256-BfsQmCNB4HRafqJ3pC2ECiwhOgwKuIqiLjr2/bvHr7Q=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-nvfQX+1pM16ll7ruXcB22fWn2zQvmpUzKhD3vznEcbI=";
   };
 
   patches = [
-    ./remove-default-commit-hash.patch
     ./remove-vendored-libraries.patch
-    ./fix-avcodec-close.patch
-    (fetchpatch {
-      name = "CVE-2026-2245.patch";
-      url = "https://github.com/CCExtractor/ccextractor/commit/fd7271bae238ccb3ae8a71304ea64f0886324925.patch";
-      hash = "sha256-wZiJob5v4SVa5YBmiHuNvgphSi4PhTTb3hg4vs1lhVg=";
-    })
   ]
   ++ finalAttrs.cargoDeps.vendorStaging.patches;
 
@@ -58,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src cargoRoot;
-    patches = [ ./use-rsmpeg-0.15.patch ];
-    hash = "sha256-68Y8nzPHxhVIRHoPXOy9tc71177lCBuOf//z3cqyDGQ=";
+    hash = "sha256-0FPxU3rUoT3/Xy3mQjjQGmxkNjs++sQxjCJ1/UuRQlc=";
   };
 
   nativeBuildInputs = [
@@ -94,10 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
     # The tests are all part of one `cargo test` invocation, so let’s
     # get the output from it.
     (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--verbose")
-
-    # TODO: This (and the corresponding patch) should probably be
-    # removed for the next stable release.
-    (lib.cmakeFeature "GIT_COMMIT_HASH" finalAttrs.src.rev)
   ]
   ++ lib.optionals enableOcr [
     (lib.cmakeBool "WITH_OCR" true)
@@ -140,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = lib.optionalString enableOcr ''
     substituteInPlace src/lib_ccx/ocr.c \
-      --replace-fail 'getenv("TESSDATA_PREFIX")' '"${tesseract}/share"'
+      --replace-fail 'getenv("TESSDATA_PREFIX")' '"${tesseract}/share/"'
   '';
 
   meta = {
diff --git a/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch b/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch
deleted file mode 100644
index 07872941084e..000000000000
--- a/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d7fdda02e3...2738cab631 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -24,9 +24,6 @@
-             OUTPUT_VARIABLE GIT_COMMIT_HASH
-             OUTPUT_STRIP_TRAILING_WHITESPACE
-     )
--ELSE(EXISTS "${BASE_PROJ_DIR}/.git")
--    set(GIT_BRANCH "Unknown")
--    set(GIT_COMMIT_HASH "Unknown")
- ENDIF(EXISTS "${BASE_PROJ_DIR}/.git")
- 
- #Get the date
diff --git a/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch
index 122707c7f21e..a5f2090ae42e 100644
--- a/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch
+++ b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch
@@ -1,13 +1,12 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2738cab631...5bb2b7d17a 100644
+index 95e27199..a1695a3f 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -48,93 +48,20 @@
+@@ -49,74 +49,14 @@ endif()
  include_directories(${PROJECT_SOURCE_DIR})
  include_directories(${PROJECT_SOURCE_DIR}/lib_ccx)
  include_directories(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi)
 -include_directories(${PROJECT_SOURCE_DIR}/thirdparty)
--include_directories(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c)
  include_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash)
 -include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng)
  
@@ -27,13 +26,11 @@ index 2738cab631...5bb2b7d17a 100644
 -include_directories(${PROJECT_SOURCE_DIR}/thirdparty/freetype/include)
  aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash/ SOURCEFILE)
 -aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/ SOURCEFILE)
--aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/ SOURCEFILE)
 -aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/zlib/ SOURCEFILE)
  aux_source_directory(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi/ SOURCEFILE)
  
 -set(UTF8PROC_SOURCE ${PROJECT_SOURCE_DIR}/thirdparty/utf8proc/utf8proc.c)
-+set(UTF8PROC_SOURCE)
- 
+-
 -set(FREETYPE_SOURCE
 -        ${PROJECT_SOURCE_DIR}/thirdparty/freetype/autofit/autofit.c
 -        ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftbase.c
@@ -77,10 +74,13 @@ index 2738cab631...5bb2b7d17a 100644
 -        ${PROJECT_SOURCE_DIR}/thirdparty/freetype/type42/type42.c
 -        ${PROJECT_SOURCE_DIR}/thirdparty/freetype/winfonts/winfnt.c
 -        )
++set(UTF8PROC_SOURCE)
++
 +set(FREETYPE_SOURCE)
  #Windows specific libraries and linker flags
  if(WIN32)
-     include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/")
+     if(NOT MINGW)
+@@ -125,17 +65,6 @@ if(WIN32)
      include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/")
      aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/" SOURCEFILE)
      set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt)
@@ -98,21 +98,11 @@ index 2738cab631...5bb2b7d17a 100644
  endif(WIN32)
  
  if(MSVC)
-@@ -212,9 +139,6 @@
-   pkg_check_modules (NANOMSG REQUIRED libnanomsg)
-   set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_STATIC_LIBRARIES})
- 
--  include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/")
--  aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/" SOURCEFILE)
--
-   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SHARING")
- endif (PKG_CONFIG_FOUND AND WITH_SHARING)
- 
 diff --git a/src/lib_ccx/CMakeLists.txt b/src/lib_ccx/CMakeLists.txt
-index 4f329bcaab...a334d20c4d 100644
+index a891560b..154c1c15 100644
 --- a/src/lib_ccx/CMakeLists.txt
 +++ b/src/lib_ccx/CMakeLists.txt
-@@ -13,9 +13,39 @@
+@@ -13,9 +13,39 @@ endif(WIN32)
  find_package(PkgConfig)
  pkg_check_modules (GPAC REQUIRED gpac)
  
@@ -152,16 +142,16 @@ index 4f329bcaab...a334d20c4d 100644
  if (WITH_FFMPEG)
      find_package(PkgConfig)
  
-@@ -94,7 +124,7 @@
-     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_RUST")
- endif (WITHOUT_RUST)
+@@ -87,7 +117,7 @@ if (WITH_HARDSUBX)
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HARDSUBX")
+ endif (WITH_HARDSUBX)
  
 -file (GLOB HeaderFiles *.h)
 +file (GLOB_RECURSE HeaderFiles *.h)
  file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
                    "includedir=\${prefix}/include\n"
                    "libdir=\${prefix}/lib\n\n"
-@@ -102,8 +132,8 @@
+@@ -95,8 +125,8 @@ file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
                    "Description: Closed Caption Extraction library\n"
                    "Version: 0.75\n"
                    "Cflags: -I\${includedir}/\n"
@@ -172,16 +162,3 @@ index 4f329bcaab...a334d20c4d 100644
                    )
  
  install (TARGETS ccx DESTINATION lib)
-diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c
-index eb1562e50c...984070a285 100644
---- a/src/lib_ccx/params.c
-+++ b/src/lib_ccx/params.c
-@@ -14,7 +14,7 @@
- #include "../lib_hash/sha2.h"
- #include <string.h>
- #include <stdio.h>
--#include <utf8proc/utf8proc.h>
-+#include <utf8proc.h>
- 
- #ifdef ENABLE_OCR
- #include <tesseract/capi.h>
diff --git a/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch b/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch
deleted file mode 100644
index 2f5fe1eac532..000000000000
--- a/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
-index 5c49573775..3e855aa637 100644
---- a/src/rust/Cargo.lock
-+++ b/src/rust/Cargo.lock
-@@ -665,11 +665,10 @@
- 
- [[package]]
- name = "rsmpeg"
--version = "0.14.2+ffmpeg.6.1"
-+version = "0.15.1+ffmpeg.7.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "927012cd6ae43519f519741f4a69602ce3a47cf84750784da124dffd03527cc0"
-+checksum = "d3ffbead667d06e0c77c4363f83d49a3481cc3838bc9a61882aa07b01e3f63e1"
- dependencies = [
-- "libc",
-  "paste",
-  "rusty_ffmpeg",
-  "thiserror",
-@@ -711,9 +710,9 @@
- 
- [[package]]
- name = "rusty_ffmpeg"
--version = "0.13.3+ffmpeg.6.1"
-+version = "0.14.1+ffmpeg.7.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "716adffa5f909c8533611b1dab9ab5666bece35687845865b75ed6a990fc239c"
-+checksum = "40f4db8e3e23d4a3044d53a41aba5324eae70d3e7fe82375ce833521533bc315"
- dependencies = [
-  "bindgen 0.69.4",
-  "camino",
-diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
-index 4c1e73dcf0..68502915dc 100644
---- a/src/rust/Cargo.toml
-+++ b/src/rust/Cargo.toml
-@@ -15,7 +15,7 @@
- env_logger = "0.8.4"
- palette = "0.6.1"
--rsmpeg = { version = "0.14.2", optional = true, features = [
-+rsmpeg = { version = "0.15.1", optional = true, features = [
-     "link_system_ffmpeg",
- ] }
- tesseract-sys = { version = "0.5.15", optional = true, default-features = false }

From c64a69ac8d59bb7665a6c94b1abefffd0d793d28 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 16 Jun 2026 15:16:57 -0300
Subject: [PATCH 0047/1386] dotnetCorePackages.dotnet_{8..11}.vmr: reintroduce
 fix for intermittent compiler error

---
 pkgs/development/compilers/dotnet/source/vmr.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix
index d18695163353..cd1bfa303a3c 100644
--- a/pkgs/development/compilers/dotnet/source/vmr.nix
+++ b/pkgs/development/compilers/dotnet/source/vmr.nix
@@ -186,6 +186,16 @@ stdenv.mkDerivation {
       -s //Project -t elem -n PropertyGroup \
       -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \
       src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
+
+    # AD0001 crashes intermittently in source-build-reference-packages with
+    # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'.
+    # https://github.com/dotnet/roslyn/issues/81645
+    xmlstarlet ed \
+      --inplace \
+      -s //Project -t elem -n PropertyGroup \
+      -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \
+      src/source-build-assets/src/referencePackages/Directory.Build.props
+
   ''
   + lib.optionalString (lib.versionOlder version "10") ''
     # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848

From 0e1200be2a9b4e422907bd43defc9d3bf480454e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jun 2026 00:14:55 +0000
Subject: [PATCH 0048/1386] protonmail-desktop: 1.13.0 -> 1.13.3

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

diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 3b9df20572d8..2220665c5616 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -10,9 +10,9 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.13.0";
-  linuxHash = "sha256-ehvDkemVmKQuNm9FgKtUM/M/z4YMjXA8qtLt94SN73U=";
-  darwinHash = "sha256-YtLlW+fSRd3hJMjHOA3kXKKq2j71Edc8NW/55zTLywY=";
+  version = "1.13.3";
+  linuxHash = "sha256-ZG3l9QhNtSXjkJ4wa/bJ15Kd7MIgw68tJTPP653HTIg=";
+  darwinHash = "sha256-C0URhmxcbQfP8uMe8nRuUx5f0JL0BMvvrWFfXHCVR90=";
 in
 stdenv.mkDerivation {
   pname = "protonmail-desktop";

From 994755f0ede9b16ba5684d38bd54bb6137fd7945 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jun 2026 18:51:23 +0000
Subject: [PATCH 0049/1386] tree-sitter-grammars.tree-sitter-r: 1.2.0 -> 1.3.0

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 178561f27088..8f35b1e9d52e 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2226,9 +2226,9 @@
   };
 
   r = {
-    version = "1.2.0";
+    version = "1.3.0";
     url = "github:r-lib/tree-sitter-r";
-    hash = "sha256-SkCLFIUvJWTtg4m5NMfHbBKald470Kni2mhj2Oxc5ZU=";
+    hash = "sha256-KSmrEe1W7gAowfVz9wVqfgm7p1ekMiLLrjdPuMX0Rb8=";
     meta = {
       license = lib.licenses.mit;
     };

From 36b9b6e8f863946936063e6e2fe8718aaa660066 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 03:20:08 +0000
Subject: [PATCH 0050/1386] cgal: 6.1.1 -> 6.2

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

diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix
index 9c7be9d86df0..f49fbddeae49 100644
--- a/pkgs/by-name/cg/cgal/package.nix
+++ b/pkgs/by-name/cg/cgal/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cgal";
-  version = "6.1.1";
+  version = "6.2";
 
   src = fetchurl {
     url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-UlBpNfcOJH7Sd348ZfIOhveSCMKi0OGArnR12vEclu8=";
+    sha256 = "sha256-+8MoFnRehxpcvetiRTF+nb8QrhqVewqx7bALT94Auo0=";
   };
 
   patches = [ ./cgal_path.patch ];

From bafd18e0d8f2edfc7827fbe683eed509f02a3d97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 18:45:05 +0000
Subject: [PATCH 0051/1386] tree-sitter-grammars.tree-sitter-robot: 1.3.0 ->
 1.4.0

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 178561f27088..b5d888dc6419 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2302,9 +2302,9 @@
   };
 
   robot = {
-    version = "1.3.0";
+    version = "1.4.0";
     url = "github:Hubro/tree-sitter-robot";
-    hash = "sha256-GJTZMIOrEXsfVzVigF2XKKDxchkOGv0zEya5o9k5ZnY=";
+    hash = "sha256-U89K9S7zkUZ0CoT2FgvKIvQ3ApjRe59YoWrks/iQ0FM=";
     meta = {
       license = lib.licenses.isc;
       maintainers = with lib.maintainers; [

From 70849de9e76bd0dc594ecad8e2f6145f2298c4d3 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 21 Jun 2026 21:43:39 -0700
Subject: [PATCH 0052/1386] pnmixer: remove unused pcre dependency

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

diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix
index a8046dc4f78e..4840b0f5f6f0 100644
--- a/pkgs/by-name/pn/pnmixer/package.nix
+++ b/pkgs/by-name/pn/pnmixer/package.nix
@@ -10,13 +10,16 @@
   glib,
   libnotify,
   libx11,
-  pcre,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pnmixer";
   version = "0.7.2";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+  enableParallelBuilding = true;
+
   src = fetchFromGitHub {
     owner = "nicklan";
     repo = "pnmixer";
@@ -41,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libnotify
     libx11
-    pcre
   ];
 
   meta = {

From df57414e817ced48bec37d483706e0c7950f8e01 Mon Sep 17 00:00:00 2001
From: lubsch <33580245+Lubsch@users.noreply.github.com>
Date: Thu, 11 Jun 2026 20:44:14 +0200
Subject: [PATCH 0053/1386] zsh-patina: init at 1.7.0

---
 pkgs/by-name/zs/zsh-patina/package.nix | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/zs/zsh-patina/package.nix

diff --git a/pkgs/by-name/zs/zsh-patina/package.nix b/pkgs/by-name/zs/zsh-patina/package.nix
new file mode 100644
index 000000000000..21c42b1b3950
--- /dev/null
+++ b/pkgs/by-name/zs/zsh-patina/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "zsh-patina";
+  version = "1.7.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "michel-kraemer";
+    repo = "zsh-patina";
+    tag = finalAttrs.version;
+    hash = "sha256-sPlIT3UHtq+5+bpfrSPPfVXTdmqjEq+6k9tPShhG7h0=";
+  };
+
+  cargoHash = "sha256-j2MwEwQhSCUCwANAxr0aZjJ9iS0cGzRRttfK8LONEpg=";
+
+  nativeBuildInputs = [ installShellFiles ];
+  postInstall = ''
+    install -Dm644 LICENSE $out/share/licenses/zsh-patina/LICENSE
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd zsh-patina --zsh <($out/bin/zsh-patina completion)
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Zsh syntax highlighter";
+    homepage = "https://github.com/michel-kraemer/zsh-patina";
+    changelog = "https://github.com/michel-kraemer/zsh-patina/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lubsch ];
+    platforms = lib.platforms.unix;
+    mainProgram = "zsh-patina";
+  };
+})

From 9a9ef8510964a85ad58dd0c0361166c22019f038 Mon Sep 17 00:00:00 2001
From: Eric Wolf <robo-eric@gmx.de>
Date: Wed, 24 Jun 2026 01:36:10 +0200
Subject: [PATCH 0054/1386] maintainers: add Deric-W

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 26d7e7fa77b5..3a61d3519a7f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6716,6 +6716,13 @@
     githubId = 77843198;
     name = "Vasilis Manetas";
   };
+  Deric-W = {
+    email = "robo-eric@gmx.de";
+    github = "Deric-W";
+    githubId = 42873573;
+    name = "Eric Wolf";
+    keys = [ { fingerprint = "ADAA B6F3 A955 5589 D66C  CE61 80D2 DA42 8A4A 537F"; } ];
+  };
   DerickEddington = {
     email = "derick.eddington@pm.me";
     github = "DerickEddington";

From 168a9c3adfc8cb0e77c29f991fce6e665ff5ee16 Mon Sep 17 00:00:00 2001
From: Eric Wolf <robo-eric@gmx.de>
Date: Wed, 24 Jun 2026 01:38:10 +0200
Subject: [PATCH 0055/1386] fail2ban: add Deric-W to maintainers

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

diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix
index e851036fbafa..739a79c530e0 100644
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@@ -113,6 +113,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://www.fail2ban.org/";
     description = "Program that scans log files for repeated failing login attempts and bans IP addresses";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      Deric-W
+    ];
   };
 })

From 3be23fbab1099ddc3d50185d0e64e9cc488be00d Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Wed, 24 Jun 2026 16:22:09 -0400
Subject: [PATCH 0056/1386] dnsmasq: libidn -> libidn2

upstream libidn recommends migrating to libidn2 wherever possible,
see https://codeberg.org/libidn/libidn. dnsmasq supports building
against libidn2, and the upstream debian packaging does so as well:
https://thekelleys.org.uk/gitweb-noai/?p=dnsmasq-debian.git;a=blob;f=debian/control;h=211c8fa5a3d9a26e8ef41763f37afa20cce24bcc;hb=HEAD#l10
thus, we should probably do the same.
---
 pkgs/by-name/dn/dnsmasq/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index c46aee2aebeb..e757543b412a 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   pkg-config,
   nettle,
-  libidn,
+  libidn2,
   libnetfilter_conntrack,
   nftables,
   buildPackages,
@@ -16,7 +16,7 @@
 let
   copts = lib.concatStringsSep " " (
     [
-      "-DHAVE_IDN"
+      "-DHAVE_LIBIDN2"
       "-DHAVE_DNSSEC"
     ]
     ++ lib.optionals dbusSupport [
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     nettle
-    libidn
+    libidn2
   ]
   ++ lib.optionals dbusSupport [ dbus ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [

From 25decb1a4dde0082408d2dbf0a99022af13b2534 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Jun 2026 11:00:41 +0200
Subject: [PATCH 0057/1386] open5gs: 2.7.7 -> 2.8.0

---
 pkgs/by-name/op/open5gs-webui/package.nix | 2 +-
 pkgs/by-name/op/open5gs/package.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open5gs-webui/package.nix b/pkgs/by-name/op/open5gs-webui/package.nix
index 872f7ccf77f2..a61c76de621c 100644
--- a/pkgs/by-name/op/open5gs-webui/package.nix
+++ b/pkgs/by-name/op/open5gs-webui/package.nix
@@ -9,5 +9,5 @@ buildNpmPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/webui";
 
-  npmDepsHash = "sha256-Epz+pCbgejkj7vcdwbPC2RfAkp2HRqGV0urXiiBrjZQ=";
+  npmDepsHash = "sha256-PtZzC9PWIAAuh4Hy/whZHgzzlnXykevhGT2f1Mc+VFM=";
 })
diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix
index f934093ffc48..462b464f8837 100644
--- a/pkgs/by-name/op/open5gs/package.nix
+++ b/pkgs/by-name/op/open5gs/package.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open5gs";
-  version = "2.7.7";
+  version = "2.8.0";
 
   diameter = fetchFromGitHub {
     owner = "open5gs";
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "open5gs";
     repo = "open5gs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZK4q6m/9v+us+6dWpi0k188KfFu1b6G9pGE4VGAe4+4=";
+    hash = "sha256-e8iCcgJRJFEdVN3TeNwFFbBkShZebxKqvsCpBv/WLVk=";
   };
 
   nativeBuildInputs = [

From 34045fbc40cd4efff9760524f884f406b3b72613 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:32:38 +0000
Subject: [PATCH 0058/1386] =?UTF-8?q?argc:=20only=20set=20`$LOCALE=5FARCHI?=
 =?UTF-8?q?VE`=20if=20we=E2=80=99re=20running=20the=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index 845c341a2a5f..034cb0d210e9 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -42,9 +42,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env = {
     LANG = "C.UTF-8";
-  }
-  // lib.optionalAttrs (glibcLocales != null) {
-    LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+    LOCALE_ARCHIVE = lib.optionalString (
+      finalAttrs.finalPackage.doInstallCheck && glibcLocales != null
+    ) "${glibcLocales}/lib/locale/locale-archive";
   };
 
   doInstallCheck = true;

From eae528082df38313afe61947296a046c1be9ef70 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:32:38 +0000
Subject: [PATCH 0059/1386] argc: use `pkgsCross.gnu64` for cross test on
 Darwin too

---
 pkgs/by-name/ar/argc/package.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index 034cb0d210e9..f038fec73678 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -55,14 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     updateScript = nix-update-script { };
     tests = {
       cross =
-        (
-          if stdenv.hostPlatform.isDarwin then
-            if stdenv.hostPlatform.isAarch64 then pkgsCross.x86_64-darwin else pkgsCross.aarch64-darwin
-          else if stdenv.hostPlatform.isAarch64 then
-            pkgsCross.gnu64
-          else
-            pkgsCross.aarch64-multiplatform
-        ).argc;
+        (if stdenv.hostPlatform.isAarch64 then pkgsCross.gnu64 else pkgsCross.aarch64-multiplatform).argc;
     };
   };
 

From aa2d70342d383ec8cbfb1f101ca32404df4fc586 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 00:32:56 +0000
Subject: [PATCH 0060/1386] tree-sitter-grammars.tree-sitter-powershell: 0.26.3
 -> 0.26.5

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 3b3bc22c085e..5a9487e0ac12 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2091,9 +2091,9 @@
   };
 
   powershell = {
-    version = "0.26.3";
+    version = "0.26.5";
     url = "github:airbus-cert/tree-sitter-powershell";
-    hash = "sha256-ETuZcVSvHF5ILN6+xjWlQM5IiT/+dtxdSckrHJSJSWk=";
+    hash = "sha256-U/SdC2d5BOmxCCPlLSbOERogrZKfOGRWwbRuBa6C0pU=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 98befc7667a987f85b6e457fc30560a4e572a370 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 22 Jun 2026 10:44:48 +0200
Subject: [PATCH 0061/1386] powerdns-admin: fix reset password

---
 ...-overwriting-password-with-empty-val.patch | 30 +++++++++++++++++++
 pkgs/by-name/po/powerdns-admin/package.nix    |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/po/powerdns-admin/0008-Fix-profile-save-overwriting-password-with-empty-val.patch

diff --git a/pkgs/by-name/po/powerdns-admin/0008-Fix-profile-save-overwriting-password-with-empty-val.patch b/pkgs/by-name/po/powerdns-admin/0008-Fix-profile-save-overwriting-password-with-empty-val.patch
new file mode 100644
index 000000000000..22479605cd90
--- /dev/null
+++ b/pkgs/by-name/po/powerdns-admin/0008-Fix-profile-save-overwriting-password-with-empty-val.patch
@@ -0,0 +1,30 @@
+diff --git a/powerdnsadmin/models/user.py b/powerdnsadmin/models/user.py
+index 42f894f..f9d845e 100644
+--- a/powerdnsadmin/models/user.py
++++ b/powerdnsadmin/models/user.py
+@@ -435,7 +435,7 @@ class User(db.Model):
+                 name='Administrator').first().id
+ 
+         if hasattr(self, "plain_text_password"):
+-            if self.plain_text_password != None:
++            if self.plain_text_password:
+                 self.password = self.get_hashed_password(
+                     self.plain_text_password)
+         else:
+@@ -476,7 +476,7 @@ class User(db.Model):
+ 
+         # store new password hash (only if changed)
+         if hasattr(self, "plain_text_password"):
+-            if self.plain_text_password != None:
++            if self.plain_text_password:
+                 user.password = self.get_hashed_password(
+                     self.plain_text_password).decode("utf-8")
+ 
+@@ -495,7 +495,7 @@ class User(db.Model):
+         user.lastname = self.lastname if self.lastname else user.lastname
+ 
+         if hasattr(self, "plain_text_password"):
+-            if self.plain_text_password != None:
++            if self.plain_text_password:
+                 user.password = self.get_hashed_password(
+                  self.plain_text_password).decode("utf-8") 
diff --git a/pkgs/by-name/po/powerdns-admin/package.nix b/pkgs/by-name/po/powerdns-admin/package.nix
index ad085252faba..8fed4e899f41 100644
--- a/pkgs/by-name/po/powerdns-admin/package.nix
+++ b/pkgs/by-name/po/powerdns-admin/package.nix
@@ -133,6 +133,7 @@ stdenv.mkDerivation {
     ./0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
     ./0005-Fix-app-context-and-register-modules.patch
     ./0006-Fix-regex.patch
+    ./0008-Fix-profile-save-overwriting-password-with-empty-val.patch
   ];
 
   postPatch = ''

From 0ec599d5f10a41bae9757961c51253cea121a4dd Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 29 Jun 2026 10:42:49 +0200
Subject: [PATCH 0062/1386] powerdns-admin: fix oidc auth

---
 .../po/powerdns-admin/0007-Fix-oidc.patch     | 48 +++++++++++++++++++
 pkgs/by-name/po/powerdns-admin/package.nix    |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/po/powerdns-admin/0007-Fix-oidc.patch

diff --git a/pkgs/by-name/po/powerdns-admin/0007-Fix-oidc.patch b/pkgs/by-name/po/powerdns-admin/0007-Fix-oidc.patch
new file mode 100644
index 000000000000..39623650cd9d
--- /dev/null
+++ b/pkgs/by-name/po/powerdns-admin/0007-Fix-oidc.patch
@@ -0,0 +1,48 @@
+diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py
+index 23d88bb..edfab3f 100644
+--- a/powerdnsadmin/routes/index.py
++++ b/powerdnsadmin/routes/index.py
+@@ -392,11 +392,38 @@ def login():
+         return authenticate_user(user, 'Azure OAuth')
+ 
+     if 'oidc_token' in session:
+-        user_data = json.loads(oidc.get('userinfo').text)
+-        oidc_username = user_data[Setting().get('oidc_oauth_username')]
+-        oidc_first_name = user_data[Setting().get('oidc_oauth_firstname')]
+-        oidc_last_name = user_data[Setting().get('oidc_oauth_last_name')]
+-        oidc_email = user_data[Setting().get('oidc_oauth_email')]
++        try:
++            oidc_metadata = oidc.load_server_metadata()
++        except Exception as e:
++            current_app.logger.warning(
++                'OIDC: unable to load server metadata ({}); '
++                'falling back to relative userinfo endpoint'.format(e))
++            oidc_metadata = {}
++
++        userinfo_endpoint = oidc_metadata.get('userinfo_endpoint')
++        try:
++            if userinfo_endpoint:
++                userinfo_resp = oidc.get(userinfo_endpoint, timeout=15)
++            else:
++                userinfo_resp = oidc.get('userinfo', timeout=15)
++            userinfo_resp.raise_for_status()
++            user_data = userinfo_resp.json()
++        except Exception as e:
++            current_app.logger.error('OIDC: failed to fetch userinfo: {}'.format(e))
++            session.pop('oidc_token', None)
++            return redirect(url_for('index.login'))
++
++        oidc_username = user_data.get(Setting().get('oidc_oauth_username'))
++        oidc_first_name = user_data.get(Setting().get('oidc_oauth_firstname'), '')
++        oidc_last_name = user_data.get(Setting().get('oidc_oauth_last_name'), '')
++        oidc_email = user_data.get(Setting().get('oidc_oauth_email'), '')
++
++        if not oidc_username:
++            current_app.logger.error(
++                'OIDC: username claim "{}" not present in userinfo'.format(
++                    Setting().get('oidc_oauth_username')))
++            session.pop('oidc_token', None)
++            return redirect(url_for('index.login'))
+ 
+         user = User.query.filter_by(username=oidc_username).first()
+         if not user:
diff --git a/pkgs/by-name/po/powerdns-admin/package.nix b/pkgs/by-name/po/powerdns-admin/package.nix
index 8fed4e899f41..424fc71278cd 100644
--- a/pkgs/by-name/po/powerdns-admin/package.nix
+++ b/pkgs/by-name/po/powerdns-admin/package.nix
@@ -133,6 +133,7 @@ stdenv.mkDerivation {
     ./0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
     ./0005-Fix-app-context-and-register-modules.patch
     ./0006-Fix-regex.patch
+    ./0007-Fix-oidc.patch
     ./0008-Fix-profile-save-overwriting-password-with-empty-val.patch
   ];
 

From 789715ba5b2f432b70aaab1bc56ee2d15b43e204 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: Fri, 26 Jun 2026 22:23:20 +0700
Subject: [PATCH 0063/1386] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-25=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 595bb7bef992..6cb9d4a64ab7 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-25";
+  version = "2.3.0-rolling-2026-06-26";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "58a9a054300a09235df52954101a49573762e0fc";
-    hash = "sha256-TofY3JzWM4XNiMqna5KnmtBJETndJ/YY0sFY/0X99GA=";
+    rev = "428a48f16cb3d6035dee3c333ca14b1466b3f3ff";
+    hash = "sha256-DOVDElUOY+IuavcLR4KYwFYrBkooVmUbT8WUNao7Bwk=";
   };
 
   outputs = [

From 58db73c1953898286aa270e417e0388b0cd68cd6 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: Fri, 26 Jun 2026 22:27:19 +0700
Subject: [PATCH 0064/1386] h2o: optionally add Zstandard support

---
 pkgs/by-name/h2/h2o/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 6cb9d4a64ab7..32aa6ad16fbc 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -20,6 +20,8 @@
   ruby,
   withUring ? stdenv.hostPlatform.isLinux,
   liburing,
+  withZstandard ? true,
+  zstd,
   nixosTests,
 }:
 
@@ -53,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     ruby
   ]
-  ++ lib.optional withUring liburing;
+  ++ lib.optional withUring liburing
+  ++ lib.optional withZstandard zstd;
 
   buildInputs = [
     brotli
@@ -64,11 +67,13 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     wslay
   ]
-  ++ lib.optional withBrotli brotli;
+  ++ lib.optional withBrotli brotli
+  ++ lib.optional withZstandard zstd;
 
   cmakeFlags = [
     "-DWITH_BROTLI=${if withBrotli then "ON" else "OFF"}"
     "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}"
+    "-DWITH_ZSTD=${if withZstandard then "ON" else "OFF"}"
   ];
 
   postInstall = ''

From 2546ae0b2440b1b56586cd6bc72dfe7b053af730 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: Mon, 29 Jun 2026 17:17:18 +0700
Subject: [PATCH 0065/1386] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-26=C2=A0?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 32aa6ad16fbc..50191ac86634 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-26";
+  version = "2.3.0-rolling-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "428a48f16cb3d6035dee3c333ca14b1466b3f3ff";
-    hash = "sha256-DOVDElUOY+IuavcLR4KYwFYrBkooVmUbT8WUNao7Bwk=";
+    rev = "edd7a120bfc4af11ac0cbebce2a43cc1f93f9af1";
+    hash = "sha256-WQy+v4zpwzgbMxT43+Nd33+YPynyZIwqzVTaknqjCmE=";
   };
 
   outputs = [

From ab5db8031f23922368fbc5cdedbdb0acc759773b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 00:38:50 +0000
Subject: [PATCH 0066/1386] mediawiki: 1.45.3 -> 1.45.4

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

diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix
index 137a750715aa..0b8a4444421c 100644
--- a/pkgs/by-name/me/mediawiki/package.nix
+++ b/pkgs/by-name/me/mediawiki/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mediawiki";
-  version = "1.45.3";
+  version = "1.45.4";
 
   src = fetchurl {
     url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
-    hash = "sha256-XqjB8yHJ+Nuk0aweTsoYJ/sTUZ1KIZDiOfUUMgWKQmk=";
+    hash = "sha256-y3yCRGjrWlEacvCOYpHQncivEuCg/9wlMu4/drsMrXw=";
   };
 
   postPatch = ''

From a625efad9c10dee4a5f857c562b5e41626d17cf1 Mon Sep 17 00:00:00 2001
From: Olivier Nicole <olivier@chnik.fr>
Date: Fri, 26 Jun 2026 09:50:34 +0200
Subject: [PATCH 0067/1386] ocamlPackages.ansi: init at 0.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Assisted-by: Claude Sonnet 4.6 (Anthropic)
Co-authored-by: Léo <16472988+redianthus@users.noreply.github.com>
---
 .../ocaml-modules/ansi/default.nix            | 48 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ansi/default.nix

diff --git a/pkgs/development/ocaml-modules/ansi/default.nix b/pkgs/development/ocaml-modules/ansi/default.nix
new file mode 100644
index 000000000000..061ae83f5d8b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ansi/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  astring,
+  fmt,
+  tyxml,
+  alcotest,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "ansi";
+  version = "0.7.0";
+
+  minimalOCamlVersion = "4.10";
+
+  src = fetchFromGitHub {
+    owner = "ocurrent";
+    repo = "ansi";
+    tag = finalAttrs.version;
+    hash = "sha256-VZR8hz2v4gAvTkizBt59DSYr3tGPWT1Iid8m8YQx48Y=";
+  };
+
+  propagatedBuildInputs = [
+    astring
+    fmt
+    tyxml
+  ];
+
+  checkInputs = [
+    alcotest
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "ANSI escape sequence parser";
+    longDescription = ''
+      This package provides a basic ANSI escape parser. Program output (such as
+      build logs) often includes ANSI escape codes to colour and style the output.
+      This library interprets some of the common codes and can convert them to
+      HTML, producing basic styled output (e.g. highlighting errors in red).
+    '';
+    homepage = "https://github.com/ocurrent/ansi";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ otini ];
+  };
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 71cfe7da5118..aeac1465c472 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -50,6 +50,8 @@ let
 
         angstrom-unix = callPackage ../development/ocaml-modules/angstrom-unix { };
 
+        ansi = callPackage ../development/ocaml-modules/ansi { };
+
         ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
 
         ao = callPackage ../development/ocaml-modules/ao { };

From 5bae6f2287726944fa167d79bb2c681d43a99aeb Mon Sep 17 00:00:00 2001
From: Marek Kubica <marek@tarides.com>
Date: Thu, 2 Jul 2026 15:08:32 +0200
Subject: [PATCH 0068/1386] ocaml: Update license

OCaml has switched away from QPL to LGPL2.1 around 10 years ago:
https://github.com/ocaml/ocaml/commit/7fc2d214c4ee8853615fc3e5649f45e11d85378d
at the 4.04 release.

Nixpkgs does not have such old versions so might as well set the version
for all of them to `lgpl21`.
---
 pkgs/development/compilers/ocaml/generic.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index d074173a8143..38fbc755582a 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -214,10 +214,7 @@ stdenv.mkDerivation (
     meta = {
       homepage = "https://ocaml.org/";
       branch = versionNoPatch;
-      license = with lib.licenses; [
-        qpl # compiler
-        lgpl2 # library
-      ];
+      license = lib.licenses.lgpl21;
       description = "OCaml is an industrial-strength programming language supporting functional, imperative and object-oriented styles";
 
       maintainers = [ lib.maintainers.georgyo ];

From b057d51894dc5df108d5b0c57a6a120d6fa9784f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:01:58 +0700
Subject: [PATCH 0069/1386] python3Packages.signalslot: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix
index a7e12c9c0a32..d6a4afad0966 100644
--- a/pkgs/development/python-modules/signalslot/default.nix
+++ b/pkgs/development/python-modules/signalslot/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   contexter,
   eventlet,
   mock,
@@ -13,7 +14,7 @@
 buildPythonPackage rec {
   pname = "signalslot";
   version = "0.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -26,7 +27,9 @@ buildPythonPackage rec {
       --replace "--cov-report html" ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     contexter
     six
   ];

From 0db60be2d3707a89c00ceb739ba21c822fd890f5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:04:35 +0700
Subject: [PATCH 0070/1386] python3Packages.signalslot: modernize

---
 .../python-modules/signalslot/default.nix           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix
index d6a4afad0966..18689588d685 100644
--- a/pkgs/development/python-modules/signalslot/default.nix
+++ b/pkgs/development/python-modules/signalslot/default.nix
@@ -11,20 +11,23 @@
   six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "signalslot";
   version = "0.2.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    pname = "signalslot";
+    inherit (finalAttrs) version;
     hash = "sha256-ZNodibNGfCOa8xd3myN+cRa28rY3/ynNUia1kwjTIOU=";
   };
 
   postPatch = ''
     substituteInPlace setup.cfg \
-      --replace "--pep8 --cov" "" \
-      --replace "--cov-report html" ""
+      --replace-fail "--pep8 --cov" "" \
+      --replace-fail "--cov-report html" ""
   '';
 
   build-system = [ setuptools ];
@@ -53,4 +56,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ myaats ];
   };
-}
+})

From 1444d7ded617fb7254961253dcb1b5ae4f3f16d5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:10:50 +0700
Subject: [PATCH 0071/1386] python3Packages.simber: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix
index 98aab295b2b3..af22cf04df2a 100644
--- a/pkgs/development/python-modules/simber/default.nix
+++ b/pkgs/development/python-modules/simber/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   colorama,
   pytestCheckHook,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "simber";
   version = "0.2.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deepjyoti30";
@@ -18,7 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco=";
   };
 
-  propagatedBuildInputs = [ colorama ];
+  build-system = [ setuptools ];
+
+  dependencies = [ colorama ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From fbca1d01f0ba115b8ad86e50946b44795d8e0858 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:11:54 +0700
Subject: [PATCH 0072/1386] python3Packages.simanneal: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
index ebface191aaf..c12584a3d02f 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -2,13 +2,14 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
+  setuptools,
   pytest,
 }:
 
 buildPythonPackage rec {
   pname = "simanneal";
   version = "0.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "perrygeo";
@@ -17,6 +18,8 @@ buildPythonPackage rec {
     hash = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytest ];
   checkPhase = "pytest tests";
 

From 7dccb3728a05279bfba8b464b3f4e57e2368be17 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:13:19 +0700
Subject: [PATCH 0073/1386] python3Packages.simber: modernize

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

diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix
index af22cf04df2a..ce93635e115e 100644
--- a/pkgs/development/python-modules/simber/default.nix
+++ b/pkgs/development/python-modules/simber/default.nix
@@ -7,15 +7,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "simber";
   version = "0.2.6";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "deepjyoti30";
     repo = "simber";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco=";
   };
 
@@ -30,8 +32,8 @@ buildPythonPackage rec {
   meta = {
     description = "Simple, minimal and powerful logger for Python";
     homepage = "https://github.com/deepjyoti30/simber";
-    changelog = "https://github.com/deepjyoti30/simber/releases/tag/${version}";
+    changelog = "https://github.com/deepjyoti30/simber/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ j0hax ];
   };
-}
+})

From eaa544a9f93bbc1433ce230d83cb41d452ef9fe3 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:16:03 +0700
Subject: [PATCH 0074/1386] python3Packages.simanneal: modernize

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

diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
index c12584a3d02f..ff553295916a 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -6,15 +6,17 @@
   pytest,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "simanneal";
   version = "0.5.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "perrygeo";
     repo = "simanneal";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk=";
   };
 
@@ -23,10 +25,12 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytest ];
   checkPhase = "pytest tests";
 
+  pythonImportsCheck = [ "simanneal" ];
+
   meta = {
     description = "Python implementation of the simulated annealing optimization technique";
     homepage = "https://github.com/perrygeo/simanneal";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 7647f73df896909f212f8d12ed1b98cc0deba01e Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Thu, 2 Jul 2026 15:59:31 -0400
Subject: [PATCH 0075/1386] nix-index-unwrapped: 0.1.10 -> 0.1.11

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

diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 060f79e0ff17..e7e791d817e0 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nix-index";
-  version = "0.1.10";
+  version = "0.1.11";
 
   __structuredAttrs = true;
 
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "nix-community";
     repo = "nix-index";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IBVI/4hwq84/vZx7Kr/Ci/P/CzPTsn1/oiCIF2vPHXg=";
+    hash = "sha256-yl/acohrgP0C5w4eozNcWcpCGhmMMjFbzgHsKwXKw00=";
   };
 
-  cargoHash = "sha256-9xzC5PE2nyEtbhWGagCX2yZ0/tfo2v3fatnNU+GdVH8=";
+  cargoHash = "sha256-EJbNptLskphe+xfI8oQ0DVUx6y4dO52eeuPiG6FSQbI=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 2b686ec2f658005ec5d170efbbe1791563a848c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 00:28:59 +0000
Subject: [PATCH 0076/1386] webtunnel: 0.0.4 -> 0.0.5

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

diff --git a/pkgs/by-name/we/webtunnel/package.nix b/pkgs/by-name/we/webtunnel/package.nix
index 9c3ea36bebd8..bc8de978ee66 100644
--- a/pkgs/by-name/we/webtunnel/package.nix
+++ b/pkgs/by-name/we/webtunnel/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "webtunnel";
-  version = "0.0.4";
+  version = "0.0.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
     owner = "anti-censorship/pluggable-transports";
     repo = "webtunnel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-00Wq2/xuDNftXG+r95/HyEcWQSX0GaQao28CG8yIiR4=";
+    hash = "sha256-9dXlkIkCERy/eFsVrAfBkbjU6aEeJLGmlLjLuXTwAs8=";
   };
 
   vendorHash = "sha256-3AAPySLAoMimXUOiy8Ctl+ghG5q+3dWRNGXHpl9nfG0=";

From 3e4bef3e25d830d7b7968514bfa96ee802f478cb Mon Sep 17 00:00:00 2001
From: Johan Herland <johan.herland@tweag.io>
Date: Thu, 2 Jul 2026 10:45:07 +0200
Subject: [PATCH 0077/1386] python3Packages.swi-tools: init at 1.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 泥鰍 <165534185+Holiu618@users.noreply.github.com>
---
 .../python-modules/swi-tools/default.nix      | 71 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/development/python-modules/swi-tools/default.nix

diff --git a/pkgs/development/python-modules/swi-tools/default.nix b/pkgs/development/python-modules/swi-tools/default.nix
new file mode 100644
index 000000000000..79ce794c8a56
--- /dev/null
+++ b/pkgs/development/python-modules/swi-tools/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  versionCheckHook,
+  hatchling,
+  cryptography,
+  jsonschema,
+  pyparsing,
+  pyyaml,
+  typer,
+  zip,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "swi-tools";
+  version = "1.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "aristanetworks";
+    repo = "swi-tools";
+    # master branch is at 1.6, they don't have a v1.6 branch/tag
+    rev = "6db86f5983426d272e541a61e0add79b3fec5b1e";
+    hash = "sha256-enWxDrTFWxJCwHF8NjH2UvZ/cxJnldF5nxm+Xzmu4xY=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    cryptography
+    jsonschema
+    pyparsing
+    pyyaml
+    typer
+    zip
+  ];
+
+  # verify.py uses importlib.resources.files(__name__) but __name__ is
+  # "switools.verify" (a module, not a package).  The cert lives in the
+  # "switools" package directory, so we need to reference that instead.
+  postPatch = ''
+    substituteInPlace src/switools/verify.py \
+      --replace-fail 'import importlib' 'import importlib, importlib.resources' \
+      --replace-fail 'importlib.resources.files(__name__)' 'importlib.resources.files("switools")'
+  '';
+
+  # Importing verify triggers the importlib.resources cert load,
+  # so this catches the exact bug we patched above.
+  pythonImportsCheck = [
+    "switools"
+    "switools.verify"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    zip
+    versionCheckHook
+  ];
+
+  meta = {
+    description = "Scripts for operating on an Arista SWI or SWIX";
+    homepage = "https://github.com/aristanetworks/swi-tools";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jherland ];
+    mainProgram = "swi-tools";
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9033e7b92583..993914e67dce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19455,6 +19455,8 @@ self: super: with self; {
 
   swh-web-client = callPackage ../development/python-modules/swh-web-client { };
 
+  swi-tools = callPackage ../development/python-modules/swi-tools { };
+
   swift = callPackage ../development/python-modules/swift { };
 
   swifter = callPackage ../development/python-modules/swifter { };

From 274049c58c50e26b55a0a0b6fe9491012fc07f2a Mon Sep 17 00:00:00 2001
From: Mark Stosberg <mark@stosberg.com>
Date: Thu, 2 Jul 2026 22:35:39 -0400
Subject: [PATCH 0078/1386] bashmount: add runtime dependencies

---
 pkgs/by-name/ba/bashmount/package.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/by-name/ba/bashmount/package.nix b/pkgs/by-name/ba/bashmount/package.nix
index 2b8f6ca3c366..336d31a5b14b 100644
--- a/pkgs/by-name/ba/bashmount/package.nix
+++ b/pkgs/by-name/ba/bashmount/package.nix
@@ -2,6 +2,15 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  makeWrapper,
+  coreutils,
+  cryptsetup,
+  eject,
+  gnugrep,
+  gnused,
+  less,
+  udisks,
+  util-linux,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp bashmount $out/bin
@@ -31,6 +42,22 @@ stdenv.mkDerivation (finalAttrs: {
     cp NEWS    $out/share/doc/bashmount
   '';
 
+  postFixup = ''
+    wrapProgram $out/bin/bashmount \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          cryptsetup
+          eject
+          gnugrep
+          gnused
+          less
+          udisks
+          util-linux
+        ]
+      }
+  '';
+
   meta = {
     homepage = "https://github.com/jamielinux/bashmount";
     description = "Menu-driven bash script for the management of removable media with udisks";

From 3319ea786d5217221be7c0da0f9730e13ed075ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.dev>
Date: Fri, 3 Jul 2026 17:26:37 +0200
Subject: [PATCH 0079/1386] babashka: remove rlwrap

Babashka now includes JLine, rlwrap is no longer needed.
---
 pkgs/by-name/ba/babashka/package.nix | 43 ++++++++--------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/ba/babashka/package.nix b/pkgs/by-name/ba/babashka/package.nix
index cfdfc0910b6b..64e5a1694f03 100644
--- a/pkgs/by-name/ba/babashka/package.nix
+++ b/pkgs/by-name/ba/babashka/package.nix
@@ -1,22 +1,11 @@
 {
   stdenvNoCC,
-  lib,
   babashka-unwrapped,
   callPackage,
   makeWrapper,
   installShellFiles,
-  rlwrap,
   clojureToolsBabashka ? callPackage ./clojure-tools.nix { },
   jdkBabashka ? clojureToolsBabashka.jdk,
-
-  # rlwrap is a small utility to allow the editing of keyboard input, see
-  # https://book.babashka.org/#_repl
-  #
-  # NOTE In some cases, rlwrap prints some extra empty lines. That behavior can
-  # break some babashka scripts. For this reason, it is disabled by default. See:
-  # https://github.com/NixOS/nixpkgs/issues/246839
-  # https://github.com/NixOS/nixpkgs/pull/248207
-  withRlwrap ? false,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "babashka";
@@ -30,28 +19,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     installShellFiles
   ];
 
-  installPhase =
-    let
-      unwrapped-bin = "${babashka-unwrapped}/bin/bb";
-    in
-    ''
-      mkdir -p $out/clojure_tools
-      ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn
-      ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/*
+  installPhase = ''
+    mkdir -p $out/clojure_tools
+    ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn
+    ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/*
 
-      makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
-        --inherit-argv0 \
-        --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
-        --set-default JAVA_HOME ${jdkBabashka}
+    makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
+      --inherit-argv0 \
+      --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
+      --set-default JAVA_HOME ${jdkBabashka}
 
-      installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
-      installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb
-      installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
-    ''
-    + lib.optionalString withRlwrap ''
-      substituteInPlace $out/bin/bb \
-        --replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"'
-    '';
+    installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
+    installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb
+    installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
+  '';
 
   installCheckPhase = ''
     ${babashka-unwrapped.installCheckPhase}

From cc1f73169486ab43430c2e1ec7958405675c8714 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 17:11:26 +0000
Subject: [PATCH 0080/1386] tree-sitter-grammars.tree-sitter-nim:
 0.6.2-unstable-2026-03-21 -> 0.6.2-unstable-2026-07-03

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 601293797c4e..37464ae74e23 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1734,10 +1734,10 @@
   };
 
   nim = {
-    version = "0.6.2-unstable-2026-03-21";
+    version = "0.6.2-unstable-2026-07-03";
     url = "github:alaviss/tree-sitter-nim";
-    rev = "3878440d9398515ae053c6f6024986e69868bb74";
-    hash = "sha256-mdAT1jTFeVP8TYi4H36sjd826KmxHQ1EZ+8gd37NGfY=";
+    rev = "ac72ba30d16edf0be021588a9301ede4accd6cf4";
+    hash = "sha256-1jr8tKdKvKTKCUSEvC+vRGw+W1Rl3WMbv0ZS3u7H1GA=";
     meta = {
       license = lib.licenses.mpl20;
       maintainers = with lib.maintainers; [

From 4192b2933effc0414099561658ff20bf828eb9c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 May 2026 14:54:57 +0000
Subject: [PATCH 0081/1386] neomutt: 20260105 -> 20260616

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

diff --git a/pkgs/by-name/ne/neomutt/package.nix b/pkgs/by-name/ne/neomutt/package.nix
index dca6fcdd021a..ff97c41d134d 100644
--- a/pkgs/by-name/ne/neomutt/package.nix
+++ b/pkgs/by-name/ne/neomutt/package.nix
@@ -43,13 +43,13 @@ assert lib.warnIf enableMixmaster
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neomutt";
-  version = "20260504";
+  version = "20260616";
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "neomutt";
     tag = finalAttrs.version;
-    hash = "sha256-PVcQjuUWK0QwcDIuKsHTMWFCpYLHBG/3Hr1IbLtlJbg=";
+    hash = "sha256-MRFJ6y2XC3I0/IIWW/J09tW/IZpLcNy7hki0rqOB9RQ=";
   };
 
   buildInputs = [

From 236fd52fb4d260cca4d80ed7ab488a94f1a5f6c3 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 29 Jun 2026 21:07:08 +0200
Subject: [PATCH 0082/1386] accountsservice: 26.13.3 -> 26.27.3

changelog: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/releases/26.27.3

diff: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/compare/26.13.3...26.27.3
---
 pkgs/by-name/ac/accountsservice/fix-paths.patch | 9 ---------
 pkgs/by-name/ac/accountsservice/package.nix     | 7 +++----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ac/accountsservice/fix-paths.patch b/pkgs/by-name/ac/accountsservice/fix-paths.patch
index 19c4744e17d0..c512b35bef89 100644
--- a/pkgs/by-name/ac/accountsservice/fix-paths.patch
+++ b/pkgs/by-name/ac/accountsservice/fix-paths.patch
@@ -78,15 +78,6 @@ index da6428c..682842d 100644
                          argv[1] = "-s";
                          argv[2] = shell;
                          argv[3] = "--";
-@@ -3163,7 +3163,7 @@ user_change_icon_file_classic_authorized_cb (Daemon                *daemon,
-                         return;
-                 }
- 
--                argv[0] = "/bin/cat";
-+                argv[0] = "@coreutils@/bin/cat";
-                 argv[1] = filename;
-                 argv[2] = NULL;
- 
 @@ -3279,7 +3279,7 @@ user_change_locked_authorized_cb (Daemon                *daemon,
                  } else {
                          const gchar *argv[5];
diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix
index b184e5d0299e..ffe6259f2366 100644
--- a/pkgs/by-name/ac/accountsservice/package.nix
+++ b/pkgs/by-name/ac/accountsservice/package.nix
@@ -9,7 +9,6 @@
   gobject-introspection,
   polkit,
   systemdLibs,
-  coreutils,
   meson,
   mesonEmulatorHook,
   dbus,
@@ -23,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "accountsservice";
-  version = "26.13.3";
+  version = "26.27.3";
 
   outputs = [
     "out"
@@ -35,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "accountsservice";
     repo = "accountsservice";
     tag = finalAttrs.version;
-    hash = "sha256-ZIfkBlEaITX2rDcV5al4e2IFP238MXOlWeGoh+3+DoQ=";
+    hash = "sha256-/n0YCPZaf1SsTScidFUZcxfJkpv/+Bnb6Z7oKL+clgE=";
   };
 
   patches = [
     # Hardcode dependency paths.
     (replaceVars ./fix-paths.patch {
-      inherit shadow coreutils;
+      inherit shadow;
     })
 
     # Do not try to create directories in /var, that will not work in Nix sandbox.

From 1edf586e552fd15b48ed0e1c770eb437829d2df6 Mon Sep 17 00:00:00 2001
From: Fida Waseque Choudhury <fida.waseque@gmail.com>
Date: Sat, 4 Jul 2026 17:56:57 +0600
Subject: [PATCH 0083/1386] antigravity-cli: fix updateScript version handling

Expose the upstream version separately from the build id so nixpkgs-update can find and rewrite the package version. Keep wholeVersion derived for the upstream download URL.

The update script now updates version and buildId separately while preserving the existing per-system hash update flow.

Assisted-by: OpenAI Codex (GPT-5)
---
 pkgs/by-name/an/antigravity-cli/package.nix | 5 +++--
 pkgs/by-name/an/antigravity-cli/update.sh   | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix
index 21da4d2caa59..496b0c4e2731 100644
--- a/pkgs/by-name/an/antigravity-cli/package.nix
+++ b/pkgs/by-name/an/antigravity-cli/package.nix
@@ -6,8 +6,9 @@
   versionCheckHook,
 }:
 let
-  wholeVersion = "1.0.12-6156052174077952"; # unfortunately this has dumb versioning
-  version = builtins.head (lib.splitString "-" wholeVersion);
+  version = "1.0.12";
+  buildId = "6156052174077952";
+  wholeVersion = "${version}-${buildId}";
 
   throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
 
diff --git a/pkgs/by-name/an/antigravity-cli/update.sh b/pkgs/by-name/an/antigravity-cli/update.sh
index 746a57dd87e7..835800502981 100755
--- a/pkgs/by-name/an/antigravity-cli/update.sh
+++ b/pkgs/by-name/an/antigravity-cli/update.sh
@@ -3,6 +3,7 @@
 
 set -euo pipefail
 
+packageFile=pkgs/by-name/an/antigravity-cli/package.nix
 baseUrl=https://storage.googleapis.com/antigravity-public/antigravity-cli
 
 currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.version or (lib.getVersion antigravity-cli)")
@@ -15,8 +16,11 @@ fi
 
 # urls unfortunately include a weird buildid that make it hard to get
 latestWholeVersion=$(curl $baseUrl/$latestVersion/manifest.json | jq -r '.platforms."linux-x64".url' | cut -d/ -f6)
+latestBuildId=${latestWholeVersion#*-}
+currentBuildId=$(sed -n 's/.*buildId = "\([^"]*\)";.*/\1/p' "$packageFile")
 
-update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion || true
+sed -i "s/buildId = \"$currentBuildId\";/buildId = \"$latestBuildId\";/" "$packageFile"
+update-source-version --version-key=version antigravity-cli $latestVersion || true
 
 for system in \
     x86_64-linux \
@@ -25,5 +29,5 @@ for system in \
     aarch64-darwin; do
     hash=$(nix store prefetch-file --json --hash-type sha256 \
       $(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.src.url" --system "$system") | jq -r '.hash')
-    update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion $hash --system=$system --ignore-same-version
+    update-source-version --version-key=version antigravity-cli $latestVersion $hash --system=$system --ignore-same-version
 done

From ed47b93cb7f325ea07464be9f4b6d047c334975c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 00:07:37 +0000
Subject: [PATCH 0084/1386] python3Packages.rio-tiler: 9.3.0 -> 9.4.0

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

diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix
index fd2f0bb6e723..bc62ed5afb3c 100644
--- a/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/pkgs/development/python-modules/rio-tiler/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rio-tiler";
-  version = "9.3.0";
+  version = "9.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cogeotiff";
     repo = "rio-tiler";
     tag = finalAttrs.version;
-    hash = "sha256-Tf3F/XRGdPDZqlXQfRc5cvGvUvu94Y6TO2cFqjFsg5g=";
+    hash = "sha256-A3GBH9IALmjL1TvJ4fzZyIqd+y4F2ggItpzR+cXH5X0=";
   };
 
   build-system = [ hatchling ];

From 9fc91f061e2a8991e278c4fa7787763d5108cb8d Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Sat, 4 Jul 2026 23:37:15 -0400
Subject: [PATCH 0085/1386] spice: apply upstream patches for gcc 16

c++ does not allow designated initializers to refer to members of
anonymous unions, and gcc 16 rejects this. this appears in two places in
spice, so we pull the upstream patches that fix this but have not yet
made it into a release.
---
 pkgs/by-name/sp/spice/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/by-name/sp/spice/package.nix b/pkgs/by-name/sp/spice/package.nix
index 73e906604be8..da68b72128ec 100644
--- a/pkgs/by-name/sp/spice/package.nix
+++ b/pkgs/by-name/sp/spice/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -38,6 +39,22 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./remove-rt-on-darwin.patch
+
+    # C++ does not allow designated initializers to refer to members of
+    # anonymous unions. This fails with GCC 16, and was fixed upstream across
+    # two merge requests but not yet released.
+    # https://gitlab.freedesktop.org/spice/spice/-/merge_requests/246
+    (fetchpatch {
+      name = "spice-test-display-base-initializer-anonymous-union.patch";
+      url = "https://gitlab.freedesktop.org/spice/spice/-/commit/59bc22a40611121b2ea7888bf3c1a501c4fc0b91.patch";
+      hash = "sha256-VQ+DrzmIws3EyZU5c0OqMZwMltUvCW34h5oXuHB8YWs=";
+    })
+    # https://gitlab.freedesktop.org/spice/spice/-/merge_requests/244
+    (fetchpatch {
+      name = "spice-test-gst-initializer-anonymous-union.patch";
+      url = "https://gitlab.freedesktop.org/spice/spice/-/commit/a904cd86430aa555a50730e9389e210637a546c1.patch";
+      hash = "sha256-6GGqi+Y4I/oftE8zXuRnX021+r7SrQPUdAdBsCv9MIw=";
+    })
   ];
 
   nativeBuildInputs = [

From b39b1295f48a93e2d903347cf4642250af5e1cef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 11:13:18 +0000
Subject: [PATCH 0086/1386] firefly-iii-data-importer: 2.3.2 -> 2.3.4

---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index d9afbec8e06e..6b6bd3e8eaf4 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "2.3.2";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JLN13SCpMXByu3rWSclcsLBGCLFMzHGHOM+bWLJ2MPw=";
+    hash = "sha256-869oPalwVdc7Ge8zcG6OniTZ6zhLOknlvFQkEHzLg0M=";
   };
 
   buildInputs = [ php ];
@@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-QobjMMPEhLvsTwlJJvf4nUi1PcZEDOaU8EzexluOI90=";
+  vendorHash = "sha256-GEioAwqo9BHzoP4/uetqiQgv+O9Qzqyo/AcW9VP23n0=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-NkxCvC0EPMLi7GV5GG1+5niL3KIaqBsleo11/gzaX/s=";
+    hash = "sha256-FEEC89/7cEuKU4mY27Pm5nr5EkOoL7BWZRAOpCZK61I=";
   };
 
   composerRepository = php.mkComposerRepository {

From d3566faecc315d6b60028b44427b65d6b1db2fe6 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 5 Jul 2026 23:59:55 +0200
Subject: [PATCH 0087/1386] python3Packages.snuggs: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix
index a2833b340713..86f350694bdb 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/pkgs/development/python-modules/snuggs/default.nix
@@ -5,6 +5,7 @@
   fetchpatch,
   click,
   numpy,
+  setuptools,
   pyparsing,
   pytestCheckHook,
   hypothesis,
@@ -13,7 +14,7 @@
 buildPythonPackage rec {
   pname = "snuggs";
   version = "1.4.7";
-  format = "setuptools";
+  pyproject = true;
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
@@ -23,6 +24,8 @@ buildPythonPackage rec {
     sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf";
   };
 
+  build-system = [ setuptools ];
+
   patches = [
     # Use non-strict xfail for failing tests
     # https://github.com/mapbox/snuggs/pull/28
@@ -32,7 +35,7 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     click
     numpy
     pyparsing

From b466af555da6da3c956038a206d557a7d9c90551 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 6 Jul 2026 00:02:14 +0200
Subject: [PATCH 0088/1386] python3Packages.snuggs: use finalAttrs

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

diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix
index 86f350694bdb..dd7b45d8864b 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/pkgs/development/python-modules/snuggs/default.nix
@@ -11,7 +11,7 @@
   hypothesis,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snuggs";
   version = "1.4.7";
   pyproject = true;
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "snuggs";
-    rev = version;
-    sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf";
+    tag = finalAttrs.version;
+    hash = "sha256-jj8H9Rgq0MSOObDiN3UXXtx67BY+jKTXz1ZTL3SCdNw=";
   };
 
   build-system = [ setuptools ];
@@ -52,4 +52,4 @@ buildPythonPackage rec {
     homepage = "https://github.com/mapbox/snuggs";
     maintainers = [ ];
   };
-}
+})

From 35788ba00fea57d2edd24cbe8677da6f28f4d29f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 05:58:02 +0000
Subject: [PATCH 0089/1386] zabbix-agent2-plugin-postgresql: 7.4.8 -> 7.4.11

---
 pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
index 1b737855f1ed..49b74350fc3b 100644
--- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
+++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
@@ -6,11 +6,11 @@
 
 buildGoModule rec {
   pname = "zabbix-agent2-plugin-postgresql";
-  version = "7.4.8";
+  version = "7.4.11";
 
   src = fetchurl {
     url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
-    hash = "sha256-OyK86KZqQRFwuxyvnjHkt4U/kTa0z+/IJNXDkpJR+/w=";
+    hash = "sha256-braefXnk57gO2y2CK1Plfj88RwRE20B8VesW7zdO7Wc=";
   };
 
   vendorHash = null;

From 4ce1caf2f21cd02dd6524f343e6a64650b900836 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 09:46:15 +0000
Subject: [PATCH 0090/1386] bookstack: 26.05.1 -> 26.05.2

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

diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix
index e039d2c5f30d..dc23a741a899 100644
--- a/pkgs/by-name/bo/bookstack/package.nix
+++ b/pkgs/by-name/bo/bookstack/package.nix
@@ -8,16 +8,16 @@
 
 php83.buildComposerProject2 (finalAttrs: {
   pname = "bookstack";
-  version = "26.05.1";
+  version = "26.05.2";
 
   src = fetchFromGitHub {
     owner = "bookstackapp";
     repo = "bookstack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g68wTZ5jRwXEKvAF9nLfKfWGf1FDD15msSkXzzJkVDQ=";
+    hash = "sha256-AYOl84DY13A5HnyUVY97kelYgoTJyq8nzeaHoksWXtI=";
   };
 
-  vendorHash = "sha256-YJwJp+OtrCDgGFsZAjdlSx0LoxQFbylqCNW90MF8Kzo=";
+  vendorHash = "sha256-m98QXFqvdomVEVs2P8gnoKaYEBNYe/CchSvBEc448ko=";
 
   passthru = {
     phpPackage = php83;

From 2d5a96dca7838acda97c6286c68886f899230622 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Sat, 21 Mar 2026 06:00:00 -0400
Subject: [PATCH 0091/1386] rc: Simplify build system hack to generate
 "VERSION" macro

Upstream uses complicated rule in Makefile that depends on .git/index to
generate version.h. Instead of changing the rule, drop version.h from
the dependency graph and generate it in post-patch phase.
---
 pkgs/by-name/rc/rc/package.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/rc/rc/package.nix b/pkgs/by-name/rc/rc/package.nix
index 65d4a9e94dcb..1d8b372c4bc0 100644
--- a/pkgs/by-name/rc/rc/package.nix
+++ b/pkgs/by-name/rc/rc/package.nix
@@ -45,19 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  # TODO: think on a less ugly fixup
   postPatch = ''
-    ed -v -s Makefile << EOS
-    # - remove reference to now-inexistent git index file
-    /version.h:/ s| .git/index||
-    # - manually insert the git revision string
-    /v=/ c
-    ${"\t"}v=${builtins.substring 0 7 finalAttrs.src.rev}
-    .
-    /\.git\/index:/ d
-    w
-    q
-    EOS
+    sed -i '/main.o: version.h/ d' Makefile
+    cat << EOF > version.h
+    #define VERSION "1.7.4+${finalAttrs.src.rev}"
+    EOF
   '';
 
   nativeBuildInputs = [

From b00025d8fa9d67fe23372e0662f1f32680f5160d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 12:38:04 +0000
Subject: [PATCH 0092/1386] librevenge: 0.0.5 -> 0.0.6

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

diff --git a/pkgs/by-name/li/librevenge/package.nix b/pkgs/by-name/li/librevenge/package.nix
index 3f023b20b60f..f95a20070669 100644
--- a/pkgs/by-name/li/librevenge/package.nix
+++ b/pkgs/by-name/li/librevenge/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "librevenge";
-  version = "0.0.5";
+  version = "0.0.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${finalAttrs.version}/librevenge-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ=";
+    sha256 = "sha256-GerPXOVdf+apkKRRQlic332gx7aHAXl/EzSCy0Txifo=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 48a62528dc302c9a4fd827765b80fc34d619a7cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 14:19:54 +0000
Subject: [PATCH 0093/1386] kdePackages.qtkeychain: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 2394adc9d07f..37025c587d20 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtkeychain";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "frankosterfeld";
     repo = "qtkeychain";
     rev = version;
-    sha256 = "sha256-jS/JNGWrrhelQ4FTzl08Yv2+U4bkziojrmTuqfj2HX4=";
+    sha256 = "sha256-6Aw+hy3WCTr3iEiZns7aH82nkVSG/KMqEA2LE0XZ7Zo=";
   };
 
   dontWrapQtApps = true;

From e4eca2cad9c10e134a4a4b122772649a8b65e130 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 19:40:07 +0000
Subject: [PATCH 0094/1386] python3Packages.aioslimproto: 3.1.8 -> 3.1.9

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

diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix
index a76649e8bd5a..c54008a0c7ba 100644
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aioslimproto";
-  version = "3.1.8";
+  version = "3.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aioslimproto";
     tag = finalAttrs.version;
-    hash = "sha256-xHdwikriA6mcb7tmElqa6suINYxeyyGZQ5iO+P7dRCo=";
+    hash = "sha256-IyDgnBQC8EbDzwRFWgmVOf4lVNsmdiTaMfpWXHUa4oM=";
   };
 
   postPatch = ''

From 3ed8f86515fdc54dac4e9cf513b26383ff9b5e0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 20:21:21 +0000
Subject: [PATCH 0095/1386] libxmp: 4.7.0 -> 4.7.1

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

diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix
index f54013905da5..c170f837e902 100644
--- a/pkgs/by-name/li/libxmp/package.nix
+++ b/pkgs/by-name/li/libxmp/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxmp";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchFromGitHub {
     owner = "libxmp";
     repo = "libxmp";
     tag = "libxmp-${finalAttrs.version}";
-    hash = "sha256-MatT8/tR8Gs3Q6WE+LOlbcZEiAxfO0Y89bo0c5reAUA=";
+    hash = "sha256-X+oIXTwlrLEl3n8gu5+LlNfIOBkZ02hiivrjTgVrqRk=";
   };
 
   outputs = [

From f4815ad77ae4af6e2da830f29dfa5ddd8a90b7af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 00:46:15 +0000
Subject: [PATCH 0096/1386] virtiofsd: 1.13.3 -> 1.14.0

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

diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix
index 1b3ef67272c8..f9eea1b8c735 100644
--- a/pkgs/by-name/vi/virtiofsd/package.nix
+++ b/pkgs/by-name/vi/virtiofsd/package.nix
@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "virtiofsd";
-  version = "1.13.3";
+  version = "1.14.0";
 
   src = fetchFromGitLab {
     owner = "virtio-fs";
     repo = "virtiofsd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-H8FjnrwB6IfZ7pVFesEWZkWpWjVYGrewlPRZc97Nlh8=";
+    hash = "sha256-NeqeSqPeD3hjAcbck+g8bmarbUL1Nks8AMAi/WxwzwY=";
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-AOWHlvFvKj05f4/KE1F37qkRstW5gUlRH0HZVZrg7Dg=";
+  cargoHash = "sha256-7byiMT2/jf0R7zHr/HBeXKk2T+OQhlVhZ9QJHlEY/Ao=";
 
   env = {
     LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";

From 97dd352dc415e846fb278b773ff476bb38a80afb Mon Sep 17 00:00:00 2001
From: dmkhitaryan <davtot111@icloud.com>
Date: Tue, 7 Jul 2026 18:11:46 +0400
Subject: [PATCH 0097/1386] iosevka: use nodejs_latest to fix Darwin build

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

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 1312abf903dc..326dc45ad92a 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -6,6 +6,7 @@
   cctools,
   go-toml,
   ttfautohint-nox,
+  nodejs_latest,
   # Custom font set options.
   # See https://typeof.net/Iosevka/customizer
   # Can be a raw TOML string, or a Nix attrset.
@@ -68,6 +69,7 @@ buildNpmPackage rec {
   };
 
   npmDepsHash = "sha256-tlBxO9K0itXO6Mac4jcygZ6+9kj1gTdmu+rtbL2qdcE=";
+  nodejs = nodejs_latest;
 
   nativeBuildInputs = [
     go-toml

From eef8a4246e493b8bb814ffcc74375e6818f20732 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 16:09:48 +0000
Subject: [PATCH 0098/1386] filebrowser: 2.63.15 -> 2.63.18

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

diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index a96b6f9c3803..a99768ad8511 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -13,13 +13,13 @@
 }:
 
 let
-  version = "2.63.15";
+  version = "2.63.18";
 
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
     tag = "v${version}";
-    hash = "sha256-O2USjwP1g+yDZpz0628YTRN2BUUnmjFvS+0qc6JU294=";
+    hash = "sha256-0j0i6bKKbyUi4O0wBT+xYjvywjRzAGd0/13Yh/dG5GA=";
   };
 
   frontend = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -62,7 +62,7 @@ buildGoModule {
   pname = "filebrowser";
   inherit version src;
 
-  vendorHash = "sha256-WXbXD75acK4woS7UC0G73pY48aGmp1l0spDc3sGYXMg=";
+  vendorHash = "sha256-BXw+fURCh1qNlwWo49aXIpSM339bV3Gwn9Ov8HLEVF0=";
 
   excludedPackages = [ "tools" ];
 

From c58ae3be5fedf9350980cc6961281df99abf64e7 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 7 Jul 2026 20:22:46 +0200
Subject: [PATCH 0099/1386] maintainers: drop amiddelk

---
 maintainers/maintainer-list.nix     | 6 ------
 pkgs/by-name/fr/frama-c/package.nix | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0b4a6908ad12..4c955939f252 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1624,12 +1624,6 @@
     githubId = 382798;
     name = "amfl";
   };
-  amiddelk = {
-    email = "amiddelk@gmail.com";
-    github = "amiddelk";
-    githubId = 1358320;
-    name = "Arie Middelkoop";
-  };
   aminechikhaoui = {
     email = "amine.chikhaoui91@gmail.com";
     github = "AmineChikhaoui";
diff --git a/pkgs/by-name/fr/frama-c/package.nix b/pkgs/by-name/fr/frama-c/package.nix
index bb9229a8803a..2cbd53fe7889 100644
--- a/pkgs/by-name/fr/frama-c/package.nix
+++ b/pkgs/by-name/fr/frama-c/package.nix
@@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [
       thoughtpolice
-      amiddelk
       luc65r
     ];
     platforms = lib.platforms.unix;

From 184358b4c5da50f92e7759c918399ec66a1890a3 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 7 Jul 2026 20:27:31 +0200
Subject: [PATCH 0100/1386] maintainers: drop orbitz

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0b4a6908ad12..323e1d3bd3d2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21115,12 +21115,6 @@
     githubId = 19862;
     name = "KJ Ørbekk";
   };
-  orbitz = {
-    email = "mmatalka@gmail.com";
-    github = "orbitz";
-    githubId = 75299;
-    name = "Malcolm Matalka";
-  };
   orhun = {
     email = "orhunparmaksiz@gmail.com";
     github = "orhun";

From 7db9f9221e44a4cf35261c7ed11ff7983a5f05b8 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 7 Jul 2026 20:32:12 +0200
Subject: [PATCH 0101/1386] maintainers: drop sprock

---
 maintainers/maintainer-list.nix    | 6 ------
 pkgs/by-name/fr/fricas/package.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0b4a6908ad12..e9aa89b132fd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26532,12 +26532,6 @@
     github = "spreetin";
     githubId = 7392173;
   };
-  sprock = {
-    email = "rmason@mun.ca";
-    github = "sprock";
-    githubId = 6391601;
-    name = "Roger Mason";
-  };
   sputn1ck = {
     email = "kon@kon.ninja";
     github = "sputn1ck";
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 9eeadf410d0a..3cc948fd7e9f 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
 
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.sprock ];
+    maintainers = [ ];
   };
 })

From 3fab0235db609082a25aa468f57576f1674bc210 Mon Sep 17 00:00:00 2001
From: Phorcys <57866459+phorcys420@users.noreply.github.com>
Date: Tue, 7 Jul 2026 21:23:59 +0200
Subject: [PATCH 0102/1386] maintainers: drop ghuntley

Last commits on maintained packages:
- coder: ["coder: resolve hash mismatch in fixed-output derivation" (23091da)](https://github.com/NixOS/nixpkgs/commit/23091da20c6491ccce78acbc71bfa98d8c64af28) on Mar 12, 2023
- mastodon: ["mastodon: add ghuntley as maintainer
" (6e0c9dc)](https://github.com/NixOS/nixpkgs/commit/6e0c9dcd87280deae219d2c5abfa1f5fd550f23a) on Nov 16, 2022
- openvscode-server: none in commit history
- pulumi: ["pulumi: 2.6.1 -> 2.10.2" (a922b0b)](https://github.com/NixOS/nixpkgs/commit/a922b0bf6fad2c7025de22a16ba12c911dd0be00) on Sep 24, 2020
---
 maintainers/maintainer-list.nix               | 6 ------
 pkgs/by-name/co/coder/package.nix             | 1 -
 pkgs/by-name/ma/mastodon/package.nix          | 1 -
 pkgs/by-name/op/openvscode-server/package.nix | 1 -
 pkgs/by-name/pu/pulumi-bin/package.nix        | 1 -
 5 files changed, 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe6dd76cbfa3..ddecd52f9ece 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10011,12 +10011,6 @@
     name = "Will Owens";
     keys = [ { fingerprint = "8E98 BB01 BFF8 AEA4 E303  FC4C 8074 09C9 2CE2 3033"; } ];
   };
-  ghuntley = {
-    email = "ghuntley@ghuntley.com";
-    github = "ghuntley";
-    githubId = 127353;
-    name = "Geoffrey Huntley";
-  };
   gibbert = {
     email = "gbjgms@gmail.com";
     github = "zgibberish";
diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index a56a65e02e57..84f200ff3676 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -104,7 +104,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       bpmct
       developmentcats
-      ghuntley
       kylecarbs
       phorcys420
     ];
diff --git a/pkgs/by-name/ma/mastodon/package.nix b/pkgs/by-name/ma/mastodon/package.nix
index f75a1fda6a4d..3a211fdc08b6 100644
--- a/pkgs/by-name/ma/mastodon/package.nix
+++ b/pkgs/by-name/ma/mastodon/package.nix
@@ -190,7 +190,6 @@ stdenv.mkDerivation rec {
       happy-river
       erictapen
       izorkin
-      ghuntley
     ];
   };
 }
diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix
index 074d42c058e5..494acae6cf4b 100644
--- a/pkgs/by-name/op/openvscode-server/package.nix
+++ b/pkgs/by-name/op/openvscode-server/package.nix
@@ -239,7 +239,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       dguenther
-      ghuntley
       emilytrau
     ];
     platforms = [
diff --git a/pkgs/by-name/pu/pulumi-bin/package.nix b/pkgs/by-name/pu/pulumi-bin/package.nix
index 6a10d4ca58eb..86513a3c1187 100644
--- a/pkgs/by-name/pu/pulumi-bin/package.nix
+++ b/pkgs/by-name/pu/pulumi-bin/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation {
     license = with lib.licenses; [ asl20 ];
     platforms = builtins.attrNames data.pulumiPkgs;
     maintainers = with lib.maintainers; [
-      ghuntley
       jlesquembre
       cpcloud
       wrbbz

From 4e85f86a5724b4936406c0244231ad1fa11b3ed2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Jul 2026 18:02:34 -0500
Subject: [PATCH 0103/1386] nwchem: move arguments out of all-packages.nix

---
 .../science/chemistry/nwchem/default.nix      | 28 +++++++++----------
 pkgs/top-level/all-packages.nix               |  6 +---
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix
index 9b082276f676..54c5d6c6fd52 100644
--- a/pkgs/applications/science/chemistry/nwchem/default.nix
+++ b/pkgs/applications/science/chemistry/nwchem/default.nix
@@ -10,9 +10,9 @@
   gfortran,
   perl,
   mpi,
-  blas,
-  lapack,
-  scalapack,
+  blas-ilp64,
+  lapack-ilp64,
+  scalapack-ilp64,
   libxc,
   python3,
   tcsh,
@@ -22,8 +22,8 @@
   makeWrapper,
 }:
 
-assert blas.isILP64 == lapack.isILP64;
-assert blas.isILP64 == scalapack.isILP64;
+assert blas-ilp64.isILP64 == lapack-ilp64.isILP64;
+assert blas-ilp64.isILP64 == scalapack-ilp64.isILP64;
 
 let
   versionGA = "5.8.2"; # Fixed by nwchem
@@ -76,9 +76,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     tcsh
     openssh
-    blas
-    lapack
-    scalapack
+    blas-ilp64
+    lapack-ilp64
+    scalapack-ilp64
     libxc
     python3
   ];
@@ -134,12 +134,12 @@ stdenv.mkDerivation rec {
     export PYTHONHOME="${python3}"
     export PYTHONVERSION=${lib.versions.majorMinor python3.version}
 
-    export BLASOPT="-L${blas}/lib -lblas"
-    export LAPACK_LIB="-L${lapack}/lib -llapack"
-    export BLAS_SIZE=${if blas.isILP64 then "8" else "4"}
+    export BLASOPT="-L${blas-ilp64}/lib -lblas"
+    export LAPACK_LIB="-L${lapack-ilp64}/lib -llapack"
+    export BLAS_SIZE=${if blas-ilp64.isILP64 then "8" else "4"}
     export USE_SCALAPACK="y"
-    export SCALAPACK="-L${scalapack}/lib -lscalapack"
-    export SCALAPACK_SIZE=${if scalapack.isILP64 then "8" else "4"}
+    export SCALAPACK="-L${scalapack-ilp64}/lib -lscalapack"
+    export SCALAPACK_SIZE=${if scalapack-ilp64.isILP64 then "8" else "4"}
 
     export LIBXC_INCLUDE="${lib.getDev libxc}/include"
     export LIBXC_MODDIR="${lib.getDev libxc}/include"
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
     ln -s ${gaSrc} src/tools/ga-${versionGA}.tar.gz
     cd src
     make nwchem_config
-    ${lib.optionalString (!blas.isILP64) "make 64_to_32"}
+    ${lib.optionalString (!blas-ilp64.isILP64) "make 64_to_32"}
   '';
 
   postBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cd03901f62a..c2ef35a3286e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10315,11 +10315,7 @@ with pkgs;
 
   molbar = with python3Packages; toPythonApplication molbar;
 
-  nwchem = callPackage ../applications/science/chemistry/nwchem {
-    blas = blas-ilp64;
-    lapack = lapack-ilp64;
-    scalapack = scalapack-ilp64;
-  };
+  nwchem = callPackage ../applications/science/chemistry/nwchem { };
 
   pdb2pqr = with python3Packages; toPythonApplication pdb2pqr;
 

From 3068e2d8edc95bf84afdf0c4fa5d62c1b4ca2c01 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Jul 2026 18:34:14 -0500
Subject: [PATCH 0104/1386] nwchem: migrate to finalAttrs, structuredAttrs, and
 strictDeps

---
 .../science/chemistry/nwchem/default.nix           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix
index 54c5d6c6fd52..a11d651b3d7a 100644
--- a/pkgs/applications/science/chemistry/nwchem/default.nix
+++ b/pkgs/applications/science/chemistry/nwchem/default.nix
@@ -20,6 +20,7 @@
   autoconf,
   libtool,
   makeWrapper,
+  mpich,
 }:
 
 assert blas-ilp64.isILP64 == lapack-ilp64.isILP64;
@@ -48,17 +49,20 @@ let
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "nwchem";
   version = "7.2.3";
 
   src = fetchFromGitHub {
     owner = "nwchemgit";
     repo = "nwchem";
-    rev = "v${version}-release";
+    tag = "v${finalAttrs.version}-release";
     hash = "sha256-2qc4kLb/WmUJuJGonIyS7pgCfyt8yXdcpDAKU0RMY58=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   outputs = [
     "out"
     "dev"
@@ -72,10 +76,12 @@ stdenv.mkDerivation rec {
     makeWrapper
     gfortran
     which
+    mpich
+    python3
+    openssh
   ];
   buildInputs = [
     tcsh
-    openssh
     blas-ilp64
     lapack-ilp64
     scalapack-ilp64
@@ -236,4 +242,4 @@ stdenv.mkDerivation rec {
     homepage = "https://nwchemgit.github.io";
     license = lib.licenses.ecl20;
   };
-}
+})

From 675204a0816f04aada2de59ff1d6906e7876b054 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Jul 2026 18:36:06 -0500
Subject: [PATCH 0105/1386] nwchem: migrate to by-name

---
 .../nwchem/default.nix => by-name/nw/nwchem/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/chemistry/nwchem/default.nix => by-name/nw/nwchem/package.nix} (100%)

diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/by-name/nw/nwchem/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/nwchem/default.nix
rename to pkgs/by-name/nw/nwchem/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2ef35a3286e..4ee9ae8f1fef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10315,8 +10315,6 @@ with pkgs;
 
   molbar = with python3Packages; toPythonApplication molbar;
 
-  nwchem = callPackage ../applications/science/chemistry/nwchem { };
-
   pdb2pqr = with python3Packages; toPythonApplication pdb2pqr;
 
   quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso {

From a380bc05e4f88cc82d379026de3fe43673bd932d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 02:55:55 +0000
Subject: [PATCH 0106/1386] tree-sitter-grammars.tree-sitter-elm: 5.9.0 ->
 5.9.2

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..06eac9ff5735 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -606,9 +606,9 @@
   };
 
   elm = {
-    version = "5.9.0";
+    version = "5.9.2";
     url = "github:elm-tooling/tree-sitter-elm";
-    hash = "sha256-vaeGViXob7AYyJj93AUJWBD8Zdfs4zXdKikvBZ3GptU=";
+    hash = "sha256-NJRmII48Zo2xKxZmL88Dxskf352fGaCp8B14+x1XJHw=";
     meta = {
       license = lib.licenses.mit;
     };

From cc27836c63fc03920dbfd5e5fa3ad047894531ca Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Wed, 8 Jul 2026 12:21:41 +0200
Subject: [PATCH 0107/1386] go_1_27: 1.27rc1 -> 1.27rc2

---
 pkgs/development/compilers/go/1.27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.27.nix b/pkgs/development/compilers/go/1.27.nix
index 2e71a083e8c7..3a553d29a1c5 100644
--- a/pkgs/development/compilers/go/1.27.nix
+++ b/pkgs/development/compilers/go/1.27.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.27rc1";
+  version = "1.27rc2";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-M49R9VfG2xI1o+64mgk2r29ODUEWKR7zuOQRhrxlUzQ=";
+    hash = "sha256-hg/XowsoXuFqKuDsXURBy0fEiHKgowy2DK40iUf0iiU=";
   };
 
   strictDeps = true;

From baf7a394da2489b2856ea06b7cf9e2ce6d6b1a7b Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 8 Jul 2026 14:46:46 +0200
Subject: [PATCH 0108/1386] spideroak: 7.5.0 -> 7.5.2

https://spideroak.support/hc/en-us/articles/36091792308763-One-Backup-7-5-2-Release-Notes-2025-04-16
---
 pkgs/by-name/sp/spideroak/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sp/spideroak/package.nix b/pkgs/by-name/sp/spideroak/package.nix
index 3b1a1ae00413..0393d819c12e 100644
--- a/pkgs/by-name/sp/spideroak/package.nix
+++ b/pkgs/by-name/sp/spideroak/package.nix
@@ -16,7 +16,7 @@
 }:
 
 let
-  sha256 = "6d6ca2b383bcc81af1217c696eb77864a2b6db7428f4b5bde5b5913ce705eec5";
+  hash = "sha256-L9AF5gOmvbN+Ur1k0oIjJJT15RZvWA7mhDgveVowu7E=";
 
   ldpath = lib.makeLibraryPath [
     fontconfig
@@ -30,7 +30,7 @@ let
     zlib
   ];
 
-  version = "7.5.0";
+  version = "7.5.2";
 
 in
 stdenv.mkDerivation {
@@ -38,9 +38,9 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    name = "SpiderOakONE-${version}-slack_tar_x64.tgz";
-    url = "https://spideroak-releases.s3.us-east-2.amazonaws.com/SpiderOakONE-${version}-slack_tar_x64.tgz";
-    inherit sha256;
+    name = "SpiderOakONE-${version}-x86_64-1.tgz";
+    url = "https://spideroak-releases.s3.us-east-2.amazonaws.com/SpiderOakONE-${version}-x86_64-1.tgz";
+    inherit hash;
   };
 
   sourceRoot = ".";
@@ -48,6 +48,8 @@ stdenv.mkDerivation {
   unpackCmd = "tar -xzf $curSrc";
 
   installPhase = ''
+    runHook preInstall
+
     mkdir "$out"
     cp -r "./"* "$out"
     mkdir "$out/bin"
@@ -66,6 +68,8 @@ stdenv.mkDerivation {
       --set SpiderOak_EXEC_SCRIPT $out/bin/spideroak
 
     sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop
+
+    runHook postInstall
   '';
 
   nativeBuildInputs = [
@@ -80,5 +84,6 @@ stdenv.mkDerivation {
     license = lib.licenses.unfree;
     platforms = lib.platforms.linux;
     mainProgram = "spideroak";
+    maintainers = [ ];
   };
 }

From 08c53a9ebc4cf5c7219809b769b5c59ed5b9288b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 13:00:26 +0000
Subject: [PATCH 0109/1386] fishPlugins.macos: 7.2.0 -> 7.3.0

---
 pkgs/shells/fish/plugins/macos.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/plugins/macos.nix b/pkgs/shells/fish/plugins/macos.nix
index ee9c2f2e4c8b..02a68afa3edd 100644
--- a/pkgs/shells/fish/plugins/macos.nix
+++ b/pkgs/shells/fish/plugins/macos.nix
@@ -7,13 +7,13 @@
 
 buildFishPlugin rec {
   pname = "macos";
-  version = "7.2.0";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "halostatue";
     repo = "fish-macos";
     tag = "v${version}";
-    hash = "sha256-yTwN2ztdU+vk+AXEfsJUN7J4KqrbLSWHgA0q5rUT5CE=";
+    hash = "sha256-VKJp+7YzqHMNniWs4aGq0gR11mPJU4gPIEgUPhdfA30=";
   };
 
   passthru.updateScript = nix-update-script { };

From 3dc7da509f84a7aaf321c774296583f7f43b6052 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 8 Jul 2026 15:16:05 +0200
Subject: [PATCH 0110/1386] cc-wrapper: Don't force outPath comparisons during
 metadata evaluation

Operations like `nix eval --file '<nixpkgs>' hello.name` are supposed
to be lazy in the sense that they shouldn't cause any derivations to
be instantiated. However, this was not the case anymore, e.g.

  $ time nix eval --file '<nixpkgs>' hello.name -vvvvvvv 2>&1 | grep -c 'copying.*to the store\|^instantiated'
  1145
  real    0m0.359s

In fact, even evaluating `lib.version` triggers 1145 paths to be
copied to the store. (Why `lib` causes a bunch of derivations to be
evaluated is another issue...)

The reason for this is that cc-wrapper has assertions like

  assert libc_bin == bintools.libc_bin

which which Nix implements by comparing their outPaths. Computing an
outPath calls derivationStrict, causing the .drv closure of the
bootstrap libc to be written to the store. Since these asserts ran
whenever a cc-wrapper derivation was forced to WHNF (which the stdenv
bootstrap stage assertions do on every evaluation of the Nixpkgs top
level), merely evaluating e.g. 'hello.name' wrote over a thousand .drv
files.

Now the asserts are (arbitrarily) moved under `unpackPhase`, which is
only forced when the derivation is actually instantiated, so
evaluating metadata attributes stays free of store writes:

  $ time nix eval --file '<nixpkgs>' hello.name -vvvvvvv 2>&1 | grep -c 'copying.*to the store\|^instantiated'
  0
  real    0m0.113s

Assisted-by: Claude Fable 5 <noreply@anthropic.com>
---
 pkgs/build-support/cc-wrapper/default.nix | 26 +++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index fd857d0c152d..85b0584a9d2d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -392,14 +392,6 @@ in
 
 assert includeFortifyHeaders' -> fortify-headers != null;
 
-# Ensure bintools matches
-assert libc_bin == bintools.libc_bin;
-assert libc_dev == bintools.libc_dev;
-assert libc_lib == bintools.libc_lib;
-assert nativeTools == bintools.nativeTools;
-assert nativeLibc == bintools.nativeLibc;
-assert nativePrefix == bintools.nativePrefix;
-
 stdenvNoCC.mkDerivation {
   pname = targetPrefix + (if name != "" then name else "${ccName}-wrapper");
   version = optionalString (cc != null) ccVersion;
@@ -469,9 +461,21 @@ stdenvNoCC.mkDerivation {
   # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750.
   dontCheckForBrokenSymlinks = true;
 
-  unpackPhase = ''
-    src=$PWD
-  '';
+  # Ensure bintools matches. This is done here rather than at top level
+  # so that evaluating the derivation's metadata (such as `name`)
+  # doesn't force the comparisons, which cause the outPaths of the
+  # compared derivations to be computed and thus .drv files to be
+  # written to the store.
+  unpackPhase =
+    assert libc_bin == bintools.libc_bin;
+    assert libc_dev == bintools.libc_dev;
+    assert libc_lib == bintools.libc_lib;
+    assert nativeTools == bintools.nativeTools;
+    assert nativeLibc == bintools.nativeLibc;
+    assert nativePrefix == bintools.nativePrefix;
+    ''
+      src=$PWD
+    '';
 
   wrapper = ./cc-wrapper.sh;
 

From 053be7e889371008eb919acb104b13c3bd311233 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 15:59:45 +0000
Subject: [PATCH 0111/1386] sqlcipher: 4.16.0 -> 4.17.0

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

diff --git a/pkgs/by-name/sq/sqlcipher/package.nix b/pkgs/by-name/sq/sqlcipher/package.nix
index a67402429d69..03d4e398c231 100644
--- a/pkgs/by-name/sq/sqlcipher/package.nix
+++ b/pkgs/by-name/sq/sqlcipher/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlcipher";
-  version = "4.16.0";
+  version = "4.17.0";
 
   src = fetchFromGitHub {
     owner = "sqlcipher";
     repo = "sqlcipher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hvgdKpgyj2vD8rxCzS9gM5pKANgMFW4IV0M/c7eapNM=";
+    hash = "sha256-IMtyUfpwhvKPWyXYZCxw2F8pbWAnknW3kxf8Gx3kW5Q=";
   };
 
   nativeBuildInputs = [

From 0a5a53a63a827e38b3680b9680f45884e0cc2e47 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Wed, 8 Jul 2026 22:29:18 +0200
Subject: [PATCH 0112/1386] pam_ssh_agent_auth: fix runtime error on aarch64

credits for this clean fix go to @gshpychka

closes #386392
---
 pkgs/by-name/pa/pam_ssh_agent_auth/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
index 6ba71b483e24..45f7a5b5cfcc 100644
--- a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
+++ b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
@@ -88,6 +88,8 @@ stdenv.mkDerivation rec {
     "--with-cflags=-I$PWD"
   ];
 
+  makeFlags = [ "LD=$(CC)" ];
+
   prePatch = "cp -r ${ed25519-donna}/. ed25519-donna/.";
 
   enableParallelBuilding = true;

From 199eb8233a01d76c7a74db229e9f5bb9f6336e75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 22:40:24 +0200
Subject: [PATCH 0113/1386] sidplayfp: 2.16.2 -> 3.1.0

Co-authored-by: OPNA2608 <opna2608@protonmail.com>
---
 pkgs/by-name/si/sidplayfp/package.nix | 66 ++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 391414fec8b8..a11d90ef8189 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -6,29 +6,75 @@
   runCommand,
   testers,
   alsaSupport ? stdenv.hostPlatform.isLinux,
+  coreaudioSupport ? stdenv.hostPlatform.isDarwin,
+  jackSupport ? stdenv.hostPlatform.isUnix,
+  pulseSupport ? stdenv.hostPlatform.isLinux,
   alsa-lib,
   autoreconfHook,
-  pulseSupport ? stdenv.hostPlatform.isLinux,
+  jack2,
   libpulseaudio,
   libsidplayfp,
   makeWrapper,
-  out123Support ? stdenv.hostPlatform.isDarwin,
-  mpg123,
   perl,
   pkg-config,
 }:
 
+let
+  miniaudioBackends = [
+    "NULL"
+  ]
+  ++ lib.optional alsaSupport "ALSA"
+  ++ lib.optional coreaudioSupport "COREAUDIO"
+  ++ lib.optional jackSupport "JACK"
+  ++ lib.optional pulseSupport "PULSEAUDIO";
+
+  miniaudioPkgconfigs =
+    lib.optional alsaSupport "alsa"
+    ++ lib.optional jackSupport "jack"
+    ++ lib.optional pulseSupport "libpulse";
+
+  miniaudioNeedsPkgconfigs = builtins.length miniaudioPkgconfigs > 0;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.16.2";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zvV1BIKkJF/UAZnSgHFqNSiioUH5iB8I7SDqnWQnGj0=";
+    hash = "sha256-wkZ/iJzz1QikNEaI00PFHaeewOrP+lYHF/iaws1aSro=";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile.am \
+      --replace-fail \
+        'AM_CPPFLAGS =' \
+        "AM_CPPFLAGS = ${
+          toString (
+            [
+              # Don't use dlopen() for audio-related libraries
+              "-DMA_NO_RUNTIME_LINKING"
+
+              # Only selected backends
+              "-DMA_ENABLE_ONLY_SPECIFIC_BACKENDS"
+            ]
+            ++ map (backend: "-DMA_ENABLE_" + backend) miniaudioBackends
+            ++ lib.optionals miniaudioNeedsPkgconfigs [
+              "$(pkg-config --cflags ${toString miniaudioPkgconfigs})"
+            ]
+          )
+        }" \
+      --replace-fail 'src_sidplayfp_LDADD =' "src_sidplayfp_LDFLAGS = ${
+        toString (
+          lib.optionals miniaudioNeedsPkgconfigs [
+            "$(pkg-config --libs ${toString miniaudioPkgconfigs})"
+          ]
+          ++ lib.optionals coreaudioSupport [ "-framework CoreAudio" ]
+        )
+      }"
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -43,15 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals alsaSupport [
     alsa-lib
   ]
+  ++ lib.optionals jackSupport [
+    jack2
+  ]
   ++ lib.optionals pulseSupport [
     libpulseaudio
-  ]
-  ++ lib.optionals out123Support [
-    mpg123
-  ];
-
-  configureFlags = [
-    (lib.strings.withFeature out123Support "out123")
   ];
 
   enableParallelBuilding = true;

From 2d758e9d097f837e7c2e2463240bca1b38794f4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 21:32:03 +0000
Subject: [PATCH 0114/1386] python3Packages.coredis: 6.6.1 -> 6.7.0

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

diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix
index 7740b0a99efe..883401023841 100644
--- a/pkgs/development/python-modules/coredis/default.nix
+++ b/pkgs/development/python-modules/coredis/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "coredis";
-  version = "6.6.1";
+  version = "6.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = "coredis";
     tag = finalAttrs.version;
-    hash = "sha256-Jn6tqMpyk849/hwYM0DHuQnGbMltRpTXAVcN5Kt6lk4=";
+    hash = "sha256-1Ks8rfOaz7rZruzp1k3V7UHCtckzomvA76+QRS7RlZo=";
   };
 
   postPatch = ''

From 7a3c37eeea3693793f1e936096c99a6a40fa33df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 23:13:29 +0000
Subject: [PATCH 0115/1386] routedns: 0.1.209 -> 0.1.223

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

diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix
index e73c5624f540..f2f9791f11dc 100644
--- a/pkgs/by-name/ro/routedns/package.nix
+++ b/pkgs/by-name/ro/routedns/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "routedns";
-  version = "0.1.209";
+  version = "0.1.223";
 
   src = fetchFromGitHub {
     owner = "folbricht";
     repo = "routedns";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fzBiF0xIArHchV2umdiO6Q2LPe/nZ7QUVKa2w7onO/0=";
+    hash = "sha256-RUGKdTtCIljqJlDOOSh0rEh7J+kF9m0dasAhlqpnkyw=";
   };
 
-  vendorHash = "sha256-e19ZqeVA+WQOILZrju7xFDii/lxmZceXk30tWY74cmM=";
+  vendorHash = "sha256-WN94s9eRr+Um2WYPnUSDKXRDeNYVy6R920eaCTNd86w=";
 
   subPackages = [ "./cmd/routedns" ];
 

From e86e43b074841c05d217f44dfa58e41a569895d5 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 8 Jul 2026 19:49:02 -0400
Subject: [PATCH 0116/1386] terra: remove cudatoolkit

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/te/terra/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/terra/package.nix b/pkgs/by-name/te/terra/package.nix
index c41332c7ad03..48c3242c1884 100644
--- a/pkgs/by-name/te/terra/package.nix
+++ b/pkgs/by-name/te/terra/package.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   stdenv,
   fetchFromGitHub,
@@ -8,7 +9,7 @@
   libxml2,
   symlinkJoin,
   cudaPackages,
-  enableCUDA ? false,
+  enableCUDA ? config.cudaSupport,
   libffi,
   libpfm,
 }:
@@ -37,8 +38,6 @@ let
     ];
   };
 
-  cuda = cudaPackages.cudatoolkit;
-
   clangVersion = llvmPackages.clang-unwrapped.version;
 
 in
@@ -60,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     libxml2
   ]
-  ++ lib.optionals enableCUDA [ cuda ]
+  ++ lib.optionals enableCUDA (with cudaPackages; [
+    cuda_nvcc
+    cuda_cudart
+  ])
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm;
 
   cmakeFlags =

From 58394f14e5fe2021a9b6091bef63ec5b852883af Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 8 Jul 2026 19:57:26 -0400
Subject: [PATCH 0117/1386] terra: enable strictDeps, __structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/te/terra/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/te/terra/package.nix b/pkgs/by-name/te/terra/package.nix
index 48c3242c1884..d8d661202d7d 100644
--- a/pkgs/by-name/te/terra/package.nix
+++ b/pkgs/by-name/te/terra/package.nix
@@ -45,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "terra";
   version = "1.2.0";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "terralang";
     repo = "terra";
@@ -52,17 +55,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CukNCvTHZUhjdHyvDUSH0YCVNkThUFPaeyLepyEKodA=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ lib.optionals enableCUDA [ cudaPackages.cuda_nvcc ];
   buildInputs = [
     llvmMerged
     ncurses
     libffi
     libxml2
   ]
-  ++ lib.optionals enableCUDA (with cudaPackages; [
-    cuda_nvcc
-    cuda_cudart
-  ])
+  ++ lib.optionals enableCUDA (
+    with cudaPackages;
+    [
+      cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
+      cuda_cudart
+    ]
+  )
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm;
 
   cmakeFlags =

From 0dd197d89733c61a267a2a83c8aa057b87321da3 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 8 Jul 2026 20:05:14 -0400
Subject: [PATCH 0118/1386] terra: modernize slightly

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/te/terra/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/terra/package.nix b/pkgs/by-name/te/terra/package.nix
index d8d661202d7d..a50217023466 100644
--- a/pkgs/by-name/te/terra/package.nix
+++ b/pkgs/by-name/te/terra/package.nix
@@ -12,6 +12,7 @@
   enableCUDA ? config.cudaSupport,
   libffi,
   libpfm,
+  versionCheckHook,
 }:
 
 let
@@ -21,7 +22,7 @@ let
   luajitSrc = fetchFromGitHub {
     owner = "LuaJIT";
     repo = "LuaJIT";
-    rev = luajitRev;
+    tag = luajitRev;
     hash = "sha256-L9T6lc32dDLAp9hPI5mKOzT0c4juW9JHA3FJCpm7HNQ=";
   };
 
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "terralang";
     repo = "terra";
-    rev = "release-${finalAttrs.version}";
+    tag = "release-${finalAttrs.version}";
     hash = "sha256-CukNCvTHZUhjdHyvDUSH0YCVNkThUFPaeyLepyEKodA=";
   };
 
@@ -108,14 +109,21 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 -t $bin/bin bin/terra
     install -Dm755 -t $out/lib lib/terra${stdenv.hostPlatform.extensions.sharedLibrary}
     install -Dm644 -t $static/lib lib/libterra_s.a
 
     mkdir -pv $dev/include
     cp -rv include/terra $dev/include
+
+    runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     description = "Low-level counterpart to Lua";
     homepage = "https://terralang.org/";
@@ -131,5 +139,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Linux Aarch64 broken above LLVM11
     # https://github.com/terralang/terra/issues/597
     broken = stdenv.hostPlatform.isAarch64;
+    mainProgram = "terra";
   };
 })

From 9a4ee3b3a9299363453f4be93268324a4c6ad11b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 00:27:16 +0000
Subject: [PATCH 0119/1386] obs-studio-plugins.advanced-scene-switcher: 1.34.2
 -> 1.35.1

---
 .../obs-studio/plugins/advanced-scene-switcher/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index e3ceeb3fbaf6..6c67d1757316 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "advanced-scene-switcher";
-  version = "1.34.2";
+  version = "1.35.1";
 
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
     rev = version;
-    hash = "sha256-BZYJ5ZZbla4nnpKdZAQPrqd+g1aeLMcsnAvyXfmm4yU=";
+    hash = "sha256-gfJtkX6OGqy+hUXvLXaOETvfIX+TRNEj0IwZnE9t81E=";
   };
 
   nativeBuildInputs = [

From 22897b7049b90fc799139694ec283ba20afb3b0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 00:46:53 +0000
Subject: [PATCH 0120/1386] linuxPackages.ena: 2.17.0 -> 2.17.2

---
 pkgs/os-specific/linux/ena/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 5d79acb6812d..fe9f85cb0599 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -10,7 +10,7 @@ let
   rev-prefix = "ena_linux_";
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.17.0";
+  version = "2.17.2";
   pname = "ena";
   name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "${rev-prefix}${finalAttrs.version}";
-    hash = "sha256-Yt8fF73lN5+wKEMtiSFToJMLv63EkfZI/WJfC9ae8H8=";
+    hash = "sha256-v/b4P5twRFaqjkeuXy6UhjnRCxVZ6+Muk80653uXnsY=";
   };
 
   hardeningDisable = [ "pic" ];

From d47d9018673b4e0be024a1f62cdeb8c00dc76d32 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 8 Jul 2026 22:12:46 -0400
Subject: [PATCH 0121/1386] spla: remove cudatoolkit usage

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/sp/spla/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix
index c6d662c633ec..4a40fed43dce 100644
--- a/pkgs/by-name/sp/spla/package.nix
+++ b/pkgs/by-name/sp/spla/package.nix
@@ -50,13 +50,17 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     gfortran
-  ];
+  ]
+  ++ lib.optionals (gpuBackend == "cuda") [ cudaPackages.cuda_nvcc ];
 
   buildInputs = [
     blas
     mpi
   ]
-  ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit
+  ++ lib.optionals (gpuBackend == "cuda") [
+    cudaPackages.cuda_cudart
+    cudaPackages.libcublas
+  ]
   ++ lib.optionals (gpuBackend == "rocm") [
     rocmPackages.clr
     rocmPackages.rocblas

From 05570a1c3e0018501956cf25a7f988ee07a6d351 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 8 Jul 2026 22:14:12 -0400
Subject: [PATCH 0122/1386] spla: enable strictDeps, __structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/sp/spla/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix
index 4a40fed43dce..cb9948f1b87e 100644
--- a/pkgs/by-name/sp/spla/package.nix
+++ b/pkgs/by-name/sp/spla/package.nix
@@ -30,10 +30,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "spla";
   version = "1.6.1";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "spla";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-fNH1IOKV1Re8G7GH9Xfn3itR80eonTbEGKQRRD16/2k=";
   };
 
@@ -50,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     gfortran
+    mpi
   ]
   ++ lib.optionals (gpuBackend == "cuda") [ cudaPackages.cuda_nvcc ];
 
   buildInputs = [
     blas
-    mpi
   ]
   ++ lib.optionals (gpuBackend == "cuda") [
     cudaPackages.cuda_cudart

From 92e7a7cee2107d5430dbe4c897b1479af0a15e22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 02:52:43 +0000
Subject: [PATCH 0123/1386] python3Packages.types-paramiko: 4.0.0.20250822 ->
 5.0.0.20260617

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

diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix
index 3a5525a8ce3c..5168da21efaa 100644
--- a/pkgs/development/python-modules/types-paramiko/default.nix
+++ b/pkgs/development/python-modules/types-paramiko/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "types-paramiko";
-  version = "4.0.0.20250822";
+  version = "5.0.0.20260617";
   pyproject = true;
   __structuredAttrs = true;
 
   src = fetchPypi {
     pname = "types_paramiko";
     inherit (finalAttrs) version;
-    hash = "sha256-G1awy9Puw9L9EjyesnBOYSt3fhWhdwWoBCeeplJeDFM=";
+    hash = "sha256-UKWw3GiznTAJfLfZO0kV27yX7XQOpjO9SSviXKHyXfQ=";
   };
 
   build-system = [ setuptools ];

From b93d8fb3bdb03fd5697718e3a54a42f746957244 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 9 Jul 2026 10:56:29 +0800
Subject: [PATCH 0124/1386] bundled-common: use structured attributes

---
 pkgs/development/ruby-modules/bundled-common/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 0fb92ea07928..75acf01e5df3 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -243,7 +243,7 @@ let
 
   basicEnv =
     if copyGemFiles then
-      runCommand name' basicEnvArgs ''
+      runCommand name' (basicEnvArgs // { __structuredAttrs = true; }) ''
         mkdir -p $out
         for i in $paths; do
           ${buildPackages.rsync}/bin/rsync -a $i/lib $out/

From 0fe8db35da30f20c0ecd80f65cf0d75b949f92f7 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 9 Jul 2026 11:04:24 +0800
Subject: [PATCH 0125/1386] bundlerEnv: use structured attributes

---
 pkgs/development/ruby-modules/bundler-env/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index a103dcd6ae7a..614c4719baca 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -102,7 +102,7 @@ else
     };
   in
   if copyGemFiles then
-    runCommand basicEnv.name bundlerEnvArgs ''
+    runCommand basicEnv.name (bundlerEnvArgs // { __structuredAttrs = true; }) ''
       mkdir -p $out
       for i in $paths; do
         ${buildPackages.rsync}/bin/rsync -a $i/lib $out/

From 6ceb2b2ae3f58a3ce269e4fbb7e0f1264c63cb8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 03:04:33 +0000
Subject: [PATCH 0126/1386] gamma-launcher: 3.0 -> 3.1

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

diff --git a/pkgs/by-name/ga/gamma-launcher/package.nix b/pkgs/by-name/ga/gamma-launcher/package.nix
index 0f13de6e90f3..c0a29cdfd513 100644
--- a/pkgs/by-name/ga/gamma-launcher/package.nix
+++ b/pkgs/by-name/ga/gamma-launcher/package.nix
@@ -17,14 +17,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "gamma-launcher";
-  version = "3.0";
+  version = "3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mord3rca";
     repo = "gamma-launcher";
     tag = "v${version}";
-    hash = "sha256-bvlNmpl2L9MAhZMyHwosXrypH1CQrSI1RQwo+sXO7/w=";
+    hash = "sha256-FLxJfP1fl3efRk9iAIAsMUrjQcUNa04GjiAKrYequF8=";
   };
 
   build-system = [ python3Packages.setuptools ];

From cad704c42aef88ffe7cca9448e087873e72e2f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Thu, 9 Jul 2026 11:30:45 +0200
Subject: [PATCH 0127/1386] luaPackages.json: Init at 0.1.2

---
 pkgs/development/lua-modules/json/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/lua-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/lua-modules/json/default.nix

diff --git a/pkgs/development/lua-modules/json/default.nix b/pkgs/development/lua-modules/json/default.nix
new file mode 100644
index 000000000000..9485c5c4eef1
--- /dev/null
+++ b/pkgs/development/lua-modules/json/default.nix
@@ -0,0 +1,34 @@
+{
+  buildLuaPackage,
+  fetchFromGitHub,
+  lib,
+  lua,
+}:
+
+buildLuaPackage rec {
+  pname = "json";
+  version = "0.1.2";
+  src = fetchFromGitHub {
+    owner = "rxi";
+    repo = "json.lua";
+    rev = "v${version}";
+    hash = "sha256-JSKMxF5NSHW3QaELFPWm1sx7kHmOXEPsUkM3i/px7Gk=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/lua/${lua.luaversion}
+    cp -r json.lua $out/share/lua/${lua.luaversion}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/rxi/json.lua";
+    description = "A lightweight JSON library for Lua";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index aed979e7a5d5..873e872640ab 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -113,6 +113,8 @@ rec {
 
   image-nvim = callPackage ../development/lua-modules/image-nvim { };
 
+  json = callPackage ../development/lua-modules/json { };
+
   lua-https = callPackage ../development/lua-modules/lua-https { };
 
   lua-pam = callPackage (

From 46911f50942dac5efbd0b3c9e8d0c96e60646888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Thu, 9 Jul 2026 11:31:14 +0200
Subject: [PATCH 0128/1386] dovecot: Fix building with Lua

Closes https://github.com/NixOS/nixpkgs/issues/538988
The committed patch file was generated by an agent, while all Nix code
was hand-written and hand-tested.

Assisted-by: GLM-5.1
---
 pkgs/by-name/do/dovecot/fix-lua-build.patch | 28 +++++++++++++++++++++
 pkgs/by-name/do/dovecot/generic.nix         |  7 ++++--
 pkgs/by-name/do/dovecot/package.nix         |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/do/dovecot/fix-lua-build.patch

diff --git a/pkgs/by-name/do/dovecot/fix-lua-build.patch b/pkgs/by-name/do/dovecot/fix-lua-build.patch
new file mode 100644
index 000000000000..23d2dcb9bcd3
--- /dev/null
+++ b/pkgs/by-name/do/dovecot/fix-lua-build.patch
@@ -0,0 +1,28 @@
+diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
+index 7474e76fb6..e7fc4aad0f 100644
+--- a/src/auth/Makefile.am
++++ b/src/auth/Makefile.am
+@@ -21,12 +21,11 @@ LUA_LIB =
+ AUTH_LUA_LIBS =
+ AUTH_LUA_LDADD =
+ if HAVE_LUA
+-
++AUTH_LUA_LDADD += $(LUA_LIBS)
+ if AUTH_LUA_PLUGIN
+ LUA_LIB += libauthdb_lua.la
+ else
+ AUTH_LUA_LIBS += $(LIBDOVECOT_LUA)
+-AUTH_LUA_LDADD += $(LUA_LIBS)
+ endif
+ endif
+ 
+@@ -200,7 +199,7 @@ endif
+ endif
+ 
+ if HAVE_LUA
+-auth_libs += $(LIBDOVECOT_LUA) $(LUA_LIBS)
++auth_libs += $(LIBDOVECOT_LUA)
+ endif
+ 
+ if AUTH_LUA_PLUGIN
+
diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix
index 40326745401c..7c54332c89ab 100644
--- a/pkgs/by-name/do/dovecot/generic.nix
+++ b/pkgs/by-name/do/dovecot/generic.nix
@@ -78,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     perl
     pkg-config
+    autoreconfHook
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ]
   ++ lib.optional (withMySQL && lib.versionOlder version "2.4") fake_mysql_config;
 
   buildInputs = [
@@ -125,7 +125,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+  env = {
+    NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+    LUA_PATH = lib.optionalString withLua "${lua5_3.pkgs.json}/share/lua/${lua5_3.luaversion}/?.lua";
+  };
 
   postPatch = ''
     sed -i -E \
diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index ccd716f729e3..aae29eb5e8fd 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -4,5 +4,6 @@ import ./generic.nix {
   patches = _: [
     # Fix loading extended modules.
     ./load-extended-modules.patch
+    ./fix-lua-build.patch
   ];
 }

From 67e4b85d40ba2809dd1bb293658c5414095f39e9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 9 Jul 2026 13:22:34 +0200
Subject: [PATCH 0129/1386] =?UTF-8?q?ocamlPackages.ocsigen-toolkit:=204.2.?=
 =?UTF-8?q?0=20=E2=86=92=204.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ocsigen-start/default.nix   |  6 ++-
 .../ocaml-modules/ocsigen-toolkit/default.nix | 54 +++++++------------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index ab011ec41b60..8777d6ed510f 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -12,6 +12,7 @@
   eliom,
   resource-pooling,
   ocsigen-ppx-rpc,
+  js_of_ocaml-ppx_deriving_json,
 }:
 
 stdenv.mkDerivation {
@@ -23,7 +24,10 @@ stdenv.mkDerivation {
     findlib
     eliom
   ];
-  buildInputs = [ ocsigen-ppx-rpc ];
+  buildInputs = [
+    ocsigen-ppx-rpc
+    js_of_ocaml-ppx_deriving_json
+  ];
   propagatedBuildInputs = [
     pgocaml_ppx
     safepass
diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 67e6da537a83..4c87218641bc 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -1,57 +1,41 @@
 {
-  stdenv,
   lib,
+  buildDunePackage,
   fetchFromGitHub,
-  ocaml,
-  findlib,
-  opaline,
   calendar,
+  cmdliner,
   eliom,
   js_of_ocaml-ppx_deriving_json,
+  ocsigen-ppx-rpc,
 }:
 
-stdenv.mkDerivation rec {
+buildDunePackage (finalAttrs: {
   pname = "ocsigen-toolkit";
-  name = "ocaml${ocaml.version}-${pname}-${version}";
-  version = "4.2.0";
-
-  propagatedBuildInputs = [
-    calendar
-    js_of_ocaml-ppx_deriving_json
-    eliom
-  ];
-  nativeBuildInputs = [
-    ocaml
-    findlib
-    opaline
-    eliom
-  ];
-
-  strictDeps = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $OCAMLFIND_DESTDIR
-    export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
-    make install
-    opaline -prefix $out
-    runHook postInstall
-  '';
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigen-toolkit";
-    tag = version;
-    hash = "sha256-wken+5hUewE0Nktl2PY1xMmVveSs8X0ihWD+MK4pzRQ=";
+    tag = finalAttrs.version;
+    hash = "sha256-q6e8pacQ/F2vJeI4IqgyWI68J8qKq1vk3yRpI09BjLU=";
   };
 
+  buildInputs = [
+    cmdliner
+    js_of_ocaml-ppx_deriving_json
+    ocsigen-ppx-rpc
+  ];
+
+  propagatedBuildInputs = [
+    calendar
+    eliom
+  ];
+
   meta = {
     homepage = "http://ocsigen.org/ocsigen-toolkit/";
     description = "User interface widgets for Ocsigen applications";
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.gal_bolle ];
-    inherit (ocaml.meta) platforms;
-    broken = true;
   };
 
-}
+})

From 2f1ac6b70f3635777e140fcc93c17e9ed10859c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 11:51:14 +0000
Subject: [PATCH 0130/1386] python3Packages.requests-cache: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index 92ee76c409b8..2f340c535413 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "requests-cache";
-  version = "1.3.2";
+  version = "1.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "requests-cache";
     repo = "requests-cache";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qil5z54kkxu8QlPQ2P/7jo+VyfC+KhhiSUyAVmuLG/o=";
+    hash = "sha256-iqoP7NalipY3BXMQkh+lrzPtPQehYg3bB/3azgx0iuo=";
   };
 
   build-system = [ hatchling ];

From 4bd348992f2aee17552c27245db9aee7cdc3fb48 Mon Sep 17 00:00:00 2001
From: Tyce Herrman <Tyce.Herrman@pm.me>
Date: Thu, 9 Jul 2026 07:50:08 -0400
Subject: [PATCH 0131/1386] bbrew: init at 2.3.1

Adds Bold Brew, a TUI for managing Homebrew, Flatpak, and Mac App Store packages.

Homepage: https://bold-brew.com

Assisted-by: OpenAI Codex (GPT-5)
---
 pkgs/by-name/bb/bbrew/package.nix | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/bb/bbrew/package.nix

diff --git a/pkgs/by-name/bb/bbrew/package.nix b/pkgs/by-name/bb/bbrew/package.nix
new file mode 100644
index 000000000000..6c0ed0daf9d2
--- /dev/null
+++ b/pkgs/by-name/bb/bbrew/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "bbrew";
+  version = "2.3.1";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Valkyrie00";
+    repo = "bold-brew";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-g74rBvBlw/rlLmZdJtIeIp0sba0Q6kFyhlHTwegOA+0=";
+  };
+
+  vendorHash = "sha256-5gFyfyerRKfq0uGkyIJ1W4XLhyRR5qPyhc/f2Y2skrI=";
+
+  subPackages = [ "cmd/bbrew" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X bbrew/internal/services.AppVersion=${finalAttrs.version}"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "TUI for managing Homebrew, Flatpak, and Mac App Store packages";
+    homepage = "https://bold-brew.com";
+    changelog = "https://github.com/Valkyrie00/bold-brew/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tyceherrman ];
+    platforms = lib.platforms.unix;
+    mainProgram = "bbrew";
+  };
+})

From f738a8221a7dcf69fee038b53a46da9a5340aab4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 12:43:51 +0000
Subject: [PATCH 0132/1386] tree-sitter-grammars.tree-sitter-cmake: 0.7.2 ->
 0.7.4

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..3f500b642005 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -292,9 +292,9 @@
   };
 
   cmake = {
-    version = "0.7.2";
+    version = "0.7.4";
     url = "github:uyha/tree-sitter-cmake";
-    hash = "sha256-mR+gA7eWigC2zO1gMHzOgRagsfK1y/NBsn3mAOqR35A=";
+    hash = "sha256-tLC3WHEQS2GqUr+5Q884fc+tDCTxx6Jxg83T9wPlHw4=";
     meta = {
       license = lib.licenses.mit;
     };

From 2856e4f683a3e160830fba469f2e6e230cc22f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Santos=20Reis?= <joao.reis@tweag.io>
Date: Thu, 9 Jul 2026 12:06:18 +0100
Subject: [PATCH 0133/1386] python3Packages.pytest-ticket: init at
 0-unstable-2025-05-15

---
 .../python-modules/pytest-ticket/default.nix  | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-ticket/default.nix

diff --git a/pkgs/development/python-modules/pytest-ticket/default.nix b/pkgs/development/python-modules/pytest-ticket/default.nix
new file mode 100644
index 000000000000..817b0dd7c074
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-ticket/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  hatch-vcs,
+  hatch-requirements-txt,
+  pytest,
+  unstableGitUpdater,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pytest-ticket";
+  version = "0-unstable-2025-05-15";
+  pyproject = true;
+
+  # hatch-vcs validates this against PEP 440 and 0-unstable-* is not a valid PEP 440 version string
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = builtins.elemAt (builtins.split "-" finalAttrs.version) 0;
+
+  src = fetchFromGitHub {
+    owner = "next-actions";
+    repo = "pytest-ticket";
+    rev = "9f77e77d99ee25a65cad2ab07815884bf7271552";
+    hash = "sha256-oR0kwrr8nnrVpWc27pOtM+6K00llTQGRTpvKmOyCIYY=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-vcs
+    hatch-requirements-txt
+  ];
+
+  dependencies = [
+    pytest
+  ];
+
+  # Patch requirements.txt out of the package
+  postInstall = ''
+    rm -f $out/lib/python*/site-packages/requirements.txt
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "pytest plugin that adds the ability to filter test cases by an associated ticket of a tracker of your choice";
+    homepage = "https://github.com/next-actions/pytest-ticket";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ joaosreis ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 498b2badb153..ad83427209ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16249,6 +16249,8 @@ self: super: with self; {
 
   pytest-textual-snapshot = callPackage ../development/python-modules/pytest-textual-snapshot { };
 
+  pytest-ticket = callPackage ../development/python-modules/pytest-ticket { };
+
   pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
 
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };

From fa8fa6d754cfbf0b3c132a6b12c0b6c7eb3d88e9 Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@exn.st>
Date: Thu, 9 Jul 2026 14:56:29 +0100
Subject: [PATCH 0134/1386] opam: 2.5.1 -> 2.5.2

---
 pkgs/development/tools/ocaml/opam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 1f568b7f4e5e..b0e3a16411f8 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -15,11 +15,11 @@ assert lib.versionAtLeast ocaml.version "4.08.0";
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opam";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "https://github.com/ocaml/opam/releases/download/${finalAttrs.version}/opam-full-${finalAttrs.version}.tar.gz";
-    hash = "sha256-SMW/r19cQEjMX0ACXec4X1utOoJpdWIWzW3S8hUAM+0=";
+    hash = "sha256-s2I4CVZ/Ge1rXWebjHu8C97JQYv/Sodf8HmdRG2FVcM=";
   };
 
   strictDeps = true;

From cfded879f2deed6ff9ba2ebd45d89fba877c405a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 15:04:30 +0000
Subject: [PATCH 0135/1386] steam-art-manager: 3.16.1 -> 3.17.0

---
 pkgs/by-name/st/steam-art-manager/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/steam-art-manager/package.nix b/pkgs/by-name/st/steam-art-manager/package.nix
index dc9e8eeaf5e4..6d8ffd9a0621 100644
--- a/pkgs/by-name/st/steam-art-manager/package.nix
+++ b/pkgs/by-name/st/steam-art-manager/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "steam-art-manager";
-  version = "3.16.1";
+  version = "3.17.0";
   src = fetchurl {
     url = "https://github.com/Tormak9970/Steam-Art-Manager/releases/download/v${version}/steam-art-manager.AppImage";
-    hash = "sha256-7Lqcj9Q5P29YFt6biFXLlVdWHdlzF/daLIaA2fGY0+A=";
+    hash = "sha256-FJeIe4ZoIdmoVQrAfPQe7Lm3K+I7z7ASj5pn3dUeMqM=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in

From c4f3e21a95aace157f7fbbd187ab54c8fd68050e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 15:20:03 +0000
Subject: [PATCH 0136/1386] nextvi: 6.0 -> 6.1

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

diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix
index 5781d5f27504..5611001eac0e 100644
--- a/pkgs/by-name/ne/nextvi/package.nix
+++ b/pkgs/by-name/ne/nextvi/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextvi";
-  version = "6.0";
+  version = "6.1";
 
   src = fetchFromGitHub {
     owner = "kyx0r";
     repo = "nextvi";
     tag = finalAttrs.version;
-    hash = "sha256-xxkV2y3+TErR9GfI1ui9CmFgKCmNm/Sdc7BE881mRx8=";
+    hash = "sha256-SysBH4+Rp1M9HtdGUAHErmc+148/fTAtYrY/QQG2OS4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From bbad0eca6e3c3589e00849978ec0eae23188f06e Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 08:24:56 -0700
Subject: [PATCH 0137/1386] python3Packages.energieleser: init at 0.1.5

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

diff --git a/pkgs/development/python-modules/energieleser/default.nix b/pkgs/development/python-modules/energieleser/default.nix
new file mode 100644
index 000000000000..f01d2c2a223a
--- /dev/null
+++ b/pkgs/development/python-modules/energieleser/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  aiohttp,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "energieleser";
+  version = "0.1.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nineti-GmbH";
+    repo = "energieleser.py";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vJ4eJaf0ue4N9aXwsPR79sTVt3NM1GKNw5XomhQUUdU=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "energieleser" ];
+
+  meta = {
+    description = "Async Python client for energieleser devices (stromleser, gasleser, wasserleser, wärmeleser)";
+    homepage = "https://github.com/nineti-GmbH/energieleser.py";
+    changelog = "https://github.com/nineti-GmbH/energieleser.py/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1db7ee376332..d582ff3e5fa9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5434,6 +5434,8 @@ self: super: with self; {
 
   encutils = callPackage ../development/python-modules/encutils { };
 
+  energieleser = callPackage ../development/python-modules/energieleser { };
+
   energyflip-client = callPackage ../development/python-modules/energyflip-client { };
 
   energyflow = callPackage ../development/python-modules/energyflow { };

From 9a70fe1f1281cd070b0cde9d1e6941487b53d814 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 08:26:20 -0700
Subject: [PATCH 0138/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d4ce6e271a27..ad976fc30ab6 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1690,7 +1690,8 @@
       ];
     "energieleser" =
       ps: with ps; [
-      ]; # missing inputs: energieleser
+        energieleser
+      ];
     "energy" =
       ps: with ps; [
         fnv-hash-fast
@@ -8022,6 +8023,7 @@
     "emulated_kasa"
     "emulated_roku"
     "energenie_power_sockets"
+    "energieleser"
     "energy"
     "energyid"
     "energyzero"

From 9c010484f7157bca4b9096adbb679bb2cb820f2a Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 09:11:00 -0700
Subject: [PATCH 0139/1386] python3Packages.pyenvertechevt800: init at 0.2.4

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

diff --git a/pkgs/development/python-modules/pyenvertechevt800/default.nix b/pkgs/development/python-modules/pyenvertechevt800/default.nix
new file mode 100644
index 000000000000..306eb75e454d
--- /dev/null
+++ b/pkgs/development/python-modules/pyenvertechevt800/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyenvertechevt800";
+  version = "0.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "daniel-bergmann-00";
+    repo = "pyenvertech-evt800";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JUXPyBnmwcKtGk2PjhKAaPZXnvl8Vkx9hrb7NurGvHo=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyenvertechevt800" ];
+
+  meta = {
+    description = "Library to interface an Envertech EVT-800 device";
+    homepage = "https://github.com/daniel-bergmann-00/pyenvertech-evt800";
+    changelog = "https://github.com/daniel-bergmann-00/pyenvertech-evt800/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..0dfb99edb74d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14468,6 +14468,8 @@ self: super: with self; {
 
   pyenphase = callPackage ../development/python-modules/pyenphase { };
 
+  pyenvertechevt800 = callPackage ../development/python-modules/pyenvertechevt800 { };
+
   pyenvisalink = callPackage ../development/python-modules/pyenvisalink { };
 
   pyephember2 = callPackage ../development/python-modules/pyephember2 { };

From 5aeecf3ee6d504eaee3bca895361389c54ba9ede Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 09:12:28 -0700
Subject: [PATCH 0140/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..9a3e8ca79954 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1726,7 +1726,8 @@
       ];
     "envertech_evt800" =
       ps: with ps; [
-      ]; # missing inputs: pyenvertechevt800
+        pyenvertechevt800
+      ];
     "environment_canada" =
       ps: with ps; [
         env-canada
@@ -8030,6 +8031,7 @@
     "enigma2"
     "enocean"
     "enphase_envoy"
+    "envertech_evt800"
     "environment_canada"
     "envisalink"
     "epic_games_store"

From 4643b729c1725fd036c07857b22dbb427a3adf48 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 09:33:29 -0700
Subject: [PATCH 0141/1386] python3Packages.pyhelty: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/pyhelty/default.nix b/pkgs/development/python-modules/pyhelty/default.nix
new file mode 100644
index 000000000000..f015cd4c58e9
--- /dev/null
+++ b/pkgs/development/python-modules/pyhelty/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyhelty";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ebaschiera";
+    repo = "pyhelty";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-w7RbTXab6CPQ4yispLa8t/wcx0bZQ1rXiXPhpqVH17k=";
+  };
+
+  build-system = [ hatchling ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyhelty" ];
+
+  meta = {
+    description = "Async client library for Helty Flow VMC (mechanical ventilation) units";
+    homepage = "https://github.com/ebaschiera/pyhelty";
+    changelog = "https://github.com/ebaschiera/pyhelty/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..ae3efd63041e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14696,6 +14696,8 @@ self: super: with self; {
 
   pyheck = callPackage ../development/python-modules/pyheck { };
 
+  pyhelty = callPackage ../development/python-modules/pyhelty { };
+
   pyheos = callPackage ../development/python-modules/pyheos { };
 
   pyhepmc = callPackage ../development/python-modules/pyhepmc { };

From eab755a9f39b4bff671c46873c2dbc18827cc6d7 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 09:34:56 -0700
Subject: [PATCH 0142/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..1e64c65f7db1 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2553,7 +2553,8 @@
       ];
     "helty" =
       ps: with ps; [
-      ]; # missing inputs: pyhelty
+        pyhelty
+      ];
     "heos" =
       ps: with ps; [
         pyheos
@@ -8160,6 +8161,7 @@
     "hdfury"
     "hdmi_cec"
     "hegel"
+    "helty"
     "heos"
     "here_travel_time"
     "hikvision"

From 43c8fbda22a8f0457e8806d580ab1d4a13fc9e6a Mon Sep 17 00:00:00 2001
From: Connor Grady <connor.grady@gmail.com>
Date: Thu, 9 Jul 2026 11:48:46 -0500
Subject: [PATCH 0143/1386] bazarr: add connor-grady as maintainer

---
 pkgs/by-name/ba/bazarr/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix
index fcb85a166a8b..d6186b59ea8a 100644
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -68,7 +68,10 @@ stdenv.mkDerivation rec {
     homepage = "https://www.bazarr.media/";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ diogotcorreia ];
+    maintainers = with lib.maintainers; [
+      connor-grady
+      diogotcorreia
+    ];
     mainProgram = "bazarr";
     platforms = lib.platforms.all;
   };

From 2958cf1962c88d1c4c0e1b4c2cd7236174e5762f Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 10:13:29 -0700
Subject: [PATCH 0144/1386] python3Packages.pyimouapi: init at 1.3.0

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

diff --git a/pkgs/development/python-modules/pyimouapi/default.nix b/pkgs/development/python-modules/pyimouapi/default.nix
new file mode 100644
index 000000000000..c5dd8b425b88
--- /dev/null
+++ b/pkgs/development/python-modules/pyimouapi/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-asyncio,
+  pytest-timeout,
+  pytestCheckHook,
+  setuptools,
+  simpleeval,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyimouapi";
+  version = "1.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Imou-OpenPlatform";
+    repo = "Py-Imou-Open-Api";
+    tag = finalAttrs.version;
+    hash = "sha256-/ZGaJubdeEe5d4wnzrS/e6hPC5i/IRccgYc34su2iw4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    simpleeval
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-timeout
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyimouapi" ];
+
+  meta = {
+    description = "Async Python client for the Imou Open Platform cloud APIs";
+    homepage = "https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api";
+    changelog = "https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..7baac43f23ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14736,6 +14736,8 @@ self: super: with self; {
 
   pyimgbox = callPackage ../development/python-modules/pyimgbox { };
 
+  pyimouapi = callPackage ../development/python-modules/pyimouapi { };
+
   pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy { inherit (pkgs) ssdeep; };
 
   pyindego = callPackage ../development/python-modules/pyindego { };

From 6f075c088ac89e37b64071f6c7b2688d36bb40f9 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 10:14:55 -0700
Subject: [PATCH 0145/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..90dc26895fd6 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3002,7 +3002,8 @@
       ];
     "imou" =
       ps: with ps; [
-      ]; # missing inputs: pyimouapi
+        pyimouapi
+      ];
     "improv_ble" =
       ps: with ps; [
         aioesphomeapi
@@ -8222,6 +8223,7 @@
     "imeon_inverter"
     "imgw_pib"
     "immich"
+    "imou"
     "improv_ble"
     "incomfort"
     "indevolt"

From 34ab7ca8e670e23f45ca61389e7f2030006d1b08 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 10:24:12 -0700
Subject: [PATCH 0146/1386] python3Packages.pyitachip2ir2: init at 0.0.8

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

diff --git a/pkgs/development/python-modules/pyitachip2ir2/default.nix b/pkgs/development/python-modules/pyitachip2ir2/default.nix
new file mode 100644
index 000000000000..2d8b779390f2
--- /dev/null
+++ b/pkgs/development/python-modules/pyitachip2ir2/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyitachip2ir2";
+  version = "0.0.8";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-QBBajL3UCVPrIMmff9L//gGsHF0WDRnbfc8hV1tWMxE=";
+  };
+
+  build-system = [ setuptools ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyitachip2ir" ];
+
+  meta = {
+    description = "Library for sending IR commands to an ITach IP2IR gateway";
+    homepage = "https://github.com/alanfischer/itachip2ir";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..4e20feffe61e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14786,6 +14786,8 @@ self: super: with self; {
 
   pyitachip2ir = callPackage ../development/python-modules/pyitachip2ir { };
 
+  pyitachip2ir2 = callPackage ../development/python-modules/pyitachip2ir2 { };
+
   pyituran = callPackage ../development/python-modules/pyituran { };
 
   pyixapi = callPackage ../development/python-modules/pyixapi { };

From 0d80ab07c0a5115fd33e3437ccf5e0152025e361 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 10:25:26 -0700
Subject: [PATCH 0147/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..981f557abbce 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3241,7 +3241,8 @@
       ];
     "itach" =
       ps: with ps; [
-      ]; # missing inputs: pyitachip2ir2
+        pyitachip2ir2
+      ];
     "itunes" =
       ps: with ps; [
       ];
@@ -8257,6 +8258,7 @@
     "iss"
     "ista_ecotrend"
     "isy994"
+    "itach"
     "ituran"
     "izone"
     "jellyfin"

From 8cdacbe386ebd5c6d95fc05d4a7f8096a15aadf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 9 Jul 2026 10:34:56 -0700
Subject: [PATCH 0148/1386] python3Packages.httplib2: 0.31.1 -> 0.32.0

Diff: https://github.com/httplib2/httplib2/compare/v0.31.1...v0.32.0

Changelog: https://github.com/httplib2/httplib2/blob/v0.32.0/CHANGELOG
---
 pkgs/development/python-modules/httplib2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 5d5156adb042..bd7d596cecdc 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "httplib2";
-  version = "0.31.1";
+  version = "0.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "httplib2";
     repo = "httplib2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1OO3BNtOGJxV9L34C60CHv95LLH9Ih1lY0zQUD4wrnc=";
+    hash = "sha256-l+E3cADVb81SN3ME8qUqI8dfmT2e7S6p0nWOCu3CQWE=";
   };
 
   build-system = [ setuptools ];

From c7d232f65cf3f12c10ae3da4f8eb079d25f1bfd7 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 10:46:19 -0700
Subject: [PATCH 0149/1386] python3Packages.aiomelcloudhome: init at 0.1.9

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

diff --git a/pkgs/development/python-modules/aiomelcloudhome/default.nix b/pkgs/development/python-modules/aiomelcloudhome/default.nix
new file mode 100644
index 000000000000..25675dc9696f
--- /dev/null
+++ b/pkgs/development/python-modules/aiomelcloudhome/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  aiohttp,
+  pydantic,
+  tenacity,
+  yarl,
+  aresponses,
+  pytest-cov-stub,
+  pytestCheckHook,
+  syrupy,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "aiomelcloudhome";
+  version = "0.1.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "erwindouna";
+    repo = "aiomelcloudhome";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-aYaV7+Lj7LShO0HqoUjSFAMTOHY5piMdSACOVizGgco=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+    tenacity
+    yarl
+  ];
+
+  nativeCheckInputs = [
+    aresponses
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  pythonImportsCheck = [ "aiomelcloudhome" ];
+
+  meta = {
+    description = "Asynchronous Python client for the Melcloud Home API";
+    homepage = "https://github.com/erwindouna/aiomelcloudhome";
+    changelog = "https://github.com/erwindouna/aiomelcloudhome/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..41ffa25c34e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -422,6 +422,8 @@ self: super: with self; {
 
   aiomealie = callPackage ../development/python-modules/aiomealie { };
 
+  aiomelcloudhome = callPackage ../development/python-modules/aiomelcloudhome { };
+
   aiomisc = callPackage ../development/python-modules/aiomisc { };
 
   aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { };

From efd279f2800177f1acd82041d5c49cd13aa2ff60 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 10:47:42 -0700
Subject: [PATCH 0150/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..761a07fb9dc6 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3980,7 +3980,8 @@
       ];
     "melcloud_home" =
       ps: with ps; [
-      ]; # missing inputs: aiomelcloudhome
+        aiomelcloudhome
+      ];
     "melissa" =
       ps: with ps; [
         py-melissa-climate
@@ -8351,6 +8352,7 @@
     "media_player"
     "media_source"
     "melcloud"
+    "melcloud_home"
     "melissa"
     "melnor"
     "meraki"

From e4a2c3a244d4753e47b8de3c9fe68a68a785d2c1 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 11:40:22 -0700
Subject: [PATCH 0151/1386] python3Packages.aio-wattwaechter: init at 1.1.0

---
 .../aio-wattwaechter/default.nix              | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/aio-wattwaechter/default.nix

diff --git a/pkgs/development/python-modules/aio-wattwaechter/default.nix b/pkgs/development/python-modules/aio-wattwaechter/default.nix
new file mode 100644
index 000000000000..466c8f726089
--- /dev/null
+++ b/pkgs/development/python-modules/aio-wattwaechter/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  aioresponses,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "aio-wattwaechter";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SmartCircuits-GmbH";
+    repo = "WattWaechter-PyPI";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hM2DGQBEUr1HYd0CDdjRdFA7+HKaF2kLVFrAWCjP+CU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aio_wattwaechter" ];
+
+  meta = {
+    description = "Async Python client for the WattWächter smart meter API";
+    homepage = "https://github.com/SmartCircuits-GmbH/WattWaechter-PyPI";
+    changelog = "https://github.com/SmartCircuits-GmbH/WattWaechter-PyPI/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..191a577abd4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -208,6 +208,8 @@ self: super: with self; {
 
   aio-pika = callPackage ../development/python-modules/aio-pika { };
 
+  aio-wattwaechter = callPackage ../development/python-modules/aio-wattwaechter { };
+
   aioacaia = callPackage ../development/python-modules/aioacaia { };
 
   aioairctrl = callPackage ../development/python-modules/aioairctrl { };

From 9d68701d5d375bcf562797640829cf7926f03b11 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 11:41:41 -0700
Subject: [PATCH 0152/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..3e686f10b6b3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -7364,7 +7364,8 @@
       ];
     "wattwaechter" =
       ps: with ps; [
-      ]; # missing inputs: aio-wattwaechter
+        aio-wattwaechter
+      ];
     "waze_travel_time" =
       ps: with ps; [
         pywaze
@@ -8856,6 +8857,7 @@
     "watergate"
     "watts"
     "watttime"
+    "wattwaechter"
     "waze_travel_time"
     "weather"
     "weatherflow"

From 2feb8804f34eab8e0647d860d8f442794826b723 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Thu, 9 Jul 2026 22:10:05 +0200
Subject: [PATCH 0153/1386] keycloak: 26.6.4 -> 26.7.0

Release notes: https://github.com/keycloak/keycloak/releases/tag/26.7.0
Full changelog: https://github.com/keycloak/keycloak/compare/26.6.4...26.7.0
Breaking changes: https://www.keycloak.org/docs/latest/upgrading/#migrating-to-26-7-0
https://www.keycloak.org/docs/latest/upgrading/#migration-changes
---
 doc/release-notes/rl-2611.section.md | 2 ++
 pkgs/by-name/ke/keycloak/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index ce3330d0b967..a25f21e9275a 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -90,6 +90,8 @@
 
 - `texlive.combine` is deprecated and scheduled for removal in 27.05. Please migrate to `texliveSmall.withPackages` (see [](#sec-language-texlive-user-guide)).
 
+- `keycloak` was updated to >= 26.7.0 and includes some breaking internal (API) changes. See the [upstream migration guide](https://www.keycloak.org/docs/latest/upgrading/#migrating-to-26-7-0) for more information.
+
 - `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias.
 
 - `pnpm_10` was upgraded to version 10.34.1+, which introduced stricter integrity checks. If you encounter `ERR_PNPM_MISSING_TARBALL_INTEGRITY`, you can fall back to the older `pnpm_10_34_0`.
diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index 921923d1c323..bd7675168fe5 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "keycloak";
-  version = "26.6.4";
+  version = "26.7.0";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-rb3Wdzc3g8jMvUffOfMfJ4Uw9HJomznXzLtPOrHoWU8=";
+    hash = "sha256-QfPCgwUZYwiCWZgL8DVlVAYE3AoZnDHn99j+f/oo0Hs=";
   };
 
   nativeBuildInputs = [

From baa53ef8069e5a7e905a3b81fd4d77153af567a8 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 11:32:14 -0700
Subject: [PATCH 0154/1386] python3Packages.python-swisscom-internet-box: init
 at 0.2.0

---
 .../python-swisscom-internet-box/default.nix  | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-swisscom-internet-box/default.nix

diff --git a/pkgs/development/python-modules/python-swisscom-internet-box/default.nix b/pkgs/development/python-modules/python-swisscom-internet-box/default.nix
new file mode 100644
index 000000000000..6a7ee9391518
--- /dev/null
+++ b/pkgs/development/python-modules/python-swisscom-internet-box/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "python-swisscom-internet-box";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "anatosun";
+    repo = "python-swisscom-internet-box";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-37F6Ld8oOmqEufYIujkjkxHqfzzgWHrxIqIga53r6xU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "swisscom_internet_box" ];
+
+  meta = {
+    description = "Python client for the Swisscom Internet-Box";
+    homepage = "https://github.com/anatosun/python-swisscom-internet-box";
+    changelog = "https://github.com/anatosun/python-swisscom-internet-box/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..e8d434de1fb9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16749,6 +16749,10 @@ self: super: with self; {
 
   python-swiftclient = callPackage ../development/python-modules/python-swiftclient { };
 
+  python-swisscom-internet-box =
+    callPackage ../development/python-modules/python-swisscom-internet-box
+      { };
+
   python-tado = callPackage ../development/python-modules/python-tado { };
 
   python-tds = callPackage ../development/python-modules/python-tds { };

From 09eca48d97fe65aa01e906d44c09980a444af1a4 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 11:33:41 -0700
Subject: [PATCH 0155/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..c5a2b90f3a33 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -6439,7 +6439,8 @@
       ];
     "swisscom" =
       ps: with ps; [
-      ]; # missing inputs: python-swisscom-internet-box
+        python-swisscom-internet-box
+      ];
     "switch" =
       ps: with ps; [
       ];
@@ -8714,6 +8715,7 @@
     "sunweg"
     "surepetcare"
     "swiss_public_transport"
+    "swisscom"
     "switch"
     "switch_as_x"
     "switchbee"

From bce91d0f38a8f6789ecf422fc4067678209243f7 Mon Sep 17 00:00:00 2001
From: Stefan Lendl <s@stfl.dev>
Date: Thu, 9 Jul 2026 22:45:26 +0200
Subject: [PATCH 0156/1386] citrix-workspace: pin wfica's EGL/GTK backend to
 X11 to fix Wayland startup segfault

---
 pkgs/by-name/ci/citrix-workspace/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix
index b9fb58c0cc6d..583e8368fd9a 100644
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -280,6 +280,15 @@ stdenv.mkDerivation rec {
             ''--set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so"''
             ''--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"''
           ]
+          ++ lib.optionals (isWfica program) [
+            # wfica is an X11 client (it runs under XWayland). On a Wayland
+            # session Mesa's EGL loader otherwise auto-selects the Wayland
+            # platform for wfica's startup OpenGL probe and segfaults in
+            # wl_proxy_create_wrapper; pin the client to X11 (user-overridable).
+            # See https://github.com/NixOS/nixpkgs/issues/540102
+            "--set-default GDK_BACKEND x11"
+            "--set-default EGL_PLATFORM x11"
+          ]
         );
 
       wrap = program: ''

From 3685500df8022d7aa4209f173894cd284cf400c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 10 Jul 2026 01:54:40 +0200
Subject: [PATCH 0157/1386] python314Packages.pyopengl-accelerate: inherit from
 pyopengl

They use the same release tag, so lets keep them in sync.
---
 .../pyopengl-accelerate/default.nix           | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
index 5dea6223c8dc..54e4f7e38005 100644
--- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix
+++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
@@ -1,35 +1,28 @@
 {
-  lib,
   buildPythonPackage,
-  fetchPypi,
   cython,
   numpy,
+  pyopengl,
   setuptools,
-  wheel,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pyopengl-accelerate";
-  version = "3.1.10";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "pyopengl_accelerate";
-    inherit version;
-    hash = "sha256-gnUcg/Cm9zK4tZI5kO3CRB04F2qYdWsXGOjWxDefWnE=";
-  };
+  inherit (pyopengl) version src;
+
+  sourceRoot = "${pyopengl.src.name}/accelerate";
 
   build-system = [
     cython
     numpy
     setuptools
-    wheel
   ];
 
   meta = {
     description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x";
-    homepage = "https://pyopengl.sourceforge.net/";
-    maintainers = with lib.maintainers; [ laikq ];
-    license = lib.licenses.bsd3;
+    homepage = "https://github.com/mcfletch/pyopengl/tree/master/accelerate#readme";
+    inherit (pyopengl.meta) maintainers license;
   };
 }

From a78507d8058f0503f44c652ae780b55800becf1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 10 Jul 2026 01:55:12 +0200
Subject: [PATCH 0158/1386] python314Packages.pyopengl: fetch from github,
 cleanup

---
 .../python-modules/pyopengl/default.nix       | 54 +++++++++----------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix
index bd2d9a6ffa06..45c51b847d29 100644
--- a/pkgs/development/python-modules/pyopengl/default.nix
+++ b/pkgs/development/python-modules/pyopengl/default.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
-  replaceVars,
-  fetchPypi,
-  setuptools,
-  pkgs,
-  pillow,
+  fetchFromGitHub,
   mesa,
+  pkgs,
+  replaceVars,
+  setuptools,
+  stdenv,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -15,23 +14,13 @@ buildPythonPackage (finalAttrs: {
   version = "3.1.10";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-xKAtaGa1TrEZyOmz+wT6g1qVq4At2WYHq0zbABLfgzU=";
+  src = fetchFromGitHub {
+    owner = "mcfletch";
+    repo = "pyopengl";
+    tag = finalAttrs.version;
+    hash = "sha256-U/7J3EoxKHp/dR2LAzTiwR5wcjZbUBuT5Dt3c76xxj4=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [ pillow ];
-
-  passthru.runtimeLibs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    "/run/opengl-driver/lib"
-    pkgs.libglvnd
-    pkgs.libGLU
-    pkgs.libglut
-    pkgs.gle
-  ];
-
   patches = lib.optionals (finalAttrs.passthru.runtimeLibs != [ ]) [
     # patch OpenGL.platform.ctypesloader::_loadLibraryPosix with extra search paths
     (replaceVars ./ld-preload-gl.patch {
@@ -39,11 +28,11 @@ buildPythonPackage (finalAttrs: {
     })
   ];
 
-  # Need to fix test runner
-  # Tests have many dependencies
-  # Extension types could not be found.
-  # Should run test suite from $out/${python.sitePackages}
-  doCheck = false; # does not affect pythonImportsCheck
+  build-system = [ setuptools ];
+
+  # mosts tests fail in the nix sandbox with:
+  #  GLX is not supported
+  doCheck = false;
 
   # PyOpenGL looks for libraries during import, making this a somewhat decent test of our patching
   # (these are impure deps on darwin)
@@ -61,14 +50,19 @@ buildPythonPackage (finalAttrs: {
     "OpenGL.GLX"
   ];
 
+  passthru.runtimeLibs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "/run/opengl-driver/lib"
+    pkgs.libglvnd
+    pkgs.libGLU
+    pkgs.libglut
+    pkgs.gle
+  ];
+
   meta = {
     homepage = "https://mcfletch.github.io/pyopengl/";
     description = "PyOpenGL, the Python OpenGL bindings";
     longDescription = ''
-      PyOpenGL is the cross platform Python binding to OpenGL and
-      related APIs.  The binding is created using the standard (in
-      Python 2.5) ctypes library, and is provided under an extremely
-      liberal BSD-style Open-Source license.
+      PyOpenGL is the cross platform Python binding to OpenGL and related APIs.
     '';
     license = lib.licenses.bsd3;
     inherit (mesa.meta) platforms;

From 312bdfd95eec68e8d19b011d8033e0a8ce46bc57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 00:00:04 +0000
Subject: [PATCH 0159/1386] toolhive: 0.29.1 -> 0.34.0

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

diff --git a/pkgs/by-name/to/toolhive/package.nix b/pkgs/by-name/to/toolhive/package.nix
index 93600ae342f0..4bde0382b27e 100644
--- a/pkgs/by-name/to/toolhive/package.nix
+++ b/pkgs/by-name/to/toolhive/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "toolhive";
-  version = "0.29.1";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "stacklok";
     repo = "toolhive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gep1QAHl7de67xS+T42/LHH4fdy670OGguwp41jgAjE=";
+    hash = "sha256-GMzCXAottmusxLeZDScn1dUX/b46ocBbemFIzRIi1Eo=";
   };
 
-  vendorHash = "sha256-ooPLPnGqyqi8e+zzu2MVjS+v7LgTfvdXbbuUp1asRNQ=";
+  vendorHash = "sha256-CTQkjxEZCyE2ouuilCSTEaxW4TimHf+5I5cnfQFz2i4=";
 
   # Build only the main CLI and operator binaries
   subPackages = [

From ddf9e33b85e426e6cd852bde07cb209d3fa6c8e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 00:46:20 +0000
Subject: [PATCH 0160/1386] python3Packages.async-substrate-interface: 2.2.0 ->
 2.2.1

---
 .../python-modules/async-substrate-interface/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/async-substrate-interface/default.nix b/pkgs/development/python-modules/async-substrate-interface/default.nix
index 26e7ed8e43cf..9a833a6693b1 100644
--- a/pkgs/development/python-modules/async-substrate-interface/default.nix
+++ b/pkgs/development/python-modules/async-substrate-interface/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "async-substrate-interface";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: {
     owner = "latent-to";
     repo = "async-substrate-interface";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-39QL0h47ubKI26rIYxniNlchNAFEkPtKw6MyKuu2AXY=";
+    hash = "sha256-JEyB2UyvtTWIszuJ8Hf9S6WzK+Hb4L1L36E/KywfkYw=";
   };
 
   # On darwin the sandbox isolation is not as strict as on linux,

From 510aab0284212d53ea58611697874801ab3270e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 01:24:23 +0000
Subject: [PATCH 0161/1386] pana: 0.23.13 -> 0.23.14

---
 pkgs/by-name/pa/pana/package.nix       |  4 ++--
 pkgs/by-name/pa/pana/pubspec.lock.json | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/pa/pana/package.nix b/pkgs/by-name/pa/pana/package.nix
index 6881bae84334..6b279726dcbf 100644
--- a/pkgs/by-name/pa/pana/package.nix
+++ b/pkgs/by-name/pa/pana/package.nix
@@ -9,13 +9,13 @@
 }:
 buildDartApplication rec {
   pname = "pana";
-  version = "0.23.13";
+  version = "0.23.14";
 
   src = fetchFromGitHub {
     owner = "dart-lang";
     repo = "pana";
     tag = version;
-    hash = "sha256-LPTcmAb0eZKhxzz/LzV4GnHfw/RAKCItoC7Vn9vvOuw=";
+    hash = "sha256-yBheou/u8TjL+MDhxd6AhWPJARLEcQF+ojmDqkv8zi4=";
   };
 
   dartEntryPoints = {
diff --git a/pkgs/by-name/pa/pana/pubspec.lock.json b/pkgs/by-name/pa/pana/pubspec.lock.json
index 2ca72fb00a18..56f6f5b351b8 100644
--- a/pkgs/by-name/pa/pana/pubspec.lock.json
+++ b/pkgs/by-name/pa/pana/pubspec.lock.json
@@ -54,41 +54,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "build",
-        "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
+        "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.6"
+      "version": "4.0.7"
     },
     "build_config": {
       "dependency": "direct dev",
       "description": {
         "name": "build_config",
-        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
+        "sha256": "f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "sha256": "fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.2"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6",
+        "sha256": "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.15.0"
+      "version": "2.15.1"
     },
     "build_verify": {
       "dependency": "direct dev",
@@ -224,11 +224,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60",
+        "sha256": "b60b8cb28aa514346eb8f6b005c60484ea65190f213b1986f6e391e0292d18f4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.9"
+      "version": "3.1.11"
     },
     "ffi": {
       "dependency": "transitive",
@@ -404,11 +404,11 @@
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d",
+        "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.3"
+      "version": "1.19.0"
     },
     "mime": {
       "dependency": "transitive",

From 453bab7160fa7f81577fe997ef786fee58af42da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 02:18:39 +0000
Subject: [PATCH 0162/1386] netbird: 0.74.2 -> 0.74.3

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 1f342526688d..5c3638e6d70f 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -73,13 +73,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.74.2";
+  version = "0.74.3";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+BGWZzw6a8Fp8NlhtbX81OA3hCTcQ9r6nLuXTsbXCZ8=";
+    hash = "sha256-JXmtoHe0CwO1nKOPi82+cxhJ3tf3XZUCpDstk8U6s94=";
   };
 
   overrideModAttrs = final: prev: {

From ebef11dee413fa5ad423307097ab805f5d286b4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 02:20:51 +0000
Subject: [PATCH 0163/1386] python3Packages.openai-agents: 0.17.6 -> 0.18.1

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

diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix
index a35a81bdad58..70b3155e7003 100644
--- a/pkgs/development/python-modules/openai-agents/default.nix
+++ b/pkgs/development/python-modules/openai-agents/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "openai-agents";
-  version = "0.17.6";
+  version = "0.18.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "openai_agents";
-    hash = "sha256-/tlPjPDrTFfGOomtSxB5MtdfKgttnolciPo8IX5jyCI=";
+    hash = "sha256-aJrYjI9kQ1QT3ecHykX7QtVSF/9u9jqrPWOMM/eOBL8=";
   };
 
   build-system = [

From d2b1e111a6b40aad2b732c16b9f0a3408ff41903 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 06:44:39 +0000
Subject: [PATCH 0164/1386] mago: 1.29.0 -> 1.43.0

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

diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index e826b30803c0..44cee926a131 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mago";
-  version = "1.29.0";
+  version = "1.43.0";
 
   src = fetchFromGitHub {
     owner = "carthage-software";
     repo = "mago";
     tag = finalAttrs.version;
-    hash = "sha256-e/LKOQ+GAtdDye/poJdbX/98gDWle3NWIZ2zHwkGkcQ=";
+    hash = "sha256-AWnPhylz41E6d1M7PxVpH4EbyYeO9T6jlWVlzBqiOhQ=";
     forceFetchGit = true; # Does not download all files otherwise
   };
 
-  cargoHash = "sha256-stjjP8VRHy5k9zMXWGikVNExXRFte0gVBEsbKmPY6U4=";
+  cargoHash = "sha256-f7HZTJ0ESx7QTKgBqd2FOH1nCeIzgODMM9Sb0tQpfdE=";
 
   env = {
     # Get openssl-sys to use pkg-config

From fa0d69c1b35d34aaab35731ad69d35b49c10b8ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 11:38:23 +0000
Subject: [PATCH 0165/1386] v2ray-rules-dat: 202606302305 -> 202607092306

---
 pkgs/by-name/v2/v2ray-rules-dat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-rules-dat/package.nix b/pkgs/by-name/v2/v2ray-rules-dat/package.nix
index 2a3526cccb63..f5b813ce1aaf 100644
--- a/pkgs/by-name/v2/v2ray-rules-dat/package.nix
+++ b/pkgs/by-name/v2/v2ray-rules-dat/package.nix
@@ -5,7 +5,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "v2ray-rules-dat";
-  version = "202606302305";
+  version = "202607092306";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,11 +25,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru = {
     geoipDat = fetchurl {
       url = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/${finalAttrs.version}/geoip.dat";
-      hash = "sha256-5VG2bpMAqY7MlKXcjIajlzv3AzE4sPph6wY4QZzlAFc=";
+      hash = "sha256-g3l3GfrMCS4hD4+ODl4LC9/gaskKOko9amqy14GpF64=";
     };
     geositeDat = fetchurl {
       url = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/${finalAttrs.version}/geosite.dat";
-      hash = "sha256-xPj6SJ0FGqNzcw0oa91ymMHTySDBMsJ3Raq9pUHM3YU=";
+      hash = "sha256-E1Vs8u0vkDtgXQNHJejL0Xenl/fYn5IE9npD2M0Js8o=";
     };
     updateScript = ./update.sh;
   };

From 8bd903e4cd6d44fb3ceca4fe0a6cfa400d2011ac Mon Sep 17 00:00:00 2001
From: BENDI <dev@bendipowered.com>
Date: Fri, 10 Jul 2026 14:11:51 +0200
Subject: [PATCH 0166/1386] nagstamon: Add missing dependencies

Adds the python deps

- packaging
- pyqt6-webengine

without which the application no longer launches.
---
 pkgs/by-name/na/nagstamon/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/na/nagstamon/package.nix b/pkgs/by-name/na/nagstamon/package.nix
index 64b3a880920c..d7cf37dfea78 100644
--- a/pkgs/by-name/na/nagstamon/package.nix
+++ b/pkgs/by-name/na/nagstamon/package.nix
@@ -41,8 +41,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
     dbus-python
     keyring
     lxml
+    packaging
     psutil
     pyqt6
+    pyqt6-webengine
     pysocks
     python-dateutil
     requests

From 4e8211fa5321cd51af25f12b20c1d225ae55b7dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 12:26:46 +0000
Subject: [PATCH 0167/1386] octavePackages.datatypes: 1.2.5 -> 1.2.6

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

diff --git a/pkgs/development/octave-modules/datatypes/default.nix b/pkgs/development/octave-modules/datatypes/default.nix
index 1be6a219be3e..cab09eb45a8a 100644
--- a/pkgs/development/octave-modules/datatypes/default.nix
+++ b/pkgs/development/octave-modules/datatypes/default.nix
@@ -7,13 +7,13 @@
 
 buildOctavePackage rec {
   pname = "datatypes";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "pr0m1th3as";
     repo = "datatypes";
     tag = "release-${version}";
-    sha256 = "sha256-e7xHit/EvsNCzWWA5tuqVMwoUvJo09gNma7RrDd2ib0=";
+    sha256 = "sha256-8gOBjU9YJbS90iR/dgUzg5DHdb3x5PmEqmaDUbRZAyM=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };

From 359dd19dc32a15034ccd86892366b6a4486af373 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 12:41:19 +0000
Subject: [PATCH 0168/1386] elpa: 2026.02.001 -> 2026.02.002

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

diff --git a/pkgs/by-name/el/elpa/package.nix b/pkgs/by-name/el/elpa/package.nix
index 650d59f93de4..0a8e5366a971 100644
--- a/pkgs/by-name/el/elpa/package.nix
+++ b/pkgs/by-name/el/elpa/package.nix
@@ -28,13 +28,13 @@ assert blas.isILP64 == scalapack.isILP64;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elpa";
-  version = "2026.02.001";
+  version = "2026.02.002";
 
   passthru = { inherit (blas) isILP64; };
 
   src = fetchurl {
     url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${finalAttrs.version}/elpa-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-o3nyf029J7LuRQF6/sZW0GQwHpcVDIdGSb39ZJV7de0=";
+    sha256 = "sha256-AuPFn+xTzY62akzBX6T78ZDPllQiciP7itVXE+lCeTI=";
   };
 
   patches = [

From aec70e19631c8203d255eca0105900cbb8105b17 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 10 Jul 2026 18:12:59 +0200
Subject: [PATCH 0169/1386] lasuite-docs{,-frontend,-collaboration-server}:
 5.3.0 -> 5.4.1

ChangeLogs:
* https://github.com/suitenumerique/docs/releases/tag/v5.4.0
* https://github.com/suitenumerique/docs/releases/tag/v5.4.1
---
 .../la/lasuite-docs-collaboration-server/package.nix        | 6 +++---
 pkgs/by-name/la/lasuite-docs-frontend/package.nix           | 6 +++---
 pkgs/by-name/la/lasuite-docs/package.nix                    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
index 1ad982520822..b93fe9205ce9 100644
--- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
@@ -13,20 +13,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lasuite-docs-collaboration-server";
-  version = "5.3.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
+    hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
-    hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU=";
+    hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
index c14ae1a7986e..722711dd1bd4 100644
--- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
@@ -12,20 +12,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lasuite-docs-frontend";
-  version = "5.3.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
+    hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
-    hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU=";
+    hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix
index 98f84e289624..6584ead2daa5 100644
--- a/pkgs/by-name/la/lasuite-docs/package.nix
+++ b/pkgs/by-name/la/lasuite-docs/package.nix
@@ -11,12 +11,12 @@
   yarnConfigHook,
 }:
 let
-  version = "5.3.0";
+  version = "5.4.1";
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${version}";
-    hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
+    hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20=";
   };
 
   mail-templates = stdenv.mkDerivation {
@@ -29,7 +29,7 @@ let
 
     offlineCache = fetchYarnDeps {
       yarnLock = "${src}/src/mail/yarn.lock";
-      hash = "sha256-MYzADDcXHGieGkygmlbZQbYcS68NdKWyHYGgoSaqDO8=";
+      hash = "sha256-miA1ysqNSaBZSb2B2uqTx1rea9R5/AgRfuCPr5X0bx8=";
     };
 
     nativeBuildInputs = [

From 9ff2dfbc96bb50c73d6b7974e0cb5ab02f1eb613 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:26:42 +0700
Subject: [PATCH 0170/1386] python3Packages.dateutils: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix
index 323a4e05ec32..0e19d5c46103 100644
--- a/pkgs/development/python-modules/dateutils/default.nix
+++ b/pkgs/development/python-modules/dateutils/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   python-dateutil,
   pytz,
 }:
@@ -9,14 +10,16 @@
 buildPythonPackage rec {
   pname = "dateutils";
   version = "0.6.12";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     python-dateutil
     pytz
   ];

From 0f5fcb3f5aaeb17f45bef6c2656adcc590d0ddb5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:26:45 +0700
Subject: [PATCH 0171/1386] python3Packages.datefinder: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix
index 953bd24bb409..2403408814e8 100644
--- a/pkgs/development/python-modules/datefinder/default.nix
+++ b/pkgs/development/python-modules/datefinder/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
   python-dateutil,
   pytz,
@@ -11,7 +12,7 @@
 buildPythonPackage rec {
   pname = "datefinder";
   version = "0.7.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "akoumjian";
@@ -20,7 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-uOSwS+mHgbvEL+rTfs4Ax9NvJnhYemxFVqqDssy2i7g=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     regex
     pytz
     python-dateutil

From d8c2da55d62c555d486575525017c3d6d4d44a01 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:26:59 +0700
Subject: [PATCH 0172/1386] python3Packages.dawg-python: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index eab79418b8b5..65e5642ec3b9 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -2,12 +2,13 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "dawg-python";
   version = "0.7.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -15,6 +16,8 @@ buildPythonPackage rec {
     hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "dawg_python" ];
 
   meta = {

From 467e6ca1dffec6529c18447844dd356063fd2ac6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:27:40 +0700
Subject: [PATCH 0173/1386] python3Packages.dateutils: modernize

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

diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix
index 0e19d5c46103..193cc01e797b 100644
--- a/pkgs/development/python-modules/dateutils/default.nix
+++ b/pkgs/development/python-modules/dateutils/default.nix
@@ -7,13 +7,16 @@
   pytz,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dateutils";
   version = "0.6.12";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    pname = "dateutils";
+    inherit (finalAttrs) version;
     hash = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E=";
   };
 
@@ -32,4 +35,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd0;
     maintainers = [ ];
   };
-}
+})

From d893e2d05cb75b0a0a97341d161b5745ba41431d Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:27:55 +0700
Subject: [PATCH 0174/1386] python3Packages.dbf: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index e08da118e6ae..5a8779bf4356 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  setuptools,
   aenum,
   python,
 }:
@@ -9,17 +10,19 @@
 buildPythonPackage rec {
   pname = "dbf";
   version = "0.99.11";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-IWnAUlLA776JfzRvBoMybsJYVL6rHQxkMN9ukDpXsxU=";
   };
 
+  build-system = [ setuptools ];
+
   # Workaround for https://github.com/ethanfurman/dbf/issues/48
   patches = lib.optional python.stdenv.hostPlatform.isDarwin ./darwin.patch;
 
-  propagatedBuildInputs = [ aenum ];
+  dependencies = [ aenum ];
 
   checkPhase = ''
     runHook preCheck

From 9fe1bcd1a6d565f1966dd105e9b92a98fded3f12 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:28:13 +0700
Subject: [PATCH 0175/1386] python3Packages.dawg-python: modernize

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

diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index 65e5642ec3b9..cef1c82cd2ee 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -5,13 +5,15 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dawg-python";
   version = "0.7.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit version;
+    inherit (finalAttrs) version;
     pname = "DAWG-Python";
     hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE=";
   };
@@ -26,4 +28,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From e90264fa6a8a704e931d9af43f7721a59b64dae6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:28:17 +0700
Subject: [PATCH 0176/1386] python3Packages.datefinder: modernize

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

diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix
index 2403408814e8..e69eb68848fd 100644
--- a/pkgs/development/python-modules/datefinder/default.nix
+++ b/pkgs/development/python-modules/datefinder/default.nix
@@ -9,15 +9,17 @@
   regex,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "datefinder";
   version = "0.7.3";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "akoumjian";
     repo = "datefinder";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-uOSwS+mHgbvEL+rTfs4Ax9NvJnhYemxFVqqDssy2i7g=";
   };
 
@@ -42,4 +44,4 @@ buildPythonPackage rec {
       despsyched
     ];
   };
-}
+})

From 2fb12d05111252aa237dbd146f7348fc3a6d5e8a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:29:52 +0700
Subject: [PATCH 0177/1386] python3Packages.dbf: modernize

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

diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 5a8779bf4356..3eef542370a1 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -7,13 +7,16 @@
   python,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dbf";
   version = "0.99.11";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    pname = "dbf";
+    inherit (finalAttrs) version;
     hash = "sha256-IWnAUlLA776JfzRvBoMybsJYVL6rHQxkMN9ukDpXsxU=";
   };
 
@@ -38,4 +41,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ ];
   };
-}
+})

From 3efe86da36a02fa4ee336dae5a7e8cb37f7577f6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:36:40 +0700
Subject: [PATCH 0178/1386] python3Packages.airly: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index e98fe6623a36..5e8e6c5ca207 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -5,6 +5,7 @@
   aiounittest,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
   pythonOlder,
 }:
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "airly";
   version = "1.1.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ak-ambi";
@@ -21,7 +22,9 @@ buildPythonPackage rec {
     hash = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   # aiounittest is not supported on 3.12
   doCheck = pythonOlder "3.12";

From e2a10bf5bf354737f94f79b2297189712e83ddb1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:38:04 +0700
Subject: [PATCH 0179/1386] python3Packages.airly: modernize

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

diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index 5e8e6c5ca207..a6cd3381605f 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -10,15 +10,17 @@
   pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "airly";
   version = "1.1.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "ak-ambi";
     repo = "python-airly";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI=";
   };
 
@@ -52,4 +54,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 48bf81bcb4f427f0ac5209392e2b9a77ef5c7a14 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:39:14 +0700
Subject: [PATCH 0180/1386] python3Packages.airly: re-enable
 previously-disabled tests

---
 pkgs/development/python-modules/airly/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index a6cd3381605f..9a3c57cb2c17 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -41,11 +41,6 @@ buildPythonPackage (finalAttrs: {
     cd tests
   '';
 
-  disabledTests = [
-    "InstallationsLoaderTestCase"
-    "MeasurementsSessionTestCase"
-  ];
-
   pythonImportsCheck = [ "airly" ];
 
   meta = {

From 0d624ebe41c6dcf9fff70d544b25ce382976f0a5 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Fri, 10 Jul 2026 18:33:13 +0100
Subject: [PATCH 0181/1386] auge: init at 1.9.0

---
 pkgs/by-name/au/auge/package.nix | 54 ++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/au/auge/package.nix

diff --git a/pkgs/by-name/au/auge/package.nix b/pkgs/by-name/au/auge/package.nix
new file mode 100644
index 000000000000..fdd1d1f07acc
--- /dev/null
+++ b/pkgs/by-name/au/auge/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "auge";
+  version = "1.9.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1
+  src = fetchurl {
+    url = "https://github.com/Arthur-Ficial/auge/releases/download/v${finalAttrs.version}/auge-${finalAttrs.version}-arm64-macos.tar.gz";
+    hash = "sha256-hL3kq1/hFo4rlq2nz4iaRLqoErLiF032ovqwl5Rwqso=";
+  };
+
+  sourceRoot = ".";
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp auge $out/bin/
+    chmod +x $out/bin/auge
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "On-device Apple Vision framework CLI";
+    homepage = "https://github.com/Arthur-Ficial/auge";
+    changelog = "https://github.com/Arthur-Ficial/auge/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
+    platforms = [ "aarch64-darwin" ];
+    mainProgram = "auge";
+    sourceProvenance = [
+      lib.sourceTypes.binaryNativeCode
+    ];
+  };
+})

From d12975a5c48912b4bcf2b8b9c1a7ee982c65d95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Jul 2026 12:29:48 -0700
Subject: [PATCH 0182/1386] immich: inline plugin-core and web

---
 pkgs/by-name/im/immich/package.nix | 69 +++---------------------------
 1 file changed, 6 insertions(+), 63 deletions(-)

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 8012f5db51a7..6f20483c95f0 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -137,6 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [
+    binaryen
+    extism-js
     nodejs
     pkg-config
     pnpmConfigHook
@@ -174,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
     # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
     rm node_modules/.pnpm/node_modules/exiftool-vendored.pl
 
-    pnpm --filter immich... build
+    pnpm --filter immich... --filter immich-web... --filter @immich/plugin-core... build
 
     runHook postBuild
   '';
@@ -196,9 +198,9 @@ stdenv.mkDerivation (finalAttrs: {
       -o -name '*.target.mk' \
     \) -exec rm -r {} +
 
-    mkdir -p "$packageOut/build/plugins"
-    ln -s '${finalAttrs.plugin-core}' "$packageOut/build/plugins/immich-plugin-core"
-    ln -s '${finalAttrs.web}' "$packageOut/build/www"
+    mkdir -p "$packageOut/build/plugins/immich-plugin-core"
+    cp -r packages/plugin-core/{dist,manifest.json} "$packageOut/build/plugins/immich-plugin-core/"
+    cp -r web/build "$packageOut/build/www"
     ln -s '${geodata}' "$packageOut/build/geodata"
 
     echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json"
@@ -222,65 +224,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  plugin-core = stdenv.mkDerivation {
-    pname = "immich-plugin-core";
-    inherit (finalAttrs) version src pnpmDeps;
-
-    nativeBuildInputs = [
-      binaryen
-      extism-js
-      nodejs
-      pnpmConfigHook
-      pnpm
-    ];
-
-    buildPhase = ''
-      runHook preBuild
-
-      pnpm --filter @immich/plugin-core... build
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      cd packages/plugin-core
-      mkdir $out
-      cp -r dist manifest.json $out
-
-      runHook postInstall
-    '';
-  };
-
-  web = stdenv.mkDerivation {
-    pname = "immich-web";
-    inherit (finalAttrs) version src pnpmDeps;
-
-    nativeBuildInputs = [
-      nodejs
-      pnpmConfigHook
-      pnpm
-    ];
-
-    buildPhase = ''
-      runHook preBuild
-
-      pnpm --filter immich-web... build
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      cd web
-      cp -r build $out
-
-      runHook postInstall
-    '';
-  };
-
   passthru = {
     tests = {
       inherit (nixosTests) immich immich-vectorchord-reindex;

From 6b19bd9a3dd4e009d37c2515c8c87ac874aaf4ab Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Fri, 10 Jul 2026 15:49:19 +0200
Subject: [PATCH 0183/1386] python3Packages.sphinx-llm: init at 0.4.1

---
 .../python-modules/sphinx-llm/default.nix     | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinx-llm/default.nix

diff --git a/pkgs/development/python-modules/sphinx-llm/default.nix b/pkgs/development/python-modules/sphinx-llm/default.nix
new file mode 100644
index 000000000000..2a00de00b91c
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-llm/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  hatchling,
+  hatch-vcs,
+  sphinx,
+  sphinx-markdown-builder,
+  langchain-ollama,
+  pytestCheckHook,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "sphinx-llm";
+  version = "0.4.1";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "sphinx-llm";
+    tag = finalAttrs.version;
+    hash = "sha256-hrJ2g4Zcjs0ojueCtrMpsMv1MRwd5kuBFYI4cnhPZrs=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
+
+  dependencies = [
+    sphinx
+    sphinx-markdown-builder
+    langchain-ollama
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [
+    "sphinx_llm.txt"
+    "sphinx_llm.docref"
+  ];
+
+  meta = {
+    description = "LLM extensions for Sphinx Documentation";
+    homepage = "https://github.com/NVIDIA/sphinx-llm";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ benley ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c96c2839b5d9..b3d25b5a56b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19073,6 +19073,8 @@ self: super: with self; {
     callPackage ../development/python-modules/sphinx-last-updated-by-git
       { };
 
+  sphinx-llm = callPackage ../development/python-modules/sphinx-llm { };
+
   sphinx-llms-txt = callPackage ../development/python-modules/sphinx-llms-txt { };
 
   sphinx-lv2-theme = callPackage ../development/python-modules/sphinx-lv2-theme { };

From 90d4d0b7cf883923db990f79c6f6ae2b08dcd732 Mon Sep 17 00:00:00 2001
From: Austin Eschweiler <austin.eschweiler@gmail.com>
Date: Fri, 10 Jul 2026 16:13:09 -0500
Subject: [PATCH 0184/1386] tts-mod-vault: 2.0.0 -> 2.1.0

---
 pkgs/by-name/tt/tts-mod-vault/package.nix     |   8 +-
 .../tt/tts-mod-vault/pubspec.lock.json        | 774 +++---------------
 2 files changed, 131 insertions(+), 651 deletions(-)

diff --git a/pkgs/by-name/tt/tts-mod-vault/package.nix b/pkgs/by-name/tt/tts-mod-vault/package.nix
index 8a4a0bd5bc6c..138b92701ae6 100644
--- a/pkgs/by-name/tt/tts-mod-vault/package.nix
+++ b/pkgs/by-name/tt/tts-mod-vault/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter341,
+  flutter344,
   makeDesktopItem,
   copyDesktopItems,
   fetchFromGitHub,
@@ -10,15 +10,15 @@
   _experimental-update-script-combinators,
 }:
 
-flutter341.buildFlutterApplication (finalAttrs: {
+flutter344.buildFlutterApplication (finalAttrs: {
   pname = "tts-mod-vault";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "markomijic";
     repo = "TTS-Mod-Vault";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vreamzu+jzlgzjbEro5kE5bM1k6cL6XCG6Tsv+LEiyI=";
+    hash = "sha256-4DRDYRPHDuUrtGoZi+oEqkbv2LYn+qPkJI8Ep6IkUYo=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
index 93ffa33d1d5b..d5cbb6534ddb 100644
--- a/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
+++ b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
@@ -1,75 +1,5 @@
 {
   "packages": {
-    "_fe_analyzer_shared": {
-      "dependency": "transitive",
-      "description": {
-        "name": "_fe_analyzer_shared",
-        "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "96.0.0"
-    },
-    "adaptive_number": {
-      "dependency": "transitive",
-      "description": {
-        "name": "adaptive_number",
-        "sha256": "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "analyzer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "analyzer",
-        "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.2.0"
-    },
-    "app_links": {
-      "dependency": "transitive",
-      "description": {
-        "name": "app_links",
-        "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.4.1"
-    },
-    "app_links_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "app_links_linux",
-        "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.3"
-    },
-    "app_links_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "app_links_platform_interface",
-        "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.2"
-    },
-    "app_links_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "app_links_web",
-        "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
     "archive": {
       "dependency": "direct main",
       "description": {
@@ -94,11 +24,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -120,66 +50,6 @@
       "source": "hosted",
       "version": "5.0.8"
     },
-    "build": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build",
-        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.4"
-    },
-    "build_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_config",
-        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "build_daemon": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_daemon",
-        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.1"
-    },
-    "build_runner": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "build_runner",
-        "sha256": "39ad4ca8a2876779737c60e4228b4bcd35d4352ef7e14e47514093edc012c734",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.11.1"
-    },
-    "built_collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "built_collection",
-        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.1.1"
-    },
-    "built_value": {
-      "dependency": "transitive",
-      "description": {
-        "name": "built_value",
-        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.12.4"
-    },
     "characters": {
       "dependency": "transitive",
       "description": {
@@ -190,26 +60,6 @@
       "source": "hosted",
       "version": "1.4.1"
     },
-    "checked_yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "checked_yaml",
-        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.4"
-    },
-    "cli_util": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cli_util",
-        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.2"
-    },
     "clock": {
       "dependency": "transitive",
       "description": {
@@ -224,21 +74,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_assets",
-        "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
+        "sha256": "bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
-    },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.11.1"
+      "version": "1.2.1"
     },
     "collection": {
       "dependency": "direct main",
@@ -250,16 +90,6 @@
       "source": "hosted",
       "version": "1.19.1"
     },
-    "convert": {
-      "dependency": "transitive",
-      "description": {
-        "name": "convert",
-        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
     "cross_file": {
       "dependency": "transitive",
       "description": {
@@ -280,35 +110,15 @@
       "source": "hosted",
       "version": "3.0.7"
     },
-    "dart_jsonwebtoken": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dart_jsonwebtoken",
-        "sha256": "0de65691c1d736e9459f22f654ddd6fd8368a271d4e41aa07e53e6301eff5075",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.3.1"
-    },
-    "dart_style": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dart_style",
-        "sha256": "15a7db352c8fc6a4d2bc475ba901c25b39fe7157541da4c16eacce6f8be83e49",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.5"
-    },
     "dbus": {
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
+        "sha256": "792974a4007974fbc5c1b5433eb2330a9db3e368c3f906253af4c007d0f49a91",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.12"
+      "version": "0.7.13"
     },
     "decimal": {
       "dependency": "transitive",
@@ -324,31 +134,21 @@
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "b9d46faecab38fc8cc286f80bc4d61a3bb5d4ac49e51ed877b4d6706efe57b25",
+        "sha256": "ea2bad3c89a27635ce2d85cce4d6b199da49a5a48ec77b03e45b65a3b90922b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.9.1"
+      "version": "5.10.0"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
+        "sha256": "dd58dc3861eb36edb13b217efc006a1c21e5bbc341de8c229b85634fa5e362e4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
-    },
-    "ed25519_edwards": {
-      "dependency": "transitive",
-      "description": {
-        "name": "ed25519_edwards",
-        "sha256": "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.1"
+      "version": "2.2.0"
     },
     "fake_async": {
       "dependency": "transitive",
@@ -370,16 +170,6 @@
       "source": "hosted",
       "version": "2.2.0"
     },
-    "file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "file",
-        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.1"
-    },
     "file_picker": {
       "dependency": "direct main",
       "description": {
@@ -406,26 +196,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_archive": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_archive",
-        "sha256": "e433389fde0bdfc20af40784fdb6d91753794b40cf708a43f95244fcd5d6c298",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.4"
-    },
-    "flutter_dotenv": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_dotenv",
-        "sha256": "d4130c4a43e0b13fefc593bc3961f2cb46e30cb79e253d4a526b1b5d24ae1ce4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
     "flutter_hooks": {
       "dependency": "direct main",
       "description": {
@@ -436,16 +206,6 @@
       "source": "hosted",
       "version": "0.21.3+1"
     },
-    "flutter_launcher_icons": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_launcher_icons",
-        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.14.4"
-    },
     "flutter_lints": {
       "dependency": "direct dev",
       "description": {
@@ -466,11 +226,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.35"
     },
     "flutter_riverpod": {
       "dependency": "transitive",
@@ -494,58 +254,8 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "functions_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "functions_client",
-        "sha256": "94074d62167ae634127ef6095f536835063a7dc80f2b1aa306d2346ff9023996",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.0"
-    },
-    "glob": {
-      "dependency": "transitive",
-      "description": {
-        "name": "glob",
-        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.3"
-    },
-    "gotrue": {
-      "dependency": "transitive",
-      "description": {
-        "name": "gotrue",
-        "sha256": "f7b52008311941a7c3e99f9590c4ee32dfc102a5442e43abf1b287d9f8cc39b2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.18.0"
-    },
-    "graphs": {
-      "dependency": "transitive",
-      "description": {
-        "name": "graphs",
-        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "gtk": {
-      "dependency": "transitive",
-      "description": {
-        "name": "gtk",
-        "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
     "hive_ce": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "hive_ce",
         "sha256": "8e9980e68643afb1e765d3af32b47996552a64e190d03faf622cea07c1294418",
@@ -564,25 +274,15 @@
       "source": "hosted",
       "version": "2.3.4"
     },
-    "hive_ce_generator": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "hive_ce_generator",
-        "sha256": "c9a7cda57823ffec35846c051637ddcd105eafa253e7395d9c8c0ed5e87fbb72",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.1"
-    },
     "hooks": {
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6",
+        "sha256": "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "2.0.2"
     },
     "hooks_riverpod": {
       "dependency": "direct main",
@@ -604,16 +304,6 @@
       "source": "hosted",
       "version": "1.6.0"
     },
-    "http_multi_server": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_multi_server",
-        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.2"
-    },
     "http_parser": {
       "dependency": "transitive",
       "description": {
@@ -624,15 +314,25 @@
       "source": "hosted",
       "version": "4.1.2"
     },
+    "icons_launcher": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "icons_launcher",
+        "sha256": "b42b2f9b10e58d6a973f71293f00a1f0572595e5e50d676c53048e464f78cb7d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.0"
+    },
     "image": {
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
+        "sha256": "6300175e00616bbc832e2fc91bfa4d776af5402c81c7151bee6905bb08473c52",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.0"
+      "version": "4.9.1"
     },
     "intl": {
       "dependency": "direct main",
@@ -644,16 +344,6 @@
       "source": "hosted",
       "version": "0.20.2"
     },
-    "io": {
-      "dependency": "transitive",
-      "description": {
-        "name": "io",
-        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.5"
-    },
     "isolate_channel": {
       "dependency": "transitive",
       "description": {
@@ -664,25 +354,35 @@
       "source": "hosted",
       "version": "0.6.1"
     },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
     "json_annotation": {
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "sha256": "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.11.0"
-    },
-    "jwt_decode": {
-      "dependency": "transitive",
-      "description": {
-        "name": "jwt_decode",
-        "sha256": "d2e9f68c052b2225130977429d30f187aa1981d789c76ad104a32243cfdebfbb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.1"
+      "version": "4.12.0"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -738,11 +438,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.18"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -758,11 +458,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.1"
+      "version": "1.18.0"
     },
     "mime": {
       "dependency": "direct main",
@@ -774,25 +474,15 @@
       "source": "hosted",
       "version": "2.0.0"
     },
-    "native_toolchain_c": {
-      "dependency": "transitive",
-      "description": {
-        "name": "native_toolchain_c",
-        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.17.4"
-    },
     "objective_c": {
       "dependency": "transitive",
       "description": {
         "name": "objective_c",
-        "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52",
+        "sha256": "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.3.0"
+      "version": "9.4.1"
     },
     "open_filex": {
       "dependency": "direct main",
@@ -818,11 +508,11 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
+        "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "9.0.1"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -855,24 +545,24 @@
       "version": "1.9.1"
     },
     "path_provider": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "path_provider",
-        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
+        "sha256": "a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.1.6"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.3.1"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -888,21 +578,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "sha256": "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.2.2"
     },
     "path_provider_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_platform_interface",
-        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+        "sha256": "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "path_provider_windows": {
       "dependency": "transitive",
@@ -914,6 +604,26 @@
       "source": "hosted",
       "version": "2.3.0"
     },
+    "pdfium_dart": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pdfium_dart",
+        "sha256": "86e95c66b09f3245b95c4924f2edce8d4f7c9786876e5c5ee8e36b104a94bbb0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.5"
+    },
+    "pdfrx_engine": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pdfrx_engine",
+        "sha256": "89865e158ced818690ab207a13a34a65803cd67ee1bec9f5f87838eb5a79600b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.3"
+    },
     "petitparser": {
       "dependency": "transitive",
       "description": {
@@ -944,26 +654,6 @@
       "source": "hosted",
       "version": "2.1.8"
     },
-    "pointycastle": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointycastle",
-        "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
-    "pool": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pool",
-        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.2"
-    },
     "posix": {
       "dependency": "transitive",
       "description": {
@@ -974,16 +664,6 @@
       "source": "hosted",
       "version": "6.5.0"
     },
-    "postgrest": {
-      "dependency": "transitive",
-      "description": {
-        "name": "postgrest",
-        "sha256": "f4b6bb24b465c47649243ef0140475de8a0ec311dc9c75ebe573b2dcabb10460",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.6.0"
-    },
     "power_extensions": {
       "dependency": "transitive",
       "description": {
@@ -1004,16 +684,6 @@
       "source": "hosted",
       "version": "2.2.0"
     },
-    "pubspec_parse": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pubspec_parse",
-        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.0"
-    },
     "rational": {
       "dependency": "transitive",
       "description": {
@@ -1024,25 +694,15 @@
       "source": "hosted",
       "version": "2.2.3"
     },
-    "realtime_client": {
+    "record_use": {
       "dependency": "transitive",
       "description": {
-        "name": "realtime_client",
-        "sha256": "5268afc208d02fb9109854d262c1ebf6ece224cd285199ae1d2f92d2ff49dbf1",
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.0"
-    },
-    "retry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "retry",
-        "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
+      "version": "0.6.0"
     },
     "riverpod": {
       "dependency": "transitive",
@@ -1068,141 +728,51 @@
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever",
-        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
+        "sha256": "42cc3b402a0f67d2455a0d067553d0f13453f6a008d98eababf8b63958d506bd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "screen_retriever_linux": {
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever_linux",
-        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "sha256": "2a476f1a5538065bc5badf376cfdc83d6ecf07d77eb2391b9c2bff5a76970048",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "screen_retriever_macos": {
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever_macos",
-        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "sha256": "b5abb900fcb86614ff10b738b34e37b9e1d03b0447280668e2bc8a98bdc7bd59",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "screen_retriever_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever_platform_interface",
-        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "sha256": "3af22d926bedf20c2caa308eea376776451a3af125919ce072e56525fded8901",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "screen_retriever_windows": {
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever_windows",
-        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "sha256": "c44b38a4c4bab34af259180a70a4eee1e29384e7b82e627c9faa68afcdab2e73",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
-    },
-    "shared_preferences": {
-      "dependency": "direct main",
-      "description": {
-        "name": "shared_preferences",
-        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.4"
-    },
-    "shared_preferences_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_android",
-        "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.20"
-    },
-    "shared_preferences_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_foundation",
-        "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.6"
-    },
-    "shared_preferences_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_linux",
-        "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shared_preferences_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shared_preferences_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_web",
-        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.3"
-    },
-    "shared_preferences_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_windows",
-        "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shelf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf",
-        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.2"
-    },
-    "shelf_web_socket": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf_web_socket",
-        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.0"
+      "version": "0.2.1"
     },
     "sky_engine": {
       "dependency": "transitive",
@@ -1210,26 +780,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "source_gen": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_gen",
-        "sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.0"
-    },
-    "source_helper": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_helper",
-        "sha256": "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.10"
-    },
     "source_span": {
       "dependency": "transitive",
       "description": {
@@ -1260,16 +810,6 @@
       "source": "hosted",
       "version": "1.0.0"
     },
-    "storage_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "storage_client",
-        "sha256": "1c61b19ed9e78f37fdd1ca8b729ab8484e6c8fe82e15c87e070b861951183657",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
@@ -1280,16 +820,6 @@
       "source": "hosted",
       "version": "2.1.4"
     },
-    "stream_transform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_transform",
-        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
@@ -1300,25 +830,15 @@
       "source": "hosted",
       "version": "1.4.1"
     },
-    "supabase": {
+    "synchronized": {
       "dependency": "transitive",
       "description": {
-        "name": "supabase",
-        "sha256": "cc039f63a3168386b3a4f338f3bff342c860d415a3578f3fbe854024aee6f911",
+        "name": "synchronized",
+        "sha256": "93b153dcb6a26dcddee6ca087dd634b53e38c10b5aa163e8e49501a776456153",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.2"
-    },
-    "supabase_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "supabase_flutter",
-        "sha256": "92b2416ecb6a5c3ed34cf6e382b35ce6cc8921b64f2a9299d5d28968d42b09bb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.12.0"
+      "version": "3.4.1"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1334,11 +854,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.9"
+      "version": "0.7.11"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1350,6 +870,16 @@
       "source": "hosted",
       "version": "1.4.0"
     },
+    "universal_io": {
+      "dependency": "transitive",
+      "description": {
+        "name": "universal_io",
+        "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.1"
+    },
     "url_launcher": {
       "dependency": "direct main",
       "description": {
@@ -1364,11 +894,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.32"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -1414,11 +944,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -1454,21 +984,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
-    },
-    "watcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "watcher",
-        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
+      "version": "15.2.0"
     },
     "web": {
       "dependency": "transitive",
@@ -1480,26 +1000,6 @@
       "source": "hosted",
       "version": "1.1.1"
     },
-    "web_socket": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web_socket",
-        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "web_socket_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web_socket_channel",
-        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.3"
-    },
     "win32": {
       "dependency": "transitive",
       "description": {
@@ -1534,11 +1034,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
+        "sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.6.1"
+      "version": "7.0.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -1549,30 +1049,10 @@
       },
       "source": "hosted",
       "version": "3.1.3"
-    },
-    "yaml_writer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml_writer",
-        "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "yet_another_json_isolate": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yet_another_json_isolate",
-        "sha256": "fe45897501fa156ccefbfb9359c9462ce5dec092f05e8a56109db30be864f01e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
     }
   },
   "sdks": {
-    "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.38.4"
+    "dart": ">=3.12.0 <4.0.0",
+    "flutter": ">=3.44.0"
   }
-}
+}
\ No newline at end of file

From b2df76a3ec458c4d4ded15ee9b9b0d7b4b83a9be Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Fri, 10 Jul 2026 15:14:17 +0200
Subject: [PATCH 0185/1386] rebar3: enable __structuredAttrs + strictDeps,
 cleanup

---
 .../tools/build-managers/rebar3/default.nix   | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 653aa1a8cbb7..5b6941efe3b1 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -6,6 +6,7 @@
   fetchHex,
   erlang,
   makeWrapper,
+  writableTmpDirAsHomeHook,
   writeScript,
   common-updater-scripts,
   coreutils,
@@ -16,22 +17,28 @@
 }:
 
 let
-  version = "3.27.0";
-  owner = "erlang";
   deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; };
-  rebar3 = stdenv.mkDerivation rec {
+  rebar3 = stdenv.mkDerivation (finalAttrs: {
     pname = "rebar3";
-    inherit version erlang;
+    version = "3.27.0";
+
+    __structuredAttrs = true;
+    strictDeps = true;
 
     # How to obtain `sha256`:
     # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz
     src = fetchFromGitHub {
-      inherit owner;
-      repo = pname;
-      rev = version;
+      owner = "erlang";
+      repo = "rebar3";
+      tag = finalAttrs.version;
       sha256 = "+va3wHlAfVtl3aK6+DVkN/EgpiMxwAGUyNywaWiKTJQ=";
     };
 
+    nativeBuildInputs = [
+      erlang
+      writableTmpDirAsHomeHook
+    ];
+
     buildInputs = [ erlang ];
 
     postPatch = ''
@@ -58,22 +65,35 @@ let
     '';
 
     buildPhase = ''
-      HOME=. escript bootstrap
+      runHook preBuild
+
+      escript bootstrap
+
+      runHook postBuild
     '';
 
     checkPhase = ''
-      HOME=. escript ./rebar3 ct
+      runHook preCheck
+
+      escript ./rebar3 ct
+
+      runHook postCheck
     '';
 
     doCheck = true;
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/bin
       cp rebar3 $out/bin/rebar3
+
+      runHook postInstall
     '';
 
     meta = {
       homepage = "https://github.com/rebar/rebar3";
+      changelog = "https://github.com/erlang/rebar3/releases/tag/${finalAttrs.version}";
       description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
       mainProgram = "rebar3";
 
@@ -105,7 +125,7 @@ let
         ]
       }
       latest=$(list-git-tags | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
-      if [ "$latest" != "${version}" ]; then
+      if [ "$latest" != "${finalAttrs.version}" ]; then
         nixpkgs="$(git rev-parse --show-toplevel)"
         nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3"
         update-source-version rebar3 "$latest" --version-key=version --print-changes --file="$nix_path/default.nix"
@@ -117,7 +137,7 @@ let
         echo "rebar3 is already up-to-date"
       fi
     '';
-  };
+  });
 
   # Alias rebar3 so we can use it as default parameter below
   _rebar3 = rebar3;

From b910f531faae777cdcd63af3b7395612fa91b0db Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 11:59:07 +0200
Subject: [PATCH 0186/1386] maintainers: add antoineco

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30952dd7302a..d1ad59414d05 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1997,6 +1997,12 @@
     githubId = 14838767;
     name = "Jacopo Scannella";
   };
+  antoineco = {
+    email = "hello@acotten.com";
+    github = "antoineco";
+    githubId = 3299086;
+    name = "Antoine Cotten";
+  };
   anton-4 = {
     name = "Anton";
     github = "Anton-4";

From 4ccd659f26bebfb21702562f2d6a91a917932714 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 12:54:10 +0200
Subject: [PATCH 0187/1386] cider-2: add antoineco as maintainer

---
 pkgs/by-name/ci/cider-2/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 1d8db2f568f6..ed47a5ee9d1a 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
     mainProgram = "cider-2";
     maintainers = with lib.maintainers; [
       amadejkastelic
+      antoineco
       l0r3v
     ];
     platforms = [ "x86_64-linux" ];

From 1dfba633c54e2713022a878e8f49eb6a118541f8 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 13:03:20 +0200
Subject: [PATCH 0188/1386] cider-2: remove deps on widevine and asar

Cider 4 is a Widevine capable build; it does not need WidevineCdm to be
symlinked. Cider fetches it from Google's CDN either way, and playback
works out of the box.

The asar extract/repack is a left over from commit 4d94729 which was
mistakenly left behind in commit 99eafc4; it is now a no-op.
---
 pkgs/by-name/ci/cider-2/package.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index ed47a5ee9d1a..d12bfd4ca490 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -8,13 +8,11 @@
 
   # Required dependencies for autoPatchelfHook
   alsa-lib,
-  asar,
   gtk3,
   libgbm,
   libGL,
   nspr,
   nss,
-  widevine-cdm,
 }:
 stdenv.mkDerivation rec {
   pname = "cider-2";
@@ -26,7 +24,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    asar
     dpkg
     autoPatchelfHook
     makeWrapper
@@ -59,16 +56,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postInstall = ''
-    ${lib.getExe asar} extract $out/lib/cider/resources/app.asar ./cider-build
-
-    ${lib.getExe asar} pack ./cider-build $out/lib/cider/resources/app.asar
-    rm -rf ./cider-build
-
-    # Install Widevine CDM for DRM support
-    ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/lib/cider/
-  '';
-
   postFixup = ''
     makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
       --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \

From ac23ecaa136d38c0b2c8dbb62b98c0a01e07671b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 22:15:08 +0000
Subject: [PATCH 0189/1386] mpvScripts.twitch-chat: 0-unstable-2026-06-13 ->
 0-unstable-2026-07-02

---
 pkgs/by-name/mp/mpv/scripts/twitch-chat.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
index 33fb7d229737..cef4666be274 100644
--- a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
+++ b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
@@ -7,13 +7,13 @@
 }:
 buildLua {
   pname = "twitch-chat";
-  version = "0-unstable-2026-06-13";
+  version = "0-unstable-2026-07-02";
 
   src = fetchFromGitHub {
     owner = "CrendKing";
     repo = "mpv-twitch-chat";
-    rev = "1e9d2dfcd8ab9c343cc6a3c55363994dbafe5b58";
-    hash = "sha256-vtv5YZO7qROhUL3TKCKaNfvv1uCjQv9kvfo7sno24BE=";
+    rev = "72d97a02fae1045dedc44979e60403a198bbef1c";
+    hash = "sha256-PaPCAmvARbRrL+NY+CcJGiQRO+Ahjo0o5vz1av3h2Ds=";
 
     postFetch = "rm $out/screenshot.webp";
   };

From 61191d9fe8bd684a6b92061f7794c92bc3cf476b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 22:55:38 +0000
Subject: [PATCH 0190/1386] policycoreutils: 3.10 -> 3.11

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

diff --git a/pkgs/by-name/po/policycoreutils/package.nix b/pkgs/by-name/po/policycoreutils/package.nix
index 41b9919dcafd..89a2e30e324c 100644
--- a/pkgs/by-name/po/policycoreutils/package.nix
+++ b/pkgs/by-name/po/policycoreutils/package.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "policycoreutils";
-  version = "3.10";
+  version = "3.11";
   inherit (libsepol) se_url;
 
   src = fetchurl {
     url = "${finalAttrs.se_url}/${finalAttrs.version}/policycoreutils-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jb1Q2Gisv66dGpcva7slh/BsnsczCNEa9qyzpAHemDI=";
+    hash = "sha256-BU5B7AOXMaXua3l6jguNbjRu4dCpusLyUttIwj+aixs=";
   };
 
   postPatch = ''

From 481d8cbe4196b790f5fb78d456908c43b30ad03e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 00:37:30 +0000
Subject: [PATCH 0191/1386] mapserver: 8.6.4 -> 8.6.5

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

diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix
index b075c21c6e20..1faa71910363 100644
--- a/pkgs/by-name/ma/mapserver/package.nix
+++ b/pkgs/by-name/ma/mapserver/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapserver";
-  version = "8.6.4";
+  version = "8.6.5";
 
   src = fetchFromGitHub {
     owner = "MapServer";
     repo = "MapServer";
     rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-kqCP0QZ8gNqS54B8nL8M9Wr9WyMQnORCs42O1eiMtRw=";
+    hash = "sha256-HEQ+bBb6cXXqR+4Yw5H+3xwQMQvlv0LjlBRT0baFeZQ=";
   };
 
   nativeBuildInputs = [

From 5a9a5ab1b6537f53271ea0f3a596c6c70e6c7973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Jul 2026 19:45:50 -0700
Subject: [PATCH 0192/1386] python3Packages.flufl-bounce: 4.0 -> 5.0.1

Diff: https://gitlab.com/flufl/flufl.bounce/-/compare/4.0...5.0.1

Changelog: https://gitlab.com/warsaw/flufl.bounce/-/blob/5.0.1/docs/NEWS.rst
---
 .../python-modules/flufl/bounce.nix           | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix
index c33f898c87d2..1b8c36884f69 100644
--- a/pkgs/development/python-modules/flufl/bounce.nix
+++ b/pkgs/development/python-modules/flufl/bounce.nix
@@ -1,41 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  fetchpatch2,
-  setuptools,
+  fetchFromGitLab,
+  hatchling,
   atpublic,
-  zope-interface,
   pytestCheckHook,
+  sybil,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "flufl-bounce";
-  version = "4.0";
+  version = "5.0.1";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "flufl.bounce";
-    inherit version;
-    hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE=";
+  src = fetchFromGitLab {
+    owner = "flufl";
+    repo = "flufl.bounce";
+    tag = finalAttrs.version;
+    hash = "sha256-NWDh8vqHCAjhQYyOUkURuFhDa2xdtEukppCBCjhxhfg=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Replace deprecated failIf with assertFalse for Python 3.12 compatibility.
-      url = "https://gitlab.com/warsaw/flufl.bounce/-/commit/e0b9fd0f24572e024a8d0484a3c9fb4542337d18.patch";
-      hash = "sha256-HJHEbRVjiiP5Z7W0sQCj6elUMyaWOTqQw6UpYOYCVZM=";
-    })
-  ];
+  build-system = [ hatchling ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     atpublic
-    zope-interface
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    sybil
+  ];
 
   pythonImportsCheck = [ "flufl.bounce" ];
 
@@ -44,8 +38,8 @@ buildPythonPackage rec {
   meta = {
     description = "Email bounce detectors";
     homepage = "https://gitlab.com/warsaw/flufl.bounce";
-    changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst";
+    changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${finalAttrs.src.tag}/docs/NEWS.rst";
     maintainers = [ ];
     license = lib.licenses.asl20;
   };
-}
+})

From 79156b225aa730219247784111f14612b346dd7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Jul 2026 20:16:46 -0700
Subject: [PATCH 0193/1386] python3Packages.pamqp: 4.0.0 -> 4.0.1

Diff: https://github.com/gmr/pamqp/compare/4.0.0...4.0.1

Changelog: https://github.com/gmr/pamqp/releases/tag/4.0.1
---
 pkgs/development/python-modules/pamqp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index d5bd70dd3192..911faf4f0163 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.0.0";
+  version = "4.0.1";
   pname = "pamqp";
 
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "gmr";
     repo = "pamqp";
     tag = version;
-    hash = "sha256-0rRVbzC5G+lH6Okvw8PtoPZKD8LlobAGYvDEIDw0aFo=";
+    hash = "sha256-WKkiwisCfGRkNbw8WtXqNe4OqUiRgVfVL7o0oMdeFJw=";
   };
 
   build-system = [ hatchling ];
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/gmr/pamqp/blob/${src.tag}/docs/changelog.rst";
+    changelog = "https://github.com/gmr/pamqp/blob/${src.tag}/docs/changelog.md";
     description = "RabbitMQ Focused AMQP low-level library";
     homepage = "https://github.com/gmr/pamqp";
     license = lib.licenses.bsd3;

From bd2ba70f7a41adcf850d35b8956d2ac8b4c8722c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Jul 2026 20:20:24 -0700
Subject: [PATCH 0194/1386] python3Packages.pamqp: use finalAttrs

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

diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index 911faf4f0163..ed8705297ce7 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -6,7 +6,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   version = "4.0.1";
   pname = "pamqp";
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = "pamqp";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-WKkiwisCfGRkNbw8WtXqNe4OqUiRgVfVL7o0oMdeFJw=";
   };
 
@@ -37,10 +37,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/gmr/pamqp/blob/${src.tag}/docs/changelog.md";
+    changelog = "https://github.com/gmr/pamqp/blob/${finalAttrs.src.tag}/docs/changelog.md";
     description = "RabbitMQ Focused AMQP low-level library";
     homepage = "https://github.com/gmr/pamqp";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From ad01b3e1556656d732a1fc6e5014e22f797df85c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 03:52:59 +0000
Subject: [PATCH 0195/1386] python3Packages.click-aliases: 1.0.6 -> 1.0.7

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

diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix
index 118ded806492..125888233166 100644
--- a/pkgs/development/python-modules/click-aliases/default.nix
+++ b/pkgs/development/python-modules/click-aliases/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "click-aliases";
-  version = "1.0.6";
+  version = "1.0.7";
 
   pyproject = true;
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "click-contrib";
     repo = "click-aliases";
     rev = "v${version}";
-    hash = "sha256-nHUvzUiWc7Fq22PPsodIDOwU1INy2CQfztD0ceguhEo=";
+    hash = "sha256-Km6rVAsdoctECEFxZG/gCnacmhdHQVJcVrOta6xh1XU=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 8c29b7ae2b6e35f9a0b95443972998414767fb31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 04:27:51 +0000
Subject: [PATCH 0196/1386] temporal-ui-server: 2.49.1 -> 2.52.0

---
 pkgs/by-name/te/temporal-ui-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix
index 4f681cba6af2..f8659de2dc3c 100644
--- a/pkgs/by-name/te/temporal-ui-server/package.nix
+++ b/pkgs/by-name/te/temporal-ui-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal-ui-server";
-  version = "2.49.1";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "ui-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cCYBMNkQZBdy1OpofI0THT9qDtYdsfI/rl3MWi0K1CU=";
+    hash = "sha256-5WGE4igWVkWwxy5k8x+X4roDX1glaW+x67UGkoiSWwM=";
   };
 
-  vendorHash = "sha256-nw4OHa13kRvdR6IFop5eZiB+5+cJCry4sgTnercRq9s=";
+  vendorHash = "sha256-E9pg16YJRDahBmiHwQY3r8kA+vBfza7KdFYqdw+qBSY=";
 
   postInstall = ''
     mv $out/bin/server $out/bin/temporal-ui-server

From 97ef7759a8cde65fbab9935bd19743bfc4f61dd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 06:06:54 +0000
Subject: [PATCH 0197/1386] fzf-git-sh: 0-unstable-2026-06-16 ->
 0-unstable-2026-07-06

---
 pkgs/by-name/fz/fzf-git-sh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix
index 3ee7e3a4e096..813841875655 100644
--- a/pkgs/by-name/fz/fzf-git-sh/package.nix
+++ b/pkgs/by-name/fz/fzf-git-sh/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fzf-git-sh";
-  version = "0-unstable-2026-06-16";
+  version = "0-unstable-2026-07-06";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf-git.sh";
-    rev = "d76cd4df21f2ca5aafeab8b31118c4df133472c0";
-    hash = "sha256-lK8rbwu5PhCOY3ODWW6U/R/O3AA4c4etxCQogHja9nA=";
+    rev = "fdf632c53262dfcc44fc09d591e462e9f8fcae83";
+    hash = "sha256-3ho7Kn84q36bj9N+Nj+5XEdkXIN4xwYk7h7g/ou3TRM=";
   };
 
   dontBuild = true;

From 76cf683aa43560df22ccb6121008e7e7d0f01073 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 07:38:31 +0000
Subject: [PATCH 0198/1386] grafanaPlugins.victoriametrics-metrics-datasource:
 0.25.1 -> 0.25.2

---
 .../plugins/victoriametrics-metrics-datasource/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
index 22b8e1765b86..bc4a76ff96f9 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-metrics-datasource";
-  version = "0.25.1";
-  zipHash = "sha256-6+XUzT0vSVd4u8UeRSa/Px7vDjwQ7YkOmArFNZBY5ts=";
+  version = "0.25.2";
+  zipHash = "sha256-yHvzgimj49NCa2A1cm9W6AYwlXsVQXwBY6t7C72DuyU=";
   meta = {
     description = "VictoriaMetrics metrics datasource for Grafana";
     license = lib.licenses.agpl3Only;

From 917f81954906d83572a6e70b5a79333bdb5e33f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 07:44:32 +0000
Subject: [PATCH 0199/1386] python3Packages.splunk-sdk: 2.1.1 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/splunk-sdk/default.nix b/pkgs/development/python-modules/splunk-sdk/default.nix
index a34fdcb4299f..d7c8900ad999 100644
--- a/pkgs/development/python-modules/splunk-sdk/default.nix
+++ b/pkgs/development/python-modules/splunk-sdk/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "splunk-sdk";
-  version = "2.1.1";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "splunk-sdk-python";
     tag = version;
-    hash = "sha256-+ae4/Q7Rx6K35RZuTOc/MDIgnX9hqswgZelnRvFiaRM=";
+    hash = "sha256-8544jRlv//Qkcq4JqrMOBZhFC6K6BI1WGT6PK4AwVvs=";
   };
 
   build-system = [ setuptools ];

From 6c552c51cb691601d409c33673af7416dd58f713 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 08:48:44 +0000
Subject: [PATCH 0200/1386] steam-rom-manager: 2.5.34 -> 2.5.42

---
 pkgs/by-name/st/steam-rom-manager/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/steam-rom-manager/package.nix b/pkgs/by-name/st/steam-rom-manager/package.nix
index 41de43fb215f..0747156ef702 100644
--- a/pkgs/by-name/st/steam-rom-manager/package.nix
+++ b/pkgs/by-name/st/steam-rom-manager/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "steam-rom-manager";
-  version = "2.5.34";
+  version = "2.5.42";
 
   src = fetchurl {
     url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage";
-    sha256 = "sha256-QbXwfT91BQ15/DL3IYC3qZcahlsQvkUKTwMUUpZY+U8=";
+    sha256 = "sha256-5CP/jYQBwHgJbAr69IQbXGKxUOXWnq/bSrSxsPUuaqY=";
   };
 
   extraInstallCommands =

From 95b84bcacc82cc368327011f1d1f9636d862c497 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 09:11:03 +0000
Subject: [PATCH 0201/1386] python3Packages.matter-ble-proxy: 1.0.0 -> 1.2.2

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

diff --git a/pkgs/development/python-modules/matter-ble-proxy/default.nix b/pkgs/development/python-modules/matter-ble-proxy/default.nix
index c155dedf829d..6c66bd13325d 100644
--- a/pkgs/development/python-modules/matter-ble-proxy/default.nix
+++ b/pkgs/development/python-modules/matter-ble-proxy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "matter-ble-proxy";
-  version = "1.0.0";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     owner = "matter-js";
     repo = "matterjs-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c/jhQfenRgE0qHisGM1TOtqWjDy/RcwGa04RE0FzR/U=";
+    hash = "sha256-7dNocUAfRAvK3bdU0gK5ADZ2EhVPn6W5rX96T2gSYqM=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python_ble_proxy";

From 0d7b51ad6994d57302ad431aede88d9b40a38c19 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Fri, 3 Jul 2026 23:51:32 +0200
Subject: [PATCH 0202/1386] cider-2: allow reading gsettings

Cider 4 throws a warning on startup:

  (cider-2:915399): GLib-GIO-CRITICAL **:
  g_settings_schema_source_lookup: assertion 'source != NULL' failed

wrapGAppsHook3[1] solves the problem transparently by prepending
- prepending gtk3 + gsettings-desktop-schemas to XDG_DATA_DIRS
- prepending dconf libs to GIO_EXTRA_MODULES
- setting the path to GTK's pixbuf loader cache as GDK_PIXBUF_MODULE_FILE

We emulate its behavior manually here to avoid a double-wrapping of the
cider-2 executable. (strace reveals that all these paths are effectively
opened on startup.)

[1]: https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks
---
 pkgs/by-name/ci/cider-2/package.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index d12bfd4ca490..6ded6b4a5738 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -5,6 +5,8 @@
   dpkg,
   autoPatchelfHook,
   makeWrapper,
+  gsettings-desktop-schemas,
+  dconf,
 
   # Required dependencies for autoPatchelfHook
   alsa-lib,
@@ -53,15 +55,21 @@ stdenv.mkDerivation rec {
 
     chmod +x $out/lib/cider/Cider
 
+    # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3.
+    # We append them manually instead to avoid a double-wrapping.
+    makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
+      --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
+      --add-flags "--no-sandbox --disable-gpu-sandbox" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
+      --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
+      --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+
     runHook postInstall
   '';
 
   postFixup = ''
-    makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
-      --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
-      --add-flags "--no-sandbox --disable-gpu-sandbox" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
-
     mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
     substituteInPlace $out/share/applications/${pname}.desktop \
       --replace-warn 'Exec=cider' 'Exec=${pname}' \
@@ -70,7 +78,7 @@ stdenv.mkDerivation rec {
     install -Dm444 $out/share/pixmaps/cider.png \
       $out/share/icons/hicolor/256x256/apps/cider.png
 
-    rm -r $out/share/pixmaps
+    rm -r $out/share/{pixmaps,lintian}
   '';
 
   passthru.updateScript = ./updater.sh;

From d25d5184a03dc17ce9d3dd42c21ebaffafd7e3ae Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 11:43:21 +0200
Subject: [PATCH 0203/1386] cider-2: suppress substituteInPlace replace warning

Suppresses the warning
  pattern Exec=/usr/lib/cider/Cider doesn't match anything in file

Use an absolute path as Exec replacement.
Be strict and fail the build on error.
---
 pkgs/by-name/ci/cider-2/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 6ded6b4a5738..22a038fa3a53 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -72,8 +72,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
     substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-warn 'Exec=cider' 'Exec=${pname}' \
-      --replace-warn 'Exec=/usr/lib/cider/Cider' 'Exec=${pname}'
+      --replace-fail Exec=cider Exec=${pname}
 
     install -Dm444 $out/share/pixmaps/cider.png \
       $out/share/icons/hicolor/256x256/apps/cider.png

From 5d35a9225ddb45b2cf42506214cf810a2aac80b0 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Mon, 6 Jul 2026 00:11:37 +0200
Subject: [PATCH 0204/1386] cider-2: remove superfluous use of pname

NixOS/nixpkgs#277994
---
 pkgs/by-name/ci/cider-2/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 22a038fa3a53..501fd5abebf6 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -16,12 +16,12 @@
   nspr,
   nss,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cider-2";
   version = "4.0.9.1";
 
   src = fetchurl {
-    url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb";
+    url = "https://repo.cider.sh/apt/pool/main/cider-v${finalAttrs.version}-linux-x64.deb";
     hash = "sha256-MsA6lK3PsyOEx938FgJFx8l9oqwoM3FzIK5goF73lTs=";
   };
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
     # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3.
     # We append them manually instead to avoid a double-wrapping.
-    makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
+    makeWrapper $out/lib/cider/Cider $out/bin/cider-2 \
       --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
       --add-flags "--no-sandbox --disable-gpu-sandbox" \
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-fail Exec=cider Exec=${pname}
+    mv $out/share/applications/cider.desktop $out/share/applications/cider-2.desktop
+    substituteInPlace $out/share/applications/cider-2.desktop \
+      --replace-fail Exec=cider Exec=cider-2
 
     install -Dm444 $out/share/pixmaps/cider.png \
       $out/share/icons/hicolor/256x256/apps/cider.png
@@ -94,4 +94,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})

From 10dafbc0b2d775cf59c42247fd1a8e745c42b3f6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 0205/1386] ntp: make use of lib.licenses

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

diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix
index ea7fda8098a9..e36dad33bf80 100644
--- a/pkgs/by-name/nt/ntp/package.nix
+++ b/pkgs/by-name/nt/ntp/package.nix
@@ -52,10 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.ntp.org/";
     description = "Implementation of the Network Time Protocol";
-    license = {
-      # very close to isc and bsd2
-      url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html";
-    };
+    license = lib.licenses.AND [
+      lib.licenses.ntp
+      lib.licenses.bsd2
+    ];
     maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = lib.platforms.unix;
   };

From 9c089e7a30772da51b71a0d6439434b6a71b479b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 0206/1386] lib.licenses: add buddy

---
 lib/licenses/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index 74180367b95a..7faea6b2644c 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -310,6 +310,11 @@ lib.mapAttrs mkLicense (
       redistributable = true;
     };
 
+    buddy = {
+      spdxId = "Buddy";
+      fullName = "Buddy License";
+    };
+
     bzip2 = {
       spdxId = "bzip2-1.0.6";
       fullName = "bzip2 and libbzip2 License v1.0.6";

From f28abb7aab71d058758d7bc63fc15a7a16f1528e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 0207/1386] buddy: change license to lib.licenses.buddy

---
 pkgs/by-name/bu/buddy/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/bu/buddy/package.nix b/pkgs/by-name/bu/buddy/package.nix
index 6abc5dda3439..ac5845e6303b 100644
--- a/pkgs/by-name/bu/buddy/package.nix
+++ b/pkgs/by-name/bu/buddy/package.nix
@@ -32,10 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://sourceforge.net/projects/buddy/";
     description = "Binary decision diagram package";
-    license = {
-      url = "https://sourceforge.net/p/buddy/gitcode/ci/master/tree/README";
-      fullName = "Buddy License";
-    };
+    license = lib.licenses.buddy;
 
     platforms = lib.platforms.unix; # Once had cygwin problems
   };

From 7757c50b02af48e093323113ab08ef6702b0ef03 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 0208/1386] lib.licenses: add ngrep

---
 lib/licenses/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index 74180367b95a..0d6b24f618e5 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -1168,6 +1168,11 @@ lib.mapAttrs mkLicense (
       fullName = "Nethack General Public License";
     };
 
+    ngrep = {
+      spdxId = "ngrep";
+      fullName = "ngrep License";
+    };
+
     nistSoftware = {
       spdxId = "NIST-Software";
       fullName = "NIST Software License";

From 706cea05f9ed688812eed033d1820227b2cf54fe Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 0209/1386] ngrep: make use of lib.licenses

---
 pkgs/by-name/ng/ngrep/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ng/ngrep/package.nix b/pkgs/by-name/ng/ngrep/package.nix
index f0968740595b..0ea285cab87b 100644
--- a/pkgs/by-name/ng/ngrep/package.nix
+++ b/pkgs/by-name/ng/ngrep/package.nix
@@ -47,12 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
       more common packet sniffing tools, such as tcpdump and snoop.
     '';
     homepage = "https://github.com/jpr5/ngrep/";
-    license = {
-      shortName = "ngrep"; # BSD-style, see README.md and LICENSE
-      url = "https://github.com/jpr5/ngrep/blob/master/LICENSE";
-      free = true;
-      redistributable = true;
-    };
+    license = lib.licenses.AND [
+      lib.licenses.ngrep
+      lib.licenses.bsd3
+    ];
     platforms = with lib.platforms; linux ++ darwin;
     maintainers = [ lib.maintainers.bjornfor ];
     mainProgram = "ngrep";

From 69b4b1d0c0f558051e1caf9c5af76a78b03d92f1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 0210/1386] lib.licenses: add wordnet

---
 lib/licenses/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index 74180367b95a..426e1aec78f6 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -1601,6 +1601,11 @@ lib.mapAttrs mkLicense (
       url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab";
     };
 
+    wordnet = {
+      spdxId = "WordNet";
+      fullName = "WordNet License";
+    };
+
     wtfpl = {
       spdxId = "WTFPL";
       fullName = "Do What The F*ck You Want To Public License";

From c9091fdb270a6868058e328e6ba6a74e79ada488 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 0211/1386] wordnet: make use of lib.licenses.wordnet

---
 pkgs/by-name/wo/wordnet/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/wo/wordnet/package.nix b/pkgs/by-name/wo/wordnet/package.nix
index a82b10cec122..bd7f906b8f2a 100644
--- a/pkgs/by-name/wo/wordnet/package.nix
+++ b/pkgs/by-name/wo/wordnet/package.nix
@@ -55,10 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     homepage = "https://wordnet.princeton.edu/";
-    license = {
-      fullName = "WordNet 3.0 license";
-      url = "https://wordnet.princeton.edu/license-and-commercial-use";
-    };
+    license = lib.licenses.wordnet;
     maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "wn";

From df554927aa3234c650b1c70a7b85a1f3ba2bfa62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 12:17:34 +0000
Subject: [PATCH 0212/1386] neo4j: 2026.02.2 -> 2026.06.0

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

diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix
index 4b5da6269d0b..a370884bc3ea 100644
--- a/pkgs/by-name/ne/neo4j/package.nix
+++ b/pkgs/by-name/ne/neo4j/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neo4j";
-  version = "2026.02.2";
+  version = "2026.06.0";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${finalAttrs.version}-unix.tar.gz";
-    hash = "sha256-TpVibiE0ijAQl5mkRjnCFpvCTifhoTcZcv8lg8PYSTw=";
+    hash = "sha256-Hc9i5+gDXnFzK4ZTK5+OMhnOiVa9BpQNWgAkaWcnGSo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c24b245b917cce0b64ecf25297e9c2ddc946f88b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Jul 2026 15:14:09 +0200
Subject: [PATCH 0213/1386] matrix-authentication-service: 1.17.0 -> 1.20.0

ChangeLogs:
* https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.18.0
* https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.19.0
* https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.20.0
---
 .../matrix-authentication-service/package.nix | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 38b359752e54..6c9cffa76f22 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -2,8 +2,9 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  fetchNpmDeps,
-  npmHooks,
+  fetchPnpmDeps,
+  pnpm,
+  pnpmConfigHook,
   nodejs,
   python3,
   pkg-config,
@@ -19,30 +20,30 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "1.17.0";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/3NgMZ0B+B0BHPBi/vuiCS6xi70wgNKCZH0hTpkWi+U=";
+    hash = "sha256-0fvGhBxwXhSzWvNhflreEFoCBycM10vMkMf4sj95vfY=";
   };
 
-  cargoHash = "sha256-aZSnQmOwqo0OG3XXM5eups0cKNs80j/nAsZB5tnWUrY=";
+  cargoHash = "sha256-3V50qNvg24WZvQ9z7IZJAnPXHTibZ6o3EzUoinLU6Gw=";
 
-  npmDeps = fetchNpmDeps {
-    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
-    src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
-    hash = "sha256-FevzqirT/GyT8urQ79AtJi+q1zcwn73AyiJTf/B9cG0=";
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 4;
+    hash = "sha256-j2A2VCKQPfoyrNDtazu8hzUHpS130Ju/Cy3yfu9tC5I=";
   };
 
-  npmRoot = "frontend";
-  npmFlags = [ "--legacy-peer-deps" ];
+  pnpmRoot = "frontend";
 
   nativeBuildInputs = [
     pkg-config
     open-policy-agent
-    npmHooks.npmConfigHook
+    pnpmConfigHook
+    pnpm
     nodejs
     (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp
   ]
@@ -82,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     in
     ''
       make -C policies
-      (cd "$npmRoot" && npm run build)
+      (cd "$pnpmRoot" && npm run build)
 
       # Fix aws-lc-sys cross-compilation
       export CC_${buildTargetUnderscore}=$CC_FOR_BUILD
@@ -92,8 +93,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Adapted from https://github.com/element-hq/matrix-authentication-service/blob/v0.20.0/.github/workflows/build.yaml#L75-L84
   postInstall = ''
     install -Dm444 -t "$out/share/$pname"        "policies/policy.wasm"
-    install -Dm444 -t "$out/share/$pname"        "$npmRoot/dist/manifest.json"
-    install -Dm444 -t "$out/share/$pname/assets" "$npmRoot/dist/"*
+    install -Dm444 -t "$out/share/$pname"        "$pnpmRoot/dist/manifest.json"
+    install -Dm444 -t "$out/share/$pname/assets" "$pnpmRoot/dist/"*
     cp -r templates   "$out/share/$pname/templates"
     cp -r translations   "$out/share/$pname/translations"
   '';

From f8e77cca69788cd3e36d6a511c58d11fa4debd1f Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Sat, 11 Jul 2026 13:16:45 +0000
Subject: [PATCH 0214/1386] codexbar: 0.41.0 -> 0.42.0

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

diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix
index e91c7026221c..fa81f5e232af 100644
--- a/pkgs/by-name/co/codexbar/package.nix
+++ b/pkgs/by-name/co/codexbar/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "codexbar";
-  version = "0.41.0";
+  version = "0.42.0";
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchurl {
     url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip";
-    hash = "sha256-M3i05Yu15uTLd/bO5E5bYen3dYo1iTEI/z7+VxeFhY0=";
+    hash = "sha256-R5l4R9E564p9ILFV5A5ZyoQceLhEc1kL2h6eB7hImOU=";
   };
 
   sourceRoot = ".";

From 13db8ffaf690406ca35ac1a158f938769143798f Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Sat, 11 Jul 2026 14:22:17 +0100
Subject: [PATCH 0215/1386] codexbar: add mainProgram

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

diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix
index fa81f5e232af..e6c441f2a2b4 100644
--- a/pkgs/by-name/co/codexbar/package.nix
+++ b/pkgs/by-name/co/codexbar/package.nix
@@ -3,6 +3,7 @@
   stdenvNoCC,
   fetchurl,
   nix-update-script,
+  makeWrapper,
   unzip,
 }:
 
@@ -19,13 +20,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ unzip ];
+  nativeBuildInputs = [ makeWrapper unzip ];
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/Applications
-    cp -r *.app $out/Applications
+    cp -r CodexBar.app $out/Applications
+    makeWrapper $out/Applications/CodexBar.app/Contents/MacOS/CodexBar $out/bin/codexbar
 
     runHook postInstall
   '';
@@ -44,5 +46,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    mainProgram = "codexbar";
   };
 })

From 5d9a7fbe7fdb491df2b4c93da813f959773b5d62 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Sat, 11 Jul 2026 15:45:08 +0200
Subject: [PATCH 0216/1386] nixos/test/systemd-localed:
 services.xserver.xkb.layout should be respected

---
 nixos/tests/all-tests.nix       |  1 +
 nixos/tests/systemd-localed.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 nixos/tests/systemd-localed.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5e7a1a12a29c..c2e373ce0fca 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1684,6 +1684,7 @@ in
   systemd-journal = runTest ./systemd-journal.nix;
   systemd-journal-gateway = runTest ./systemd-journal-gateway.nix;
   systemd-journal-upload = runTest ./systemd-journal-upload.nix;
+  systemd-localed = runTest ./systemd-localed.nix;
   systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix;
   systemd-machinectl = runTest ./systemd-machinectl.nix;
   systemd-misc = runTest ./systemd-misc.nix;
diff --git a/nixos/tests/systemd-localed.nix b/nixos/tests/systemd-localed.nix
new file mode 100644
index 000000000000..308d90122868
--- /dev/null
+++ b/nixos/tests/systemd-localed.nix
@@ -0,0 +1,23 @@
+{ lib, ... }:
+{
+  name = "systemd-localed";
+  meta.maintainers = [ lib.maintainers.haansn08 ];
+
+  nodes.machine = { ... }: {
+    # we don't use services.xserver.enable because some window managers like
+    # niri rely on systemd-localed for the keyboard layout:
+    # https://niri-wm.github.io/niri/Configuration%3A-Input.html#layout
+    services.graphical-desktop.enable = true;
+
+    services.xserver.xkb.layout = "jp";
+  };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("default.target")
+    machine.wait_for_unit("dbus.socket")
+
+    status, stdout = machine.execute("localectl")
+    t.assertIn("X11 Layout: jp", stdout)
+  '';
+}

From ba673cf63472ec6e3152b3cdaa8331e958f7641b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Jul 2026 11:48:49 +0200
Subject: [PATCH 0217/1386] python3Packages.click-aliases: modernize

---
 .../python-modules/click-aliases/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix
index 125888233166..36ab94b8140d 100644
--- a/pkgs/development/python-modules/click-aliases/default.nix
+++ b/pkgs/development/python-modules/click-aliases/default.nix
@@ -7,31 +7,31 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "click-aliases";
   version = "1.0.7";
-
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-aliases";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Km6rVAsdoctECEFxZG/gCnacmhdHQVJcVrOta6xh1XU=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ click ];
+  dependencies = [ click ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "click_aliases" ];
 
   meta = {
-    homepage = "https://github.com/click-contrib/click-aliases";
     description = "Enable aliases for click";
+    homepage = "https://github.com/click-contrib/click-aliases";
+    changelog = "https://github.com/click-contrib/click-aliases/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ panicgh ];
   };
-}
+})

From 1dbdb986bbaf6551ac3a97871b9b90bf16f44728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 11 Jul 2026 10:26:44 -0400
Subject: [PATCH 0218/1386] mpv-unwrapped: fix darwin build (fixes #540682)

---
 pkgs/by-name/mp/mpv-unwrapped/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix
index 4333d1ce35f5..924f515fff27 100644
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -61,6 +61,7 @@
   wayland-protocols,
   wayland-scanner,
   zimg,
+  llvmPackages,
 
   # Boolean
   alsaSupport ? stdenv.hostPlatform.isLinux,
@@ -163,6 +164,8 @@ stdenv.mkDerivation (finalAttrs: {
     buildPackages.darwin.sigtool
     swift
     makeBinaryWrapper
+    # TODO: Remove once #536365 reaches this branch
+    llvmPackages.lld
   ]
   ++ lib.optionals waylandSupport [ wayland-scanner ];
 
@@ -233,6 +236,9 @@ stdenv.mkDerivation (finalAttrs: {
   # ./osdep/mac/swift.h:270:9: fatal error: '.../app_bridge_objc-1.pch' file not found
   env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
     NIX_SWIFTFLAGS_COMPILE = "-disable-bridging-pch";
+
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
   };
 
   postBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''

From fac56b935339f50c6582b5fccf0bcf33d69b9741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 11 Jul 2026 10:44:23 -0400
Subject: [PATCH 0219/1386] qbittorrent: fix darwin build

---
 pkgs/by-name/qb/qbittorrent/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index 671e1d0e3d2b..07f1fe49193e 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -17,6 +17,7 @@
   wrapGAppsHook3,
   zlib,
   nixosTests,
+  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -35,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wrapGAppsHook3
     qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TODO: Remove once #536365 reaches this branch
+    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -60,6 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ];
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   qtWrapperArgs = lib.optionals trackerSearch [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ];
 
   dontWrapGApps = true;

From d784d7a3a6a4e6660466c1d4033291417549dcd1 Mon Sep 17 00:00:00 2001
From: Sandro Marques <me@sandro.dev>
Date: Sat, 11 Jul 2026 23:49:33 +0900
Subject: [PATCH 0220/1386] unityhub: add unzip as dependency

Makes `unzip` available to Unity Hub, similar ot #500431.

It is required when installing module "Android SDK & NDK Tools" for [Unity 2022.3 LTS (2022.3.22f1)](https://unity.com/releases/editor/whats-new/2022.3.22f1).
This Unity version is the latest one [supported by VRChat](https://creators.vrchat.com/sdk/upgrade/current-unity-version/).
---
 pkgs/by-name/un/unityhub/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index 71388456cc17..f59a771f63cc 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
         libxrandr
         xdg-utils
         p7zip
+        unzip
 
         # GTK filepicker
         gsettings-desktop-schemas

From 8c343a1064617802f01492391abeeb34351411a3 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Sat, 11 Jul 2026 12:37:38 -0400
Subject: [PATCH 0221/1386] python3Packages.httpsig: Fix build with setuptools
 82

---
 .../python-modules/httpsig/default.nix          |  6 +++++-
 .../httpsig/no-pkg-resources.patch              | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/httpsig/no-pkg-resources.patch

diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix
index dd7034304f25..a2e96ec2caa9 100644
--- a/pkgs/development/python-modules/httpsig/default.nix
+++ b/pkgs/development/python-modules/httpsig/default.nix
@@ -20,6 +20,11 @@ buildPythonPackage rec {
     hash = "sha256-cdbVAkYSnE98/sIPXlfjUdK4SS1jHMKqlnkUrPkfbOY=";
   };
 
+  patches = [
+    # pkg_resources is gone in setuptools 82
+    ./no-pkg-resources.patch
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
@@ -29,7 +34,6 @@ buildPythonPackage rec {
     pycryptodome
     requests
     six
-    setuptools
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/httpsig/no-pkg-resources.patch b/pkgs/development/python-modules/httpsig/no-pkg-resources.patch
new file mode 100644
index 000000000000..2ef147d088cd
--- /dev/null
+++ b/pkgs/development/python-modules/httpsig/no-pkg-resources.patch
@@ -0,0 +1,17 @@
+--- a/httpsig/__init__.py
++++ b/httpsig/__init__.py
+@@ -1,11 +1,11 @@
+-from pkg_resources import get_distribution, DistributionNotFound
++from importlib.metadata import PackageNotFoundError, version
+ 
+ from .sign import Signer, HeaderSigner
+ from .verify import Verifier, HeaderVerifier
+ 
+ try:
+-    __version__ = get_distribution(__name__).version
+-except DistributionNotFound:
++    __version__ = version(__name__)
++except PackageNotFoundError:
+     # package is not installed
+     pass
+ 

From 5a9256d210bdad81dc8bd33e39b3aa9818c1ec01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 19:02:40 +0000
Subject: [PATCH 0222/1386] schemesh: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/by-name/sc/schemesh/package.nix b/pkgs/by-name/sc/schemesh/package.nix
index 6d7b5f8344ba..4e242cfd3b5d 100644
--- a/pkgs/by-name/sc/schemesh/package.nix
+++ b/pkgs/by-name/sc/schemesh/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemesh";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "cosmos72";
     repo = "schemesh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tt3pxzti/Vv5JiP0kiplv6gOPiFU75tKoKyvpEPPztw=";
+    hash = "sha256-Sk2AZXd5kBR3Er8GeVm+10BaLwFL9k0v5Uk5CmuWv6o=";
   };
 
   buildInputs = [

From d3883d08702963c1d0e40ec06c2d9d964709d4fd Mon Sep 17 00:00:00 2001
From: weriomat <engel@weriomat.com>
Date: Fri, 10 Jul 2026 13:28:54 +0200
Subject: [PATCH 0223/1386] prometheus-squid-exporter: set mainProgram

---
 pkgs/by-name/pr/prometheus-squid-exporter/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
index 40be646bdb98..93ebc6366d6c 100644
--- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
@@ -20,6 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Squid Prometheus exporter";
     homepage = "https://github.com/boynux/squid-exporter";
+    mainProgram = "squid-exporter";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ srhb ];
   };

From f2adadc278083457677adda4c085815f5beca0b5 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 12 Jul 2026 07:21:21 +1000
Subject: [PATCH 0224/1386] vaults: drop

Vaults has been removed as it depends on FUSE 2 and CryFS.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/va/vaults/package.nix            |  89 -----------
 .../va/vaults/remove_flatpak_dependency.patch | 139 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 3 files changed, 1 insertion(+), 228 deletions(-)
 delete mode 100644 pkgs/by-name/va/vaults/package.nix
 delete mode 100644 pkgs/by-name/va/vaults/remove_flatpak_dependency.patch

diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix
deleted file mode 100644
index 8a55f45bf772..000000000000
--- a/pkgs/by-name/va/vaults/package.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  replaceVars,
-  appstream-glib,
-  desktop-file-utils,
-  meson,
-  ninja,
-  pkg-config,
-  python3,
-  rustPlatform,
-  rustc,
-  cargo,
-  wrapGAppsHook3,
-  glib,
-  gtk4,
-  libadwaita,
-  wayland,
-  gocryptfs,
-  cryfs,
-  fuse,
-  util-linux,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vaults";
-  version = "0.10.0";
-
-  src = fetchFromGitHub {
-    owner = "mpobaschnig";
-    repo = "vaults";
-    tag = finalAttrs.version;
-    hash = "sha256-B4CNEghMfP+r0poyhE102zC1Yd2U5ocV1MCMEVEMjEY=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) pname version src;
-    hash = "sha256-my4CxFIEN19juo/ya2vlkejQTaZsyoYLtFTR7iCT9s0=";
-  };
-
-  patches = [
-    (replaceVars ./remove_flatpak_dependency.patch {
-      cryfs = lib.getExe' cryfs "cryfs";
-      gocryptfs = lib.getExe' gocryptfs "gocryptfs";
-      fusermount = lib.getExe' fuse "fusermount";
-      umount = lib.getExe' util-linux "umount";
-    })
-  ];
-
-  postPatch = ''
-    patchShebangs build-aux
-  '';
-
-  nativeBuildInputs = [
-    desktop-file-utils
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook3
-    cargo
-    rustc
-    rustPlatform.cargoSetupHook
-  ];
-
-  buildInputs = [
-    appstream-glib
-    gtk4
-    python3
-    glib
-    libadwaita
-    wayland
-    gocryptfs
-    cryfs
-  ];
-
-  meta = {
-    description = "GTK frontend for encrypted vaults supporting gocryptfs and CryFS for encryption";
-    homepage = "https://mpobaschnig.github.io/vaults/";
-    changelog = "https://github.com/mpobaschnig/vaults/releases/tag/${finalAttrs.version}";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      benneti
-      aleksana
-    ];
-    mainProgram = "vaults";
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/by-name/va/vaults/remove_flatpak_dependency.patch b/pkgs/by-name/va/vaults/remove_flatpak_dependency.patch
deleted file mode 100644
index 7f7e863494de..000000000000
--- a/pkgs/by-name/va/vaults/remove_flatpak_dependency.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff --git a/src/backend/cryfs.rs b/src/backend/cryfs.rs
-index 089bf03..157c72a 100644
---- a/src/backend/cryfs.rs
-+++ b/src/backend/cryfs.rs
-@@ -35,13 +35,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
-         }
-     }
- 
--    let global_config = GlobalConfigManager::instance().get_flatpak_info();
--    let instance_path = global_config
--        .section(Some("Instance"))
--        .unwrap()
--        .get("app-path")
--        .unwrap();
--    let cryfs_instance_path = instance_path.to_owned() + "/bin/cryfs";
-+    let cryfs_instance_path = "@cryfs@".to_string();
-     log::info!("CryFS binary path: {}", cryfs_instance_path);
-     cryfs_instance_path
- }
-@@ -49,9 +43,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
- pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
-     log::trace!("is_available({:?})", vault_config);
- 
--    let output = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg(get_binary_path(vault_config))
-+    let output = Command::new(get_binary_path(vault_config))
-         .arg("--version")
-         .output()?;
-     log::debug!("CryFS output: {:?}", output);
-@@ -64,9 +56,7 @@ pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
- pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
-     log::trace!("init({:?}, password: <redacted>)", vault_config);
- 
--    let mut child = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg(get_binary_path(vault_config))
-+    let mut child = Command::new(get_binary_path(vault_config))
-         .env("CRYFS_FRONTEND", "noninteractive")
-         .stdin(Stdio::piped())
-         .stdout(Stdio::piped())
-@@ -106,9 +96,7 @@ pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
- pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
-     log::trace!("open({:?}, password: <redacted>)", vault_config);
- 
--    let mut child = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg(get_binary_path(vault_config))
-+    let mut child = Command::new(get_binary_path(vault_config))
-         .env("CRYFS_FRONTEND", "noninteractive")
-         .stdin(Stdio::piped())
-         .stdout(Stdio::piped())
-@@ -143,9 +131,7 @@ pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
- pub fn close(vault_config: &VaultConfig) -> Result<(), BackendError> {
-     log::trace!("close({:?})", vault_config);
- 
--    let child = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg("fusermount")
-+    let child = Command::new("@fusermount@")
-         .arg("-u")
-         .stdout(Stdio::piped())
-         .arg(&vault_config.mount_directory)
-diff --git a/src/backend/gocryptfs.rs b/src/backend/gocryptfs.rs
-index 9638f3a..ffa8f44 100644
---- a/src/backend/gocryptfs.rs
-+++ b/src/backend/gocryptfs.rs
-@@ -35,13 +35,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
-         }
-     }
- 
--    let global_config = GlobalConfigManager::instance().get_flatpak_info();
--    let instance_path = global_config
--        .section(Some("Instance"))
--        .unwrap()
--        .get("app-path")
--        .unwrap();
--    let gocryptfs_instance_path = instance_path.to_owned() + "/bin/gocryptfs";
-+    let gocryptfs_instance_path = "@gocryptfs@".to_string();
-     log::info!("gocryptfs binary path: {}", gocryptfs_instance_path);
-     gocryptfs_instance_path
- }
-@@ -49,9 +43,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
- pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
-     log::trace!("is_available({:?})", vault_config);
- 
--    let output = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg(get_binary_path(vault_config))
-+    let output = Command::new(get_binary_path(vault_config))
-         .arg("--version")
-         .output()?;
-     log::debug!("gocryptfs output: {:?}", output);
-@@ -64,9 +56,7 @@ pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
- pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
-     log::trace!("init({:?}, password: <redacted>)", vault_config);
- 
--    let mut child = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg(get_binary_path(vault_config))
-+    let mut child = Command::new(get_binary_path(vault_config))
-         .stdin(Stdio::piped())
-         .stdout(Stdio::piped())
-         .arg("--init")
-@@ -104,9 +94,7 @@ pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
- pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
-     log::trace!("open({:?}, password: <redacted>)", vault_config);
- 
--    let mut child = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg(get_binary_path(vault_config))
-+    let mut child = Command::new(get_binary_path(vault_config))
-         .stdin(Stdio::piped())
-         .stdout(Stdio::piped())
-         .arg("-q")
-@@ -142,9 +130,7 @@ pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
- pub fn close(vault_config: &VaultConfig) -> Result<(), BackendError> {
-     log::trace!("close({:?}, password: <redacted>)", vault_config);
- 
--    let child = Command::new("flatpak-spawn")
--        .arg("--host")
--        .arg("umount")
-+    let child = Command::new("@umount@")
-         .stdout(Stdio::piped())
-         .arg(&vault_config.mount_directory)
-         .spawn()?;
-diff --git a/src/global_config_manager.rs b/src/global_config_manager.rs
-index 619bb18..cea9ac3 100644
---- a/src/global_config_manager.rs
-+++ b/src/global_config_manager.rs
-@@ -102,7 +102,7 @@ impl GlobalConfigManager {
-         let object: Self = glib::Object::new();
- 
-         *object.imp().flatpak_info.borrow_mut() =
--            Ini::load_from_file("/.flatpak-info").expect("Could not load .flatpak-info");
-+            Ini::load_from_file("/.flatpak-info").unwrap_or_else(|_| Ini::new());
- 
-         match user_config_dir().as_os_str().to_str() {
-             Some(user_config_directory) => {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a5bb5b418569..dbbf5a708693 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2322,6 +2322,7 @@ mapAliases {
   varnish60Packages = throw "varnish 6.0 has been removed as it used unmaintained dependencies.  Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-29
   varnish77 = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01
   varnish77Packages = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01
+  vaults = throw "'vaults' has been removed as it depends on 'fuse2', which is deprecated and no longer available in Nixpkgs."; # Added 2026-07-12
   vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27
   vazir-fonts = throw "'vazir-fonts' has been renamed to 'vazirmatn'"; # Added 2026-06-15
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11

From e61d9690c93029f5761d05cd7a3c36755ec47737 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 12 Jul 2026 07:17:18 +1000
Subject: [PATCH 0225/1386] cryfs: drop

CryFS has been removed as it depends on FUSE 2, which is deprecated. Also removes references to CryFS from Sirikali and Plasma Vault.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/cr/cryfs/package.nix             | 147 ------------------
 pkgs/by-name/si/sirikali/package.nix          |   5 +-
 pkgs/kde/plasma/plasma-vault/default.nix      |   2 -
 .../plasma/plasma-vault/hardcode-paths.patch  |  26 ----
 pkgs/top-level/aliases.nix                    |   3 +-
 5 files changed, 4 insertions(+), 179 deletions(-)
 delete mode 100644 pkgs/by-name/cr/cryfs/package.nix

diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix
deleted file mode 100644
index 4505ab2bad8b..000000000000
--- a/pkgs/by-name/cr/cryfs/package.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  python3,
-  boost,
-  curl,
-  fuse,
-  gtest,
-  openssl,
-  range-v3,
-  spdlog,
-  llvmPackages,
-  writableTmpDirAsHomeHook,
-  versionCheckHook,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "cryfs";
-  version = "1.0.3";
-
-  src = fetchFromGitHub {
-    owner = "cryfs";
-    repo = "cryfs";
-    tag = finalAttrs.version;
-    hash = "sha256-DbXZxPACisAcdaqaqRiBK2Su/Wp6E9Mh+w62EkJrpYA=";
-  };
-
-  postPatch = ''
-    patchShebangs src/
-  ''
-  # Set Boost_USE_STATIC_LIBS via CMake command line. (see cmakeFlags below)
-  + ''
-    substituteInPlace cmake-utils/Dependencies.cmake \
-      --replace-fail "set(Boost_USE_STATIC_LIBS OFF)" ""
-  ''
-  # Downsize large file test as 4.5G is too big for Hydra.
-  + ''
-    substituteInPlace test/cpp-utils/data/DataTest.cpp \
-      --replace-fail "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    python3
-  ];
-
-  strictDeps = true;
-
-  buildInputs = [
-    boost
-    curl
-    fuse
-    gtest
-    openssl
-    range-v3
-    spdlog
-  ]
-  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
-
-  cmakeFlags = [
-    (lib.cmakeFeature "DEPENDENCY_CONFIG" "../cmake-utils/DependenciesFromLocalSystem.cmake")
-    (lib.cmakeBool "CRYFS_UPDATE_CHECKS" false)
-    (lib.cmakeBool "Boost_USE_STATIC_LIBS" stdenv.hostPlatform.isStatic) # This option is case sensitive.
-    (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
-  ];
-
-  # macFUSE needs to be installed for the tests to succeed on Darwin.
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  nativeCheckInputs = [
-    writableTmpDirAsHomeHook
-  ];
-
-  checkPhase =
-    let
-      runTest =
-        {
-          path,
-          filter ? null,
-        }:
-        "command ./${path}${lib.optionalString (!isNull filter) " '--gtest_filter=${filter}'"}";
-    in
-    ''
-      runHook preCheck
-
-      pushd test/
-    ''
-    # See the test runner at https://github.com/cryfs/cryfs/blob/1.0.3/.github/workflows/actions/run_tests/action.yaml.
-    + (lib.concatLines [
-      (runTest {
-        path = "gitversion/gitversion-test";
-      })
-      (runTest {
-        path = "cpp-utils/cpp-utils-test";
-        filter =
-          if stdenv.hostPlatform.isStatic then "*-BacktraceTest.*:*.AssertMessageContainsBacktrace" else null;
-      })
-      (runTest {
-        path = "parallelaccessstore/parallelaccessstore-test";
-      })
-      (runTest {
-        path = "blockstore/blockstore-test";
-      })
-      (runTest {
-        path = "blobstore/blobstore-test";
-      })
-      (runTest {
-        path = "cryfs/cryfs-test";
-      })
-      # Skip tests trying to access /dev/fuse inside the build sandbox.
-      (runTest {
-        path = "fspp/fspp-test";
-        filter = ""; # Skip all tests.
-      })
-      (runTest {
-        path = "cryfs-cli/cryfs-cli-test";
-        filter = "*-CliTest.WorksWithCommasInBasedir:CliTest_IntegrityCheck.*:CliTest_Setup.*:CliTest_Unmount.*:RunningInForeground*";
-      })
-    ])
-    + ''
-      popd
-
-      runHook postCheck
-    '';
-
-  doInstallCheck = true;
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-
-  meta = {
-    description = "Cryptographic filesystem for the cloud";
-    homepage = "https://www.cryfs.org/";
-    changelog = "https://github.com/cryfs/cryfs/raw/${finalAttrs.version}/ChangeLog.txt";
-    license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [
-      peterhoeg
-      sigmasquadron
-    ];
-    platforms = lib.systems.inspect.patterns.isUnix;
-  };
-})
diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix
index e5515c04c595..a2ebb86b243a 100644
--- a/pkgs/by-name/si/sirikali/package.nix
+++ b/pkgs/by-name/si/sirikali/package.nix
@@ -8,7 +8,6 @@
   pkg-config,
   qt6,
   kdePackages,
-  cryfs,
   fscrypt-experimental,
   gocryptfs,
   sshfs,
@@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
   qtWrapperArgs = [
     "--prefix PATH : ${
       lib.makeBinPath [
-        cryfs
         fscrypt-experimental
         gocryptfs
         sshfs
@@ -65,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, cryfs, gocryptfs and fscrypt";
+    description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, gocryptfs and fscrypt";
+    longDescription = "Sirikali also supports `cryfs`, but `cryfs` is no longer available in Nixpkgs.";
     homepage = "https://github.com/mhogomchungu/sirikali";
     changelog = "https://github.com/mhogomchungu/sirikali/blob/${finalAttrs.src.rev}/changelog";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix
index 9af74adc3a89..164eafc6aa39 100644
--- a/pkgs/kde/plasma/plasma-vault/default.nix
+++ b/pkgs/kde/plasma/plasma-vault/default.nix
@@ -3,7 +3,6 @@
   mkKdeDerivation,
   replaceVars,
   pkg-config,
-  cryfs,
   gocryptfs,
   lsof,
 }:
@@ -12,7 +11,6 @@ mkKdeDerivation {
 
   patches = [
     (replaceVars ./hardcode-paths.patch {
-      cryfs = lib.getExe' cryfs "cryfs";
       gocryptfs = lib.getExe' gocryptfs "gocryptfs";
       lsof = lib.getExe lsof;
     })
diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
index 4c64b37503fc..8b80ee63854f 100644
--- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
+++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
@@ -1,16 +1,3 @@
-diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
-index f425eb3..5b8cd43 100644
---- a/kded/engine/backends/cryfs/cryfsbackend.cpp
-+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
-@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
-     auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
-     KConfigGroup backendConfig(config, "CryfsBackend");
- 
--    return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
-+    return process("@cryfs@", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
- }
- 
- } // namespace PlasmaVault
 diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
 index 8636e4e..4f4ba0d 100644
 --- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
@@ -46,16 +33,3 @@ index f488d00..6b76565 100644
              | cast<QString>()
              | onError([this] {
                  d->updateMessage(i18n("Failed to fetch the list of applications using this vault"));
-diff --git a/kded/ui/cryfscypherchooserwidget.cpp b/kded/ui/cryfscypherchooserwidget.cpp
-index bbe76ef..dbd27ac 100644
---- a/kded/ui/cryfscypherchooserwidget.cpp
-+++ b/kded/ui/cryfscypherchooserwidget.cpp
-@@ -39,7 +39,7 @@ void CryfsCypherChooserWidget::initializeCyphers()
-     // TODO: This needs to be prettier -- for modules to be able
-     // to reach their backends directly
-     auto process = new QProcess();
--    process->setProgram("cryfs");
-+    process->setProgram("@cryfs@");
-     process->setArguments({"--show-ciphers"});
- 
-     auto env = process->processEnvironment();
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dbbf5a708693..3635af1c16c0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -597,6 +597,7 @@ mapAliases {
   cromfs = throw "'cromfs' has been removed due to lack of fuse 3 support. You can try replacing it with dwarfs: https://github.com/mhx/dwarfs#with-cromfs"; # Added 2026-06-05
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
   crossLibcStdenv = throw "'crossLibcStdenv' has been renamed to/replaced by 'stdenvNoLibc'"; # Converted to throw 2025-10-27
+  cryfs = throw "'cryfs' has been removed as versions <2.x depend on FUSE 2, which is deprecated and is no longer available in Nixpkgs. 'cryfs' may be added again in the future once version 2.0.0 is stabilised. In the meantime, consider using 'gocryptfs'."; # Added 2026-07-12
   crystal_1_11 = throw "'crystal_1_11' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-09-04
   csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Addeed 2025-11-07
   cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
@@ -694,7 +695,7 @@ mapAliases {
   ebpf-verifier = warnAlias "'ebpf-verifier' has been renamed to 'prevail'" prevail; # Added 2026-04-01
   EBTKS = throw "'EBTKS' has been renamed to/replaced by 'ebtks'"; # Converted to throw 2025-10-27
   ec2-utils = throw "'ec2-utils' has been renamed to/replaced by 'amazon-ec2-utils'"; # Converted to throw 2025-10-27
-  ecryptfs = throw "'ecryptfs' has been removed due to lack of maintenance. Consider using 'fscrypt', 'gocryptfs' or 'cryfs' instead."; # Added 2026-01-14
+  ecryptfs = throw "'ecryptfs' has been removed due to lack of maintenance. Consider using 'fscrypt' or 'gocryptfs' instead."; # Added 2026-01-14
   edid-decode = v4l-utils; # Added 2025-06-20
   eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
   eintopf = throw "'eintopf' has been renamed to/replaced by 'lauti'"; # Converted to throw 2025-10-27

From 323b76b8230825bcd74dae526a3cea72d6c46fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 12 Jul 2026 01:33:42 +0200
Subject: [PATCH 0226/1386] Revert "nixos/nginx: disable MemoryDenyWriteExecute
 when lua with luajit is enabled"

This reverts commit 04b527753e405d48b62e168488f373d19723e88d.
---
 nixos/modules/services/web-servers/nginx/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 8d6343816e44..eb344d92377a 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -1617,7 +1617,6 @@ in
           MemoryDenyWriteExecute =
             !(
               (builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules)
-              || cfg.lua.enable
               || (cfg.package == pkgs.openresty)
             );
           RestrictRealtime = true;

From e190092b9338df15adc6d94e789495c508ee8900 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 00:26:44 +0000
Subject: [PATCH 0227/1386] nethogs: 0.8.8 -> 0.9.0

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

diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix
index 006122654ec5..2fe67b8d5fee 100644
--- a/pkgs/by-name/ne/nethogs/package.nix
+++ b/pkgs/by-name/ne/nethogs/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nethogs";
-  version = "0.8.8";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "nethogs";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU=";
+    sha256 = "sha256-ojbsCoJ8fOaHgm1tWyM59siTDYmCllXOUNqNQJwRhws=";
   };
 
   buildInputs = [

From f71a0a88b34ee30dbcf119a13a4814540f6b134b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 8 Jul 2026 01:46:28 +0200
Subject: [PATCH 0228/1386] python314Packages.torchaudio: use cudaPackages from
 torch

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

diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index 974bf23e7ec1..0db400402f72 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -28,12 +28,12 @@
   torchaudio,
 
   cudaSupport ? torch.cudaSupport,
-  cudaPackages,
   rocmSupport ? torch.rocmSupport,
 }:
 
 let
   inherit (stdenv) hostPlatform;
+  inherit (torch) cudaCapabilities cudaPackages;
 in
 buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "torchaudio";
@@ -53,7 +53,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
 
     # CUDA
     USE_CUDA = cudaSupport;
-    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
     TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUCTC_DECODER = 1;
     TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUDA = 1;
     TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MULTIGPU_CUDA = 1;

From 6150d2f95a385168c00649c80f0c39aafb01cfd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 8 Jul 2026 02:08:12 +0200
Subject: [PATCH 0229/1386] python314Packages.torch: automatically adjust the
 magma cuda version

to improve overridability
---
 pkgs/development/python-modules/torch/source/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 3f006e3e4384..c374f7f87271 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -14,7 +14,7 @@
   autoAddDriverRunpath,
   effectiveMagma ?
     if cudaSupport then
-      magma-cuda-static
+      magma-cuda-static.override { inherit cudaPackages; }
     else if rocmSupport then
       magma-hip
     else

From dea9c30f322f7371b01fda10e3f848616a271014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 12 Jul 2026 01:51:50 +0200
Subject: [PATCH 0230/1386] python314Packages.torch: assert that triton uses
 the same cuda major+minor version

---
 pkgs/development/python-modules/torch/source/default.nix | 3 +++
 pkgs/development/python-modules/triton/default.nix       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index c374f7f87271..b6013d8f2ebd 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -263,6 +263,9 @@ let
     "Magma cudaPackages does not match cudaPackages" =
       cudaSupport
       && (effectiveMagma.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion);
+    "Triton cudaPackages does not match cudaPackages" =
+      cudaSupport
+      && (_tritonEffective.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion);
   };
 
   unroll-src = writeShellScript "unroll-src" ''
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 72e8df58f076..92c3d8a25d38 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -218,6 +218,7 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: {
   ];
 
   passthru = {
+    inherit cudaPackages;
     gpuCheck = effectiveStdenv.mkDerivation {
       pname = "triton-pytest";
       inherit (triton) version src;

From 3e54bbc91de53b06960d9002c25877310d05c2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 12 Jul 2026 01:52:17 +0200
Subject: [PATCH 0231/1386] python314Packages.torch: automatically adjust the
 triton cuda version

to improve overridability
---
 pkgs/development/python-modules/torch/source/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index b6013d8f2ebd..f8d9d63a873b 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -81,7 +81,7 @@
   #          (dependencies without cuda support).
   #          Instead we should rely on overlays and nixpkgsFun.
   # (@SomeoneSerge)
-  _tritonEffective ? if cudaSupport then triton-cuda else triton,
+  _tritonEffective ? if cudaSupport then triton-cuda.override { inherit cudaPackages; } else triton,
   triton-cuda,
 
   # Disable MKLDNN on aarch64-darwin, it negatively impacts performance,

From 3e46c77dd8c72ceb5db0fba1db90137b149ed163 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Sun, 12 Jul 2026 04:23:54 +0200
Subject: [PATCH 0232/1386] nixos/graphical-desktop: avoid writing empty Option
 values to 00-keyboard.conf

---
 .../services/misc/graphical-desktop.nix       | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix
index e26050c123de..906601d1fc0c 100644
--- a/nixos/modules/services/misc/graphical-desktop.nix
+++ b/nixos/modules/services/misc/graphical-desktop.nix
@@ -22,17 +22,23 @@ in
 
   config = lib.mkIf cfg.enable {
     environment = {
-      # localectl looks into 00-keyboard.conf
-      etc."X11/xorg.conf.d/00-keyboard.conf".text = ''
-        Section "InputClass"
-          Identifier "Keyboard catchall"
-          MatchIsKeyboard "on"
-          Option "XkbModel" "${xcfg.xkb.model}"
-          Option "XkbLayout" "${xcfg.xkb.layout}"
-          Option "XkbOptions" "${xcfg.xkb.options}"
-          Option "XkbVariant" "${xcfg.xkb.variant}"
-        EndSection
-      '';
+      # systemd-localed looks into 00-keyboard.conf
+      # systemd-localed does not like if Option values are ""
+      etc."X11/xorg.conf.d/00-keyboard.conf".text =
+        let
+          optionLine =
+            name: value: lib.optionalString (value != null && value != "") ''Option "${name}" "${value}"'';
+        in
+        ''
+          Section "InputClass"
+            Identifier "Keyboard catchall"
+            MatchIsKeyboard "on"
+            ${optionLine "XkbModel" xcfg.xkb.model}
+            ${optionLine "XkbLayout" xcfg.xkb.layout}
+            ${optionLine "XkbOptions" xcfg.xkb.options}
+            ${optionLine "XkbVariant" xcfg.xkb.variant}
+          EndSection
+        '';
       systemPackages = with pkgs; [
         nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more
         xdg-utils

From 8678700644b2650cd54c77e0b1f9d9344d1750d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 03:17:35 +0000
Subject: [PATCH 0233/1386] asdf-vm: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix
index 59e5688f9162..25c6b0934e4c 100644
--- a/pkgs/by-name/as/asdf-vm/package.nix
+++ b/pkgs/by-name/as/asdf-vm/package.nix
@@ -8,18 +8,18 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "asdf-vm";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "asdf-vm";
     repo = "asdf";
 
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WUHNr9AaCOYh0mZS5zZqWwuq8uw6bgGtj5mPgIvNGUE=";
+    hash = "sha256-qq1HJidVBqHyfk2OZ439fnkJKRq1xglqOrF3GVvWeXY=";
 
   };
 
-  vendorHash = "sha256-RSKenTwSgseEpvT6K36kWRfmIMPymYEGOTPcEHU7o2E=";
+  vendorHash = "sha256-Rv5p63opBTlyRlRDisgYX5fVJFny1clDn7b/zumV83M=";
 
   nativeBuildInputs = [
     makeWrapper

From e00a69115c61bd6d571d4118aa484fb6fc59d2a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 03:41:12 +0000
Subject: [PATCH 0234/1386] rdap: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/by-name/rd/rdap/package.nix b/pkgs/by-name/rd/rdap/package.nix
index 4713875f843b..09834e1e63c6 100644
--- a/pkgs/by-name/rd/rdap/package.nix
+++ b/pkgs/by-name/rd/rdap/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rdap";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "openrdap";
     repo = "rdap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
+    hash = "sha256-dlRIKf/NikCxiKub6qFmC+e3J1XllaVodzVZvUyvycE=";
   };
 
-  vendorHash = "sha256-8b1EAnR8PkEAw9yLBqPKFeANJit0OCJG+fssAGR/iTk=";
+  vendorHash = "sha256-F9kwlUwrV6cUT9C/xZx5TyDPoqTt8mt/uh+QYaSCiUw=";
 
   doCheck = false;
 

From df590320f3f282ed2a9bdaad200004b73942919a Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Sun, 12 Jul 2026 10:32:34 +0200
Subject: [PATCH 0235/1386] nixos/matrix-authentication-service: use env var
 instead of %d

%d works in the context of the ExecStart command, since it's expanded by
systemd. However, extraConfigFiles is also used in the ExecStartPre
*script*, and bash does not know what %d is, so it's not expanded and
the MAS config check fails because it can't find "%d/config-0" (instead
of the intended "/run/credentials/...")
---
 .../modules/services/matrix/matrix-authentication-service.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/matrix/matrix-authentication-service.nix b/nixos/modules/services/matrix/matrix-authentication-service.nix
index 4b57643e4090..ee3c1a5d8232 100644
--- a/nixos/modules/services/matrix/matrix-authentication-service.nix
+++ b/nixos/modules/services/matrix/matrix-authentication-service.nix
@@ -45,7 +45,9 @@ let
       pruned;
   configFile = format.generate "config.yaml" finalSettings;
 
-  extraConfigFiles = lib.imap0 (i: _: "%d/config-${toString i}") cfg.extraConfigFiles;
+  extraConfigFiles = lib.imap0 (
+    i: _: "\${CREDENTIALS_DIRECTORY}/config-${toString i}"
+  ) cfg.extraConfigFiles;
   runtimeConfig = "/run/matrix-authentication-service/config.yaml";
 in
 {

From cac58b3049a3af6e7d720a505232929db52511ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= <ilkecan@protonmail.com>
Date: Fri, 27 Mar 2026 15:33:47 +0300
Subject: [PATCH 0236/1386] wl-find-cursor: init at 0-unstable-2026-02-03

---
 pkgs/by-name/wl/wl-find-cursor/package.nix | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/wl/wl-find-cursor/package.nix

diff --git a/pkgs/by-name/wl/wl-find-cursor/package.nix b/pkgs/by-name/wl/wl-find-cursor/package.nix
new file mode 100644
index 000000000000..a4ceb1e5f4e7
--- /dev/null
+++ b/pkgs/by-name/wl/wl-find-cursor/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  stdenv,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+}:
+
+stdenv.mkDerivation {
+  pname = "wl-find-cursor";
+  version = "0-unstable-2026-02-03";
+
+  src = fetchFromGitHub {
+    owner = "cjacker";
+    repo = "wl-find-cursor";
+    rev = "ce1a125702b466dc537c5490f7888b4a68dee883";
+    hash = "sha256-IUreWEOWF1loS5SiAh8XPFrKE35Pxv6e8hhvdtNvjiU=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    wayland
+  ];
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "/usr/share/wayland-protocols" "${wayland-protocols}/share/wayland-protocols" \
+      --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace-fail "install: default" "install: all"
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Highlight and print the mouse cursor position on Wayland";
+    homepage = "https://github.com/cjacker/wl-find-cursor";
+    license = lib.licenses.mit;
+    mainProgram = "wl-find-cursor";
+    maintainers = with lib.maintainers; [ ilkecan ];
+    platforms = lib.platforms.linux;
+  };
+}

From 6d7ec600a496b8343ad490cd956a30db829dedc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 09:20:54 +0000
Subject: [PATCH 0237/1386] nushellPlugins.desktop_notifications: 0.113.1 ->
 0.114.1

---
 .../nu/nushell-plugin-desktop_notifications/package.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix
index cd4d1026ea33..76cc59030954 100644
--- a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_desktop_notifications";
-  version = "0.113.1";
+  version = "0.114.1";
 
   src = fetchFromGitHub {
     owner = "FMotalleb";
     repo = "nu_plugin_desktop_notifications";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aA47T3Fxo2eH0JclZRC7zY4RK8eRnAqj712LhgXEMpU=";
+    hash = "sha256-/41DHPv9UKHUY551UppiauEiwoB0qQnkSrl6pHytwLs=";
   };
 
-  cargoHash = "sha256-e/q/X0Temmkoj6DcPLUC+QfN9lVDrE4esVEx9LF4bHc=";
+  cargoHash = "sha256-csBlo1Gly1LbvMxfmydmLlzhQh7ul2haLr7IAq/GlbI=";
 
   passthru.updateScript = nix-update-script { };
 

From 5726bb4d6f6c33d8ec9cfa021943004e345f257f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 09:47:11 +0000
Subject: [PATCH 0238/1386] tree-sitter-grammars.tree-sitter-ghostty:
 1.3.1-unstable-2026-06-03 -> 1.3.1-unstable-2026-07-07

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..360f9d0ee47c 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -808,10 +808,10 @@
   };
 
   ghostty = {
-    version = "1.3.1-unstable-2026-06-03";
+    version = "1.3.1-unstable-2026-07-07";
     url = "github:bezhermoso/tree-sitter-ghostty";
-    rev = "7f41507014534e5f72d16e4639c0346d0adb8054";
-    hash = "sha256-81aTIWcdmHj+sNxB8geIoJwTZocMPTZXWvEKkARzhuU=";
+    rev = "1f47dfd4da0faab5321b47518ce2faa4be163580";
+    hash = "sha256-tpTm4e3f+hjy9Mi91fSm1qojJLB6A8KsN/iEsiOdxsw=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 9a6777d143cd454a535dd9c8b04f76387f38d1ca Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 5 Jul 2026 20:09:14 +0530
Subject: [PATCH 0239/1386] python3Packages.python3-eventlib: fix build of
 blink-qt

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../0001-fixes-for-python3.14.patch           | 49 +++++++++++++++++++
 .../python3-eventlib/default.nix              |  5 ++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch

diff --git a/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch b/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch
new file mode 100644
index 000000000000..738b2f500328
--- /dev/null
+++ b/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch
@@ -0,0 +1,49 @@
+From c3076f3ae4567af11dc6815550487adaff69ce03 Mon Sep 17 00:00:00 2001
+From: phanirithvij <phanirithvij2000@gmail.com>
+Date: Sun, 5 Jul 2026 18:30:15 +0530
+Subject: [PATCH] fixes for python3.14
+
+Add fallback stubs for urllib attributes removed in Python 3.14.
+---
+ eventlib/green/urllib.py | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/eventlib/green/urllib.py b/eventlib/green/urllib.py
+index 0c8e375..ba82160 100644
+--- a/eventlib/green/urllib.py
++++ b/eventlib/green/urllib.py
+@@ -7,7 +7,12 @@ from eventlib.green import socket, time
+ from urllib.error import( __all__ )
+ from urllib.response import( __all__ )
+ from urllib.robotparser import( __all__ )
+-from urllib.request import( __all__, __version__, MAXFTPCACHE, ftpcache, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies)
++try:
++    from urllib.request import( __all__, __version__, MAXFTPCACHE, ftpcache, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies)
++except ImportError:
++    from urllib.request import( __all__, __version__, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies)
++    MAXFTPCACHE = 10
++    ftpcache = {}
+ from urllib.parse import( __all__,  quote, unwrap, unquote, splithost, splituser, splittype, splitattr, splitpasswd, splitport, splitquery, splitvalue)
+ from urllib.parse import urljoin as basejoin
+ 
+@@ -41,7 +46,16 @@ def urlcleanup():
+         _urlopener.cleanup()
+ 
+ 
+-class URLopener(urllib.request.URLopener):
++try:
++    _URLopener = urllib.request.URLopener
++    _FancyURLopener = urllib.request.FancyURLopener
++except AttributeError:
++    class _URLopener(object):
++        def __init__(self, *args, **kwargs): pass
++    class _FancyURLopener(_URLopener):
++        pass
++
++class URLopener(_URLopener):
+ 
+     def open_http(self, url, data=None):
+         """Use HTTP protocol."""
+-- 
+2.54.0
+
diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix
index a2e63e597ffa..34958a136738 100644
--- a/pkgs/development/python-modules/python3-eventlib/default.nix
+++ b/pkgs/development/python-modules/python3-eventlib/default.nix
@@ -20,6 +20,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-jN9nn+rI4TJLrEiEIoVxQ3XnXWSws1FenGUfG3doc94=";
   };
 
+  patches = [
+    # remove once new release with https://github.com/AGProjects/python3-eventlib/pull/4
+    ./0001-fixes-for-python3.14.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From 530a50b4bff977b040ffbe4d4a34906c18ed356e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 12 Jul 2026 13:18:20 +0200
Subject: [PATCH 0240/1386] rstudio: fix build with ru-ru-mozilla dict

---
 pkgs/by-name/rs/rstudio/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 712c82014729..853211adfe8b 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -73,7 +73,13 @@ let
   # -large versions in case of clashes
   largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
   otherDicts = lib.filter (
-    d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
+    d:
+    !(
+      lib.hasInfix "ru-ru-libreoffice" d.name # conflits with ru-ru-mozilla
+      || (
+        lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (lib.map (d: d.dictFileName) largeDicts)
+      )
+    )
   ) hunspellDictionaries;
   dictionaries = largeDicts ++ otherDicts;
 

From 200c8267178b8626971e33e8d9e33bfc3573ebcb Mon Sep 17 00:00:00 2001
From: Christopher Kaster <me@atomicptr.de>
Date: Sun, 12 Jul 2026 13:57:30 +0200
Subject: [PATCH 0241/1386] odin: dev-2026-07 -> dev-2026-07a

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

diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix
index b23e7a24a94b..2c4dc1838814 100644
--- a/pkgs/by-name/od/odin/package.nix
+++ b/pkgs/by-name/od/odin/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "odin";
-  version = "dev-2026-07";
+  version = "dev-2026-07a";
 
   src = fetchFromGitHub {
     owner = "odin-lang";
     repo = "Odin";
     tag = finalAttrs.version;
-    hash = "sha256-pVCZB6YOk73tBGVE1i73JJG3z9SZNakFuMp4Kepqnvc=";
+    hash = "sha256-sjL6mj2zfUVpiwkooTTBCVkPRoPWR7ci/hb9TYF+J/I=";
   };
 
   patches = [

From f4db22b565b9abca4b9f169672e15d2c797d8ac5 Mon Sep 17 00:00:00 2001
From: jk <47693+sectore@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:19:21 +0200
Subject: [PATCH 0242/1386] timr-tui: 1.9.0 -> 1.11.0

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

diff --git a/pkgs/by-name/ti/timr-tui/package.nix b/pkgs/by-name/ti/timr-tui/package.nix
index 176eaf7a74cd..a96305f7995b 100644
--- a/pkgs/by-name/ti/timr-tui/package.nix
+++ b/pkgs/by-name/ti/timr-tui/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "timr-tui";
-  version = "1.9.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "sectore";
     repo = "timr-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MEDqrP/wlFHMkXFUwn+VQu8gEjc40xI5xcetG/VqSic=";
+    hash = "sha256-/XsYDAvtkbGEtHz68ar2MqONAXyP3i5X0iZ08lnYOu4=";
   };
 
-  cargoHash = "sha256-lQw6p0+uph2P4OdQq2Mz3EHc9o8RcH3SjYPzGvPn2tk=";
+  cargoHash = "sha256-DnjKH1EnOY9YnApJDO4R0M7XhxYs5k1f4hoa3J3J32c=";
 
   # Enable upstream "sound" feature when requested
   buildFeatures = lib.optionals enableSound [ "sound" ];

From 00c33702baa387c313bcfa919ef1c9565ec45c20 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 12 Jul 2026 15:26:31 +0200
Subject: [PATCH 0243/1386] handbrake: 1.11.1 -> 1.11.2

https://github.com/HandBrake/HandBrake/releases/tag/1.11.2
---
 pkgs/by-name/ha/handbrake/package.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix
index edc886281aca..fadb57ec8242 100644
--- a/pkgs/by-name/ha/handbrake/package.nix
+++ b/pkgs/by-name/ha/handbrake/package.nix
@@ -88,23 +88,18 @@
 }:
 
 let
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = applyPatches {
     src = fetchFromGitHub {
       owner = "HandBrake";
       repo = "HandBrake";
       # uses version commit for logic in version.txt
-      rev = "4ce99a885cde39b3511016efdb5124726819defb";
-      hash = "sha256-oWXNiRK0wbmINnjM3GrOIawcSULTuy3yANfgW8li9F0=";
+      rev = "9eb6c936803e8b071035b1a77662cb0db58441ea";
+      hash = "sha256-f4kBFeW1yVFLlXGAimWsZx+9PKlgR6xrXUZG+CBh28A=";
     };
 
     patches = [
-      # Only needed so the subsequent patch applies
-      (fetchpatch2 {
-        url = "https://github.com/HandBrake/HandBrake/commit/c8e16778a330881af36fa32004f887bd73874d15.patch";
-        hash = "sha256-i3/X9opDzsZIO7bjLHHZltuQH93uENRF0t7FP7DDdBM=";
-      })
       # Update x265 submodule to v4.2, drop in next release
       (fetchpatch2 {
         url = "https://github.com/HandBrake/HandBrake/commit/432514bf839e7280511e4a7afc35fb4868ef4d0b.patch";
@@ -116,6 +111,14 @@ let
         ];
         hash = "sha256-xwIY1pO9mKbrQFjQCENuvntIoiZTHeUVg8axrl3zxxo=";
       })
+      # Update ffmpeg to v8.1.2, drop if backported
+      (fetchpatch2 {
+        url = "https://github.com/HandBrake/HandBrake/commit/02b704c5cf2e73d227fbb5be151501b232b0e5f2.patch?full_index=1";
+        excludes = [
+          "contrib/ffmpeg/module.defs"
+        ];
+        hash = "sha256-fSfLXH+aRwVv9BrDT1oNBHD2VUbAnN3jVu3CJeoaAKg=";
+      })
     ];
   };
 
@@ -150,6 +153,7 @@ let
       "${src}/contrib/ffmpeg/A22-fix-d3d11-static-pool-size-error.patch"
       "${src}/contrib/ffmpeg/A23-movenc-set-the-chapters-track-language-to-the-same-a.patch"
       "${src}/contrib/ffmpeg/A24-movenc-use-version-2-audio-descriptor-for-2-channels.patch"
+      "${src}/contrib/ffmpeg/A26-avformat-movenc-fix-mov_create_dvd_sub_decoder_speci.patch"
     ];
   });
 
@@ -173,12 +177,12 @@ let
   });
 
   svt-av1-hb = svt-av1.overrideAttrs (old: rec {
-    version = "4.0.1";
+    version = "4.1.0";
     src = fetchFromGitLab {
       owner = "AOMediaCodec";
       repo = "SVT-AV1";
-      rev = "v${version}";
-      hash = "sha256-7krVkLZxgolqPTkuyKAx07BekAPacftcGZ44lQTQFZQ=";
+      tag = "v${version}";
+      hash = "sha256-NPJG1SsRlG9kGtUwdJa/uP6DAtF09nCctzeorrvjAhQ=";
     };
     postPatch = (old.postPatch or "") + ''
       pushd ..

From cb75965a98349f1ef907a5b8634e71a24a096a00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 14:09:18 +0000
Subject: [PATCH 0244/1386] stevenblack-blocklist: 3.16.94 -> 3.16.97

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

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 88e5948799ab..6e406f749753 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.94";
+  version = "3.16.97";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-vVEf9FAXT4QgwM2BZF593JVD7NpTlwXdy9JXrnufhAo=";
+    hash = "sha256-5r8r57m+Ilce6Onu/svc05yyrLGH5S65RixbwqlpmPU=";
   };
 
   outputs = [

From 41f3bd769c6bf4a71fe91fd5815ff1370d4643e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 12 Jul 2026 16:57:00 +0200
Subject: [PATCH 0245/1386] python314Packages.torchcodec: use cudaPackages from
 torch

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

diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix
index db1d474a6be0..8523ebbe076c 100644
--- a/pkgs/development/python-modules/torchcodec/default.nix
+++ b/pkgs/development/python-modules/torchcodec/default.nix
@@ -20,10 +20,12 @@
   torchvision,
 
   cudaSupport ? torch.cudaSupport,
-  cudaPackages,
   rocmSupport ? torch.rocmSupport,
 }:
 
+let
+  inherit (torch) cudaCapabilities cudaPackages;
+in
 buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "torchcodec";
   version = "0.14.0";
@@ -100,7 +102,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
     ENABLE_CUDA = cudaSupport;
   }
   // lib.optionalAttrs cudaSupport {
-    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
   }
   // lib.optionalAttrs rocmSupport {
     ROCM_PATH = torch.rocmtoolkit_joined;

From 87e25e161859d91175e921e1828d32111584dbb8 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sun, 12 Jul 2026 16:26:45 +0100
Subject: [PATCH 0246/1386] ibm-plex: 0-unstable-2026-02-12 ->
 0-unstable-2026-05-26

The Mono variant of the font has been updated from version 1.1.0 to 2.5.0.
---
 pkgs/by-name/ib/ibm-plex/fonts.nix   | 6 +++---
 pkgs/by-name/ib/ibm-plex/package.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ib/ibm-plex/fonts.nix b/pkgs/by-name/ib/ibm-plex/fonts.nix
index cda27fb6be87..9a5dd7b1748c 100644
--- a/pkgs/by-name/ib/ibm-plex/fonts.nix
+++ b/pkgs/by-name/ib/ibm-plex/fonts.nix
@@ -6,10 +6,10 @@
     version = "1.1.0";
   };
   mono = {
-    hash = "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=";
+    hash = "sha256-GK9KStu5KQ5g5+IUwJq4L+a5gOwzsNXH80OOIbyvOnM=";
     name = "IBM Plex Mono";
-    url = "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip";
-    version = "1.1.0";
+    url = "https://github.com/IBM/plex/releases/download/%40ibm/plex-mono%402.5.0/ibm-plex-mono.zip";
+    version = "2.5.0";
   };
   sans = {
     hash = "sha256-mK+8GGl2ugF2+fS6yd3p5NWPHHcKEJWiShDS3lihOlI=";
diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix
index b87f6cabff55..8f3f7bbcf445 100644
--- a/pkgs/by-name/ib/ibm-plex/package.nix
+++ b/pkgs/by-name/ib/ibm-plex/package.nix
@@ -62,7 +62,7 @@ in
 assert lib.assertMsg (unknownFamilies == [ ]) "Unknown font(s): ${toString unknownFamilies}";
 symlinkJoin {
   pname = "ibm-plex";
-  version = "0-unstable-2026-02-12";
+  version = "0-unstable-2026-05-26";
   paths = lib.attrValues fontDerivations;
   passthru = fontDerivations // {
     updateScript = ./update.py;

From e831059c259a99a2d99c9875c9337dc9ebcfa877 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sun, 12 Jul 2026 18:01:51 +0200
Subject: [PATCH 0247/1386] principia: 2026.06.19 -> 2026.07.09

---
 pkgs/by-name/pr/principia/package.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/pr/principia/package.nix b/pkgs/by-name/pr/principia/package.nix
index 6256a94789ca..faaae3be19ec 100644
--- a/pkgs/by-name/pr/principia/package.nix
+++ b/pkgs/by-name/pr/principia/package.nix
@@ -12,22 +12,18 @@
   libGL,
   libjpeg,
   libpng,
-  SDL2,
-  SDL2_gfx,
-  SDL2_image,
-  SDL2_mixer,
-  SDL2_ttf,
+  sdl3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "principia";
-  version = "2026.06.19";
+  version = "2026.07.09";
 
   src = fetchFromGitHub {
     owner = "Bithack";
     repo = "principia";
-    rev = finalAttrs.version;
-    hash = "sha256-LYU8ctsEndBS3AGuQ9BtFaWR6RgTyoG4WAd91+B4zwY=";
+    tag = finalAttrs.version;
+    hash = "sha256-DlAhlbJjVCWpcwa6WDRU3Vms3AgDZdjZjBuBy9MOPh4=";
   };
 
   nativeBuildInputs = [
@@ -43,11 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libjpeg
     libpng
-    SDL2
-    SDL2_gfx
-    SDL2_image
-    SDL2_mixer
-    SDL2_ttf
+    sdl3
   ];
 
   cmakeFlags = [

From 8ae443a994b2a83cc06b2250d5c4d22aaaaac2cb Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Sun, 12 Jul 2026 16:50:20 +0000
Subject: [PATCH 0248/1386] codexbar: 0.42.0 -> 0.42.1

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

diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix
index e6c441f2a2b4..ad9647c26197 100644
--- a/pkgs/by-name/co/codexbar/package.nix
+++ b/pkgs/by-name/co/codexbar/package.nix
@@ -9,18 +9,21 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "codexbar";
-  version = "0.42.0";
+  version = "0.42.1";
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchurl {
     url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip";
-    hash = "sha256-R5l4R9E564p9ILFV5A5ZyoQceLhEc1kL2h6eB7hImOU=";
+    hash = "sha256-PXzuRhlQUwqc6ftC8UKpnNY6EK8r9DKPeVbItiGnL64=";
   };
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ makeWrapper unzip ];
+  nativeBuildInputs = [
+    makeWrapper
+    unzip
+  ];
 
   installPhase = ''
     runHook preInstall

From f5e6d801971fb5e4fe29c6a16736478027031912 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 16:56:02 +0000
Subject: [PATCH 0249/1386] dwarf-fortress-packages.dwarf-fortress-original:
 53.14 -> 53.15

---
 pkgs/games/dwarf-fortress/df.lock.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json
index 03bf7fd55d19..3f69718c270e 100644
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@@ -1,28 +1,28 @@
 {
   "game": {
     "latest": {
-      "linux": "53.14",
+      "linux": "53.15",
       "darwin": "0.47.05"
     },
     "versions": {
-      "53.14": {
+      "53.15": {
         "df": {
-          "version": "53.14",
+          "version": "53.15",
           "urls": {
             "linux": {
-              "url": "https://www.bay12games.com/dwarves/df_53_14_linux.tar.bz2",
-              "outputHash": "sha256-ZU/va7bblzh5UuPuuctjUHzEmcFLtzjXp9R86UV+G9k="
+              "url": "https://www.bay12games.com/dwarves/df_53_15_linux.tar.bz2",
+              "outputHash": "sha256-LreGXGk8Pgmr8Mk37VT3U0tCFOhRKZFdEsXBzmJtN4o="
             }
           }
         },
         "hack": {
-          "version": "53.14-r2",
+          "version": "53.15-r1",
           "git": {
             "url": "https://github.com/DFHack/dfhack.git",
-            "revision": "53.14-r2",
-            "outputHash": "sha256-8OvJ8NULgfR+S0kzOSmQvplhPT7wcxw02sRkG450ptE="
+            "revision": "53.15-r1",
+            "outputHash": "sha256-7vNk/JmNu0tQEevZ7XeGX/435EydR15dJJIHEyS1a7c="
           },
-          "xmlRev": "01aae95cacd98850e4f477c45a4b75f800bacecc"
+          "xmlRev": "80a6267faddb7aa99759c9df94186de3f873dd97"
         }
       },
       "52.05": {

From 831887f4502dad5f1e84ca02e4998593b5597217 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 17:18:01 +0000
Subject: [PATCH 0250/1386] netboxPlugins.netbox-custom-objects: 0.5.2 -> 0.6.0

---
 .../ne/netbox_4_5/plugins/netbox-custom-objects/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix
index 4a7d67384c07..987236a2cc56 100644
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "netbox-custom-objects";
-  version = "0.5.2";
+  version = "0.6.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
     owner = "netboxlabs";
     repo = "netbox-custom-objects";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bFPcv7eEUFfLB7XfxOnJR+pBSXUVKsAupcid2dxjtho=";
+    hash = "sha256-HnA2CJL0EOJctQpsu/G+9fULBIa8rrrYNiT0aaDw/rI=";
   };
 
   build-system = [ setuptools ];

From b98568508bfc894bb76a6198f9bd910ca00b6876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:37:11 -0700
Subject: [PATCH 0251/1386] parla: 0.6.4 -> 0.6.6

Diff: https://github.com/trufae/parla/compare/0.6.4...0.6.6

Changelog: https://github.com/trufae/parla/releases/tag/0.6.6
---
 pkgs/by-name/pa/parla/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/parla/package.nix b/pkgs/by-name/pa/parla/package.nix
index 738fc018fb4f..088e1b0ce231 100644
--- a/pkgs/by-name/pa/parla/package.nix
+++ b/pkgs/by-name/pa/parla/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "parla";
-  version = "0.6.4";
+  version = "0.6.6";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "trufae";
     repo = "parla";
     tag = finalAttrs.version;
-    hash = "sha256-tlqrUxzQS+u4DlSIKAp9oR69KRW2gTgwBoroUJzvsaY=";
+    hash = "sha256-ZSI/dABNaApCXKJkLGXFp1Fp221Axurj/Z3O9Q9pQZk=";
   };
 
   nativeBuildInputs = [

From d632772ad87cd3391b6e0f83c039ba8129aded24 Mon Sep 17 00:00:00 2001
From: Benjamin Levy <7348004+io12@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:05:00 -0400
Subject: [PATCH 0252/1386] pdal: 2.9.3 -> 2.10.2

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

diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 88cb48468f45..80ccb9bbba2e 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdal";
-  version = "2.9.3";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
     tag = finalAttrs.version;
-    hash = "sha256-htuvNheRwzpdSKc4FbwugBWWaCNC7/20TSKwRpLr+7Y=";
+    hash = "sha256-VxELHAiiFMKjsvgBK4Cm6YJSrs/4QhhF1haZv4/FlZg=";
   };
 
   nativeBuildInputs = [
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     "pdal_io_stac_reader_test"
 
     # Require data to be downloaded from Internet
-    "pdal_io_copc_reader_test"
+    "pdal_io_copc_remote_reader_test"
   ];
 
   nativeCheckInputs = [

From 31450c1f0a69b01e3c2bfde2fd126fe180c79d38 Mon Sep 17 00:00:00 2001
From: Lyn <me@fugi.dev>
Date: Fri, 17 Apr 2026 14:55:07 +0200
Subject: [PATCH 0253/1386] sable-unwrapped: init at 1.19.4

---
 pkgs/by-name/ci/cinny/package.nix           |  5 +-
 pkgs/by-name/sa/sable-unwrapped/package.nix | 80 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  5 ++
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/sa/sable-unwrapped/package.nix

diff --git a/pkgs/by-name/ci/cinny/package.nix b/pkgs/by-name/ci/cinny/package.nix
index df494780e81d..02bfc4fca9cf 100644
--- a/pkgs/by-name/ci/cinny/package.nix
+++ b/pkgs/by-name/ci/cinny/package.nix
@@ -4,15 +4,16 @@
   stdenvNoCC,
   writeText,
   conf ? { },
+  pname ? "cinny",
 }:
 let
-  configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
+  configOverrides = writeText "${pname}-config-overrides.json" (builtins.toJSON conf);
 in
 if (conf == { }) then
   cinny-unwrapped
 else
   stdenvNoCC.mkDerivation {
-    pname = "cinny";
+    inherit pname;
     inherit (cinny-unwrapped) version meta;
 
     dontUnpack = true;
diff --git a/pkgs/by-name/sa/sable-unwrapped/package.nix b/pkgs/by-name/sa/sable-unwrapped/package.nix
new file mode 100644
index 000000000000..6cb5d792e1e4
--- /dev/null
+++ b/pkgs/by-name/sa/sable-unwrapped/package.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  pnpm_10,
+  nodejs-slim_24,
+  nix-update-script,
+}:
+
+let
+  nodejs-slim = nodejs-slim_24;
+  pnpm = pnpm_10.override { inherit nodejs-slim; };
+in
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  __darwinAllowLocalNetworking = true;
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  pname = "sable-unwrapped";
+  version = "1.19.4";
+
+  src = fetchFromGitHub {
+    owner = "SableClient";
+    repo = "Sable";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GI4ZXmqPTWt3WlTQDkjVfRWhiJnd3mdq5paA3/TGMEA=";
+  };
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    inherit pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-iBvtMeYUHWhsz1DnKjTzydAt3cGPaisUhaagoaZRg1M=";
+  };
+
+  nativeBuildInputs = [
+    nodejs-slim
+    pnpmConfigHook
+    pnpm
+  ];
+
+  # Controls how the application displays its version, e.g. "v1.14.0 (nix)".
+  # Also prevents some attempts to execute git during build.
+  env = {
+    VITE_IS_RELEASE_TAG = "true";
+    VITE_BUILD_HASH = "nix";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "An almost stable Matrix client";
+    homepage = "https://github.com/SableClient/Sable";
+    changelog = "https://github.com/SableClient/Sable/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
+      fugi
+    ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40b8b3c09319..c86acad0fc96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9359,6 +9359,11 @@ with pkgs;
 
   rusty-psn-gui = rusty-psn.override { withGui = true; };
 
+  sable = callPackage ../by-name/ci/cinny/package.nix {
+    pname = "sable";
+    cinny-unwrapped = sable-unwrapped;
+  };
+
   sweethome3d = recurseIntoAttrs (
     (callPackage ../applications/misc/sweethome3d { })
     // (callPackage ../applications/misc/sweethome3d/editors.nix {

From 2a424cd798d3420a05981f6df3e7d181f1b5f25f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 19:40:56 +0000
Subject: [PATCH 0254/1386] dae: 1.1.0 -> 2.0.0

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

diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix
index 6ac073aeb8fb..844bd9eea49a 100644
--- a/pkgs/by-name/da/dae/package.nix
+++ b/pkgs/by-name/da/dae/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "dae";
-  version = "1.1.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "dae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Kc51VQuqObxKXVXGv5CnDm4/3XYqjPvrpAQSVb2vxSM=";
+    hash = "sha256-hzX3b86BHvxXQZotSteiHoyBMF/P4WubeuJ6xpxa8ac=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-juxIsZt1T33epN8CbzDc02MmlW5PtYa4pcGxuX9OpH4=";
+  vendorHash = "sha256-S2dNFvMeZqGhzu+sIBGeaET4bQXfeucao6XR4QSTpog=";
 
   proxyVendor = true;
 

From 7eb2be8e9068701b7265bdfc296b522cdf9eee4e Mon Sep 17 00:00:00 2001
From: ekisu <dts.ramon@gmail.com>
Date: Sun, 12 Jul 2026 18:06:49 -0300
Subject: [PATCH 0255/1386] vita3k: 3821 -> 4064

Also unsets `QT_PLUGIN_PATH` and `QML2_IMPORT_PATH` to avoid
crashes on startup; since now Vita3k uses Qt 6.

Assisted-by: OpenCode (MiniMax-M3)
---
 pkgs/by-name/vi/vita3k/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vita3k/package.nix b/pkgs/by-name/vi/vita3k/package.nix
index 3be34a8c632e..4d2ff7e43d41 100644
--- a/pkgs/by-name/vi/vita3k/package.nix
+++ b/pkgs/by-name/vi/vita3k/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "vita3k";
-  version = "3821";
+  version = "4064";
 
   src = fetchurl {
     url = "https://github.com/Vita3K/Vita3K-builds/releases/download/${version}/Vita3K-x86_64.AppImage";
-    sha256 = "sha256-U2sGt8zHGODes2DB7qK5xJVAhkxyQ6ku/UCmd1D1184=";
+    sha256 = "sha256-QUzu+7BqiJ8gWWugwyMyKyQ3bXzmAx/zSxJ2+AeVQB4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -28,7 +28,9 @@ appimageTools.wrapType2 rec {
         --replace-fail "Exec=Vita3K" "Exec=vita3k"
       cp -r ${appimageContents}/usr/share/icons $out/share
       wrapProgram $out/bin/vita3k \
-        --set APPIMAGE 1
+        --set APPIMAGE 1 \
+        --unset QT_PLUGIN_PATH \
+        --unset QML2_IMPORT_PATH
     '';
 
   passthru.updateScript = nix-update-script { };

From cce826bedac124fc5de6666e1c49375f6632aad9 Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 19:26:49 +0100
Subject: [PATCH 0256/1386] maintainers/scripts/update.py: fix exclusion of
 commitBody when commitMessage is provided

When manually providing a commit message, the logic to add
a commit body is skipped accidentally.
---
 maintainers/scripts/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py
index ca35f04d1285..bf52c01bb56f 100644
--- a/maintainers/scripts/update.py
+++ b/maintainers/scripts/update.py
@@ -307,7 +307,7 @@ async def commit_changes(
             commit_message = "{attrPath}: {oldVersion} -> {newVersion}".format(**change)
             if "commitMessage" in change:
                 commit_message = change["commitMessage"]
-            elif "commitBody" in change:
+            if "commitBody" in change:
                 commit_message = commit_message + "\n\n" + change["commitBody"]
             await check_subprocess_output(
                 "git",

From 56cc555fc9be3e27a8a96f79f206e5d6726f164f Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 20:19:46 +0100
Subject: [PATCH 0257/1386] minecraft-server: support updateScript generated
 commits

---
 .../mi/minecraft-server/derivation.nix        |   6 +-
 pkgs/by-name/mi/minecraft-server/update.py    | 132 +++++++++++++++++-
 2 files changed, 133 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mi/minecraft-server/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix
index 4192dff1ccf6..e7e31f2a16ce 100644
--- a/pkgs/by-name/mi/minecraft-server/derivation.nix
+++ b/pkgs/by-name/mi/minecraft-server/derivation.nix
@@ -36,7 +36,11 @@ stdenv.mkDerivation {
 
   passthru = {
     tests = { inherit (nixosTests) minecraft-server; };
-    updateScript = ./update.py;
+    updateScript = {
+      command = [ ./update.py ];
+
+      supportedFeatures = [ "commit" ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/mi/minecraft-server/update.py b/pkgs/by-name/mi/minecraft-server/update.py
index f272c8b71a84..de4c9339c576 100755
--- a/pkgs/by-name/mi/minecraft-server/update.py
+++ b/pkgs/by-name/mi/minecraft-server/update.py
@@ -110,6 +110,32 @@ def group_major_releases(releases: List[Version]) -> Dict[str, List[Version]]:
     return groups
 
 
+def slugify(version: str) -> str:
+    return version.replace(".", "-")
+
+
+def get_changelog_url(version: str) -> Optional[str]:
+    """
+    Attempt to resolve the Minecraft changelog article URL.
+    Returns the URL if it exists, otherwise None.
+    """
+    url = f"https://www.minecraft.net/en-us/article/minecraft-java-edition-{slugify(version)}"
+
+    # our request is denied without a human user-agent
+    headers = {
+        "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:140.0) Gecko/20100101 Firefox/140.0"
+    }
+
+    try:
+        response = requests.head(url, headers=headers, timeout=3)
+        if response.status_code == 200:
+            return url
+    except requests.RequestException as e:
+        pass
+
+    return None
+
+
 def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]:
     """
     Return a dictionary containing the latest version for each major release.
@@ -118,8 +144,12 @@ def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]:
     """
     return {
         major_release: max(
-            (release for release in releases if get_major_release(release.id) == major_release),
-            key=lambda x: tuple(map(int, x.id.split('.'))),
+            (
+                release
+                for release in releases
+                if get_major_release(release.id) == major_release
+            ),
+            key=lambda x: tuple(map(int, x.id.split("."))),
         )
         for major_release in group_major_releases(releases)
     }
@@ -153,7 +183,101 @@ def generate() -> Dict[str, Dict[str, str]]:
     return servers
 
 
+def get_latest(servers: Dict[str, Dict[str, str]]) -> str | None:
+    return max(
+        (v.get("version") for v in servers.values()),
+        key=lambda x: tuple(map(int, x.split("."))) if x is not None else (),
+    )
+
+
+def generate_commit(
+    previous_servers: Dict[str, Dict[str, str]],
+    servers: Dict[str, Dict[str, str]],
+    versions_file: Path,
+) -> List[Dict[str, str | list[str]]]:
+    actions = []
+    commit_body_lines = []
+
+    old_latest = get_latest(previous_servers)
+    new_latest = get_latest(servers)
+
+    for major_version, server in servers.items():
+        version = server.get("version")
+        previous_server = previous_servers.get(major_version)
+
+        if version is None:
+            continue
+
+        attribute = f"minecraftServers.vanilla-{slugify(major_version)}"
+
+        if not previous_server:
+            # this version didn't exist before
+            # check if its now the latest version
+            if version == new_latest:
+                action = f"{old_latest} -> {new_latest}"
+                attribute = "minecraft-server"
+            else:
+                action = f"init {version}"
+
+        else:
+            previous_version = previous_server.get("version")
+            if previous_version == version:
+                continue
+
+            action = f"{previous_version} -> {version}"
+
+        actions.append(action)
+
+        commit_body_lines.append(f"{attribute}: {action}")
+
+        changelog_url = get_changelog_url(version)
+        if changelog_url:
+            commit_body_lines.append(f"Release notes: {changelog_url}")
+
+    if not commit_body_lines:
+        return []
+
+    if len(actions) == 1:
+        commit_message = commit_body_lines[0]
+
+        # the body should only be the release notes to avoid repeatition
+        # if the release notes don't exist this will be blank
+        commit_body = "\n".join(commit_body_lines[1:]).strip()
+    else:
+        detailed_message = f"minecraft-server: {', '.join(actions)}"
+
+        commit_message = (
+            detailed_message
+            if len(detailed_message) <= 72
+            else "minecraft-server: update multiple versions"
+        )
+
+        commit_body = "\n".join(commit_body_lines).strip()
+
+    commit_json = {
+        "attrPath": "minecraftServers.vanilla",
+        "files": [str(versions_file)],
+        "commitMessage": commit_message,
+    }
+
+    if commit_body:
+        commit_json["commitBody"] = commit_body
+
+    return [commit_json]
+
+
 if __name__ == "__main__":
-    with open(Path(__file__).parent / "versions.json", "w") as file:
-        json.dump(generate(), file, indent=2)
+    versions_file = Path(__file__).parent / "versions.json"
+
+    with open(versions_file, "r") as file:
+        previous_servers = json.load(file)
+
+    servers = generate()
+
+    commit_json = generate_commit(previous_servers, servers, versions_file)
+
+    with open(versions_file, "w") as file:
+        json.dump(servers, file, indent=2)
         file.write("\n")
+
+    print(json.dumps(commit_json))

From 906c30c7853c524daf6c03424cb3a1942e717c22 Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 20:04:10 +0000
Subject: [PATCH 0258/1386] minecraft-server: 26.1.2 -> 26.2

Release notes: https://www.minecraft.net/en-us/article/minecraft-java-edition-26-2
---
 pkgs/by-name/mi/minecraft-server/versions.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/mi/minecraft-server/versions.json b/pkgs/by-name/mi/minecraft-server/versions.json
index ac403058dc95..192cef5383f4 100644
--- a/pkgs/by-name/mi/minecraft-server/versions.json
+++ b/pkgs/by-name/mi/minecraft-server/versions.json
@@ -1,4 +1,10 @@
 {
+  "26.2": {
+    "sha1": "823e2250d24b3ddac457a60c92a6a941943fcd6a",
+    "url": "https://piston-data.mojang.com/v1/objects/823e2250d24b3ddac457a60c92a6a941943fcd6a/server.jar",
+    "version": "26.2",
+    "javaVersion": 25
+  },
   "26.1": {
     "sha1": "97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51",
     "url": "https://piston-data.mojang.com/v1/objects/97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51/server.jar",

From 2d7b93f85c58384f9691c7986ad605f40b3d2c82 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sun, 12 Jul 2026 17:59:31 -0400
Subject: [PATCH 0259/1386] openboard: fix build with poppler 26+

https://github.com/OpenBoard-org/OpenBoard/pull/1474
---
 pkgs/by-name/op/openboard/package.nix         |  4 ++
 .../op/openboard/poppler-26-compat.patch      | 69 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/op/openboard/poppler-26-compat.patch

diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix
index c68a6034eb91..ee2fd8646c40 100644
--- a/pkgs/by-name/op/openboard/package.nix
+++ b/pkgs/by-name/op/openboard/package.nix
@@ -48,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MjUbfv+3o3f4qsLPxLDeUn+/h5YupMMhC/SecwmCR8Q=";
   };
 
+  patches = [
+    ./poppler-26-compat.patch # https://github.com/OpenBoard-org/OpenBoard/pull/1474
+  ];
+
   postPatch = ''
     substituteInPlace resources/etc/OpenBoard.config \
       --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \
diff --git a/pkgs/by-name/op/openboard/poppler-26-compat.patch b/pkgs/by-name/op/openboard/poppler-26-compat.patch
new file mode 100644
index 000000000000..1630211ff88f
--- /dev/null
+++ b/pkgs/by-name/op/openboard/poppler-26-compat.patch
@@ -0,0 +1,69 @@
+diff --git a/src/pdf/PDFRenderer.h b/src/pdf/PDFRenderer.h
+index 8f0cb93e03c9fe03414e394a91ec7ec73a542739..a5e872611e2060ee84a7a8382297af1e81dff7da 100644
+--- a/src/pdf/PDFRenderer.h
++++ b/src/pdf/PDFRenderer.h
+@@ -58,8 +58,6 @@ class PDFRenderer : public QObject
+ 
+         virtual QSizeF pointSizeF(int pageNumber) const = 0;
+ 
+-        virtual QString title() const = 0;
+-
+         void attach();
+         void detach();
+ 
+diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
+index 8e361430c031e21fdde6faa23594ee561aedf21a..bb4bca36cec30f6992181d59f8417b4ffb442594 100644
+--- a/src/pdf/XPDFRenderer.cpp
++++ b/src/pdf/XPDFRenderer.cpp
+@@ -157,39 +157,6 @@ int XPDFRenderer::pageCount() const
+         return 0;
+ }
+ 
+-QString XPDFRenderer::title() const
+-{
+-    if (isValid())
+-    {
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
+-        Object pdfInfo = mDocument->getDocInfo();
+-#else
+-        Object pdfInfo;
+-        mDocument->getDocInfo(&pdfInfo);
+-#endif
+-        if (pdfInfo.isDict())
+-        {
+-            Dict *infoDict = pdfInfo.getDict();
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
+-            Object title = infoDict->lookup((char*)"Title");
+-#else
+-            Object title;
+-            infoDict->lookup((char*)"Title", &title);
+-#endif
+-            if (title.isString())
+-            {
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 72
+-                return QString(title.getString()->c_str());
+-#else
+-                return QString(title.getString()->getCString());
+-#endif
+-            }
+-        }
+-    }
+-
+-    return QString();
+-}
+-
+ 
+ QSizeF XPDFRenderer::pageSizeF(int pageNumber) const
+ {
+diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h
+index 6264ae1b087fefe82fa7ec8291a52ead657b3697..7a9bdf7777aa6cbc1b823a7a6adf52e837a7fc59 100644
+--- a/src/pdf/XPDFRenderer.h
++++ b/src/pdf/XPDFRenderer.h
+@@ -73,7 +73,6 @@ class XPDFRenderer : public PDFRenderer
+         virtual QSizeF pageSizeF(int pageNumber) const override;
+         virtual int pageRotation(int pageNumber) const override;
+         virtual QSizeF pointSizeF(int pageNumber) const override;
+-        virtual QString title() const override;
+         virtual void render(QPainter *p, int pageNumber, const bool cacheAllowed, const QRectF &bounds = QRectF()) override;
+ 
+     signals:

From 52ad4c068369d880726fa61b29516b6f6ab61356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 15:06:29 -0700
Subject: [PATCH 0260/1386] dblatex: use default python3

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

diff --git a/pkgs/by-name/db/dblatex/package.nix b/pkgs/by-name/db/dblatex/package.nix
index 3bed1f8cc05f..e3bd013ed712 100644
--- a/pkgs/by-name/db/dblatex/package.nix
+++ b/pkgs/by-name/db/dblatex/package.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
-  python311,
+  python3,
   libxslt,
   texliveBasic,
   enableAllFeatures ? false,
@@ -62,8 +63,26 @@ stdenv.mkDerivation rec {
     sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-replace-imp-by-importlib.patch";
+      hash = "sha256-ND9fS8KkQKnML6EwJFSUFhqiIn4yEvu1KOxTRPjXsd0=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-adjust-submodule-imports.patch";
+      hash = "sha256-0wOn2IvCSCtrE0rM56yw3FcGggTsDk3owQa1UmFsbVo=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-script_path.patch";
+      hash = "sha256-JGN9NxOiqoZ0Yz5ZbYwsis3tujBA2OWX5PZtrc/iTJY=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    (python3.withPackages (ps: [ ps.setuptools_80 ]))
+  ];
+
   buildInputs = [
-    python311
     libxslt
     tex
   ]
@@ -100,7 +119,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    ${python311.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
+    python ./setup.py install --prefix="$out" --use-python-path --verbose
   '';
 
   passthru = { inherit tex; };

From bc7db25cab1a179b3f0404f1eb01376459781c00 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 8 Jul 2026 18:54:25 +0100
Subject: [PATCH 0261/1386] communique: init at 1.2.1

---
 pkgs/by-name/co/communique/package.nix | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/co/communique/package.nix

diff --git a/pkgs/by-name/co/communique/package.nix b/pkgs/by-name/co/communique/package.nix
new file mode 100644
index 000000000000..bf46339cb802
--- /dev/null
+++ b/pkgs/by-name/co/communique/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cacert,
+  gitMinimal,
+  ripgrep,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "communique";
+  version = "1.2.1";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jdx";
+    repo = "communique";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lQN6LViO3Ta6eCbU6j76OFN95R6A0hP3Pfc38KrHDng=";
+  };
+
+  cargoHash = "sha256-RJzjpDhxpi7Zmzw9kl48yq6//zTYOeJ+SrgAfqq/tl4=";
+
+  nativeCheckInputs = [
+    cacert
+    gitMinimal
+    ripgrep
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Editorialized release notes powered by AI";
+    homepage = "https://github.com/jdx/communique";
+    changelog = "https://github.com/jdx/communique/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
+    mainProgram = "communique";
+  };
+})

From c1997f9e93ef6f61b8abced1796f3a7fbc3f5b51 Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 23:14:49 +0100
Subject: [PATCH 0262/1386] minecraft-server: add wrench-exile-legacy as a
 maintainer

---
 pkgs/by-name/mi/minecraft-server/derivation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/minecraft-server/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix
index e7e31f2a16ce..a93d2eb05302 100644
--- a/pkgs/by-name/mi/minecraft-server/derivation.nix
+++ b/pkgs/by-name/mi/minecraft-server/derivation.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       thoughtpolice
       tomberek
+      wrench-exile-legacy
       costrouc
     ];
     mainProgram = "minecraft-server";

From d2eb2d3d14c64dae4dbf09ea94d92633aa3a7b5f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 13 Jul 2026 00:23:45 +0200
Subject: [PATCH 0263/1386] pyxel: 2.8.10 -> 2.9.7, fix build

---
 pkgs/by-name/py/pyxel/package.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix
index 7ab45a73ad22..456378be116f 100644
--- a/pkgs/by-name/py/pyxel/package.nix
+++ b/pkgs/by-name/py/pyxel/package.nix
@@ -11,36 +11,26 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyxel";
-  version = "2.8.10";
+  version = "2.9.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kitao";
     repo = "pyxel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+SitYe2HFA6rwqk5lipcKFdBy69zdAhw3Q+Nb0iBx6s=";
+    hash = "sha256-k86VRX25yVNZvsnsWl0EYGd8njhx9yl6gkqI7mznjEs=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "add-Cargo.lock.patch";
-      url = "https://github.com/kitao/pyxel/commit/821286112ea0c26141aa64b25aaa076611a2a91d.patch";
-      excludes = [ "CHANGELOG.md" ];
-      hash = "sha256-XtFdtmprPKrdjFOzEsNMJjc4PpNv6KDtWX2Hes2IKe0=";
-    })
-  ];
-
   cargoRoot = "crates";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs)
       src
-      patches
       pname
       version
       cargoRoot
       ;
-    hash = "sha256-SGrQmGZeM2NcooDqCTO2HOXgLg7h+VvDIierDacqSFs=";
+    hash = "sha256-tpJSUdjdXwXK/n1nyMga5uTk7TAz/JLQVN0rSdbKxGk=";
   };
 
   buildAndTestSubdir = "python";
@@ -62,6 +52,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
 
+  preBuild = ''
+    # logic taken from Makefile
+    cp LICENSE README.md python/pyxel/
+  '';
+
   # Tests want to use the display
   doCheck = false;
 

From d7efcc99aa06d2737ed05edce1b3a77aafce99a1 Mon Sep 17 00:00:00 2001
From: neonvoidx <me@neonvoid.dev>
Date: Fri, 10 Jul 2026 11:46:01 -0400
Subject: [PATCH 0264/1386] spicetify-cli: fix for version 2.44.0+

spicetify-cli 2.44.0+ is now a build artifact, and needs to be built,
otherwise spotify will not load properly while using spicetify
---
 pkgs/by-name/sp/spicetify-cli/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix
index 59c94ea53481..821969f111a4 100644
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   testers,
   spicetify-cli,
+  nodejs,
+  esbuild,
 }:
 buildGoModule (finalAttrs: {
   pname = "spicetify-cli";
@@ -28,6 +30,17 @@ buildGoModule (finalAttrs: {
     "-X 'main.version=${finalAttrs.version}'"
   ];
 
+  nativeBuildInputs = [
+    nodejs
+    esbuild
+  ];
+
+  postBuild = ''
+    esbuild ./src/jsHelper/spicetifyWrapper/index.js \
+      --bundle --minify --target=chrome108 --format=iife \
+      --outfile=spicetifyWrapper.js
+  '';
+
   postInstall =
     /*
       jsHelper and css-map.json are required at runtime
@@ -39,7 +52,9 @@ buildGoModule (finalAttrs: {
       mkdir -p $out/share/spicetify
 
       cp -r $src/jsHelper $out/share/spicetify/jsHelper
+      chmod -R u+w $out/share/spicetify/jsHelper
       cp $src/css-map.json $out/share/spicetify/css-map.json
+      cp spicetifyWrapper.js $out/share/spicetify/jsHelper/spicetifyWrapper.js
 
       mv $out/bin/cli $out/share/spicetify/spicetify
 

From 65dcb5c7cfa734208c970c2705807a8578a1b91f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 00:44:34 +0000
Subject: [PATCH 0265/1386] nomacs: 3.22.1 -> 3.23.1

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

diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix
index 143522dcb93b..2ec5f4154826 100644
--- a/pkgs/by-name/no/nomacs/package.nix
+++ b/pkgs/by-name/no/nomacs/package.nix
@@ -13,8 +13,8 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "nomacs";
-  version = "3.22.1";
-  hash = "sha256-20ieFrIkoz4/T4QLK2PNdGPhw9Aj1+a9PimDvTKLqpg=";
+  version = "3.23.1";
+  hash = "sha256-Udc+J+AYJZviWJhPtWvtXDss7Wqm9Gc9T8KsfOkx4EE=";
 
   src = fetchFromGitHub {
     owner = "nomacs";

From 8c3d3148f6308e07124186a8b0d9e5ed575679ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 00:54:40 +0000
Subject: [PATCH 0266/1386] zsh: 5.9.1 -> 5.9.2

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

diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index d8d86ba0399f..ea7931ffac72 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsh";
-  version = "5.9.1";
+  version = "5.9.2";
   outputs = [
     "out"
     "doc"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-XSC+wD+YHcTpoJ7CRedBU4j/ZB95xcXEFrUELljYKA0=";
+    sha256 = "sha256-NvpzQ3S0R4NYLOwJvNZ4IuL5ksd57BYkq1WW3weNL4E=";
   };
 
   patches = [

From 244ccc84988d7620b6b04d7a7b6ea32bbc68c519 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 00:54:56 +0000
Subject: [PATCH 0267/1386] labymod-launcher: 3.0.10 -> 3.0.11

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

diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix
index 2fd80eaac300..f35e48a086ab 100644
--- a/pkgs/by-name/la/labymod-launcher/package.nix
+++ b/pkgs/by-name/la/labymod-launcher/package.nix
@@ -6,12 +6,12 @@
 
 let
   pname = "labymod-launcher";
-  version = "3.0.10";
+  version = "3.0.11";
 
   src = fetchurl {
     name = "labymod-launcher";
     url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
-    hash = "sha256-etrP2kfhaWVyTgRAsw8MeBy3ndScTkKi3ogXiaQZ2g0=";
+    hash = "sha256-piGk8nbOj4AUjw05y9Ux59JSPXBIB7VisDbVirriMoI=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 66bab6662e8d2bef15626012da9ec8ce3d5b7728 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 12 Jul 2026 18:40:54 -0700
Subject: [PATCH 0268/1386] gnupatch: move to by-name/

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

diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/by-name/gn/gnupatch/package.nix
similarity index 100%
rename from pkgs/tools/text/gnupatch/default.nix
rename to pkgs/by-name/gn/gnupatch/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4ccbaaa5d70..1bd3059b3f97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2099,8 +2099,6 @@ with pkgs;
 
   gnugrep = callPackage ../tools/text/gnugrep { };
 
-  gnupatch = callPackage ../tools/text/gnupatch { };
-
   gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
   gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
 

From 9e05d87b9feb965977cc5d1b1d621e028defc2ca Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 02:59:34 +0100
Subject: [PATCH 0269/1386] openusage: 0.6.13 -> 0.7.5

---
 pkgs/by-name/op/openusage/package.nix | 37 ++++++++++++---------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/op/openusage/package.nix b/pkgs/by-name/op/openusage/package.nix
index 6d4326bc5d68..b5eed30695af 100644
--- a/pkgs/by-name/op/openusage/package.nix
+++ b/pkgs/by-name/op/openusage/package.nix
@@ -2,41 +2,35 @@
   lib,
   stdenvNoCC,
   fetchurl,
+  _7zz,
   nix-update-script,
-  undmg,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openusage";
-  version = "0.6.13";
+  version = "0.7.5";
 
-  # if is aarch64 download aarch64, otherwise intel
-  src =
-    if stdenvNoCC.hostPlatform.isAarch64 then
-      fetchurl {
-        url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_aarch64.dmg";
-        hash = "sha256-Zfv1VAJSDHFdo2R9KgZ3TN/gu2Ua9Uleq5wNXrBBEH4=";
-      }
-    else if stdenvNoCC.hostPlatform.isx86_64 then
-      fetchurl {
-        url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_x64.dmg";
-        hash = "sha256-tllecJOGNUDG3GwQhjeRaNrTHVK2GPzstfiT/GanZmM=";
-      }
-    else
-      throw "Unsupported architecture";
+  src = fetchurl {
+    url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage-${finalAttrs.version}.dmg";
+    hash = "sha256-ycKm7kzOM+fv5Jhjv3JrG+oyK3LEOj9Ps7ll2Pz0T9c=";
+  };
+
+  unpackCmd = "7zz -snld x $src";
+
+  nativeBuildInputs = [ _7zz ];
+
+  sourceRoot = ".";
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/Applications
-    cp -r "OpenUsage.app" $out/Applications/
+    mkdir -p $out/Applications $out/bin
+    cp -r OpenUsage.app $out/Applications/
+    ln -s $out/Applications/OpenUsage.app/Contents/MacOS/OpenUsage $out/bin/openusage
 
     runHook postInstall
   '';
 
-  nativeBuildInputs = [ undmg ];
-  sourceRoot = ".";
-
   dontBuild = true;
   dontFixup = true;
 
@@ -50,5 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = lib.platforms.darwin;
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ myzel394 ];
+    mainProgram = "openusage";
   };
 })

From 84023071070a5dc3181ae7ac288870327d44c2f1 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 03:08:52 +0100
Subject: [PATCH 0270/1386] openusage: add Br1ght0ne to maintainers

---
 pkgs/by-name/op/openusage/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openusage/package.nix b/pkgs/by-name/op/openusage/package.nix
index b5eed30695af..7db3f84249e2 100644
--- a/pkgs/by-name/op/openusage/package.nix
+++ b/pkgs/by-name/op/openusage/package.nix
@@ -43,7 +43,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = lib.platforms.darwin;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ myzel394 ];
+    maintainers = with lib.maintainers; [
+      myzel394
+      Br1ght0ne
+    ];
     mainProgram = "openusage";
   };
 })

From 6a71d414905966426d13011d68fb1358158cc214 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 02:18:03 +0000
Subject: [PATCH 0271/1386] eww: 0.6.0-unstable-2026-03-05 ->
 0.6.0-unstable-2026-07-05

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

diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index b079226da18d..53fc9eea0f50 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "eww";
-  version = "0.6.0-unstable-2026-03-05";
+  version = "0.6.0-unstable-2026-07-05";
 
   src = fetchFromGitHub {
     owner = "elkowar";
     repo = "eww";
-    rev = "865cf631d5bbb5f9fccc99b3f4cc80b9eeada18c";
-    hash = "sha256-fL12XFMsf/efSlbzQc7cCI366CwETkM6sWpEfcF9s6A=";
+    rev = "4ded06345553e4c2bcf8179fc7438e53c5e54d89";
+    hash = "sha256-fnI8XgBowMxs/j9FGf+pQI2U8YjN8pTRqkVmFm8PBHE=";
   };
 
   cargoHash = "sha256-Kf99eojqXvdbZ3eRS8GBgyLYNpZKJGIJtsOsvhhSVDk=";

From bf291f75e1355785b1c159bd736604d71b8b33ce Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 03:17:25 +0100
Subject: [PATCH 0272/1386] agent-safehouse: 0.10.1 -> 0.11.0

Diff: https://github.com/eugene1g/agent-safehouse/compare/v0.10.1...v0.11.0
---
 pkgs/by-name/ag/agent-safehouse/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ag/agent-safehouse/package.nix b/pkgs/by-name/ag/agent-safehouse/package.nix
index ca43776cf6ec..4c3d91b3981d 100644
--- a/pkgs/by-name/ag/agent-safehouse/package.nix
+++ b/pkgs/by-name/ag/agent-safehouse/package.nix
@@ -2,18 +2,19 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  versionCheckHook,
   nix-update-script,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "safehouse";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "eugene1g";
     repo = "agent-safehouse";
     rev = "v" + version;
-    hash = "sha256-Nm04UnyQ2mVLkIIEspDd2vbdcJxZ17MH07fW6PvokJI=";
+    hash = "sha256-2GWxh5J9qqudc2QM/CACXpqJLcNULKSfTAHBzR++UAE=";
   };
 
   postPatch = "patchShebangs scripts bin";
@@ -37,6 +38,9 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "Sandbox your local AI agents so they can read/write only what they need";
     homepage = "https://github.com/eugene1g/agent-safehouse";

From 4cbf1cdc14c5ef368c3112541567066357af5868 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 03:17:50 +0100
Subject: [PATCH 0273/1386] agent-safehouse: add Br1ght0ne to maintainers

---
 pkgs/by-name/ag/agent-safehouse/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ag/agent-safehouse/package.nix b/pkgs/by-name/ag/agent-safehouse/package.nix
index 4c3d91b3981d..c07c75768503 100644
--- a/pkgs/by-name/ag/agent-safehouse/package.nix
+++ b/pkgs/by-name/ag/agent-safehouse/package.nix
@@ -47,6 +47,9 @@ stdenvNoCC.mkDerivation rec {
     mainProgram = "safehouse";
     license = lib.licenses.asl20;
     platforms = lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ myzel394 ];
+    maintainers = with lib.maintainers; [
+      myzel394
+      Br1ght0ne
+    ];
   };
 }

From d6ca58a53078e02adc503abf365614d4b249e95a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 02:41:33 +0000
Subject: [PATCH 0274/1386] rage: 0.11.2 -> 0.12.0

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

diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index 4dd1e7472c63..ad23d7eb796a 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rage";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "str4d";
     repo = "rage";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uBRXdDdfKTlw006LfCrIvbng7b/fhJDHrmHDLLxdmAU=";
+    hash = "sha256-T295mhtn1sznTRV1ovAyK9Y+8A+d0NsXUOZO7248j9Y=";
   };
 
-  cargoHash = "sha256-b5x6ESGsF0Mn5dNVagBSopuawbrNcJuMK1//Ns+xuJs=";
+  cargoHash = "sha256-Dy8TAdOI9Y/w3kdfq3YY153V6ikRDtnyoOd5SybQids=";
 
   nativeBuildInputs = [
     installShellFiles

From 8a4c1dd05ed4e28f14713c4ffb6ca619290bd6f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 02:53:01 +0000
Subject: [PATCH 0275/1386] cel-go: 0.28.1 -> 0.29.2

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

diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index 5d944d2d3b64..6ce048623ee6 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -26,18 +26,18 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "cel-go";
-  version = "0.28.1";
+  version = "0.29.2";
 
   src = fetchFromGitHub {
     owner = "cel-expr";
     repo = "cel-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fiFkoYVKdSdYkSMQxmC1SvEEGsalBasCl9tzsGSYwmw=";
+    hash = "sha256-IubOpjSE91Y2kmWrXw/jFA2QqB3Mx0d/DcJgDVI6+dc=";
   };
 
   modRoot = "repl";
 
-  vendorHash = "sha256-tMaDwKoE5tzbQD5b7EnpKqiT/CT9WDCKgoxQeyhIlXE=";
+  vendorHash = "sha256-xbg13CPZEK2uXa6U7T5I/6l1OFcgFOaThcKCfQkgJXI=";
 
   subPackages = [
     "main"

From 4a0b0715aa84ea8c858eee4afc2c0ee33f5cfec3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 04:26:08 +0000
Subject: [PATCH 0276/1386] python3Packages.meep: 1.33.0 -> 1.34.0

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

diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 7bec67cd363e..aaf6f1d6f917 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -36,13 +36,13 @@ assert !lapack.isILP64;
 
 buildPythonPackage rec {
   pname = "meep";
-  version = "1.33.0";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "meep";
     tag = "v${version}";
-    hash = "sha256-ih1SoCMnIihBy5qCiEh0tTMpCaD7Joo1/HLtE0tv9LY=";
+    hash = "sha256-k6RccmCO2of3ENW0ZEqmi5BoqE0SPgYId6VFYAAjOFA=";
   };
 
   pyproject = false;

From 6f460773735002acc0c415d52837878e976b6c4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 04:42:26 +0000
Subject: [PATCH 0277/1386] zsign: 1.0.4 -> 1.0.8

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

diff --git a/pkgs/by-name/zs/zsign/package.nix b/pkgs/by-name/zs/zsign/package.nix
index e7a946ab4da1..5408a9c89ff4 100644
--- a/pkgs/by-name/zs/zsign/package.nix
+++ b/pkgs/by-name/zs/zsign/package.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsign";
-  version = "1.0.4";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "zhlynn";
     repo = "zsign";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NuwV8s+rzsXBha/vqnemvUo6Etm70ZVYL/CZKBJ1szA=";
+    hash = "sha256-zyywaE87HcGZ5QV6tFsCn9j+mAD1/ENVxZ22E/ItlSA=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/build/${platformName}";

From 784efc9aef7731ef0bea2ee4f6694e249b2de12b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 12 Jul 2026 22:39:00 -0600
Subject: [PATCH 0278/1386] kikit: pin solidpython to setuptools_80, patch for
 numpy2 changes

---
 pkgs/by-name/ki/kikit/default.nix             | 9 +++++++++
 pkgs/by-name/ki/kikit/solidpython/default.nix | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index 9e9e61ca60d3..62d0935c8336 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -4,6 +4,7 @@
   lib,
   bats,
   fetchFromGitHub,
+  fetchpatch,
   python,
   buildPythonApplication,
   callPackage,
@@ -47,6 +48,14 @@ buildPythonApplication (finalAttrs: {
     '';
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-stencil-arc-numpy2.patch";
+      url = "https://github.com/yaqwsx/KiKit/commit/036ca08fc380dd2c5b8b3ba2adc4215f4114e975.patch?full_index=1";
+      hash = "sha256-AmvH822nAubqVhl1PEKvE0Ij/K0NrBsSvnMUJXgxmfI=";
+    })
+  ];
+
   build-system = [
     setuptools
   ];
diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix
index 7003d6a590ce..7f02e5c00228 100644
--- a/pkgs/by-name/ki/kikit/solidpython/default.nix
+++ b/pkgs/by-name/ki/kikit/solidpython/default.nix
@@ -7,7 +7,7 @@
   poetry-core,
   prettytable,
   ply,
-  setuptools,
+  setuptools_80,
   euclid3,
 }:
 buildPythonPackage (finalAttrs: {
@@ -28,7 +28,8 @@ buildPythonPackage (finalAttrs: {
 
   propagatedBuildInputs = [
     ply
-    setuptools
+    # Pinned to v80 due to pkg_resources removal, see https://github.com/SolidCode/SolidPython/issues/216
+    setuptools_80
     euclid3
 
     prettytable

From 0ab4968115459c3ad208a6014723b9cc3181cbe8 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Mon, 13 Jul 2026 09:00:27 +0200
Subject: [PATCH 0279/1386] input-remapper: 2.2.0 -> 2.2.1

https://github.com/sezanzeb/input-remapper/releases/tag/2.2.1

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/in/input-remapper/package.nix | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/in/input-remapper/package.nix b/pkgs/by-name/in/input-remapper/package.nix
index 3b7a60156f8e..03c5738a0f08 100644
--- a/pkgs/by-name/in/input-remapper/package.nix
+++ b/pkgs/by-name/in/input-remapper/package.nix
@@ -32,24 +32,25 @@ let
 in
 (python3Packages.buildPythonApplication rec {
   pname = "input-remapper";
-  version = "2.2.0";
-  format = "setuptools";
+  version = "2.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sezanzeb";
     repo = "input-remapper";
     tag = version;
-    hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI=";
+    hash = "sha256-CFg/AvmZseU1f9bWI4CtYp9blvAhCgGzVWE8csVDbyE=";
   };
 
   postPatch = ''
     # fix FHS paths
-    substituteInPlace inputremapper/configs/data.py \
-      --replace-fail "/usr/share"  "$out/usr/share"
+    substituteInPlace inputremapper/installation_info.py \
+      --replace-fail 'DATA_DIR = "/usr/share/input-remapper"' \
+        "DATA_DIR = \"$out/usr/share/input-remapper\""
   ''
   + lib.optionalString withDebugLogLevel ''
     # if debugging
-    substituteInPlace inputremapper/logger.py \
+    substituteInPlace inputremapper/logging/logger.py \
       --replace-fail "logger.setLevel(logging.INFO)"  "logger.setLevel(logging.DEBUG)"
   '';
 
@@ -63,15 +64,17 @@ in
   ]
   ++ maybeXmodmap;
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies = with python3Packages; [
-    setuptools # needs pkg_resources
-    pygobject3
+    dasbus
     evdev
-    pkgconfig
-    pydantic
-    pydbus
     gtksourceview4
+    packaging
     psutil
+    pycairo
+    pydantic
+    pygobject3
   ];
 
   # buildPythonApplication maps nativeCheckInputs to nativeInstallCheckInputs.
@@ -98,6 +101,7 @@ in
 
     install -m644 -D -t $out/share/applications/ data/*.desktop
     install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy
+    install -m644 -D data/69-input-remapper-forwarded.rules $out/etc/udev/rules.d/69-input-remapper-forwarded.rules
     install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules
     install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service
     install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy
@@ -179,7 +183,8 @@ in
       # discussion
       postPatch = prev.postPatch or "" + ''
         # set revision for --version output
-        echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py
+        substituteInPlace inputremapper/installation_info.py \
+          --replace-fail 'COMMIT_HASH = "unknown"' 'COMMIT_HASH = "${final.src.rev}"'
       '';
     }
   )

From 1b4756921fe7c109f8a1c779063ac70d06386ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gnuetzi@gmail.com>
Date: Mon, 13 Jul 2026 09:48:29 +0200
Subject: [PATCH 0280/1386] codecov-cli: fix bug due to wrong relaxed
 dependency

---
 pkgs/by-name/co/codecov-cli/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix
index 676417a9ec6b..f5043d0dc516 100644
--- a/pkgs/by-name/co/codecov-cli/package.nix
+++ b/pkgs/by-name/co/codecov-cli/package.nix
@@ -2,7 +2,20 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  fetchPypi,
 }:
+let
+  # Due to bug:
+  # https://github.com/codecov/codecov-cli/issues/721
+  click_8_2 = python3Packages.click.overridePythonAttrs (old: rec {
+    version = "8.2.1";
+    src = fetchPypi {
+      pname = "click";
+      inherit version;
+      hash = "sha256-J8SRzAXZaNJx1aHbE+O1oYRjbZ2TDxSMULA48NBkYgI=";
+    };
+  });
+in
 
 python3Packages.buildPythonApplication rec {
   pname = "codecov-cli";
@@ -21,12 +34,11 @@ python3Packages.buildPythonApplication rec {
   build-system = with python3Packages; [ setuptools ];
 
   pythonRelaxDeps = [
-    "click"
     "responses"
   ];
 
   dependencies = with python3Packages; [
-    click
+    click_8_2
     ijson
     pyyaml
     responses

From 6491d89d67fd67494291e1fbd3079d5c37a85721 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 07:56:32 +0000
Subject: [PATCH 0281/1386] tree-sitter-grammars.tree-sitter-gitattributes:
 0-unstable-2025-08-17 -> 0.1.6-unstable-2025-08-17

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..4a5c9c993f9a 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -851,7 +851,7 @@
   };
 
   gitattributes = {
-    version = "0-unstable-2025-08-17";
+    version = "0.1.6-unstable-2025-08-17";
     url = "github:tree-sitter-grammars/tree-sitter-gitattributes";
     rev = "1b7af09d45b579f9f288453b95ad555f1f431645";
     hash = "sha256-eHDcJgHpWemOYtKACVhl5Muri1W1Igrjm/p0rAbvrNY=";

From 39510dfd3f4428c2566e0d6014dab772dacdf26e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 13 Jul 2026 10:57:44 +0300
Subject: [PATCH 0282/1386] python3Packages.parsnip: categorize inputs

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

diff --git a/pkgs/development/python-modules/parsnip/default.nix b/pkgs/development/python-modules/parsnip/default.nix
index 01cc2248d975..e5b7af805993 100644
--- a/pkgs/development/python-modules/parsnip/default.nix
+++ b/pkgs/development/python-modules/parsnip/default.nix
@@ -2,9 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
   more-itertools,
   numpy,
+
+  # tests
   ase,
   gemmi,
   pycifrw,

From 68250c786c31f80d94629491d0aa2f57ab5cae20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 08:00:41 +0000
Subject: [PATCH 0283/1386] tree-sitter-grammars.tree-sitter-sshclientconfig:
 2026.6.4 -> 2026.7.9

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..f4a202975cd8 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2544,9 +2544,9 @@
   };
 
   sshclientconfig = rec {
-    version = "2026.6.4";
+    version = "2026.7.9";
     url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
-    hash = "sha256-jluMtWRFuyG8WGiVn1ge2NfSdRIq8zqS1R12AG/Imtc=";
+    hash = "sha256-La1h6uJC5gUA84OAr3zBbQiR+AnrhcUhNf6r4HUpwhg=";
     meta = {
       license = lib.licenses.cc0;
       maintainers = with lib.maintainers; [

From d1104a3f611b67212a56533887e4d1016f9e3229 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 08:01:07 +0000
Subject: [PATCH 0284/1386] tree-sitter-grammars.tree-sitter-meson:
 0-unstable-2026-01-22 -> 1.3.0-unstable-2026-06-29

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..083a3f93a7af 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1649,10 +1649,10 @@
   };
 
   meson = {
-    version = "0-unstable-2026-01-22";
+    version = "1.3.0-unstable-2026-06-29";
     url = "github:tree-sitter-grammars/tree-sitter-meson";
-    rev = "c84f3540624b81fc44067030afce2ff78d6ede05";
-    hash = "sha256-+GMR051L89asgavX2T3zKwWl8xUFHenlCWJYELhMuyA=";
+    rev = "aa8d472034956f94f51f2ef2cbfec4cc07efbfde";
+    hash = "sha256-UJREw7mQqJTKcD2owKJ4GZkkch/KGTIy9/+Fdl3W3ik=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From a77e5341c588b4b1b237d152ace787a3ef107554 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 12 Jul 2026 12:07:23 +0300
Subject: [PATCH 0285/1386] python3Packages.parsnip: fix Numpy 2.5 error

---
 pkgs/development/python-modules/parsnip/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/parsnip/default.nix b/pkgs/development/python-modules/parsnip/default.nix
index e5b7af805993..d71458cca8bf 100644
--- a/pkgs/development/python-modules/parsnip/default.nix
+++ b/pkgs/development/python-modules/parsnip/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -33,6 +34,18 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-A1YoTBRN3ukcueUso5P2zPZ/pxu25k9h6aI7+AQvr1Q=";
   };
 
+  patches = [
+    # Numpy 2.5 compatibility, see: https://github.com/glotzerlab/parsnip/pull/245
+    (fetchpatch {
+      url = "https://github.com/glotzerlab/parsnip/commit/41a6bd6e42ea212203d5ce5864c687927b834586.patch";
+      includes = [
+        # Other files are changelog & credits
+        "parsnip/parsnip.py"
+      ];
+      hash = "sha256-Y91fITsPkmcct2tDsaHtNB8ct41IMtw1A+QnRwChc7k=";
+    })
+  ];
+
   build-system = [
     setuptools
   ];

From 8a8445ec5e05530d1fa3910c778156297d7196c5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 12 Jul 2026 11:51:11 +0300
Subject: [PATCH 0286/1386] python3Packages.parsnip: 0.6.0 -> 1.0.0

Diff: https://github.com/glotzerlab/parsnip/compare/v0.6.0...v1.0.0

Changelog: https://github.com/glotzerlab/parsnip/blob/v1.0.0/changelog.rst
---
 pkgs/development/python-modules/parsnip/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/parsnip/default.nix b/pkgs/development/python-modules/parsnip/default.nix
index d71458cca8bf..ecba18084e7b 100644
--- a/pkgs/development/python-modules/parsnip/default.nix
+++ b/pkgs/development/python-modules/parsnip/default.nix
@@ -14,6 +14,7 @@
   # tests
   ase,
   gemmi,
+  gsd,
   pycifrw,
   pytest-doctestplus,
   pytestCheckHook,
@@ -22,7 +23,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "parsnip";
-  version = "0.6.0";
+  version = "1.0.0";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -31,7 +32,7 @@ buildPythonPackage (finalAttrs: {
     owner = "glotzerlab";
     repo = "parsnip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A1YoTBRN3ukcueUso5P2zPZ/pxu25k9h6aI7+AQvr1Q=";
+    hash = "sha256-27FEp+Z+Q4a2RR01YVmN7eUClpto8uUysp5mZWeKz7M=";
   };
 
   patches = [
@@ -58,6 +59,7 @@ buildPythonPackage (finalAttrs: {
   nativeCheckInputs = [
     ase
     gemmi
+    gsd
     pycifrw
     pytest-doctestplus
     pytestCheckHook

From e4356ec9740005b61c9210d6fd97d065c062b875 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 08:03:13 +0000
Subject: [PATCH 0287/1386] tree-sitter-grammars.tree-sitter-xml:
 0-unstable-2026-01-21 -> 0.7.0-unstable-2026-01-21

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..7a54d1b87899 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -3136,7 +3136,7 @@
   };
 
   xml = {
-    version = "0-unstable-2026-01-21";
+    version = "0.7.0-unstable-2026-01-21";
     url = "github:tree-sitter-grammars/tree-sitter-xml";
     rev = "5000ae8f22d11fbe93939b05c1e37cf21117162d";
     hash = "sha256-QN+jQx1CrTbYpmM9mLUfjWcymGsa0Th7LVgk4thnQXU=";

From 0f8eabeb293b42abb87a95ca089e908547ab1582 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 08:13:16 +0000
Subject: [PATCH 0288/1386] postgresqlPackages.pg_search: 0.24.1 -> 0.24.2

---
 pkgs/servers/sql/postgresql/ext/pg_search.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_search.nix b/pkgs/servers/sql/postgresql/ext/pg_search.nix
index 42910a2f284c..8ebd6dd80e62 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_search.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_search.nix
@@ -11,16 +11,16 @@
 
 buildPgrxExtension (finalAttrs: {
   pname = "pg_search";
-  version = "0.24.1";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "paradedb";
     repo = "paradedb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N1CjmumBRmvTSMGrTA/gVDIpEBscrFzAHcdCj/OoIbg=";
+    hash = "sha256-Oz/38hdNfyuRSjV7ErGNcuz9Ik4iDnQrj6fsNNTGYR4=";
   };
 
-  cargoHash = "sha256-+pAuGubZefpAWPGT2xRtGO8DKX/LXvF2qeMcROYun4k=";
+  cargoHash = "sha256-jImzqOPHBcTQa5Jpi4gxpEYS+x56DFeArdzS0G3MfTY=";
 
   inherit postgresql;
 

From 37ecda9da3a8ef1a4fcb56aabacafd9507a68e89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 08:23:24 +0000
Subject: [PATCH 0289/1386] haproxy: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 77945c05c7d6..ac08bb4307e0 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-LmLEzk/XfTvHzxflhkMWY0VEVqB4t8hGW48BJbW8Ivg=";
+    hash = "sha256-sTMNuw1ua8SnLEcIpqnlhVec0RVt/ldjwmMFEFvBKQc=";
   };
 
   buildInputs = [

From 522877bbebdc29e8db4c4eeee6f2b3b4d7e761fc Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Mon, 13 Jul 2026 10:49:18 +0200
Subject: [PATCH 0290/1386] pocket-id: 2.9.0 -> 2.10.0

---
 pkgs/by-name/po/pocket-id/package.nix | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 8aab3ee29b46..9ddd5193ac3a 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -1,30 +1,31 @@
 {
   lib,
   fetchFromGitHub,
-  buildGo126Module,
+  buildGo127Module,
   stdenvNoCC,
   nodejs,
   pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
+  pnpmBuildHook,
   nixosTests,
   nix-update-script,
   versionCheckHook,
 }:
-buildGo126Module (finalAttrs: {
+buildGo127Module (finalAttrs: {
   pname = "pocket-id";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZGjlEbx7gU1HHJRRSONFq/nYnubHOjfxQsVYpEHQkGE=";
+    hash = "sha256-ad8YlWwWeGEwsrx29qpq1asEr4UNN7BueGTBPfFrRuE=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-elY0YGOOtZtlLnyFiDJ6ZzZULhI183kZgsFmQQAg2EE=";
+  vendorHash = "sha256-bQNeocRCmhiV7gwCJppjsNw7K5MnsJMK9M18jf0X/oM=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -59,24 +60,19 @@ buildGo126Module (finalAttrs: {
     nativeBuildInputs = [
       nodejs
       pnpmConfigHook
+      pnpmBuildHook
       pnpm_10
     ];
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
       pnpm = pnpm_10;
-      fetcherVersion = 3;
-      hash = "sha256-lQw+hmJcEBzMe3uOTmRErfHojAHwnRBN6aTy7yK9BCA=";
+      fetcherVersion = 4;
+      hash = "sha256-LVhTS3ertpGqLMsoodaoEgDb7sK3kTRTVB3KOyvJwpE=";
     };
 
     env.BUILD_OUTPUT_PATH = "dist";
 
-    buildPhase = ''
-      runHook preBuild
-
-      pnpm --filter pocket-id-frontend build
-
-      runHook postBuild
-    '';
+    pnpmWorkspaces = [ "pocket-id-frontend" ];
 
     installPhase = ''
       runHook preInstall

From 9c71adbeb55d14bb7463b5d0fa3d273249f70a8b Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Sun, 12 Jul 2026 22:53:39 +0200
Subject: [PATCH 0291/1386] nixos/tests/matrix-authentication-service: use
 extraConfigFiles

nixos/tests/matrix-authentication-service: use extraConfigFiles
---
 .../matrix/matrix-authentication-service.nix  | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/matrix/matrix-authentication-service.nix b/nixos/tests/matrix/matrix-authentication-service.nix
index 9194b1fc56cd..19900b5a9c18 100644
--- a/nixos/tests/matrix/matrix-authentication-service.nix
+++ b/nixos/tests/matrix/matrix-authentication-service.nix
@@ -189,11 +189,26 @@ in
       { nodes, ... }:
       let
         bundle = mkBundle masDomain;
+
+        extraConfig = pkgs.writeText "masExtraConfig.yml" (
+          builtins.toJSON {
+            secrets = {
+              encryption_file = "/var/lib/matrix-authentication-service/encryption";
+              keys = [
+                {
+                  kid = "rsa-4096";
+                  key_file = "/var/lib/matrix-authentication-service/key_rsa_4096";
+                }
+              ];
+            };
+          }
+        );
       in
       {
         services.matrix-authentication-service = {
           enable = true;
           createDatabase = true;
+          extraConfigFiles = [ (toString extraConfig) ];
           settings = {
             http = {
               public_base = "https://${masDomain}:8080/";
@@ -223,15 +238,7 @@ in
               secret_file = "/var/lib/matrix-authentication-service/matrix_secret";
             };
             database.uri = "postgresql:///matrix-authentication-service?host=/run/postgresql&user=matrix-authentication-service";
-            secrets = {
-              encryption_file = "/var/lib/matrix-authentication-service/encryption";
-              keys = [
-                {
-                  kid = "rsa-4096";
-                  key_file = "/var/lib/matrix-authentication-service/key_rsa_4096";
-                }
-              ];
-            };
+            # secrets is defined in extraConfigFiles
             policy.data.client_registration.allow_insecure_uris = true;
             upstream_oauth2.providers = [
               {

From e5141cc3cc461395dca93884389461ed0a01a25f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 13 Jul 2026 11:23:57 +0200
Subject: [PATCH 0292/1386] windows.mcfgthreads: 2.4.1 -> 2.4.2

https://github.com/lhmouse/mcfgthread/compare/v2.4-ga.1...v2.4-ga.2
---
 pkgs/os-specific/windows/mcfgthreads/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 946d9c9fcbac..975cc42697ad 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mcfgthread";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "lhmouse";
     repo = "mcfgthread";
     tag = "v${lib.versions.majorMinor finalAttrs.version}-ga.${lib.versions.patch finalAttrs.version}";
-    hash = "sha256-zQAH/Kdcl9+sSlu8WIJfNMR4KyJ+plenEa5q9rEIf/M=";
+    hash = "sha256-KjZqFaTbPhdI87j11ugSu6Yoe+Rf473+AwopaIfNrKY=";
   };
 
   postPatch = ''

From 6348c5fe94b93ca7119d088fa7e85a1805d2f708 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 11:18:20 +0000
Subject: [PATCH 0293/1386] python3Packages.uiprotect: 15.4.3 -> 15.12.2

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

diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 6306bf2c76cb..ca985614fabb 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -39,14 +39,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "uiprotect";
-  version = "15.4.3";
+  version = "15.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "uilibs";
     repo = "uiprotect";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H5ymzsqdCcL9C4suW2Gk1Op7UmmwztqNrB1VeGIFUFE=";
+    hash = "sha256-YyIzDl0qSCoXs7k3lda3/q89gtXf2Do7EgXeTSmunoo=";
   };
 
   build-system = [ poetry-core ];

From fe25c04b54d931ce52350d8dcd18fec11b2f4406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 12 Jul 2026 19:18:08 +0200
Subject: [PATCH 0294/1386] music-assistant: 2.9.6 -> 2.9.8

Diff: https://github.com/music-assistant/server/compare/2.9.6...2.9.8

Changelog: https://github.com/music-assistant/server/releases/tag/2.9.7
Changelog: https://github.com/music-assistant/server/releases/tag/2.9.8
---
 pkgs/by-name/mu/music-assistant/frontend.nix  | 4 ++--
 pkgs/by-name/mu/music-assistant/package.nix   | 4 ++--
 pkgs/by-name/mu/music-assistant/providers.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix
index e6cf66afac4d..4f9ca804376c 100644
--- a/pkgs/by-name/mu/music-assistant/frontend.nix
+++ b/pkgs/by-name/mu/music-assistant/frontend.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "music-assistant-frontend";
-  version = "2.17.186";
+  version = "2.17.186.post3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "music_assistant_frontend";
     inherit version;
-    hash = "sha256-dNGzXDRZuQLRkMY0erjJZE4h26yFP4Fdn9a3K6T0RvM=";
+    hash = "sha256-a+Z2HuUuvkZQragrRP6vlofk6x/xJHWmnZPBa2BHpso=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index 38490bcda4d0..508c6154dcee 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -40,7 +40,7 @@ assert
 
 pythonPackages.buildPythonApplication (finalAttrs: {
   pname = "music-assistant";
-  version = "2.9.6";
+  version = "2.9.8";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     owner = "music-assistant";
     repo = "server";
     tag = finalAttrs.version;
-    hash = "sha256-lEbWQi6iUvqL2MXk/ZqkdX4Ou5pFWIVi6qfSyWCs8uQ=";
+    hash = "sha256-Zk9jgcGwksMQo45qzzlE2Dqw1IQr0rsBkzMnFHTdl1U=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 47fa0e297d4e..da5c0fc054f9 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.9.6";
+  version = "2.9.8";
   builtins = [
     "builtin"
     "coverartarchive"

From 24d396f353cb79aac9132c77b63eb128e242571e Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 13 Jul 2026 08:48:17 -0300
Subject: [PATCH 0295/1386] chickenPackages.chickenEggs.mdh: mark as broken due
 to PCRE

---
 pkgs/development/compilers/chicken/5/overrides.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 90e483195687..7e361fe758ff 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -129,18 +129,8 @@ in
   leveldb = addToBuildInputs pkgs.leveldb;
   magic = addToBuildInputs pkgs.file;
   magic-pipes = addToBuildInputs pkgs.chickenPackages_5.chickenEggs.regex;
-  mdh =
-    old:
-    (addToBuildInputs pkgs.pcre old)
-    // {
-      postPatch = ''
-        substituteInPlace bmgsubs.c \
-          --replace-fail "char   *gotamatch();" "char *gotamatch(char *, int, int (*)(char *, int));" \
-          --replace-fail "int bmg_search(char *, int, int (*)());" "int bmg_search(char *, int, int (*)(char *, int));" \
-          --replace-fail "int	(*action)();" "int (*action)(char *, int);" \
-          --replace-fail "int (*action)();" "int (*action)(char *, int);"
-      '';
-    };
+  # requires PCRE
+  mdh = broken;
   # missing dependency in upstream egg
   mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]);
   mosquitto = addToPropagatedBuildInputs [ pkgs.mosquitto ];

From 15e5afb03c8b03c11131bf9f2d3b57b9d16b6f0e Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 13 Jul 2026 08:56:47 -0300
Subject: [PATCH 0296/1386] chickenPackages.chickenEggs.fuse: mark as broken
 due to fuse2

---
 .../development/compilers/chicken/5/overrides.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 90e483195687..880f317919e3 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -78,19 +78,8 @@ in
       ];
     };
   freetype = addToBuildInputsWithPkgConfig pkgs.freetype;
-  fuse =
-    old:
-    (addToBuildInputsWithPkgConfig pkgs.fuse old)
-    // {
-      env.NIX_CFLAGS_COMPILE = toString [
-        (
-          if stdenv.cc.isClang then
-            "-Wno-error=incompatible-function-pointer-types"
-          else
-            "-Wno-error=incompatible-pointer-types"
-        )
-      ];
-    };
+  # requires fuse2
+  fuse = broken;
   isaac =
     old:
     (addToBuildInputsWithPkgConfig pkgs.libffi old)

From f09afe460a40d3ae60151217f17d9c491019113b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 11:57:19 +0000
Subject: [PATCH 0297/1386] python3Packages.scrapy: 2.16.0 -> 2.17.0

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

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index cceb55ded458..c03267c6f715 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "scrapy";
-  version = "2.16.0";
+  version = "2.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scrapy";
     repo = "scrapy";
     tag = version;
-    hash = "sha256-s72COXzDuTtRNGenZEZG8QCeq+9LBu6fuT5NOjpVYaY=";
+    hash = "sha256-4FAZJZc8qsMn93XPNYnnbqecA29DWwh5VNNlCsnib7A=";
   };
 
   pythonRelaxDeps = [

From 67e5d3eddee47ad41c7173e400f549ce7272aa8d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 13 Jul 2026 15:10:27 +0300
Subject: [PATCH 0298/1386] zsh: add doronbehar to maintainers

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

diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index ea7931ffac72..862f3bae856f 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -145,6 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pSub
       artturin
+      doronbehar
     ];
     platforms = lib.platforms.unix;
     mainProgram = "zsh";

From 309086ac7cb1b574c2fa54cc7ab2b622fced6a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 13 Jul 2026 14:13:56 +0200
Subject: [PATCH 0299/1386] switch-to-configuration-ng: Die less

This is horrible when logind fails (for any reason) and the services
that were stopped already do not get started anymore because stc-ng
died. This replaces the die() with the exit code so regular tooling
should pick up that something failed without the catastrophic events of
services like sshd not running.
---
 pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
index 84a46d64565f..d74fce7b6d19 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
@@ -2376,7 +2376,7 @@ won't take effect until you reboot the system.
     match logind.list_users() {
         Err(err) => {
             eprintln!("Unable to list users with logind: {err}");
-            die();
+            exit_code = 4;
         }
         Ok(users) => {
             for (uid, name, user_dbus_path) in users {

From aecbb1a2320fbe051783e1c043614ae3d82e6801 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 12:28:10 +0000
Subject: [PATCH 0300/1386] aliae: 0.26.6 -> 1.1.1

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

diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix
index 42dc084574f5..5a14624dab5b 100644
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliae";
-  version = "0.26.6";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "aliae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W/jj2YQc6M0ro4groCynly2stjv2FLAMvIopnQYCngY=";
+    hash = "sha256-/n20oNQGcfji2whdl/DaUUf2kgiVZMB73veUfOr9EqU=";
   };
 
-  vendorHash = "sha256-8YTyhjF0p2l76sowq92ts5TjjcARToOfJN9nlFu19L4=";
+  vendorHash = "sha256-qY12bkwa8lyHtS7AdvkKuAmwDRyn5am2aU6wy8GE4Wk=";
 
   sourceRoot = "${finalAttrs.src.name}/src";
 

From 801b3eb24a40c514c62660ca72535fb266dde3fd Mon Sep 17 00:00:00 2001
From: KorkutKardes7 <korkutkardes7@hotmail.com>
Date: Mon, 13 Jul 2026 14:55:46 +0300
Subject: [PATCH 0301/1386] wire-desktop: mac 3.40.5442 -> 3.42.5489

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

diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index 822107c0d8df..b6663db4acbf 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -28,12 +28,12 @@ let
       };
     };
     x86_64-darwin = rec {
-      version = "3.40.5442";
+      version = "3.42.5489";
       src = fetchFromGitHub {
         owner = "wireapp";
         repo = "wire-desktop";
         tag = "macos/${version}";
-        hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
+        hash = "sha256-v80sdksor6V0OVXlBTeMf9Jz8lhQy+UdyTxxupuafeo=";
       };
     };
     aarch64-linux = x86_64-linux;

From 2ac472ebae89a78171dad75463f98786dc57c7c2 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Mon, 6 Jul 2026 11:37:28 +0200
Subject: [PATCH 0302/1386] fluux-messenger: 0.16.2 -> 0.17.0

---
 pkgs/by-name/fl/fluux-messenger/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/fluux-messenger/package.nix b/pkgs/by-name/fl/fluux-messenger/package.nix
index 43e12c6d985b..fbf63c51d4f2 100644
--- a/pkgs/by-name/fl/fluux-messenger/package.nix
+++ b/pkgs/by-name/fl/fluux-messenger/package.nix
@@ -18,24 +18,24 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fluux-messenger";
-  version = "0.16.2";
+  version = "0.17.0";
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "processone";
     repo = "fluux-messenger";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-G5VDcFHp+mIYBXh7Vju/8bGB3CPD1dyZKq8zAOKn3UY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ojPEj7W41+tQXQ9AW/XN8IIX6zhOcKigxNiBv6qu9V4=";
   };
 
   cargoRoot = "apps/fluux/src-tauri";
-  cargoHash = "sha256-/jaEpC0f6B1zTxN7MHv/DESFnRTSAd3qi9rrnXurcPQ=";
+  cargoHash = "sha256-GpF/Qp0yM4uSMwxNT6dYPeO2buvE6SxtER8hfaepDoc=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-XAzE4I13GN4Gfi6g4VX5ZwM2DhVycKz7cGBQroAFvf8=";
+    hash = "sha256-nNXjsiQY7Lmq+aB5nSlMGrB1zCtAe9FFFHqOsQOG3Dk=";
   };
 
   nativeBuildInputs = [
@@ -69,10 +69,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "XMPP client for communities and organizations";
+    longDescription = "A modern, Web and Desktop cross-platform XMPP client for communities and organizations, built with a reusable Typescript SDK and Tauri for desktop";
+    changelog = "https://github.com/processone/fluux-messenger/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     homepage = "https://github.com/processone/fluux-messenger";
     license = lib.licenses.agpl3Plus;
     mainProgram = "fluux";
     maintainers = [ lib.maintainers.haansn08 ];
     platforms = lib.platforms.all;
+    # see also https://github.com/processone/fluux-messenger/blob/main/fluux-messenger.doap
   };
 })

From ce2d17e9abaf03c177a288754306ff88c8d76781 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 13:10:57 +0000
Subject: [PATCH 0303/1386] lazyworktree: 1.47.0 -> 1.48.0

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

diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix
index a319756abbe7..0ddaca0b29a9 100644
--- a/pkgs/by-name/la/lazyworktree/package.nix
+++ b/pkgs/by-name/la/lazyworktree/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lazyworktree";
-  version = "1.47.0";
+  version = "1.48.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "lazyworktree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aiObEOw+osGRzvkSwo/aWbby8eb/jPiruxcGehafUvw=";
+    hash = "sha256-0Ldrul/T7QdmZiIiaCPkcojw75WZqKBLMSmKyLBUd3Y=";
   };
 
-  vendorHash = "sha256-aQ0My2re9rCoU6EZ0VSyHYT1TMZEMAwnhmcqGBd95ks=";
+  vendorHash = "sha256-HCPS084sPctHAXgy0SK0EWVpn6K/UQYCu2LnGT0czAI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 49c526f255e72aa82c88ea01d0624afc51a0ce46 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Mon, 13 Jul 2026 15:48:45 +0200
Subject: [PATCH 0304/1386] fluux-messenger: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/by-name/fl/fluux-messenger/package.nix b/pkgs/by-name/fl/fluux-messenger/package.nix
index fbf63c51d4f2..d6cda40b0798 100644
--- a/pkgs/by-name/fl/fluux-messenger/package.nix
+++ b/pkgs/by-name/fl/fluux-messenger/package.nix
@@ -18,24 +18,25 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fluux-messenger";
-  version = "0.17.0";
+  version = "0.17.1";
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchFromGitHub {
+    name = "${finalAttrs.pname}-${finalAttrs.version}-source";
     owner = "processone";
     repo = "fluux-messenger";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ojPEj7W41+tQXQ9AW/XN8IIX6zhOcKigxNiBv6qu9V4=";
+    hash = "sha256-aT7X11BOmksEcCLk5hkokfLx7Q8Jk2zTWskoN8aZha0=";
   };
 
   cargoRoot = "apps/fluux/src-tauri";
-  cargoHash = "sha256-GpF/Qp0yM4uSMwxNT6dYPeO2buvE6SxtER8hfaepDoc=";
+  cargoHash = "sha256-fEHe7enJzdEauou1xWfM94WHL1uAP1sfY2JN1ZmZmEE=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-nNXjsiQY7Lmq+aB5nSlMGrB1zCtAe9FFFHqOsQOG3Dk=";
+    hash = "sha256-4Op4jykCtc9oFBIn8vOUqxGr7/OloIhPD1JT+q4dX7Y=";
   };
 
   nativeBuildInputs = [

From 0534b5c8f2a8e8f4c9a8674661f76c843b10ef4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 14:01:56 +0000
Subject: [PATCH 0305/1386] python3Packages.pygmt: 0.18.0 -> 0.19.0

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

diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix
index 23c581d02b50..a45712b74c48 100644
--- a/pkgs/development/python-modules/pygmt/default.nix
+++ b/pkgs/development/python-modules/pygmt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pygmt";
-  version = "0.18.0";
+  version = "0.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GenericMappingTools";
     repo = "pygmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yWB/IRu5B6hnu8e1TvpAaLehr1TMqvnDc5sRgyMw2mM=";
+    hash = "sha256-XuJuSma2EVqEYpJlz/rS01gQeI+DgJSifLs2Wj2pdiI=";
   };
 
   postPatch = ''

From 618140bfa882d6a8cf84484e055ef6e96e9285bf Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Mon, 13 Jul 2026 13:48:46 +0000
Subject: [PATCH 0306/1386] signal-cli: Add update script

---
 pkgs/by-name/si/signal-cli/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index 2a000ed314bd..5b0c65ac352b 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -11,6 +11,9 @@
   callPackage,
   versionCheckHook,
   signal-cli,
+  writeShellApplication,
+  curl,
+  nix-update,
 }:
 
 let
@@ -93,6 +96,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  passthru = {
+    updateScript = lib.getExe (writeShellApplication {
+      name = "signal-cli-update";
+      runtimeInputs = [
+        curl
+        nix-update
+      ];
+      text = ''
+        nix-update signal-cli
+        nix-update signal-cli.passthru.libsignal-jni --version "$(curl --silent --location https://github.com/AsamK/signal-cli/raw/v"$(nix-instantiate --raw --eval -A signal-cli.version)"/libsignal-version)"
+      '';
+    });
+    libsignal-jni = libsignal-jni;
+  };
+
   meta = {
     homepage = "https://github.com/AsamK/signal-cli";
     description = "Command-line and dbus interface for communicating with the Signal messaging service";

From 0041d521408ab56047272016d22533a1607f1bfe Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Mon, 13 Jul 2026 10:36:03 -0300
Subject: [PATCH 0307/1386] sage: import matplotlib, numpy and scipy update
 patches

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

diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 7362bf8f3897..a277be1af4bd 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -109,6 +109,27 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/void-linux/void-packages/f8951eacbdc6538af3330d17d5587a0c208ab349/srcpkgs/sagemath/patches/40679-Update_to_maxima_5.49.patch";
       hash = "sha256-n6YSVNomLM7f5kRAGzhijag8QnlXxKJz9RHFLVtZpdk=";
     })
+
+    # https://github.com/sagemath/sage/pull/42384, landed in 10.10.beta4
+    (fetchpatch2 {
+      name = "matplotlib-3.11-update.patch";
+      url = "https://github.com/sagemath/sage/commit/3d3a04bbfb66dc1141afadbfaefa01dff8749761.patch?full_index=1";
+      hash = "sha256-LlEblRKlPPmvSU26LmT6DTxFElvhA9SBkrU3xeIFZu4=";
+    })
+
+    # https://github.com/sagemath/sage/pull/42437, landed in 10.10.beta5
+    (fetchpatch2 {
+      name = "numpy-2.5-update.patch";
+      url = "https://github.com/sagemath/sage/commit/3e709448881442c133047f2993db39d855c70bd8.patch?full_index=1";
+      hash = "sha256-8vxIYG6yhCBML9vioJhAjBgTeCCGmdfk7qAtEEQnK/g=";
+    })
+
+    # https://github.com/sagemath/sage/pull/42465, landed in 10.10.beta5
+    (fetchpatch2 {
+      name = "scipy-1.18-update.patch";
+      url = "https://github.com/sagemath/sage/commit/926f32aab22f81ddb9fda874a20fee84c7bfacc3.patch?full_index=1";
+      hash = "sha256-EMn/fr5WlRQtFj5GHo02kczasmKaiqFfRSVZo2uvOPI=";
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

From 0742d998079a26507bd32402a8d46072e8081abd Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Mon, 13 Jul 2026 14:16:56 +0000
Subject: [PATCH 0308/1386] signal-cli: 0.14.5 -> 0.14.6

Changelog: https://github.com/AsamK/signal-cli/blob/v0.14.6/CHANGELOG.md
---
 pkgs/by-name/si/signal-cli/deps.json         | 135 ++++++++++---------
 pkgs/by-name/si/signal-cli/libsignal-jni.nix |   6 +-
 pkgs/by-name/si/signal-cli/package.nix       |   4 +-
 3 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/pkgs/by-name/si/signal-cli/deps.json b/pkgs/by-name/si/signal-cli/deps.json
index 135d933b7af8..05319b87b32d 100644
--- a/pkgs/by-name/si/signal-cli/deps.json
+++ b/pkgs/by-name/si/signal-cli/deps.json
@@ -2,10 +2,10 @@
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
  "https://build-artifacts.signal.org": {
-  "libraries/maven/org/signal#libsignal-client/0.94.4": {
-   "jar": "sha256-dYt1xROjZUTd1T+9jqQKFSztuNFODwDnm+knIoeWNKs=",
-   "module": "sha256-rNxY6ygoNFYCvNGhHlEhQqTTBxYBjmScsbl0qkgMPsw=",
-   "pom": "sha256-3Xt0yJrLIJ93BbRJ5/huzjlPBuoTtX/g2ZW3NCXxuug="
+  "libraries/maven/org/signal#libsignal-client/0.96.3": {
+   "jar": "sha256-Z9uYCI4uREB6XguuCv4dkOYzUX8iCZ/pvZYyax5g7e8=",
+   "module": "sha256-YRfX76VAxM76fJNya4AABAzKemh2fjCZFK+uP8NxIEc=",
+   "pom": "sha256-zgXDL0gNXa6zF1QyoFdUcAZ44UTTZiv+biEOqhH7gNQ="
   }
  },
  "https://plugins.gradle.org/m2": {
@@ -27,23 +27,23 @@
   "com/google/errorprone#error_prone_parent/2.27.0": {
    "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
   },
-  "org/graalvm/buildtools#graalvm-reachability-metadata/1.1.2": {
-   "jar": "sha256-Oompk1nesyVXp5HxGoDoG/jmy+iyaL3G9ZoVPWzrMOk=",
-   "module": "sha256-ufhI62i4r+Ob8JLkxw3pQbST4Cy6jfpJs2HaS7psQFw=",
-   "pom": "sha256-cEP8FFEG37OTOP9EamEpAKIDm8/prnmSPWqaV/rHErs="
+  "org/graalvm/buildtools#graalvm-reachability-metadata/1.1.4": {
+   "jar": "sha256-XpBnpBN2KBw1S0rKAeQca/LdXinwnNHRoxn7Bd/Lz7M=",
+   "module": "sha256-XJS9cV2yYZwZN7I7Z6LvX0yaP5+0HNyWaFuB0vkbEp4=",
+   "pom": "sha256-QQggaIBXhhCBLsrE9gAPdGSI+fDM/DS6+F5koXR5aG4="
   },
-  "org/graalvm/buildtools#native-gradle-plugin/1.1.2": {
-   "jar": "sha256-I57AfHtYli06pZ1xKhi8BIb1m5LAgT8FPXiyDERYWzM=",
-   "module": "sha256-jKQfcwvN/ok03+we8GLx62NXUpxSUzgg9KYl+GsZhE0=",
-   "pom": "sha256-G1+zTmhVvtwnqfiYWCxb5I2a1xF9cDydj/2bDTPfZI4="
+  "org/graalvm/buildtools#native-gradle-plugin/1.1.4": {
+   "jar": "sha256-KahlTAhJJSmPoZmli+g5NXitajz/QSwM7Raii6cfSK4=",
+   "module": "sha256-4I887jCwORt5609RZp0PnHvhxrxd5btp52XmFkFPCaw=",
+   "pom": "sha256-+xTOUZ1sEzVn/f3wQRxVmxxDSq8QUeMqDETSSi2Ax1o="
   },
-  "org/graalvm/buildtools#utils/1.1.2": {
-   "jar": "sha256-zOlCsuhNGG8SjUxr5dSVv8ID+rxfcwDHUYZounAaozg=",
-   "module": "sha256-6OfFXvTVM/l2oZQF2hPVVm8i5liMvu/6nuogtfJ430g=",
-   "pom": "sha256-/qFY/QLJ6J9BqNIkVYS63810tzxiva9TwBGJzuEc3pI="
+  "org/graalvm/buildtools#utils/1.1.4": {
+   "jar": "sha256-pCd1lX+eRCSKmUOEHbHl5OYr7Qx4Yg6Tvl3UPMlVrdg=",
+   "module": "sha256-MYABUNF78ObERX4EXTamANDzHh0BRkRegpw9xWzPTOU=",
+   "pom": "sha256-rt82QOjPhUY4hHVMuUWjzc4J8I2P8sujpdUs9z/ijSY="
   },
-  "org/graalvm/buildtools/native#org.graalvm.buildtools.native.gradle.plugin/1.1.2": {
-   "pom": "sha256-lpcCHJItfukS1MnDy6Z2GsynwLWczuEJ5VVhN2kOIAM="
+  "org/graalvm/buildtools/native#org.graalvm.buildtools.native.gradle.plugin/1.1.4": {
+   "pom": "sha256-t+b6IIdqZaR/CkU4dt+4Y3SQm3M++ryIqdh/1wL9VcY="
   },
   "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.5.7": {
    "jar": "sha256-zIyqQQGjXQzwQzpj6K04kRpMhIBz/MlPQ64CUfM+Ta8=",
@@ -191,40 +191,45 @@
   "com/fasterxml/jackson#jackson-base/2.20.2": {
    "pom": "sha256-2h3M8cF7Sx/XPEiKaRH93ekBcrRvgbbdbUchrAgzDfQ="
   },
+  "com/fasterxml/jackson#jackson-base/2.21.5": {
+   "pom": "sha256-T04r6gD/5XX17AVMB6T7w0wZVdhjXAGj6IATvyxx3v8="
+  },
   "com/fasterxml/jackson#jackson-bom/2.20.2": {
    "pom": "sha256-izQ6yh3LT3KLlMxzgxmYMOPTorDQdzQ3h+7iIAkYtB4="
   },
+  "com/fasterxml/jackson#jackson-bom/2.21.5": {
+   "pom": "sha256-V/4i3sZZ3gZVNX+tBYLvfIsv5aiQam8f8by70eRVSEY="
+  },
   "com/fasterxml/jackson#jackson-parent/2.20": {
    "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U="
   },
   "com/fasterxml/jackson#jackson-parent/2.21": {
    "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.20": {
-   "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=",
-   "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=",
-   "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ="
-  },
   "com/fasterxml/jackson/core#jackson-annotations/2.21": {
    "jar": "sha256-U8oIX0oVD3A/SeGqvZNb0DtD4eo9VdE1Q4KSryLO9Ws=",
    "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=",
    "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.20.2": {
-   "jar": "sha256-YbhaQbvDM+bbO3ck1an/UBHsX56xzuQeYiQgvG4OQTE=",
-   "module": "sha256-sYxSWUiGF4L+YKs7Z7fAYj8BCGZdSHPoXKCVwZBMRC4=",
-   "pom": "sha256-Hvbw4LWflUdfUMcGuUPw9AKZM8KUd1bfV2MVIIJ8n0k="
+  "com/fasterxml/jackson/core#jackson-core/2.21.5": {
+   "jar": "sha256-tktYdBYrUDoOWKj3dYJm6N2fkb9J46Wa4LX0dYmiMbc=",
+   "module": "sha256-3hE/RTHe9Q/rEr4E5wdKj3b18+8pDPiGuQCGpOJ0Uw8=",
+   "pom": "sha256-N2IPWbeJFti+VjAcczhNFdVFwOIXQxvG0Seo2IDfQH0="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.20.2": {
-   "jar": "sha256-EZVz/GzrJbJrsDK7WIjn/YpOkzmHloo4glOgF9rLXlQ=",
-   "module": "sha256-AZgSiK3esDDuVzZeueuGxmW3QCStl/EhvgaSFV7s6Fw=",
-   "pom": "sha256-lENiw258gC/9Y7MgVi3skwEMhobnqzRddIGgxBJDdb4="
+  "com/fasterxml/jackson/core#jackson-databind/2.21.5": {
+   "jar": "sha256-UHQYwPr9OLKyz7cEUhYw2mE6jkzIOBGVpvQYAXiD4sA=",
+   "module": "sha256-kg4qAhGjH1TS5+Tv/cWA0Cw0Eqb+/bYyqAVOYMR1g4E=",
+   "pom": "sha256-cu7sNq3UbNfRhf7YkmXNuXp/wFzzQTzipZRA7+GCOhI="
   },
   "com/fasterxml/jackson/module#jackson-module-kotlin/2.20.2": {
-   "jar": "sha256-u63iN5HvGjjwaWA7yD7YhncU21gkdC7779Hq9nxqPsY=",
    "module": "sha256-Vanis/UbE12fJ1AW8Sw+LgXpvJU0HK6xm0OdwgiQLeU=",
    "pom": "sha256-AMlp5rd3mENZlpq8S/xARCK4i5DNq9HAcxgcY/mJvaE="
   },
+  "com/fasterxml/jackson/module#jackson-module-kotlin/2.21.5": {
+   "jar": "sha256-b0W75DRFjSrR9eoWxqv2fnq+o3Syya5Wic9N0nwWyLk=",
+   "module": "sha256-Gp94BEdljdtH7J19zGCXmqsqWyXw6QKUaFPdKSvYhYE=",
+   "pom": "sha256-IYgSf4943/3K9k2pWd1VHksQeFrMFH7zPs8Upnnwp4w="
+  },
   "com/github/hypfvieh#dbus-java-core/5.0.0": {
    "jar": "sha256-rZddGhfTd43evWMePZ1TNylKqRW8Zf3m6Qh9kHKbu0U=",
    "pom": "sha256-kZVCUw1wZlye6aHC1WawY+UG8HX4PKS2WdJzgtRqmCw="
@@ -247,35 +252,35 @@
    "jar": "sha256-972ddcZpd9iIiFH3XcAxOXJ05z+W5TUkcu3UzTpWp5A=",
    "pom": "sha256-4BVvMJm4gti9fjIKfcdET6b/RxDX5z8VATjAKn34xrU="
   },
-  "com/github/turasa#core-network/2.15.3_unofficial_148": {
-   "jar": "sha256-kG/++qSroP0gmgMstrDud5/8+aFY0qVC7cRzo5v0AQ8=",
-   "module": "sha256-VV9WzZ07/OvIx47enZ7C8tIzqFnADuoztLjcZUlmk9E=",
-   "pom": "sha256-iLVprHpnWzYRZcg5To8JvFHGYcveVmtnjzzDE2b3Nww="
+  "com/github/turasa#core-network/2.15.3_unofficial_149": {
+   "jar": "sha256-GVPQRIGhzTYHRqEcaJXSARmNG2dwK7c+jZ8sEiNmSYM=",
+   "module": "sha256-3IoBIylLsNuZ3gQBfDOJLAjw//nJNdWuAkeBg+4DPus=",
+   "pom": "sha256-T3cziZ6ojUK0il3be2EtOOR9DU8oMo82ShskFwSY+WE="
   },
-  "com/github/turasa#models-jvm/2.15.3_unofficial_148": {
-   "jar": "sha256-pvMLhBCjLdxQLu2Qrb5jJksL9obxbBGSoWyGDp2lyQU=",
-   "module": "sha256-WTiMAglD704zGg5MJa9qpuIBtP8/bMC6uaVVX1SCq94=",
-   "pom": "sha256-zHT6v9tJkjleUGMRgy0fJj5pO7j5kTzSX1X3yqrfaJw="
+  "com/github/turasa#models-jvm/2.15.3_unofficial_149": {
+   "jar": "sha256-yV3+jIv1k0OgOZC6aaNpyyCHky+9SjkFCkOzNyd59Sk=",
+   "module": "sha256-+RfD6IfyqLwwx4yiC3vPKvIOiFxVJ2dMHopXGCjEemo=",
+   "pom": "sha256-nAda2RUTEPd4TpPCycdR/yurrgzRMti2nJLYUnx1luU="
   },
-  "com/github/turasa#serialization/2.15.3_unofficial_148": {
-   "jar": "sha256-GBL2didnuADhwNl8Nd+EkHt3qIxNokatE075iH/5MTA=",
-   "module": "sha256-OK9RSVzL6aTz6KT2f1WkUFruIFm6iX+PtDJ4/NGGvLU=",
-   "pom": "sha256-GH0DT39/JIV4Vd1TbcmRY7yyn9VhQxJ71mtNWxVo4wA="
+  "com/github/turasa#serialization/2.15.3_unofficial_149": {
+   "jar": "sha256-5VYS8h0X+L1msDFGToRfe3QysgDk/28ybOHiPvOLpSM=",
+   "module": "sha256-LZ++GNTTVHtkSQU+F1Yh74aWiDfxu4hX0BACHV/pfbU=",
+   "pom": "sha256-+6K9tLA0ZipVh4S2X2m3qzs8Mr52q4hr/FBqwwcZO3k="
   },
-  "com/github/turasa#signal-network/2.15.3_unofficial_148": {
-   "jar": "sha256-7s79fhwH+KnrKd7IwHkGE48qCwJM9zyKbD7wBOSIBuw=",
-   "module": "sha256-JRhHCJ6lNuExw+iiDXaVy2eFWz0HaTndQiH/U/hL1Xc=",
-   "pom": "sha256-zQK1ZB2AhjPNjtZ2jAX6h4LkQJVjJJAlZnAnl7Oj6YQ="
+  "com/github/turasa#signal-network/2.15.3_unofficial_149": {
+   "jar": "sha256-iyDpWzrUxD9kCjvy9VaiY8ke4KpvEmcVvLbSowF9rrE=",
+   "module": "sha256-eac61/Ch79ZmYlUGEmIOp5hiQmyeZ374skjFi0ePiGQ=",
+   "pom": "sha256-lFMmHnKp5HNFchDoNPxMS9Rsm0CSSaiocNq3u2hKlIA="
   },
-  "com/github/turasa#signal-service-java/2.15.3_unofficial_148": {
-   "jar": "sha256-LDl6pQfdDFSrtr83lVS3qYffAaldl0cD7+Vo5S8T8/o=",
-   "module": "sha256-G0hNL61wL9/siUnIY4Yj5/4C7topI98YSUXzr/DSykU=",
-   "pom": "sha256-Cl9UR0TYl2bwZjiWqfiWg2nydWIxt3bT2uKS4jLLC18="
+  "com/github/turasa#signal-service-java/2.15.3_unofficial_149": {
+   "jar": "sha256-QvbDo11PUhrjNSCtKUQqVY09E6GeYpu6WilT+sZ9L/U=",
+   "module": "sha256-2zEraXZG7IwGUZrXewbCSjyqzfbX6fKWByaIt4zF4rw=",
+   "pom": "sha256-OgvLg26yJT3roGS7C4drZtWsUAxsMPuwzKSQ11wmc8Q="
   },
-  "com/github/turasa#util-jvm/2.15.3_unofficial_148": {
-   "jar": "sha256-K88fOGdE9OeEKtJE7yrP6r5+xH+qqV9jXlgjpaeWvqw=",
-   "module": "sha256-arB+hobHhM3FLlDy1H7EsuA8cg63tQZOJHsuLpW+a0A=",
-   "pom": "sha256-/BslyKHB+7gHa8P6eKFVBrLBX6fAmNe2Sgi5y1NZNO0="
+  "com/github/turasa#util-jvm/2.15.3_unofficial_149": {
+   "jar": "sha256-HTaxo8hwGL2Fs9lArKYyRwvwIVlbyulA/ZGWw04Muyk=",
+   "module": "sha256-8w78BIIXxZ8DXn/c+KzjD3BDltmozX/HIywBS6dg+iA=",
+   "pom": "sha256-IKLxLIQGAFLIj7Y95zkE2+Kc9Ve/NZlO5My/dMFNhFo="
   },
   "com/google/code/findbugs#jsr305/3.0.2": {
    "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
@@ -511,10 +516,10 @@
   "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
-  "org/graalvm/buildtools#junit-platform-native/1.1.2": {
-   "jar": "sha256-3ufXTMgG0c6k4Pq0XSQ3kpa6egbLl6XFw3FQBNJOZ/I=",
-   "module": "sha256-AD2sjuf4rDNoGyZ6TrhdxX8NoAAdmfv8i8tuQenYw5g=",
-   "pom": "sha256-Pfs+WOyowbpg6WlcPtmp91sRn71kXEf0PE2+jYhGjP8="
+  "org/graalvm/buildtools#junit-platform-native/1.1.4": {
+   "jar": "sha256-awt9Zk7WMDhj4kgUEWWMZEuwRNqKypkWAPNjIZW9U2A=",
+   "module": "sha256-1cQqHZkROq4o/V8T9pRZAcaK493smv35dbZmU92iSYk=",
+   "pom": "sha256-lZyCqHco7Hxe4I/Co5dBfN34LmCO/rnjMoriPPWKNhI="
   },
   "org/jetbrains#annotations/13.0": {
    "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
@@ -570,9 +575,9 @@
    "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
    "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
   },
-  "org/jetbrains/kotlin#kotlin-reflect/2.0.21": {
-   "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
-   "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
+  "org/jetbrains/kotlin#kotlin-reflect/2.1.21": {
+   "jar": "sha256-vNdaNspK2OBhFyFO2Af43qL+YaceB/kcoU9DNQJLhGM=",
+   "pom": "sha256-7XngK/COxxXsvNHi16RTYteqfDP5LvZ15t+kpJMbzF8="
   },
   "org/jetbrains/kotlin#kotlin-reflect/2.2.20": {
    "jar": "sha256-ggkIOkp8TkdtmEKweDCPqWqW8Hpr2Z8F81hu4TKJqyY=",
@@ -699,6 +704,10 @@
    "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
    "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
+  "org/junit#junit-bom/5.14.1": {
+   "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=",
+   "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ="
+  },
   "org/junit#junit-bom/5.14.2": {
    "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=",
    "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8="
diff --git a/pkgs/by-name/si/signal-cli/libsignal-jni.nix b/pkgs/by-name/si/signal-cli/libsignal-jni.nix
index b29734ca400f..a64a6a045f6e 100644
--- a/pkgs/by-name/si/signal-cli/libsignal-jni.nix
+++ b/pkgs/by-name/si/signal-cli/libsignal-jni.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-jni";
-  version = "0.94.4";
+  version = "0.96.3";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Uh/j8cXUWgWgSo9UBfYOFuC8i+2YdMwGHcXf55PkGgU=";
+    hash = "sha256-FOppsfocUvUfWa6AfBPOxAnntGJkzTbnPwqMzzbHnWQ=";
   };
 
-  cargoHash = "sha256-st6zTKvxSsyMce22E8nFsJMGjQkk9sEAzSCmyZP8x20=";
+  cargoHash = "sha256-wsXlCpNwO+E6rVNaD2R51Mi0sZUv2lhllGxDxzyptYA=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index 5b0c65ac352b..c375bdaf5de4 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-cli";
-  version = "0.14.5";
+  version = "0.14.6";
 
   src = fetchFromGitHub {
     owner = "AsamK";
     repo = "signal-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p669Gjn3HYdVNtAA1Bvgc4iL6U9KnG4SLX1/aUKulPY=";
+    hash = "sha256-VJ+/0CvfgtE6VHFeTLKAswTWrnyAL7AYrfCYVJpXDaE=";
   };
 
   nativeBuildInputs = [

From 6d11b0dfb87d2b7ce9d9a397ffdc427135b0045a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= <ilkecan@protonmail.com>
Date: Mon, 13 Jul 2026 17:29:59 +0300
Subject: [PATCH 0309/1386] brewtarget: set __structuredAttrs & strictDeps, add
 changelog

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

diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix
index 334d8e2ba912..cffed27593d7 100644
--- a/pkgs/by-name/br/brewtarget/package.nix
+++ b/pkgs/by-name/br/brewtarget/package.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   postPatch = ''
     # 3 sed statements from below derived from AUR
     # Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland
@@ -41,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     pkg-config
+    qt6.qttools
     qt6.wrapQtAppsHook
     wrapGAppsHook3
     pandoc
@@ -51,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtbase
     qt6.qtmultimedia
     qt6.qtsvg
-    qt6.qttools
     xercesc
     xalanc
   ];
@@ -66,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Open source beer recipe creation tool";
     mainProgram = "brewtarget";
     homepage = "https://www.brewtarget.beer";
+    changelog = "https://github.com/Brewtarget/brewtarget/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [

From adafca942f37b3150849efd4f823331f525bbff2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 14:31:15 +0000
Subject: [PATCH 0310/1386] python3Packages.types-openpyxl: 3.1.5.20250919 ->
 3.1.5.20260518

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

diff --git a/pkgs/development/python-modules/types-openpyxl/default.nix b/pkgs/development/python-modules/types-openpyxl/default.nix
index 28c28da71abb..bfcb893c1959 100644
--- a/pkgs/development/python-modules/types-openpyxl/default.nix
+++ b/pkgs/development/python-modules/types-openpyxl/default.nix
@@ -6,14 +6,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "types-openpyxl";
-  version = "3.1.5.20250919";
+  version = "3.1.5.20260518";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_openpyxl";
     inherit (finalAttrs) version;
-    hash = "sha256-IytZBnc+66zhUJuJlM2t2gQ/aSz9upv7uGypIdVNMtc=";
+    hash = "sha256-2pzWROToAhWj9gqMLCyOmA6UGptYHP+jh2KFqnkcpa8=";
   };
 
   build-system = [ setuptools ];

From 37a21cc9bd1d8490c7d9e996bb13cd03a667bc72 Mon Sep 17 00:00:00 2001
From: qrzbing <qrzbing@foxmail.com>
Date: Mon, 13 Jul 2026 22:35:53 +0800
Subject: [PATCH 0311/1386] picgo: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix
index e751fa0e7c50..24bcc055a3e1 100644
--- a/pkgs/by-name/pi/picgo/package.nix
+++ b/pkgs/by-name/pi/picgo/package.nix
@@ -18,20 +18,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "picgo";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "Molunerfinn";
     repo = "PicGo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ruTgNgZsjpdu2Cc2Q4HxPdoQHUww1UTbvLazglaz75c=";
+    hash = "sha256-uxgrtuxcIlwCuz3X2hL0ZSpq8hMA4JxQD8ibNFw+35g=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) version src;
     inherit pnpm;
     pname = "picgo";
-    hash = "sha256-IAuTtI0Ljm4+xCeMGIQAf7lK37CQ6qf7PJsksLIti7Q=";
+    hash = "sha256-a08WFoWcjo0mV1eu8oOQgbOiu/xfpoMxx3v17Eltsbk=";
     fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3
   };
 

From b100c59115f9e0027a434009a9765a3e08c85544 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 14:51:47 +0000
Subject: [PATCH 0312/1386] mpc-qt: 26.01 -> 26.07

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

diff --git a/pkgs/by-name/mp/mpc-qt/package.nix b/pkgs/by-name/mp/mpc-qt/package.nix
index b650f73842c4..d1c9a889cf71 100644
--- a/pkgs/by-name/mp/mpc-qt/package.nix
+++ b/pkgs/by-name/mp/mpc-qt/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mpc-qt";
-  version = "26.01";
+  version = "26.07";
 
   src = fetchFromGitHub {
     owner = "mpc-qt";
     repo = "mpc-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tgCdPzolUlp3Cy1ZbDlMQvl/4WcTl86QTZ8F18f0JME=";
+    hash = "sha256-1tm/Sw/6szY4k2ObFnOsXfffIJ31eokjqkOt90DquWE=";
   };
 
   nativeBuildInputs = [

From 9ffa676bee6495f023d1a8760cb6624b4a7763ea Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Sun, 12 Jul 2026 01:49:03 +0100
Subject: [PATCH 0313/1386] python3Packages.autobean: init at 0.2.3

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

diff --git a/pkgs/development/python-modules/autobean/default.nix b/pkgs/development/python-modules/autobean/default.nix
new file mode 100644
index 000000000000..c3c52c411a1c
--- /dev/null
+++ b/pkgs/development/python-modules/autobean/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  beancount,
+  nix-update-script,
+  pdm-pep517,
+  pytest-cov-stub,
+  pytestCheckHook,
+  python-dateutil,
+  pyyaml,
+  requests,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "autobean";
+  version = "0.2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SEIAROTg";
+    repo = "autobean";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JTxrDER8iSPu9Rp/7Al7KVibWOVBXdHnq6fyGVMedas=";
+  };
+
+  build-system = [
+    pdm-pep517
+  ];
+
+  dependencies = [
+    beancount
+    python-dateutil
+    pyyaml
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "autobean" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/SEIAROTg/autobean";
+    description = "Collection of plugins and scripts that help automating bookkeeping with beancount";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ambroisie ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b11f4638909..89eb236ac48e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1597,6 +1597,8 @@ self: super: with self; {
 
   autobahn = callPackage ../development/python-modules/autobahn { };
 
+  autobean = callPackage ../development/python-modules/autobean { };
+
   autocommand = callPackage ../development/python-modules/autocommand { };
 
   autodocsumm = callPackage ../development/python-modules/autodocsumm { };

From 8ad320e52164c44e3a8d627fdb602f0de98e8050 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 13 Jul 2026 16:54:08 +0200
Subject: [PATCH 0314/1386] singular: fix omalloc on aarch64-darwin

---
 pkgs/by-name/si/singular/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix
index 6c5afc5b4f00..630de742d1eb 100644
--- a/pkgs/by-name/si/singular/package.nix
+++ b/pkgs/by-name/si/singular/package.nix
@@ -55,11 +55,6 @@ stdenv.mkDerivation rec {
     "--with-ntl=${ntl}"
     "--with-flint=${flint}"
   ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    # omalloc does not support pagesizes >= 16K
-    # https://github.com/Singular/Singular/blob/spielwiese/omalloc/configure.ac
-    "--disable-omalloc"
-  ]
   ++ lib.optionals enableDocs [
     "--enable-doc-build"
   ];
@@ -76,8 +71,8 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  # Use fq_nmod_mat_entry instead of row pointer (removed in flint 3.3.0)
   patches = [
+    # Use fq_nmod_mat_entry instead of row pointer (removed in flint 3.3.0)
     (fetchpatch {
       url = "https://github.com/Singular/Singular/commit/05f5116e13c8a4f5f820c78c35944dd6d197d442.patch";
       hash = "sha256-4l7JaCCFzE+xINU+E92eBN5CJKIdtQHly4Ed3ZwbKTA=";
@@ -86,6 +81,15 @@ stdenv.mkDerivation rec {
       url = "https://github.com/Singular/Singular/commit/595d7167e6e019d45d9a4f1e18ae741df1f3c41d.patch";
       hash = "sha256-hpTZy/eAiHAaleasWPAenxM35aqeNAZ//o6OqqdGOJ4=";
     })
+    # Fix omalloc on aarch64-darwin
+    (fetchpatch {
+      url = "https://github.com/Singular/Singular/commit/6a47eae152527e3147e3168989301b676576e9eb.patch";
+      hash = "sha256-JW72CoDg0Pkmcg+uklkyV94F9qaT3cnHUhUG/6bStKY=";
+    })
+    (fetchpatch {
+      url = "https://github.com/Singular/Singular/commit/935a043cac58180942ab753efbd576ba59eaab8e.patch";
+      hash = "sha256-T9ml6SnXCKImnQDnBU4zrpYGRi2wlTYvjmln0r1AvPM=";
+    })
   ];
 
   # For reference (last checked on commit 75f460d):

From 388f79edb7041ad3adba6cd01586893c64cbb392 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 15:10:11 +0000
Subject: [PATCH 0315/1386] dolt: 2.1.9 -> 2.1.10

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index d29b29491c35..7db759314cc4 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "dolt";
-  version = "2.1.9";
+  version = "2.1.10";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AtCEygxUHlC73zWsBvYrdxLtSO2FtQd+NSthPnP2cvA=";
+    hash = "sha256-svBAmp/gPHSa6HXmqiFFB31sbaQa6s3HIW1tti8G1pA=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-pBrTYPPPbDAKjok4ti8kjzxLPH4Xg1fqKQZx2QvEoVE=";
+  vendorHash = "sha256-tBvNKDBv86pGBhzPc9tGDVwR1tB/HmUMn2VH42B6QRc=";
   proxyVendor = true;
   doCheck = false;
 

From 1d1cc09c06c50b632d36c0b532325b4941308e81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 15:12:32 +0000
Subject: [PATCH 0316/1386] tmuxai: 2.2.2 -> 2.3.1

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

diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix
index 19c9c0d5a0c2..73fc773f78ea 100644
--- a/pkgs/by-name/tm/tmuxai/package.nix
+++ b/pkgs/by-name/tm/tmuxai/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tmuxai";
-  version = "2.2.2";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "alvinunreal";
     repo = "tmuxai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t0ToGlmeWIgbZokqewdlsj8Bm89yURFf/vVZ82OoxL4=";
+    hash = "sha256-CZDGiOi0eD/HTpOXhlRyCw1MaA0gRZI1k0ET5O2xC3I=";
   };
 
-  vendorHash = "sha256-TlP5DlsPL46ityGhje/b8OHDHeWWCxu5K5iu3pyVxog=";
+  vendorHash = "sha256-Wzc7EDaW0fA76Fh4obqyAHiowXXxNbJXknkHXFBcKjY=";
 
   ldflags = [
     "-s"

From 23955f520554545d97beb080437931c368e01cba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 15:26:28 +0000
Subject: [PATCH 0317/1386] atlantis: 0.44.1 -> 0.46.0

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

diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix
index 0a6a212f3298..b42a8e9cd24a 100644
--- a/pkgs/by-name/at/atlantis/package.nix
+++ b/pkgs/by-name/at/atlantis/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlantis";
-  version = "0.44.1";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CMMsW0VFUi5c2AsuvH5uxggzJ3wD1k24Zrk4tjlBczo=";
+    hash = "sha256-4twWPp+ZgK6YmNL5RJmLKhtxe33T1GDCu1qejUbqXkA=";
   };
 
   ldflags = [
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     "-X=main.date=1970-01-01T00:00:00Z"
   ];
 
-  vendorHash = "sha256-hxgujZGbcEelOpoy7eCnbrypXraN7aPe8Ox81kkg3gs=";
+  vendorHash = "sha256-/PnEQvaqADxwFvrHWOPFopQwdyUXBa6cf/H7a/RaHcg=";
 
   subPackages = [ "." ];
 

From fea07e8fdda773803d17cb3edd45dd0875e758f3 Mon Sep 17 00:00:00 2001
From: 9R <git@9-r.net>
Date: Mon, 13 Jul 2026 17:55:24 +0200
Subject: [PATCH 0318/1386] home-assistant-custom-components.moonraker: 1.13.3
 -> 1.13.4

---
 .../home-assistant/custom-components/moonraker/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
index c9f8fb84a1fd..a415ca09f4c1 100644
--- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
@@ -14,13 +14,13 @@
 buildHomeAssistantComponent rec {
   owner = "marcolivierarsenault";
   domain = "moonraker";
-  version = "1.13.3";
+  version = "1.13.4";
 
   src = fetchFromGitHub {
     owner = "marcolivierarsenault";
     repo = "moonraker-home-assistant";
     tag = version;
-    hash = "sha256-EVlz2wsI3T815Lct9sfdYneyM0/8RHVbT6XJegtW9vs=";
+    hash = "sha256-i6ZOcCa5LD0aw6oOvVSjT6ZMfFMweS7hBBVhV4P4tv4=";
   };
 
   dependencies = [

From 2bbe55bd12dee87d1da4a1f6b69c145e7397b289 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Mon, 13 Jul 2026 11:57:28 -0400
Subject: [PATCH 0319/1386] veilid: 0.5.5 -> 0.5.6

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

diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 207124d7dae9..55674e3a1b11 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "veilid";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = "veilid";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-14jRIs2iE5JH1ZmC/1DGcg6cejsnmhUTkquXNmOEuQA=";
+    hash = "sha256-SBFCfIYfOicbUviIZMBXbfW1CESguEFLge6ssmYqm+A=";
   };
 
-  cargoHash = "sha256-xuIw/RRKydanStS7dw1jK96bgEH0U5TDbayaBZq/OCg=";
+  cargoHash = "sha256-Rtk9ba/nwaL5oCsKZsFxCy3qUnq8vVrmllzYlgV0FDU=";
 
   nativeBuildInputs = [
     capnproto

From 69a1d570bc34f6494ecc7cda0be953894d12d248 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 16:04:12 +0000
Subject: [PATCH 0320/1386] ouch: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 10458eae1768..005ccb829ba5 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ouch";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "ouch-org";
     repo = "ouch";
     rev = finalAttrs.version;
-    hash = "sha256-yQt+FeEUgC6JurFwOU1Yd++OYT75TmGO7/qchng/BUA=";
+    hash = "sha256-fxBalMi5xdLNBnd5VIdAYDIjbSBrOPrmpKlKW1DmbxQ=";
   };
 
-  cargoHash = "sha256-3/uO5WLcGXWryJSQ8UhJGecpAD2vQVE2c19vYAHtT/4=";
+  cargoHash = "sha256-kYef8Xsi1gO0V2yXHiTkPi2rFjECw3jjhADSMhhu5zg=";
 
   nativeBuildInputs = [
     cmake

From 2c81cda0c0aac3ac898db66434c941f706eebc27 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 03:03:50 -0500
Subject: [PATCH 0321/1386] vimPlugins: update on 2026-07-13

---
 .../editors/vim/plugins/generated.nix         | 132 +++++++++---------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index ec930367a355..eac90038986a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1610,12 +1610,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "0-unstable-2026-06-21";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "21233d5fd574439ae1e2f5e4bfbc574214f4ab3d";
-      hash = "sha256-Dizi44p6XYaQlXEL5qnfJFX44nXKIAkZAZvQ5QH11eA=";
+      rev = "012273e4bbf3e143224a272ad2efd10b69a000ba";
+      hash = "sha256-8npfL3fYQ05dHWGm46bdRS3tMOyooXhyxM0gpI0Ompw=";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -1638,12 +1638,12 @@ final: prev: {
 
   base46 = buildVimPlugin {
     pname = "base46";
-    version = "0-unstable-2026-07-09";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "base46";
-      rev = "a972909f1d7ba798b93b56631bc2cd5e96ea40da";
-      hash = "sha256-7WqUWfziecAeGtbKBU6/FESY/pf56bEGKhvnxcm/gNI=";
+      rev = "cbb71c6cb56f53b30ab1a95a6d277f7e0524025b";
+      hash = "sha256-QG9FcdlCKYXzncvDt47RQQGyJ2ARt1N+ec75qtc7gSk=";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
     meta.license = unfree;
@@ -4185,12 +4185,12 @@ final: prev: {
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "0-unstable-2026-07-09";
+    version = "0-unstable-2026-07-12";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "47a2b8157b05433268564672bd2e9667bb287c9d";
-      hash = "sha256-affL0j96Hp+Ffry2KF69dR2hQfLSY2kRYoexvd38r5A=";
+      rev = "0b2b0db07b0426441ece46988d9ab28088f07cd5";
+      hash = "sha256-SjAiNoeAxuu2UFHupUnDtjrPtGqAiFdHoq21Qn35OVA=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -5433,12 +5433,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-07-09";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "24a927e168789103137156e980e2635956e90b3c";
-      hash = "sha256-uo3/DBMPv67UOQJscAW6aoc7c5IDJdQta7f8/1kI9dQ=";
+      rev = "26b939e2e013ddfc137a8e6149cda1f0b62303ca";
+      hash = "sha256-M6uNfKiHviaJyItvvAdEplB+pdqF4N5DOwxG2oPYwpg=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5995,12 +5995,12 @@ final: prev: {
 
   flash-nvim = buildVimPlugin {
     pname = "flash.nvim";
-    version = "2.1.0-unstable-2025-10-28";
+    version = "2.1.0-unstable-2026-07-10";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "flash.nvim";
-      rev = "fcea7ff883235d9024dc41e638f164a450c14ca2";
-      hash = "sha256-pHh0tJd/ynfjriu8xjnKunKVDHkoXii6ZbikdkIwovY=";
+      rev = "b6346946d10d07998efee029fb0f7a593806d0cd";
+      hash = "sha256-1v2+iq4/TnJq37iiGedIKFf6PxlTHQac8RXECZ2HYdM=";
     };
     meta.homepage = "https://github.com/folke/flash.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -6737,11 +6737,11 @@ final: prev: {
 
   gitportal-nvim = buildVimPlugin {
     pname = "gitportal.nvim";
-    version = "0-unstable-2026-06-26";
+    version = "0-unstable-2026-07-10";
     src = fetchgit {
       url = "https://codeberg.org/trevorhauter/gitportal.nvim/";
-      rev = "ee5446aa17738a419e855e2e4c01cb65e378e4cb";
-      hash = "sha256-nt+4FjY+9IEBbUMNk0FpTwNfFu0/3k7DKeops+cGlxk=";
+      rev = "d2efb8d1bf141c77cfa1b5311995912bc36671d0";
+      hash = "sha256-ofRP84DSgrXyNXXZjM82n1AhsfleDU6k7r4+R9sof40=";
     };
     meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8752,12 +8752,12 @@ final: prev: {
 
   lexima-vim = buildVimPlugin {
     pname = "lexima.vim";
-    version = "2.1.0-unstable-2025-05-15";
+    version = "2.1.0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "cohama";
       repo = "lexima.vim";
-      rev = "ab621e4756465c9d354fce88cff2bd1aa7887065";
-      hash = "sha256-NtHCfuL2Tq1a4Xevx+xAbnzsKqnPAbU/l7JvK7p0evU=";
+      rev = "9f6942c5e1f0f6fe63bdcdac515f34c484b970f5";
+      hash = "sha256-hU/MmP5Ykb52vCJvlMtQipKe4LGC7d+lH//r8ysDELE=";
     };
     meta.homepage = "https://github.com/cohama/lexima.vim/";
     meta.license = unfree;
@@ -11034,12 +11034,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-07-09";
+    version = "1.4.0-unstable-2026-07-12";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "f6c1c4832932d336feb77befa30074cd1a998f3d";
-      hash = "sha256-1IPVcaU+I2MRz+ATZ9nQafzccEHn9UfmaLkfR1YB2e0=";
+      rev = "e3a0a2bfcc5e7dc26f11e102e26ff6c1f43582fb";
+      hash = "sha256-fflB8jO6lwvLctuKDAdobWvksHEfNNrHsx6pEJdmwEQ=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11681,12 +11681,12 @@ final: prev: {
 
   neotest-vitest = buildVimPlugin {
     pname = "neotest-vitest";
-    version = "0.2.0-unstable-2026-06-29";
+    version = "0.2.0-unstable-2026-07-12";
     src = fetchFromGitHub {
       owner = "marilari88";
       repo = "neotest-vitest";
-      rev = "ab5a73d6ec9d33e807d6c67ce5169c4ca4a5d7f3";
-      hash = "sha256-daeDCN58hMAesXEBhc4gbN2ISGQ0orIUNhL2ApB3E+s=";
+      rev = "c3c69715da4b158069fd4262083e7219a5c14cfb";
+      hash = "sha256-BPERc4+iWEu1UWDXv+MaSUXJR4KNFFAqrPXxyJCSe9I=";
     };
     meta.homepage = "https://github.com/marilari88/neotest-vitest/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12254,12 +12254,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "0-unstable-2026-07-09";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "5cfd3c8f2c3e6603d52d8f6c0b715743bbb5270d";
-      hash = "sha256-TgBx2alqrazm2JSu4afsZ0tnKWHqpclpBly/0SxYpxs=";
+      rev = "28019401865beffcedc744bb1506d0201b88f2f9";
+      hash = "sha256-QKBDxZzEQKGzHOVJmS9D9i9h2/0HubbgUlAvaA7Erh0=";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -12436,12 +12436,12 @@ final: prev: {
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "0-unstable-2026-05-30";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "catgoose";
       repo = "nvim-colorizer.lua";
-      rev = "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde";
-      hash = "sha256-qVFQGJMGr0htwZqarhMdh7yG6SSH/rv8yqmp1CsoT3I=";
+      rev = "149fbd9f5e25511b0a8bad3ccecd43d1bc584f86";
+      hash = "sha256-jRqUMQuJVxMfQpLZ0A7hlwIXPqcip990Ay5X140uh0Y=";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
     meta.license = unfree;
@@ -14194,12 +14194,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2026-06-29";
+    version = "0-unstable-2026-07-09";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "b9a73e167f851a98d8f29d62658d3640bb8a7314";
-      hash = "sha256-v6vM3ajWF3yI2QA1pSqzo2zsbQohX1kmaI81b1Aqusc=";
+      rev = "8476766529b7c0ee9b7da12b6dbce1b716bb62cd";
+      hash = "sha256-Ahxcp7UCoISeLOhZAkX966lyHk8jiSwWy9SAlUnzJo4=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15737,12 +15737,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "0-unstable-2026-07-08";
+    version = "0-unstable-2026-07-10";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "05ffc134f0b70ce2715c761745f1f78321fcfa9b";
-      hash = "sha256-LLD9Vm3E1Vmp8P5dF1TAzHvRyGxmjpYSOvGksmhtEHc=";
+      rev = "b4954e97e145bd8129b3bbe99809759f6ced2235";
+      hash = "sha256-AuJNxfvNYnqPvihxBn1vADdvwoDNInVbOLS0Pq5q9v8=";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16227,12 +16227,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-07-04";
+    version = "2.1.0-unstable-2026-07-10";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "ebf4d8bbc16570817c0f5275468466b9d00b8d7d";
-      hash = "sha256-mqmD7cZ2B+VuIyW/yv+N8nJquRX31tXw1tz1qvSMmus=";
+      rev = "9493405fb8ee683aa6efd50c529f6296ad8f40ad";
+      hash = "sha256-cMPRVxFMBVRpIcy7kCQyoXzgsIFJJ1cDgAcvOm9FNnI=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16506,12 +16506,12 @@ final: prev: {
 
   spellwarn-nvim = buildVimPlugin {
     pname = "spellwarn.nvim";
-    version = "0-unstable-2026-03-05";
+    version = "0-unstable-2026-07-13";
     src = fetchFromGitHub {
       owner = "ravibrock";
       repo = "spellwarn.nvim";
-      rev = "c98cfca978791cae3edaced7056bd340debee8fe";
-      hash = "sha256-rLsiBIifNC8zwUNsAJ8AeTlDS9IS/y3XEKfF5FZ2hZI=";
+      rev = "3e818a7da69bfb342e2d84fdef9cb9f639d047d3";
+      hash = "sha256-WHXJaSTB91B0S3YizCJLBriGQDvYQKVK3I8WT97YQEc=";
     };
     meta.homepage = "https://github.com/ravibrock/spellwarn.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18826,12 +18826,12 @@ final: prev: {
 
   vifm-vim = buildVimPlugin {
     pname = "vifm.vim";
-    version = "0.14-unstable-2026-06-07";
+    version = "0.14-unstable-2026-07-12";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "6bffbab9c448f2814217ea2f7f982ad73b8fa718";
-      hash = "sha256-/8lN8y20+g9pWzBrXgVArgZQq0CfXyLGRVDpweDmguE=";
+      rev = "9102ad4198c4f3adeef4b039c042866eb9345cdd";
+      hash = "sha256-BLI7TEtSfXG1Md8lBnejJ3vUuXh3LJyZH6PJGHMoCuI=";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
     meta.license = unfree;
@@ -20814,12 +20814,12 @@ final: prev: {
 
   vim-flog = buildVimPlugin {
     pname = "vim-flog";
-    version = "3.0.0-unstable-2025-03-19";
+    version = "3.0.0-unstable-2026-07-12";
     src = fetchFromGitHub {
       owner = "rbong";
       repo = "vim-flog";
-      rev = "665b16ac8915f746bc43c9572b4581a5e9047216";
-      hash = "sha256-x8fUmcuBLEQwZD+m7gEanpPppukRa6NoalNehY/2JuM=";
+      rev = "c8a573b5a829d0a3ed1b72c87dd62d832b665e87";
+      hash = "sha256-BKnp7LKONUT/BRu7kS8Yvmj7xcFgrTWxHtz2wyAhtYg=";
     };
     meta.homepage = "https://github.com/rbong/vim-flog/";
     meta.license = unfree;
@@ -21543,12 +21543,12 @@ final: prev: {
 
   vim-illuminate = buildVimPlugin {
     pname = "vim-illuminate";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "8629e6b2dfa8c66677b9d489eb02480cbcfa9599";
-      hash = "sha256-lvcm3OA1jYmwhyD9yLYT829s70jGBgEPEgfenlGSJnY=";
+      rev = "91313e598ca62e110bc71535c49069b66b9883c9";
+      hash = "sha256-3HM1aqFasEWXHaLQbJnax6Spw71TVd23BjsmH8jdTtQ=";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -21894,12 +21894,12 @@ final: prev: {
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "0-unstable-2026-06-12";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "49f318424ed17fb8d49122daa39820fd6a2880f5";
-      hash = "sha256-r/YS0LFio0BNTCUh0nRrAndUfcJgYio+ADCoqq8NH8U=";
+      rev = "b3301b091c730061a6da1f9fab670eece6af187c";
+      hash = "sha256-ZcrnrD8ZHb76U1SrjEGlDLSr54WbtAyqjeooj8y0tug=";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -22202,12 +22202,12 @@ final: prev: {
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "0.0.1-unstable-2026-06-11";
+    version = "0.0.1-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "bffb50ffa688e651a3d4ad827c90b887d5c67200";
-      hash = "sha256-4AzLUvDTv8stTk2oKvjXetinK5YGx636TwP9yKdluZs=";
+      rev = "1b1803c4ae35ef8fecaaea1e6580ee700278804f";
+      hash = "sha256-kGQZWrg6tf5j/iHfTIKiQC/JZJRoKbKxMYzfhERvN+8=";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25799,12 +25799,12 @@ final: prev: {
 
   y9nika-nvim = buildVimPlugin {
     pname = "y9nika.nvim";
-    version = "0-unstable-2026-05-26";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "y9san9";
       repo = "y9nika.nvim";
-      rev = "0fc35319498d8e4509601546f4efb423026e53a1";
-      hash = "sha256-0S2+9L1gW6Rbh1lUP+EGJ0AGIUnNAiTlrGAEJrbm7rc=";
+      rev = "18827266802e8e105c724c72a84c2c59beb5d90f";
+      hash = "sha256-CzEqiuag+4RKOCjM4P2qp3ux9LMcRpQNA8t9r8RzXRc=";
     };
     meta.homepage = "https://github.com/y9san9/y9nika.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -26053,11 +26053,11 @@ final: prev: {
 
   zig-vim = buildVimPlugin {
     pname = "zig.vim";
-    version = "0-unstable-2026-07-08";
+    version = "0-unstable-2026-07-12";
     src = fetchgit {
       url = "https://codeberg.org/ziglang/zig.vim/";
-      rev = "71f3454efc5cf781aba507f709b921993d096731";
-      hash = "sha256-oiZv49qsZIHfB+OtxCYwC+CzpI1cJnEdyhDMZS3DGO8=";
+      rev = "1ba233de1f93ae7cf5c0903541e6ad422207b089";
+      hash = "sha256-rbzX8wJKczk/dKpjPnNouf/LhpFmN9/zRNzEc0QhHm0=";
     };
     meta.homepage = "https://codeberg.org/ziglang/zig.vim/";
     meta.license = unfree;

From 311128d9154f98e9aca14b9496deb02d33168a77 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 11:10:30 -0500
Subject: [PATCH 0322/1386] vimPlugins.codecompanion-nvim: 19.18.0 -> 19.19.0

---
 pkgs/applications/editors/vim/plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index eac90038986a..6b3394d59395 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3568,12 +3568,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.18.0";
+    version = "19.19.0";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      tag = "v19.18.0";
-      hash = "sha256-4O0UuJuuv4gmyxiZlLMG/sKlt84SW2ZooeOlFlK6/7I=";
+      tag = "v19.19.0";
+      hash = "sha256-1ypjttA0T6wnVrqBaiqGtcJnqiyhxeg2EXh7O9nPBpE=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";

From faaaaf1dd1e66f0c4924e83e95e07bc812f87014 Mon Sep 17 00:00:00 2001
From: xeni <xeni@koeln.ccc.de>
Date: Mon, 13 Jul 2026 18:15:12 +0200
Subject: [PATCH 0323/1386] schildi-revenge: 26.06.06 -> 26.07.13

---
 pkgs/by-name/sc/schildi-revenge/deps.json   | 2225 ++++++++++++++++++-
 pkgs/by-name/sc/schildi-revenge/package.nix |    6 +-
 2 files changed, 2163 insertions(+), 68 deletions(-)

diff --git a/pkgs/by-name/sc/schildi-revenge/deps.json b/pkgs/by-name/sc/schildi-revenge/deps.json
index 4398568ab401..d0ba78d4a5c3 100644
--- a/pkgs/by-name/sc/schildi-revenge/deps.json
+++ b/pkgs/by-name/sc/schildi-revenge/deps.json
@@ -1,272 +1,1385 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
- "https://dl.google.com/dl/android/maven2/androidx": {
-  "annotation#annotation-jvm/1.9.1": {
+ "https://dl.google.com/dl/android/maven2": {
+  "androidx/activity#activity-compose/1.10.1": {
+   "module": "sha256-HtE6UO27iFlidR4by1uKQgeiDLeA6iSP+mU6qz+xD+k=",
+   "pom": "sha256-5k22txJvtRI5S8PPQzKjiCgAnaqN1W7L5sDHMAshJ/U="
+  },
+  "androidx/activity#activity-ktx/1.10.1": {
+   "module": "sha256-fBg4lRiaJ/16pZ/c9QKfpk+tKOnTkSmpyzDkC15CZ64=",
+   "pom": "sha256-QhNJDkzitXUOREUkbf6d5PZlXCEjwEp5qCSMyIk+K/Q="
+  },
+  "androidx/activity#activity-ktx/1.7.0": {
+   "module": "sha256-9AAacJtvcTKyKl4Xwk+Lips8RipZjeOw8WzFekNEurY=",
+   "pom": "sha256-cEmjrk2pyvNQojMroLECJd7ovohU1gioN76X0ipxk8g="
+  },
+  "androidx/activity#activity/1.10.1": {
+   "module": "sha256-iTtzpLFtGcAzhnWtC5+lEi2cacRPYRhxvYxAfTviOmg=",
+   "pom": "sha256-CuTeiIl09c75gmYJAOwyoz8QlodQ23r6lDja7Bg/FOc="
+  },
+  "androidx/activity#activity/1.7.0": {
+   "module": "sha256-KnRrASaoqy9XbnFn8aeFtFLvfumXq9l57gxaKcNvbqY=",
+   "pom": "sha256-7eFnck23n8fFLPAv4JeZtFqUpTHX8CaFp4M3vAYsA5s="
+  },
+  "androidx/activity/activity-compose/1.10.1/activity-compose-1.10.1": {
+   "aar": "sha256-+JrxsmzMg0Y0OHyFfC3U9GVNN2UIkAOcUnwv7QfbamE="
+  },
+  "androidx/activity/activity-ktx/1.10.1/activity-ktx-1.10.1": {
+   "aar": "sha256-85b1jb13LAZbhzaWt0o9TQh1VLN2YoDmO0myXbtTqxY="
+  },
+  "androidx/activity/activity-ktx/1.7.0/activity-ktx-1.7.0": {
+   "aar": "sha256-/OMX1hoi8SlntHW/y4DIndpm5BiXXokOpwPLdOErWxE="
+  },
+  "androidx/activity/activity/1.10.1/activity-1.10.1": {
+   "aar": "sha256-titSjJF96b5Jfrb4iDAZfCDp0hJnw5FsYTSS5e6DfU0="
+  },
+  "androidx/activity/activity/1.7.0/activity-1.7.0": {
+   "aar": "sha256-5EsgMiczhxVpgpEsWR734t1IW6Cy5om1KLWkLycaTyc="
+  },
+  "androidx/annotation#annotation-experimental/1.4.0": {
+   "module": "sha256-WTDqfyH8ttDesroydIoO98j9LEI4SGBYK6fNIN65A3k=",
+   "pom": "sha256-QdK52Hn8kiGs2o6HPsfSaxU7m44EdwrHlJHgV2uu8Dg="
+  },
+  "androidx/annotation#annotation-experimental/1.4.1": {
+   "module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=",
+   "pom": "sha256-/leyKEF/TXxneQPcYftKfPmT1gNJneJtjYET5HfMTxs="
+  },
+  "androidx/annotation#annotation-jvm/1.10.0": {
+   "jar": "sha256-3dBy3btVMXjiBVF853ey8Fqp5BKYLZ7LTu3HTxIS9pc=",
+   "module": "sha256-Qq/KN0GUJz5AZ7k3z8RHvTyMT9RB9B1E+VQFDf1hBt0=",
+   "pom": "sha256-XuzgkDtIEKodqFQU3EwnRgRth4pUOqEt1PH+dBcfdQY="
+  },
+  "androidx/annotation#annotation-jvm/1.8.1": {
+   "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=",
+   "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ="
+  },
+  "androidx/annotation#annotation-jvm/1.9.1": {
    "jar": "sha256-HjQ5F+vye6lv5NxSscrX/TK3OPvGNVu2zVs7MF1yEtA=",
    "module": "sha256-A/tlkXfIYY5HQlklwRvJHzhHA+omwmW+myXNeSkrURw=",
    "pom": "sha256-ibmcIY1gAZMWtQqreYFnB7whaWyJagMOGxrgOJYby44="
   },
-  "annotation#annotation/1.9.1": {
+  "androidx/annotation#annotation/1.10.0": {
+   "module": "sha256-Wy1Dh/OE5ZE6SuyXmiDs4Tu1zpkryQqWLeof7qf6iek=",
+   "pom": "sha256-iA979LNdBgdGy+8xnUoFK0vYJrtxtAUA5VMZch/6TnY="
+  },
+  "androidx/annotation#annotation/1.8.1": {
+   "module": "sha256-5jhuha/dhlBE4hZXXkk+05pjpjJb2SU3miFCnDlByLU=",
+   "pom": "sha256-txIll07Ah+uWwl72gZ9VscIvUw6FykRrpzX7Zu0E/1w="
+  },
+  "androidx/annotation#annotation/1.9.1": {
    "jar": "sha256-ODIq+nNFw34pxl7IhSF4rhwm4jCWoGNNB6SjiTkx9Yw=",
    "module": "sha256-8gSwW3KKl1YXGLxxYkLkfGKcAIWoDudPylPU1ji8vj8=",
    "pom": "sha256-xzOIHC4X1ffIZhzAKpFZyxYLeyCUon1ZORbIfT4lBjY="
   },
-  "arch/core#core-common/2.2.0": {
+  "androidx/annotation/annotation-experimental/1.4.0/annotation-experimental-1.4.0": {
+   "aar": "sha256-xut+Z2AR7GWzJCg3PUUN69/EUXnE+LOnUhdPuHwXsIo="
+  },
+  "androidx/annotation/annotation-experimental/1.4.1/annotation-experimental-1.4.1": {
+   "aar": "sha256-a9THx0dvgmDNO9u4EYNYPpP8n3kMJ96n3DFBgcv4eqA="
+  },
+  "androidx/appcompat#appcompat-resources/1.7.1": {
+   "module": "sha256-FjzF4PJJQz3bABb70BGrjeB88j4H5hjHRkRojibNGOg=",
+   "pom": "sha256-L6+SLow9cG8p2GKz+7OqE0dwXCHG6uGFhtK7H3Nm6gE="
+  },
+  "androidx/appcompat/appcompat-resources/1.7.1/appcompat-resources-1.7.1": {
+   "aar": "sha256-ji2zEiTKU7EIx4TaKzYZWQYnFtQWshDP7z1aOCgwbfA="
+  },
+  "androidx/arch/core#core-common/2.1.0": {
+   "pom": "sha256-g7uzlg6qvGAKw2bJTLWUFORBUyodaqk4iwuL/6zlzwE="
+  },
+  "androidx/arch/core#core-common/2.2.0": {
    "jar": "sha256-ZTCKBrHADuGGy54ZMhOD8EO5k4E/FSLEf0o+MwO9ukE=",
    "module": "sha256-7fQgDP3C2UYjIlLJnl3LnGG7kJ61RQsmE9HU/cl0uYE=",
    "pom": "sha256-HhfUr41kJb4qafivTWVKh+BFYlmp7vFUKGm8sCNUfig="
   },
-  "collection#collection-jvm/1.5.0": {
+  "androidx/arch/core#core-runtime/2.2.0": {
+   "module": "sha256-qLF1E5SeXbbJYBwwvhnflTdi3Yd1EvHiz8+ugdJECUQ=",
+   "pom": "sha256-D5U3BlmBQNnYc1zdWusfo1kz9OLzHAvz64GgU6TIwaU="
+  },
+  "androidx/arch/core/core-runtime/2.2.0/core-runtime-2.2.0": {
+   "aar": "sha256-ob5eDKorB2I4Yq9q4hs6sHGBIyRRhNDjDeqBtT+ZCkc="
+  },
+  "androidx/autofill#autofill/1.0.0": {
+   "pom": "sha256-Nner6tXU4Gz3bLrLlUFR4FF3nCJ0SURR+0JON1qp5FA="
+  },
+  "androidx/autofill/autofill/1.0.0/autofill-1.0.0": {
+   "aar": "sha256-yUaPVuBQBuoVGkJsVJV80Hmbi4OledKEbdIgYfM+Xs0="
+  },
+  "androidx/collection#collection-jvm/1.5.0": {
    "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=",
    "module": "sha256-3eheKSUJIxtUcbsJG1dQmdT0MWHrKB6HOFA4oBYQcuY=",
    "pom": "sha256-EcQVhk00AvYdQm5nIQFY3OGwRoBBJSaplPGCPs08s4g="
   },
-  "collection#collection/1.5.0": {
+  "androidx/collection#collection-ktx/1.5.0": {
+   "jar": "sha256-k5tKhpdkDnfYPk6LTEqdGPgTAZjFlhGUr43Z253Hw1M=",
+   "module": "sha256-QiiJTiXux+FzKbIGunLoqtJVvFNQGNxirMXv87XHqqU=",
+   "pom": "sha256-mD+NBjDQctW/zRZqSYrHIT86RKmMCQUQBM6WQp2GfOo="
+  },
+  "androidx/collection#collection/1.1.0": {
+   "pom": "sha256-Z+kGbKSs/cbjzFCCk8MboDmAV/8Rjk9wseGBPJo0VtE="
+  },
+  "androidx/collection#collection/1.4.2": {
+   "module": "sha256-AybSz1rb5ZIxKBDKH3HGwMww91PEPwfHQCNht4ineEw=",
+   "pom": "sha256-TyYVoXrqz+EraCmCFKGfKhnGjGbVkAdb27+2WevOK38="
+  },
+  "androidx/collection#collection/1.5.0": {
    "jar": "sha256-9f+49GHEtdbyiDoscEeXd3OzHVsj7wMMBXUUwMns60c=",
    "module": "sha256-v+t72E8/fdp71ztnCdSh9h9aN/hDcouuCKBn49+aCu8=",
    "pom": "sha256-LWXI0LNtS0+q3ESv+breI9hx1xWe7fKz8C2AKzS3elc="
   },
-  "compose/runtime#runtime-annotation-jvm/1.11.0-rc01": {
+  "androidx/compose/animation#animation-android/1.11.2": {
+   "module": "sha256-rvYyphtOF/+CyYGvVpzAK8G/d7J8roSwbkzbQIpdWxQ=",
+   "pom": "sha256-ka56+it4dejAYu0ZtCpYNRWl2SwtGpkjXkrPLPXlmXo="
+  },
+  "androidx/compose/animation#animation-core-android/1.11.2": {
+   "module": "sha256-YbXCv2BYgWKSiJ+Hd7XcyCMWTVMlTeY6AJaT5JQxwc4=",
+   "pom": "sha256-QP/GOWTB3xrvpY3nG2AJHXVC3maRqGMjmLlRYqqWnWE="
+  },
+  "androidx/compose/animation#animation-core/1.11.2": {
+   "module": "sha256-wnW8zE4K0YIJhM/Ttq2uSbwuVFD0lmlvdM9cf+zCdq4=",
+   "pom": "sha256-EOhVmCPzhXxcJGQ7vHvbgnMHN1GQbAPTVX7FSEfh8hY="
+  },
+  "androidx/compose/animation#animation/1.11.2": {
+   "module": "sha256-NIsbeSIlgiOhe2dj71cysAepvZmk1Db5FP0xLImOdco=",
+   "pom": "sha256-yQ+2AszF2+TiDodBHAJbDeK4Qtk9CT+c4vk2alqd5+s="
+  },
+  "androidx/compose/animation/animation-android/1.11.2/animation-android-1.11.2": {
+   "aar": "sha256-e6ziQR7qXFoXcW9FnRmuK609uOFd+ik/4SWAbvdBai0="
+  },
+  "androidx/compose/animation/animation-core-android/1.11.2/animation-core-android-1.11.2": {
+   "aar": "sha256-pkgiwzFpSbgFCz9hqIeJGUsEn2X0RPjYubthg8KL9kc="
+  },
+  "androidx/compose/foundation#foundation-android/1.11.2": {
+   "module": "sha256-6qKCVahAhxe2LrCmHNMktpSJHkaJwR2AwJQ3PeRR7Lw=",
+   "pom": "sha256-qGjpTc8wdLw5IRAdoOYXECahq3SEBi1QlL/wT0zeI98="
+  },
+  "androidx/compose/foundation#foundation-layout-android/1.11.2": {
+   "module": "sha256-8BPcZmNCnMK87mPKttpncqLfwhJkMaM9Q9F9whCbXHA=",
+   "pom": "sha256-28ffCVZJwys9W1in+wku8DCnbgq3pQse5P5r8BhiEFo="
+  },
+  "androidx/compose/foundation#foundation-layout/1.11.2": {
+   "module": "sha256-n1XOaelLqzL2iXElv3m+JEUTd7pJaiEfeZND2UCTU8c=",
+   "pom": "sha256-nCt+th0bOOiOWlGkQ/pmOHFZXyHFQxbFwuq1+kE6Bzs="
+  },
+  "androidx/compose/foundation#foundation/1.11.2": {
+   "module": "sha256-QoD2r41VMyT1tdKBNaDBrQB9/EtMjQWrv4IzpiyURZ4=",
+   "pom": "sha256-BORtqkQ7iBqL9F6k+UkU06KwRt8iJSnE3Dzias2AO+4="
+  },
+  "androidx/compose/foundation/foundation-android/1.11.2/foundation-android-1.11.2": {
+   "aar": "sha256-oGJMM9ysSVxBiC/X6ERdEnK9FgrDiToopmzhT5T+3UU="
+  },
+  "androidx/compose/foundation/foundation-layout-android/1.11.2/foundation-layout-android-1.11.2": {
+   "aar": "sha256-Pp7jmd6n+4M03Otv7fXiD34vYZcZ9o6gVv7RFmVR7Ug="
+  },
+  "androidx/compose/material#material-icons-core-android/1.7.6": {
+   "module": "sha256-eietGojQmSEqfhomiis0BXeFUrAtAgvl8Gprn2o+yUI=",
+   "pom": "sha256-DyMnhhbx+raN5Ipg2UQGjelGROS3JucFqIHB53gJj9Q="
+  },
+  "androidx/compose/material#material-icons-core/1.7.6": {
+   "module": "sha256-sRuDHpv+L6ZMeSiVb5/otZT4uPQLQliwmEAGKz9Wsr8=",
+   "pom": "sha256-itunFh4OocV1LwuYYW7lKi2Jm5qgYHzzUA+lQyquXEo="
+  },
+  "androidx/compose/material#material-icons-extended-android/1.7.6": {
+   "module": "sha256-YGlqfsGPzoI3DMbiFqT56yFgMth8q0A0LjNKdHI+vas=",
+   "pom": "sha256-JdIXQwTDF55rO/3YzjzpXJCpLEvUro4Me5QeWBeEAGA="
+  },
+  "androidx/compose/material#material-icons-extended/1.7.6": {
+   "module": "sha256-7NczNuE23rRe267g3qEPelSQHh54FcS9FicJeXmJN4M=",
+   "pom": "sha256-rFSvA/qAXWNsC/pFi+Fqw1mL+7NtvsGA9loGGFA/o70="
+  },
+  "androidx/compose/material#material-ripple-android/1.9.3": {
+   "module": "sha256-E7KTlP/fTKvl0ykB28khwaVNVolsS0LQIjGSosNQsOc=",
+   "pom": "sha256-vez15umfjUgjj/TZKH++ZqhxTfPbEVt92OE2gY493VM="
+  },
+  "androidx/compose/material#material-ripple/1.9.3": {
+   "module": "sha256-5F/QpN9hdGLtrfkiBoiZNXk/vhwHlY89WFa6OYZAM5U=",
+   "pom": "sha256-jzXiBWbwG9TL3ETMza5U9qWTiPsj4NDiPa4/ZkB2j1A="
+  },
+  "androidx/compose/material/material-icons-core-android/1.7.6/material-icons-core-android-1.7.6": {
+   "aar": "sha256-SNGCBRI2sd/sgpszv00/0G0DwodtUyII4/dJAVnWXEY="
+  },
+  "androidx/compose/material/material-icons-extended-android/1.7.6/material-icons-extended-android-1.7.6": {
+   "aar": "sha256-B+l+UvNdeJ70ddnGh+XKRsxU+aDUr44dypKsJfshRQw="
+  },
+  "androidx/compose/material/material-ripple-android/1.9.3/material-ripple-android-1.9.3": {
+   "aar": "sha256-gWH+Pr737PP0ClO3tpMIUHuxCwI7P9x7WO+zFxNohHk="
+  },
+  "androidx/compose/material3#material3-android/1.4.0": {
+   "module": "sha256-/M1qjQ0z/PfDJ3vEPrRSxzgD7GIFl8gdvEp54pCnGpc=",
+   "pom": "sha256-zANiZTJAcIoBDeUP7oyviEphD7sQtgE+hmlNd8Q/68c="
+  },
+  "androidx/compose/material3#material3/1.4.0": {
+   "module": "sha256-dXCB0Sja+IAcHdmsxDH6UmnmVrKKCkkK6YzO5o6cNFI=",
+   "pom": "sha256-ZytDH1nI4KhSJpCy9G8beWZxBjiJPGDDHF8Z+EctYsw="
+  },
+  "androidx/compose/material3/material3-android/1.4.0/material3-android-1.4.0": {
+   "aar": "sha256-Ojfos23zgi/h5gWfD5+v2ogAOIhgR3YkrBuUIsQYo24="
+  },
+  "androidx/compose/runtime#runtime-android/1.11.2": {
+   "module": "sha256-uIZvUklXzYGh7ecfjemeyfQ1WfM4ELcYp/gNb9vCSgY=",
+   "pom": "sha256-5hPA+jb5BoVtWGyVHaItONXvk0Fa0rcqibHIagHaouY="
+  },
+  "androidx/compose/runtime#runtime-annotation-android/1.11.2": {
+   "module": "sha256-O6eGZLUOkrOgJeFqThKfjTYmcwmznVufNfHRDNyxZyE=",
+   "pom": "sha256-/5hwEFAR3UYq3yB59k+9pHgUOm+5UN1iIui69Q1lFCQ="
+  },
+  "androidx/compose/runtime#runtime-annotation-jvm/1.11.0-rc01": {
    "jar": "sha256-4oaoUgcJ173GZIHCcmYMKo0msSdA92ECVDzkVwQ3A5Y=",
    "module": "sha256-JJMFQNItrRK1aVpERxiOx5N/eKYqVKRapnPK2ftwRlI=",
    "pom": "sha256-wshTQYcZD+NmeWky/a0PL6PqPjYIj+5Qp5AvyXIdSB8="
   },
-  "compose/runtime#runtime-annotation-jvm/1.11.2": {
+  "androidx/compose/runtime#runtime-annotation-jvm/1.11.2": {
    "jar": "sha256-4oaoUgcJ173GZIHCcmYMKo0msSdA92ECVDzkVwQ3A5Y=",
    "module": "sha256-mAOREpmtfxBJH7AM7QZ3H0dLv7UNLLk0sExeV79pFZA=",
    "pom": "sha256-Wn8tmNFKL4YHDqKdhJDiYpn0jwhQtpG3lU0293kQ5T8="
   },
-  "compose/runtime#runtime-annotation/1.11.0-rc01": {
+  "androidx/compose/runtime#runtime-annotation/1.11.0-rc01": {
+   "jar": "sha256-GQ42On8pUXlPW08JhtpFTzmkJbh3mbLVksKniXLRdd8=",
    "module": "sha256-pnylTwY8OPboC3lNrvVJNVUVS69V6xil3z7n7ct4N0A=",
    "pom": "sha256-/V+nj8Fb55Ttiaikhp5CdiQqpGjc7FI4SSpB41QDhzc="
   },
-  "compose/runtime#runtime-annotation/1.11.2": {
+  "androidx/compose/runtime#runtime-annotation/1.11.2": {
    "jar": "sha256-GQ42On8pUXlPW08JhtpFTzmkJbh3mbLVksKniXLRdd8=",
    "module": "sha256-NhSpP6QePns7dSfjf64wXhswojyyKF+s428wXbuC9Fk=",
    "pom": "sha256-Smd2+thKJeT9sP3AaLiAilcuXMDpvscSsilMHjmsCTY="
   },
-  "compose/runtime#runtime-desktop/1.11.0-rc01": {
+  "androidx/compose/runtime#runtime-desktop/1.11.0-rc01": {
    "jar": "sha256-UMm1xchPpj0MKqcTGjxvVbM9FrUhFXWWReQ3D0yZhY8=",
    "module": "sha256-WuLpf5rVMLT9FWxbJzjII9glpQFdP1kHjnt7sMikYYY=",
    "pom": "sha256-xUBbjIh6dBleBjsbR9Wd5uq4cwUIJrIQzASS0N6RMN8="
   },
-  "compose/runtime#runtime-desktop/1.11.2": {
+  "androidx/compose/runtime#runtime-desktop/1.11.2": {
    "jar": "sha256-aVUa7o+SEUkhgW89mqpmBiEE2yKO1XEKZmb3rb36/jw=",
    "module": "sha256-b5bQGrIJuGKdS8crPLYqzT/hKshtjg/0349RsopLKkQ=",
    "pom": "sha256-EtXDwmN11h2Sv/Bn09S8gJ5H3KE/I9H2BuVUcBJ80Do="
   },
-  "compose/runtime#runtime-retain-desktop/1.11.0-rc01": {
+  "androidx/compose/runtime#runtime-retain-android/1.11.2": {
+   "module": "sha256-vtZ9MEQZVvLYzsnEL6R+CaLrX4jfipp6BngVRYj73CU=",
+   "pom": "sha256-UtQgmPUe90hJOfieLT7sEJ2pnk3Lo56bxjxWJtuJaWI="
+  },
+  "androidx/compose/runtime#runtime-retain-desktop/1.11.0-rc01": {
    "jar": "sha256-m35ip98zPDPv+eGm1sJQik2P5LekN3gHVTj+PaS8RIU=",
    "module": "sha256-rYhJPsh9RcM4BOFBSWvvuRUqyDP6A3pPjiIHPyxQz1k=",
    "pom": "sha256-wB6g2unzf3ouoBbiMFgR+0Uw3FdKCVymkX3CdRmzD8Y="
   },
-  "compose/runtime#runtime-retain-desktop/1.11.2": {
+  "androidx/compose/runtime#runtime-retain-desktop/1.11.2": {
    "jar": "sha256-m35ip98zPDPv+eGm1sJQik2P5LekN3gHVTj+PaS8RIU=",
    "module": "sha256-jnF2lFlOIuU+IBhrzSS9g6J/QcAQP1sr3LPsRXNCQn0=",
    "pom": "sha256-x7EjehNSlhZPkgt+FUwmSyv9rQVSVQBDdhV4cA6jNdA="
   },
-  "compose/runtime#runtime-retain/1.11.0-rc01": {
+  "androidx/compose/runtime#runtime-retain/1.11.0-rc01": {
+   "jar": "sha256-o2qxCWSG9aiFkeqG9u1S8RLD+E8b+cM0PcGS00EOhCo=",
    "module": "sha256-d7+iDvl5cCm/1OeY+q7OmWf3OAqfnEADlwKLCWBT5uQ=",
    "pom": "sha256-lUVDAEJaV/dC7d4G2YRGBzNIcxC/GZZajaIS8S2yukM="
   },
-  "compose/runtime#runtime-retain/1.11.2": {
+  "androidx/compose/runtime#runtime-retain/1.11.2": {
    "jar": "sha256-o2qxCWSG9aiFkeqG9u1S8RLD+E8b+cM0PcGS00EOhCo=",
    "module": "sha256-zetoCiKgEn2QY9hj1syYoi6BIXIeGHCZYdU9EpytGHI=",
    "pom": "sha256-H9Opc9dmUGpvO9tc80BY7xISKV3219XNeSPWtkXPoZw="
   },
-  "compose/runtime#runtime-saveable-desktop/1.11.0-rc01": {
+  "androidx/compose/runtime#runtime-saveable-android/1.11.2": {
+   "module": "sha256-5XXpLh42zQlNK5P+9azh21RI80Oh+Ie3dRKs5jwLxFk=",
+   "pom": "sha256-Ed+YtJ8khupdibdMifKqKpcPV2x9jhTUnhu/zGkVTko="
+  },
+  "androidx/compose/runtime#runtime-saveable-android/1.7.0": {
+   "module": "sha256-FPU88sgBBcde61vxmQRDmtXfpDJ93ZRIKdy3KDraCWA=",
+   "pom": "sha256-NB5w5ZLSQyjAvfAz9nk5Wz1r6Ps/T/hh2GBkvUrZw3E="
+  },
+  "androidx/compose/runtime#runtime-saveable-desktop/1.11.0-rc01": {
    "jar": "sha256-saF+bCJt67Qsoif1gEWdnZ3qYtQqqOaF71bNfOdwsaE=",
    "module": "sha256-LlNO/IXS7Of611IBgz2SAnWXq7jU+EyOQs8vrJLPlCE=",
    "pom": "sha256-OwnxBF1mzdZ9aIA3eS53NkRbN9YXHv1slz6wRMbuQXA="
   },
-  "compose/runtime#runtime-saveable-desktop/1.11.2": {
+  "androidx/compose/runtime#runtime-saveable-desktop/1.11.2": {
    "jar": "sha256-saF+bCJt67Qsoif1gEWdnZ3qYtQqqOaF71bNfOdwsaE=",
    "module": "sha256-qRjbULEcx/dEJhf9My0a3Ut72bIqIOpMfYHfAeZNe1g=",
    "pom": "sha256-nUKDfFDNQ3n/5QKT55cT1APh4+73w4HEES6XX24TtDk="
   },
-  "compose/runtime#runtime-saveable/1.11.0-rc01": {
+  "androidx/compose/runtime#runtime-saveable/1.11.0-rc01": {
+   "jar": "sha256-16wwfVhrLKq/C97ElJohyPSaZT+miOZi2fSn6y2UdW4=",
    "module": "sha256-fHZc5oTwYER/CkeFgB4Nz0GWATkAAx7a4VQKGJ/SvhQ=",
    "pom": "sha256-vl2THwygv0IJwVJODwJ81FXvFZe8l/U6tSGe4Sam2JU="
   },
-  "compose/runtime#runtime-saveable/1.11.2": {
+  "androidx/compose/runtime#runtime-saveable/1.11.2": {
    "jar": "sha256-16wwfVhrLKq/C97ElJohyPSaZT+miOZi2fSn6y2UdW4=",
    "module": "sha256-L0uS8+cbpnQ5rVI2sge9WWYmzNVb7nDYEfLU1+CApk0=",
    "pom": "sha256-70hZYCbjOYhPNdacUpiMQqyWb0vINRa/X3zyEyh8oic="
   },
-  "compose/runtime#runtime/1.11.0-rc01": {
+  "androidx/compose/runtime#runtime-saveable/1.7.0": {
+   "module": "sha256-V096AtKqST7Zo0pfOFZyJm6XS77qNQMnRU6gCL3S7Zc=",
+   "pom": "sha256-UG3TGS4UUkxsHClvNFl7hGoyZPqtF820AuHszCJNDko="
+  },
+  "androidx/compose/runtime#runtime/1.11.0-rc01": {
+   "jar": "sha256-iOf2l5HyKyfudkmfYMltbJ335UGYVnwgqjlW8J5Lti0=",
    "module": "sha256-9qoW/UKCWGMRau0MFAqIPj7KRSjihhCRTnqhFCIaMXE=",
    "pom": "sha256-kQ9SBuUzbh/ekzZH/n/oxA/uWZ8CO47JZtfoxSzgWFg="
   },
-  "compose/runtime#runtime/1.11.2": {
+  "androidx/compose/runtime#runtime/1.11.2": {
    "jar": "sha256-EjyO2UUlDPUP+610tYV8s32u9aU/hTeHC1VFJbNkExw=",
    "module": "sha256-aLriuaUArmOAm45H/xSZcnvBSkJASOBVMum55WOqoG0=",
    "pom": "sha256-Zqsry2Myf6uC84jtBvgW/CIyfhdSEaibFIPN5CmLgAo="
   },
-  "datastore#datastore-core-jvm/1.2.1": {
+  "androidx/compose/runtime#runtime/1.7.0": {
+   "module": "sha256-e5NRsP9t+SdtAtQPEnZa5Vv1xt+4/430x338oTj7n8E=",
+   "pom": "sha256-eUHY/NaDVXGG0vU8gXPDX3GqrJ1OZI6a6x7cS5L702E="
+  },
+  "androidx/compose/runtime/runtime-android/1.11.2/runtime-android-1.11.2": {
+   "aar": "sha256-VzMcZArTPx9h4NdtTgq9Y3tF2vqzdGfVB1jsH9R7svQ="
+  },
+  "androidx/compose/runtime/runtime-annotation-android/1.11.2/runtime-annotation-android-1.11.2": {
+   "aar": "sha256-zb1/i+pEFepW6YUpUKiV2hW6WVBrC5F7HiHlYHpCmEQ="
+  },
+  "androidx/compose/runtime/runtime-retain-android/1.11.2/runtime-retain-android-1.11.2": {
+   "aar": "sha256-KER9kKSgtHZTwRiK4nL/pnhMoIRf/xknv0r9zwlsE68="
+  },
+  "androidx/compose/runtime/runtime-saveable-android/1.11.2/runtime-saveable-android-1.11.2": {
+   "aar": "sha256-GBLtZHvDWvl+pX/HcSKnGuGen61p82I+hu40G1rwhGQ="
+  },
+  "androidx/compose/ui#ui-android/1.11.2": {
+   "module": "sha256-tWCMOOd+ggHbUGo5J+xTsS+FpB/wRk7DOCFwO4Q8iRA=",
+   "pom": "sha256-6jSe3GeeEu6DDpuu1SIUGta7CN1wf3zlomIdlObKdYo="
+  },
+  "androidx/compose/ui#ui-geometry-android/1.11.2": {
+   "module": "sha256-gO3OmMisRWcQX6GdGoFQCuZ/jx0DfcqYC2BtcQboWZ0=",
+   "pom": "sha256-QoQD2hnDC0WZgJBLSRtRx21/cbDx6Fhb0sggXQvXpWQ="
+  },
+  "androidx/compose/ui#ui-geometry/1.0.1": {
+   "module": "sha256-4v6ktWj/k+NAvEsYyKPCqbr98+EhDZ7TADbB2YiL42k=",
+   "pom": "sha256-a8eueqmlaUSxbzq4pWXDMtMHt5ZHH2wPUepXvtq7wgg="
+  },
+  "androidx/compose/ui#ui-geometry/1.11.2": {
+   "module": "sha256-qHu7vhOvVrnAxRTSX/uLzNxBn1jrOsdFtEsvCDXPO2o=",
+   "pom": "sha256-eAxENP5NXBdpeoeUq1vaDHYW8jc5xf9jmqOZbXFyyy0="
+  },
+  "androidx/compose/ui#ui-graphics-android/1.11.2": {
+   "module": "sha256-uSR/yfnXL4lNlzrJWmWUrGOusO4fTY4/T1A5nNKUZO0=",
+   "pom": "sha256-LzD4OVaihZV9X6lEWNupgty3irCXK+4hzkwWLxB+X10="
+  },
+  "androidx/compose/ui#ui-graphics/1.0.1": {
+   "module": "sha256-rZzkDe7HIbiYjEOrhH2APQC+6Ixnz8g43uVlaR8125U=",
+   "pom": "sha256-GONZWSUbahn/IUhSZDDJtpPpDm2Zv6ebCEm9lJ1e5VY="
+  },
+  "androidx/compose/ui#ui-graphics/1.11.2": {
+   "module": "sha256-MPXuHUeVRAJD05zRyFq9+vdCXqphF9P3aArPZm//Mm8=",
+   "pom": "sha256-SKX6uAEwRVKaC5qQ7ZC7ECwvDXdV74sJsyYqysJ7is8="
+  },
+  "androidx/compose/ui#ui-text-android/1.11.2": {
+   "module": "sha256-v5zD85CE+CHP5zlfa37nFinhvvK3nNWgRu+SUPtIQcQ=",
+   "pom": "sha256-t2KaGzJ5hE7LoMvWBZIlkzhoLlyzyKn1H4GvkcG1rbA="
+  },
+  "androidx/compose/ui#ui-text/1.0.1": {
+   "module": "sha256-Q6HslNPOzF870g8cU1UasDoLpyivGHGnS/I5xBh5Xxs=",
+   "pom": "sha256-sclCzOWe1DTUcgZ7yUk4f7XLxgJ/dAsCWQzrjggKgbw="
+  },
+  "androidx/compose/ui#ui-text/1.11.2": {
+   "module": "sha256-ERBLV++3cXI4sR2rotbwkOTPN4G/y5UvecnUW7nf+zw=",
+   "pom": "sha256-7poQVrUiXJVHPvAeCuadTLvLwnzknWH49mMoy3k+qcQ="
+  },
+  "androidx/compose/ui#ui-tooling-preview-android/1.11.2": {
+   "module": "sha256-hI4gQNaXrIIs5zCUu5GBvqX1Q1ppc4bxeTpJ/qKKIUo=",
+   "pom": "sha256-Bg+sIq7AbyFzp1wDY4QGT4dxVUwKPal+ToJaIzzmvE8="
+  },
+  "androidx/compose/ui#ui-tooling-preview/1.11.2": {
+   "module": "sha256-onXe5206hFJnbBcFhttxPBtiN3tefWC2+qidCrTJwKk=",
+   "pom": "sha256-OpFj1r4dkFmHXbSi/4tFyXS3P8DGdIR8TQr4NsMXPS8="
+  },
+  "androidx/compose/ui#ui-unit-android/1.11.2": {
+   "module": "sha256-+MOr+zOmIeyyr/WUvk/VNPudJ4dcAFZXUlsKHn1EhGw=",
+   "pom": "sha256-2a93abw9zmQ7Rzo9Cvdjs/95YdNdhsNukTV/9yLDZKQ="
+  },
+  "androidx/compose/ui#ui-unit/1.0.1": {
+   "module": "sha256-PbEuW0fW9tqR7Ub+uQL+URKCyEbk7xr/u5FHefprEII=",
+   "pom": "sha256-jrCYEDVgGvGhTFv4p/Ae99S0702VciEhxhF/o9CO7lk="
+  },
+  "androidx/compose/ui#ui-unit/1.11.2": {
+   "module": "sha256-ncKF5czk992PHR6m0rLT4p6NzdFXmJ+0PKCPjOl9CKw=",
+   "pom": "sha256-Sf7dpUF8Ud6ry9pbGFE69y2ozsCAKx7LIYrB8Al3gOc="
+  },
+  "androidx/compose/ui#ui-util-android/1.11.2": {
+   "module": "sha256-wVDIfflEGEAJYh0PVVTSEc4BgE31pL7RA14FMREYYt0=",
+   "pom": "sha256-J4aoJKYHeLClXr3iNtPKtUsCPi8NjlLNYy6dQWWpLMI="
+  },
+  "androidx/compose/ui#ui-util/1.11.2": {
+   "module": "sha256-Y9rfTGMmKeB+RoKW7mFJdrtIUbhQKS32umBu8RAe1aE=",
+   "pom": "sha256-L8IPFsnoXf3qsUl6S+EcRL370DazNVRjtSV2nJRtdmE="
+  },
+  "androidx/compose/ui#ui/1.0.1": {
+   "module": "sha256-VwMaasm2DltWeS6/XN5uFoEv9WbtkZDL0YiwC0bBN3k=",
+   "pom": "sha256-IfZaw0n3m8YNhGbQ64DNBj8YUvRMrKShyfN8GandvWY="
+  },
+  "androidx/compose/ui#ui/1.11.2": {
+   "module": "sha256-7WT/sFlotqW6seWh5QqwPVnHzb1GLvbS7AMRBecupmA=",
+   "pom": "sha256-Twps2Hz8SXdQmdKc+OV+I+vEemKhiHvZqyeuk4+cUUw="
+  },
+  "androidx/compose/ui/ui-android/1.11.2/ui-android-1.11.2": {
+   "aar": "sha256-oNf5MK8sp3XOXg5VyD8oo2w7mzXuBHUZDD/wYvaWJXI="
+  },
+  "androidx/compose/ui/ui-geometry-android/1.11.2/ui-geometry-android-1.11.2": {
+   "aar": "sha256-OoOW3zx4L45XU07058gbnMuIm8/89yDoTHyi3RAOLdo="
+  },
+  "androidx/compose/ui/ui-geometry/1.0.1/ui-geometry-1.0.1": {
+   "aar": "sha256-BNzqed4K+DR/RRe+wgV41CQK5e5AGRAgygfXo45kADM="
+  },
+  "androidx/compose/ui/ui-graphics-android/1.11.2/ui-graphics-android-1.11.2": {
+   "aar": "sha256-XFEHfa2KchbnuPL5YNKoLQioMhKf/mn/Bz2P5LozexI="
+  },
+  "androidx/compose/ui/ui-graphics/1.0.1/ui-graphics-1.0.1": {
+   "aar": "sha256-a39dDJREg+o5Cz1tqEOOemngz+MQvRbDxeeKwAFbFmM="
+  },
+  "androidx/compose/ui/ui-text-android/1.11.2/ui-text-android-1.11.2": {
+   "aar": "sha256-459edu1nB9iu3z2EZzbGHxG+/eBVBNGL4D+es5urBvA="
+  },
+  "androidx/compose/ui/ui-text/1.0.1/ui-text-1.0.1": {
+   "aar": "sha256-8na0A/uVvaKfyDoz/3F1kWYuosdp/DTCB37EYLZfDaA="
+  },
+  "androidx/compose/ui/ui-tooling-preview-android/1.11.2/ui-tooling-preview-android-1.11.2": {
+   "aar": "sha256-g8oLra9Vr1htelF5emu3URnC38kdePWB8DMxefF/lEA="
+  },
+  "androidx/compose/ui/ui-unit-android/1.11.2/ui-unit-android-1.11.2": {
+   "aar": "sha256-zfpoLRccipMJY3XiNupZmHOcCbk/cv1x6v8JkBGhaKY="
+  },
+  "androidx/compose/ui/ui-unit/1.0.1/ui-unit-1.0.1": {
+   "aar": "sha256-dbE+KhXaijGs912BxCd/8oILG/WCkbRoisVSAM3BgHI="
+  },
+  "androidx/compose/ui/ui-util-android/1.11.2/ui-util-android-1.11.2": {
+   "aar": "sha256-Bsz698i8HF9uomMjPEfVhbWl5Rr7opw9IUlZb1RiJZc="
+  },
+  "androidx/compose/ui/ui/1.0.1/ui-1.0.1": {
+   "aar": "sha256-GUPapKNBKGG5or3Bp8jC/wXZuBkcHT5W67Ij0utKhSY="
+  },
+  "androidx/concurrent#concurrent-futures/1.0.0": {
+   "pom": "sha256-RQW5peMKlBi1mprWcCw+QZOupuaRo9A88iDHZArQg+I="
+  },
+  "androidx/concurrent#concurrent-futures/1.1.0": {
+   "jar": "sha256-DOBnxRSg0QSdG+vfcJ40TtMmb+l0QnVoKTfNyxMzTp4=",
+   "module": "sha256-d2OaCwUeIlELrZOv/OoOvXge8SS/m3YhqVdJk3vPzf0=",
+   "pom": "sha256-dIo0610T0Z0Yet7K6oJmf97V8bC5imVeE+0uSos9iuY="
+  },
+  "androidx/core#core-ktx/1.13.0": {
+   "module": "sha256-o+agaS4F/VnmrDgHFe1ysyXGJaNidkbGnRCL3N3EJg8=",
+   "pom": "sha256-fPbU+y9hq0kkIyuS1lgLZd+RA8BDfNrmDOFDiMNzEhA="
+  },
+  "androidx/core#core-ktx/1.13.1": {
+   "module": "sha256-q1MLBOL75zIFSEiZo75WyQlohz60lvxS5ep1ltkQNdE=",
+   "pom": "sha256-Mcw0W4xs3SBG3PZ4ct+KjLT0TqDK3k34AALKp+O3GAk="
+  },
+  "androidx/core#core-ktx/1.16.0": {
+   "module": "sha256-ifuSyhJ1lM3NEcXvtasOjrI0ZrxBuN91eVFNL+9uEoE=",
+   "pom": "sha256-RmDPtgbtiYKLo+EPebKYCf+2d+5dI0b+m8sD38S5tkU="
+  },
+  "androidx/core#core-viewtree/1.0.0": {
+   "module": "sha256-EThs+kbLv922pAWfFDVMAGkc9l09Y8NhiBioMybvPH8=",
+   "pom": "sha256-1PLtEXb6jFYSuA90yVKoeZFCqe02AioaI4/eWxQFgNk="
+  },
+  "androidx/core#core/1.13.0": {
+   "module": "sha256-Lg5uXBIFt0YqDFw+MrWMLlJUNYEu2JlGx75nN0k7UeM=",
+   "pom": "sha256-RQLk7YtZEiAhrJocExLiMm5LD0P37Lu8m1Dud0KVdNQ="
+  },
+  "androidx/core#core/1.13.1": {
+   "module": "sha256-KhCXm7s7zXslt/Zkq06bAW+r8hdKJnaLZ34S5L6kx8Q=",
+   "pom": "sha256-Unq/pajWr3SLN+HAFi0WM6LV6kOHsCBai0NrYhS6HPY="
+  },
+  "androidx/core#core/1.16.0": {
+   "module": "sha256-SrSjsLwWZOOixg3saZr2NXeOFcbuNzlxaQlI8HPdch4=",
+   "pom": "sha256-B0l0oVUCIa96qF3taQPD2Eyb3t+ea0/zsMtHEym1rHc="
+  },
+  "androidx/core/core-ktx/1.13.0/core-ktx-1.13.0": {
+   "aar": "sha256-WcVOYSnpJhxtgQ+O6kpu4vSZTYFisc2fyIychMkqzPw="
+  },
+  "androidx/core/core-ktx/1.16.0/core-ktx-1.16.0": {
+   "aar": "sha256-F2bb2C9koS3NNZ7LbxXzzzXbTWbSKWGnxRsv/GRoMUw="
+  },
+  "androidx/core/core-viewtree/1.0.0/core-viewtree-1.0.0": {
+   "aar": "sha256-3BtnjVjrzyv6FYe+aP+CZpTOPSISUbnvMNTUs2KX5t4="
+  },
+  "androidx/core/core/1.13.0/core-1.13.0": {
+   "aar": "sha256-G5bI6xDEtAKD/dbpqnT//wX65PFdVPYbpp1Rf80URpU="
+  },
+  "androidx/core/core/1.16.0/core-1.16.0": {
+   "aar": "sha256-a/A9OdvjdErM4ifTtpc3TDYlquECX77IrZ/XvVi85DE="
+  },
+  "androidx/customview#customview-poolingcontainer/1.0.0": {
+   "module": "sha256-kDA01RUt0uAWKxRo6iWiLhyjhABrPSgtWhQ8x2AyGgE=",
+   "pom": "sha256-n6YhlsTE55tqWNuziowCK++NshmJ19ri2g9vW2Yompw="
+  },
+  "androidx/customview/customview-poolingcontainer/1.0.0/customview-poolingcontainer-1.0.0": {
+   "aar": "sha256-NYQQL8Sb85nFbjt75L/hIADEYRIyDNjPhcwKj5Pz51I="
+  },
+  "androidx/databinding#databinding-common/8.13.2": {
+   "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=",
+   "pom": "sha256-HRsskeiTEHht7ncOkSby+iDtEuPmF+Q5yiif9d85E7E="
+  },
+  "androidx/databinding#databinding-compiler-common/8.13.2": {
+   "jar": "sha256-osP/8MOaxyxMIcQVAXBmwmPv4XDYrrnTOaPsp8DXnx4=",
+   "pom": "sha256-b+dyhf/5yqYWJqP8b/Y1JUj4GQosdDS+kh7P70a+o+s="
+  },
+  "androidx/datastore#datastore-core-android/1.2.1": {
+   "module": "sha256-bQdjAukJZcxR2STEtnplqfqRvd59EHvFeco6IhVQhtU=",
+   "pom": "sha256-w/79rLpSc2DXs1Zane9mZ1MANJbOkOOYrasWfNfGME8="
+  },
+  "androidx/datastore#datastore-core-jvm/1.2.1": {
    "jar": "sha256-3S0ID8FusL6h4C5VUdQ0lvueUXeFXFtyxqr24WqxxcE=",
    "module": "sha256-n5XebiGnr+uq44H79ZKtcX0PipLdfhVISq3z6SUaSoY=",
    "pom": "sha256-/HfBwerbtG10A85wFKe7JbQ55JuHr1OW24NF5OjQHUg="
   },
-  "datastore#datastore-core-okio-jvm/1.2.1": {
+  "androidx/datastore#datastore-core-okio-jvm/1.2.1": {
    "jar": "sha256-et5iOaZ2dINPVyRCjncsQXYintML4lOsflIIKikH7gU=",
    "module": "sha256-h1PfOHGdyVNabVODRmi5E30+EWcQghuya3h6hcn8v8o=",
    "pom": "sha256-9jvfHz3Gn4wQi57GB8QznRIVm9lbamqtNKNAriG1N+s="
   },
-  "datastore#datastore-core-okio/1.2.1": {
+  "androidx/datastore#datastore-core-okio/1.2.1": {
    "jar": "sha256-qqFaAMdoj/Xobp6fbCj4fexa/plcRVA18lEBTSmMNMY=",
    "module": "sha256-Uio4O9pYJQuWCKnOZ2L8oPVL6aOPlEay0uJhwsnOsqg=",
    "pom": "sha256-l6IMy9DxVBo743GsqYmHKPZS/hpYg/9SuUg8YSvS5yg="
   },
-  "datastore#datastore-core/1.2.1": {
+  "androidx/datastore#datastore-core/1.2.1": {
    "jar": "sha256-724F4UniVvNgr6IJhajKUtjhGXBlfqKSpvu1cT95R9o=",
    "module": "sha256-PsuQuyXi5OZ09U4VSWSZINGzHPOcjKLCyREV6Pivje0=",
    "pom": "sha256-xQ8uSECCuGNRBn74OB07ApFTWjzbnlIgiRBZMPhNI7M="
   },
-  "datastore#datastore-preferences-core-jvm/1.2.1": {
+  "androidx/datastore#datastore-preferences-core-android/1.2.1": {
+   "module": "sha256-HjuwBxdFtHOiaOJLoiPE2vhn0OQJQGiRFvy4h3DKnZ8=",
+   "pom": "sha256-Y7r+U4pEUmkdWtfcZ4MYeegV5Ml822vzzHr8mBSpYbc="
+  },
+  "androidx/datastore#datastore-preferences-core-jvm/1.2.1": {
    "jar": "sha256-vINQxaOCo/aCYBSG9UUdYSLV/YwVr6Maznsi+pgAXqY=",
    "module": "sha256-yO1zm8SUsu88iTP+qBqItqpgNfEu/7R0BAdmYQ//hE0=",
    "pom": "sha256-I7MC9Tjee7D+DuOTnTBXQVB0rMzb3iubCbi2nOpxuns="
   },
-  "datastore#datastore-preferences-core/1.2.1": {
+  "androidx/datastore#datastore-preferences-core/1.2.1": {
    "jar": "sha256-/mJsICueo7bqzo2q6w5pL6XYL1Vx0sA3Wo3RT508ymY=",
    "module": "sha256-RhuLV+aHzDFW7/tPrayde7XadyMm7mo0hE61nrCR2Yw=",
    "pom": "sha256-lGmC5zev6Fn5A5+6GFdcodTx520Yghu3M9O0C0LeCvk="
   },
-  "datastore#datastore-preferences-external-protobuf/1.2.1": {
+  "androidx/datastore#datastore-preferences-external-protobuf/1.2.1": {
    "jar": "sha256-Twm6f8oqBzpcVSeptjdYK5PiYsK2qJl3xYTSjOqDjrw=",
    "module": "sha256-AJRV3Ob24zyLPvmkSFn3u+o51JBKUjqibFtmYOAyZrI=",
    "pom": "sha256-f3iN+Yvsc2EbIW+0vqYl2RMwBUIit4nnYmoUb4b7Iyc="
   },
-  "datastore#datastore-preferences-proto/1.2.1": {
+  "androidx/datastore#datastore-preferences-proto/1.2.1": {
    "jar": "sha256-2bvZT3jppskzCO7Sa4p+1GsfEooZwoL+NvloBOnXwYQ=",
    "module": "sha256-XrEsUlySObPJ6F2WsXea3Qy4ZrD7AC+MBvWyh6DvkbQ=",
    "pom": "sha256-4vhhHTXgwleKQzM84/5eHLXlFo3XNDgQ0QrLZIhWbQY="
   },
-  "lifecycle#lifecycle-common-jvm/2.10.0": {
+  "androidx/datastore/datastore-core-android/1.2.1/datastore-core-android-1.2.1": {
+   "aar": "sha256-Q17a17yx+7GipG3nvk1trymUebMyjr91fr3+AoEMvdg="
+  },
+  "androidx/datastore/datastore-preferences-core-android/1.2.1/datastore-preferences-core-android-1.2.1": {
+   "aar": "sha256-SMIjXldvsBX4YXJuee6UdJSON9ox0siHwW6+tGgXBZ8="
+  },
+  "androidx/documentfile#documentfile/1.0.0": {
+   "pom": "sha256-ATKIqTF6VScGzmJfskST6CIyiFKSI+xXjPhVpa6cFuU="
+  },
+  "androidx/documentfile/documentfile/1.0.0/documentfile-1.0.0": {
+   "aar": "sha256-hloGHvL60WUi+EM1NrjUcgjEb/fHdFGX36HutIGGlIc="
+  },
+  "androidx/dynamicanimation#dynamicanimation/1.0.0": {
+   "pom": "sha256-RM4i7mINKPFzAbzGCtSbabfQWWwqh7BUrR4/6se0qJg="
+  },
+  "androidx/dynamicanimation/dynamicanimation/1.0.0/dynamicanimation-1.0.0": {
+   "aar": "sha256-zgBRYsIpvzCNLVsS+2ytCHQGnLvqzO5jqBk70I1A3gQ="
+  },
+  "androidx/emoji2#emoji2/1.2.0": {
+   "module": "sha256-nRmWzKA3d7qh8nzRVTHbmDpjPa43uQ+FvVNQGstWaZ0=",
+   "pom": "sha256-+vWVXSybCbupLlFWnyuShBne0FtclknARTySXH2mI2A="
+  },
+  "androidx/emoji2#emoji2/1.3.0": {
+   "module": "sha256-3chR7bpl/RWnobw60YZI4vcy3VrY7zYCIkvOBkf1tNE=",
+   "pom": "sha256-FOu+qCNPATIRll/dCLQu6QfOAHWvMhAYyMKGXC5dsOs="
+  },
+  "androidx/emoji2#emoji2/1.4.0": {
+   "module": "sha256-kr4WzMt1f4B73dkvH8qVoDioEMzKBRxBScEWgkeJVLg=",
+   "pom": "sha256-H2ciFIT30SYOtuK0kM1OcEa/XLU2J215+XKtPxmLR00="
+  },
+  "androidx/emoji2/emoji2/1.4.0/emoji2-1.4.0": {
+   "aar": "sha256-Qz/r00NKRWZxdsdqZPPyBcpjNaa1RMW11X8lo4o3UkI="
+  },
+  "androidx/exifinterface#exifinterface/1.4.2": {
+   "module": "sha256-Y2UWXrWqzHAKNLFlCikQ6gHr2BmCG4mvdon6QSdPsAs=",
+   "pom": "sha256-sRwHY/MJTShmRBK30zFrtdGnhYEPt7T+XzVs1cvNFyU="
+  },
+  "androidx/exifinterface/exifinterface/1.4.2/exifinterface-1.4.2": {
+   "aar": "sha256-a7K2hoKiAjxV81+UFET/6gFXlHsGHk/XYGupNeLndCU="
+  },
+  "androidx/graphics#graphics-path/1.0.1": {
+   "module": "sha256-P2/H6W+KH9IQRdp/LjMq71KKofVrZFX7jyUEOq+g4bg=",
+   "pom": "sha256-hm+zV8cUb192eK1E5LxsKCPVaN784e0oBbtsiZYGsig="
+  },
+  "androidx/graphics/graphics-path/1.0.1/graphics-path-1.0.1": {
+   "aar": "sha256-jKQDK215s1HwtZrUtYDt27lCPhZS98lYgwaH8e7i7AM="
+  },
+  "androidx/interpolator#interpolator/1.0.0": {
+   "pom": "sha256-DdwHzDlpn0js2eyJS1gwwPCeIugpWSlO3zchciTIi3s="
+  },
+  "androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0": {
+   "aar": "sha256-MxkxNaZP4h+iw17sZojxp25RJgbA/IPcG2ieN63Xcyo="
+  },
+  "androidx/legacy#legacy-support-core-utils/1.0.0": {
+   "pom": "sha256-j9CTAIs+58BuUseNoq+YCntHtpuWf6kdrXr0ZvegCjg="
+  },
+  "androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0": {
+   "aar": "sha256-p+3PAdW1KzA0BzAnvEd1t4pHZLtiAruR1hyCmt2N0cc="
+  },
+  "androidx/lifecycle#lifecycle-common-java8/2.10.0": {
+   "jar": "sha256-SX3YTeny/UYyTyX5o68DLToj0IfoevUVxLGUNfbWplE=",
+   "module": "sha256-RTKPdawHejY4HcU9aMBSiLoZgTfKvEH91NJNxEfu3bo=",
+   "pom": "sha256-r6pdhRk6axCKJfb6iorj57KwsrK3z1NZf3K8tPWUJxg="
+  },
+  "androidx/lifecycle#lifecycle-common-java8/2.6.1": {
+   "module": "sha256-G+sLn/+2MKAF3sodNYPSrL7IaF1t6AmjpuDkM/QYtsM=",
+   "pom": "sha256-HeG0opB9T5Oym6QzmvRluaJOHA/2p0ks8d/N+AJdRew="
+  },
+  "androidx/lifecycle#lifecycle-common-jvm/2.10.0": {
    "jar": "sha256-FZQwgth7zXiDA5j6N38sixJkPeKQ0JBu2OSaLTNd21Q=",
    "module": "sha256-k9kBazr9A2OaQH9RoRnVyk2umI3jdsOA8OUd2diOaG0=",
    "pom": "sha256-ygYrmrsCmLDUCuEMLRygbUEp9fYO/cXoxExsKzN10Vs="
   },
-  "lifecycle#lifecycle-common-jvm/2.9.4": {
+  "androidx/lifecycle#lifecycle-common-jvm/2.9.4": {
    "jar": "sha256-N9ibIQHwdKxsJgkX2rsYVgdkXuIAqjAYx8W95w7c8YQ=",
    "module": "sha256-HRg385QrM+owqiMB/c6iY5QIoP1v1DaMIkePqBU6678=",
    "pom": "sha256-MXNemVOq7qtOB/z/pMarNRn5CzMcSx2oFz35EWB9OQY="
   },
-  "lifecycle#lifecycle-common/2.10.0": {
+  "androidx/lifecycle#lifecycle-common/2.10.0": {
    "jar": "sha256-nTqZgAlbdp3rTzKPfzJUObGIFHEk1m3ELt1V4+e+6jc=",
    "module": "sha256-XRJHse373J3e3L5SXJ0mKVZ7HFOMt6nGIM0EShJLXHM=",
    "pom": "sha256-EAT03wURixPCqQmEa63GZkbtJ3lEcGpgTk3YKE1TVIs="
   },
-  "lifecycle#lifecycle-common/2.9.4": {
+  "androidx/lifecycle#lifecycle-common/2.6.1": {
+   "module": "sha256-k3R6kUXLNrxxAF9Zjt4y4rEUmt5aFuYrDklpNFvGLYU=",
+   "pom": "sha256-PmaDDVn65S4QMLS+ckseV3rIFNJzNf34GnEoPcCCnxo="
+  },
+  "androidx/lifecycle#lifecycle-common/2.6.2": {
+   "module": "sha256-D6fyj1z/ikBqT3hwskPLDW16fCD6p6K+yv9ZB64S+cw=",
+   "pom": "sha256-VzBM2sTaKJpuzdBzjhax2IWPHvjp+r4tZaljcZ/YHbo="
+  },
+  "androidx/lifecycle#lifecycle-common/2.9.2": {
+   "module": "sha256-SDP4jjmhvSZO1eoYciAj6+UedLGaBBEkaqPXQOFukIE=",
+   "pom": "sha256-bLkiyxFc6PYeffjRkl4tHTDvPP0I2G7Tl66qc32V+S8="
+  },
+  "androidx/lifecycle#lifecycle-common/2.9.4": {
+   "jar": "sha256-x6boNdoHEtFe/q4Nct+R5mMQQt9Pzw+cIM7KdAY4xoU=",
    "module": "sha256-xXi9dV6kbXp3gRMJo1OVOOLX+4agX8KtgcZV7Pff96Q=",
    "pom": "sha256-DjoMh5jSb0kjhVCj3E1r1GXUm4K8t1nKPEY6MWAOchw="
   },
-  "lifecycle#lifecycle-runtime-compose-desktop/2.10.0": {
+  "androidx/lifecycle#lifecycle-livedata-core-ktx/2.10.0": {
+   "module": "sha256-KyigMgHzB3sq4+KFP5g5RK/fUYsCk5rPyf6eX8q4cnU=",
+   "pom": "sha256-2YIILDJ57rnBh9mJdmXKmpDTRD812txokmH0snxy2aw="
+  },
+  "androidx/lifecycle#lifecycle-livedata-core-ktx/2.9.4": {
+   "module": "sha256-CpQOeeJWzH++xp2Os1NirHlZmrSyGrSEarpkuklgoZI=",
+   "pom": "sha256-yiBzrEbTZBB/302DLFtynmEM3H0S5zbZFRtaURm+gLk="
+  },
+  "androidx/lifecycle#lifecycle-livedata-core/2.10.0": {
+   "module": "sha256-HYO9XzzMEpjtolue0SjowYf4MOfzr40ClL5oirsDw10=",
+   "pom": "sha256-S+1ekc0qfAFVgyC2oXbbuGf8o8TGl9uUjiA75F+RDWQ="
+  },
+  "androidx/lifecycle#lifecycle-livedata-core/2.9.4": {
+   "module": "sha256-3uYGVquxlNoCjZO5vWUrSxZM2rNaAAtHXWMwPF0AmUs=",
+   "pom": "sha256-zsEWEUjj9sS31ROqmJcp6EqO6UcfDEfANHiz+zxJ6iE="
+  },
+  "androidx/lifecycle#lifecycle-livedata/2.10.0": {
+   "module": "sha256-Om1HOzEEyYNQHeSIPWunaE3IMzDEYO+Vg5CoJlsHgxA=",
+   "pom": "sha256-trk2hsVaHKjsIOfYSl/jQSZ+XaxuOQ+xzKOYODER6wg="
+  },
+  "androidx/lifecycle#lifecycle-livedata/2.9.4": {
+   "module": "sha256-moFToHri7di3kZo0rZGVhHAF6u1p+j5QYGNiCKcowxI=",
+   "pom": "sha256-JPi5RFSZEqtoOqcOYdMrXhqoPC8fnULwno7aMjd2CrE="
+  },
+  "androidx/lifecycle#lifecycle-process/2.10.0": {
+   "module": "sha256-xorsfMHQ0Z9RMo59KMkdz7SsjhqYQ8/WGB4aqUrhnJs=",
+   "pom": "sha256-osMGIyCHP5rCne0dnKSiQVUpwuRWjVO18rgT7FKtxmQ="
+  },
+  "androidx/lifecycle#lifecycle-process/2.4.1": {
+   "module": "sha256-46rj7QS0dE/zFFLpj9KZ4639KNO1cjZh2WeLkvoJzrQ=",
+   "pom": "sha256-2n4uEMrn12JaCuRUAXoSV0nheRoTnC13feka3YlBCvU="
+  },
+  "androidx/lifecycle#lifecycle-process/2.9.2": {
+   "module": "sha256-sLST7Nw14vme9f3lNAYMPQqe70YGocxMeMY+p5Nje0U=",
+   "pom": "sha256-Q0y5BeqcHXkoyHKoXddkfoh0WfdYo+mPIoExXu8f0yk="
+  },
+  "androidx/lifecycle#lifecycle-process/2.9.4": {
+   "module": "sha256-981QUbrLP0uOx9xArGNCph7qEUdZLdqfNkokz4gsfds=",
+   "pom": "sha256-XqxaCicThHf0Dwqg50nNB/v1WA1KmtxtLVnbZMrEmxA="
+  },
+  "androidx/lifecycle#lifecycle-runtime-android/2.10.0": {
+   "module": "sha256-dJtuekQikUWB4HldnUj7T5bao/7pd0dCH/QjSGAYX0c=",
+   "pom": "sha256-6X7gHa9vTcy5AL23Zyuqta08fCXEVJH9zPXroztur/8="
+  },
+  "androidx/lifecycle#lifecycle-runtime-android/2.9.4": {
+   "module": "sha256-x4iOhQxA/QWfssHsW/RuiDE+m11RUhM8OFoar7hDP0c=",
+   "pom": "sha256-Jx5UAJ/fOizVq0FOignmr0JRtj1ISkLFMKuGiXSl6h8="
+  },
+  "androidx/lifecycle#lifecycle-runtime-compose-android/2.10.0": {
+   "module": "sha256-pZT365OTD+9SwsuxlPj0GyWQZ5+eZq7DNZVMRRosCPg=",
+   "pom": "sha256-gHgw76JxMGSShrAGHJcq2dwLGmHRv8LXGi6N33H2K8U="
+  },
+  "androidx/lifecycle#lifecycle-runtime-compose-android/2.9.4": {
+   "module": "sha256-4Ieiwr3+NgSXM5M1ulHbzdFQPAp8n0+ChdtwI+BClDk=",
+   "pom": "sha256-p6Bzx9sQl0Ynuog/ZIo0/oBT9QwpTZGS4YPJAdrqjGU="
+  },
+  "androidx/lifecycle#lifecycle-runtime-compose-desktop/2.10.0": {
    "jar": "sha256-TSM+7sxuJ2mnZEKDDF/RiEBXw20M4nRRZxk6EMyJdvg=",
    "module": "sha256-JXsLxt9zrYYOazeLlIkIZ5ZMdDDanIhKZfZnz+XL3BA=",
    "pom": "sha256-DVXZUfjn5VGIMZwhP4lx37pZ2Re2ZYhSe5ZUcCc7u1Y="
   },
-  "lifecycle#lifecycle-runtime-compose-desktop/2.9.4": {
+  "androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.4": {
    "jar": "sha256-0lwIPfk9pxihh2oyk70V99x6gR6ZhzWUO85ZBoOleDU=",
    "module": "sha256-xANG1Q0gglWZKxsFPINcljYxhBtw34tvxp8kUpmI3MU=",
    "pom": "sha256-EHpGt+Pp/+28BWd4Ler5/3ZztYgdDFX72Bsv49r9CHQ="
   },
-  "lifecycle#lifecycle-runtime-compose/2.10.0": {
+  "androidx/lifecycle#lifecycle-runtime-compose/2.10.0": {
    "jar": "sha256-wFuz86yHG28cdomAuFGtBWRZ8pKuxV7HbOzHF4GB7fc=",
    "module": "sha256-YyuoWyQ6BAT28zrW58mW97qaQvN32whHNK56MY6qbsg=",
    "pom": "sha256-D3kM4VGREBDVN80gRSZ1AX/yX9/x+1zfSZvzoFrULKo="
   },
-  "lifecycle#lifecycle-runtime-compose/2.9.4": {
+  "androidx/lifecycle#lifecycle-runtime-compose/2.9.4": {
+   "jar": "sha256-iDVBasWaI/cVLrDyF72rdCo3fphUYjB2OcErr8FAjkE=",
    "module": "sha256-J9hk9AyjC5Z7hdqsa5F7va6mN9Y+EjlIyVBFwhvlhIM=",
    "pom": "sha256-DvP7KPibgLkMeK1ro0UWTVWQiJ7jRZsCfyZpWTYpFXU="
   },
-  "lifecycle#lifecycle-runtime-desktop/2.10.0": {
+  "androidx/lifecycle#lifecycle-runtime-desktop/2.10.0": {
    "jar": "sha256-b3C3b7eiYvR7mTF8IyccKKia0YQAVHtL/vvS7wRQD5A=",
    "module": "sha256-Lu74CEz2cSnhmSJ6P6us+FBvV/ruywqrD3ZdXE5ZBAo=",
    "pom": "sha256-SQEy3ZcZUnyYf6pBMkaax+QcJXub5DU/Kc2rFcVS568="
   },
-  "lifecycle#lifecycle-runtime-desktop/2.9.4": {
+  "androidx/lifecycle#lifecycle-runtime-desktop/2.9.4": {
    "jar": "sha256-L7SfdtECF5L7NZ4KkkbBUJ8vW1VfCkZZHSTVjetovVw=",
    "module": "sha256-+VLq6Qa8BiePYEGvs8EzPp1rAL5DeIV7zWahulg2eQk=",
    "pom": "sha256-+yriSTRTAzy/Kzp0qh36Z8/bwYmlTRkJg9/RVQLQtuc="
   },
-  "lifecycle#lifecycle-runtime/2.10.0": {
+  "androidx/lifecycle#lifecycle-runtime-ktx-android/2.10.0": {
+   "module": "sha256-mAob4UbK+harOxaAmR3eFLIHeksT1bMUJ8uY3Ikw8ks=",
+   "pom": "sha256-XBomndDwrOh/IoMog7iYvXtCUtaofwTBc0fYPjEoZg4="
+  },
+  "androidx/lifecycle#lifecycle-runtime-ktx-android/2.9.4": {
+   "module": "sha256-aiBw6dkkO9O11aEIudtVg7zEx0KzLvtF/jP0lCnrcZM=",
+   "pom": "sha256-eKrOefvO2OuMF+CwKy1VvpkG+92gU+amF+5uWV/KzhQ="
+  },
+  "androidx/lifecycle#lifecycle-runtime-ktx/2.10.0": {
+   "jar": "sha256-XXTR6cRdU4qvxIsjE+WY7/m0oTv+6fLz13b1J01c3iI=",
+   "module": "sha256-VW8VlXN2hYtuOrwI+z31ZupetAZxSSUxlL8qBJYG204=",
+   "pom": "sha256-BgrRdTOB56+deluJgp85Tvb9R/d+MbpMgSRivDe9phg="
+  },
+  "androidx/lifecycle#lifecycle-runtime-ktx/2.6.1": {
+   "module": "sha256-OYVPMsmwEPZS9OUEHKTOBpgdy2lUEowejhzALmOrGF8=",
+   "pom": "sha256-UF6EiRwSTXiwivfASJMOzc09FpDlBFNZoftGrmzybro="
+  },
+  "androidx/lifecycle#lifecycle-runtime-ktx/2.9.2": {
+   "module": "sha256-/edqfOymbbSbEwD6rX0iIHYGJAWSJpCeq7/tHvTNeKQ=",
+   "pom": "sha256-d/i5UFhMLiAK1hUNRrLK8Cqu7CZuv172Xnzl0aa+FQc="
+  },
+  "androidx/lifecycle#lifecycle-runtime-ktx/2.9.4": {
+   "module": "sha256-BeV4jgAF06oz4tZaXctRvasGCUolTBNbggMW1kkxq8c=",
+   "pom": "sha256-CvaMzSgqP5jYMvORtmVQmNR28Z2R9A+QnTxpWBShHKs="
+  },
+  "androidx/lifecycle#lifecycle-runtime/2.10.0": {
    "jar": "sha256-2UTSBKRQ7QGjLv/M+0gyv51kYAkLcXqIoBM4HSBKtjk=",
    "module": "sha256-2oBfoBekrM4T9QFGmnWj8wYkjuvFj1vMKAGbABXfumU=",
    "pom": "sha256-Sote7FTV7N8JnqU7Lk6fJNspZ+pdOTCXtqbFSe1pMI0="
   },
-  "lifecycle#lifecycle-runtime/2.9.4": {
+  "androidx/lifecycle#lifecycle-runtime/2.6.1": {
+   "module": "sha256-pMuwGkLQcEe9jYcAF8lqGwt7RnMyDoa2YxehO+LsEMc=",
+   "pom": "sha256-QecdAD1DfxadToraWcsZgvG0e30lwjAQuPyB1SinQNU="
+  },
+  "androidx/lifecycle#lifecycle-runtime/2.6.2": {
+   "module": "sha256-6gExhGq+H+nepZrG3+Hw+52LbWAMnv+aH9StXuXny8c=",
+   "pom": "sha256-gXUlVUbipfUQhl+ErOaAZglUcwJAsZBdkXW0NFvtqXc="
+  },
+  "androidx/lifecycle#lifecycle-runtime/2.9.4": {
+   "jar": "sha256-ulZtD0bcAcIWl3jScjh4ns66oAZVZC4Cwk5Og+fcWQU=",
    "module": "sha256-3LxbW1BmboQlinS/2OUUkYxZOk/87wwDWFYqAvvYDFg=",
    "pom": "sha256-1helGd2zajCCE/W5r5kWOwo6NznOA4G2yND6aBRhOgg="
   },
-  "lifecycle#lifecycle-viewmodel-desktop/2.10.0": {
+  "androidx/lifecycle#lifecycle-viewmodel-android/2.10.0": {
+   "module": "sha256-BrB6B64Xx1kqMMUzw9RqEl/LG+8JbX5hNOJCDbJGTQo=",
+   "pom": "sha256-CqFxpQ9QqFyQaHrYLc038xr90b/SRjwhXRMilg5R4ig="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-android/2.9.4": {
+   "module": "sha256-tjes3YqrU0iXRmGDCHSnRWusNB9DoLKBgnzGsPz8c8E=",
+   "pom": "sha256-lmC1otgP/g8OW0+ZO1gdFZcqjBSq5ReEtgl7yXvgN54="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-compose-android/2.10.0": {
+   "module": "sha256-VSolTWLF2aqDC9edophyCCUeHIGv2Tw8K/+wJtQvRco=",
+   "pom": "sha256-NjOHpx8PMSUXUUvs2aQB7IWJ+8uNCTShysPF8F6wDIo="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-compose/2.10.0": {
+   "module": "sha256-J8EDbQHMgtAUKwTg1NfbPJkQBHKlkr6vdYvC6GWfLuc=",
+   "pom": "sha256-SAtwtmyTWh9JJ0LvWuFt+XTXtJV6AR8nlQAgctXtUlk="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-desktop/2.10.0": {
    "jar": "sha256-58hqXlxm/UH9PMnJrTGimXEQsaY4DEQbo/e2sLBw4ys=",
    "module": "sha256-zaMZ18njJgKFmnK+gcACblbReX75umfpFz6QXT90d08=",
    "pom": "sha256-z5W8pQ/AIStIWGre/gQ9VF+B+/YeNF8LeR6tlrLnNuE="
   },
-  "lifecycle#lifecycle-viewmodel-desktop/2.9.4": {
+  "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.4": {
    "jar": "sha256-mPgWvmhpQHyH1GBYdW+XeA+mxs9hrNupchb0E3Ma8V0=",
    "module": "sha256-73aG2pDJWnP0A+vKyHzwbNdR5JGecf4gqRFFm8tIT1s=",
    "pom": "sha256-sLwaHSilS9d4oSYQRI0o/tYDh3gfHNWa+r40sdA0XSs="
   },
-  "lifecycle#lifecycle-viewmodel-savedstate-desktop/2.10.0": {
+  "androidx/lifecycle#lifecycle-viewmodel-ktx/2.10.0": {
+   "module": "sha256-g3v92Eju/vd1RPoonb/0xChoDdmCBkHq24Qcx6dMg/k=",
+   "pom": "sha256-4TnbsaAM4Iqu2GVXqpaO7HFR1tSzBMMk4uVyJ1qs2Qg="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-ktx/2.6.1": {
+   "module": "sha256-pREPhXiLwWffn+j74IAE3cXF3ZsVy3N2zurvAl/Mqvg=",
+   "pom": "sha256-D0XiJCYK980beeN8VfnSPf+U/UExbtn2ACU/rM/0wc8="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-ktx/2.9.2": {
+   "module": "sha256-y4SLtnJXBWOSmoa6bINhgfSoqIQrE4+mdo6+AS9YJeY=",
+   "pom": "sha256-kVzYQ90QvT1aPgrNUQ99tZN/8U9oHb6GrePjBORoMGU="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-ktx/2.9.4": {
+   "module": "sha256-VjHv6reX95oa26XfZLLwzKVOCLQodW33YwyyO5AJimc=",
+   "pom": "sha256-DM0OnTYa1ptqclOrTtISSjvU+/mzOONsFDGzxe57x5Q="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate-android/2.10.0": {
+   "module": "sha256-lJ0qhitrWEzuka9wqeAXvbEX0iW7RgltqUJKFyjKeek=",
+   "pom": "sha256-X81Cm6V+Hd4bQ4U05Twj1idNI04zx0iWP2+qn4GTPIc="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate-android/2.9.4": {
+   "module": "sha256-v2TEw89a1f5db9Dgd4fsaAVMwib59nDgWvXvnaZ8JZM=",
+   "pom": "sha256-NKuEkea2MRI85ffwrgbfojjCEdzz5xAz7WFlb51HcYw="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.10.0": {
    "jar": "sha256-kpRFl4QqaXYj0HRtcZ2K86y59MeA2mEQYvpg2ZOUTSw=",
    "module": "sha256-Wbc2f72Ct0pgUykaEnQ8rAws8f6WkpN4xR2Cv4/pqV0=",
    "pom": "sha256-i2wwG0UvOIUsD9VRfFFDl2uwLDaSHb+F3TDYiz9gOAE="
   },
-  "lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.4": {
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.4": {
    "jar": "sha256-PgtE4lFOr91pONVFfZ9G5HhQd8RdO0NktcI8TcuT79M=",
    "module": "sha256-Zz9dNS3D2hsaNY5aMO9+FjIZs6HXA27hjJNQxT8F8rE=",
    "pom": "sha256-MV7u84MhWBlbUY4+zOEEWkqSmexIP1YYh2BuVf9qHLk="
   },
-  "lifecycle#lifecycle-viewmodel-savedstate/2.10.0": {
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.10.0": {
    "jar": "sha256-sYFE6RxHgLOwWUMlYFPX1NzMRbFTBm1fX/zhg5qgURs=",
    "module": "sha256-UIV3gePd+OOZBeTkpXowSWwkX5kB0bfT8XOCOCGINH0=",
    "pom": "sha256-WWVv/K4eDhRwQ7DW2JlmpflnUvBSkev6AoQG7ZRETdE="
   },
-  "lifecycle#lifecycle-viewmodel-savedstate/2.9.4": {
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.4": {
+   "jar": "sha256-wMw+Mfw1hIbZbwJw3+Kw9E+YXwyrDvp3OipWfVX3YaU=",
    "module": "sha256-Q4nMoKmoAace/664j4nwoD2Zwivgk8U5qcD5w5YpVBY=",
    "pom": "sha256-aRK1XHRcV57G/L6wBl1aF9i18G3QpYeIA31B5A21AgI="
   },
-  "lifecycle#lifecycle-viewmodel/2.10.0": {
+  "androidx/lifecycle#lifecycle-viewmodel/2.10.0": {
    "jar": "sha256-UIvzKEdXFp/Ff0K4S+8LhTjJOvK9C+xbo+/pPUWlv3k=",
    "module": "sha256-T9cd9zMkXEbkuI6FtKkLgsmvSjWe8x8r3yUPk6AsdFI=",
    "pom": "sha256-HYYK/wylmNSOjoPaP05naQeEmFdKGNO4iewrjECQsZg="
   },
-  "lifecycle#lifecycle-viewmodel/2.9.4": {
+  "androidx/lifecycle#lifecycle-viewmodel/2.6.1": {
+   "module": "sha256-K0BvrqXBLyuN9LemCTH4RmSPLh9NeDYeGY0RhPGaR5c=",
+   "pom": "sha256-3C6OZdtT0hZZon7ZO5Zt7jNsHC6OhyhhZ3OJqZuLkTQ="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel/2.9.4": {
+   "jar": "sha256-VBDN/cPyW8y1pNvYEhpdN2sTeQQc7Gsdol+ZZ8oJ8Bk=",
    "module": "sha256-lk1p1rh3KW6Lead7uCbvX7GGrsqnoaf/d2+yJQyZMAY=",
    "pom": "sha256-BU22+S2SMBA7OsqLDavMDWPeJuRA/5jrWxmiVV0+sDc="
   },
-  "navigationevent#navigationevent-desktop/1.0.1": {
+  "androidx/lifecycle/lifecycle-livedata-core-ktx/2.10.0/lifecycle-livedata-core-ktx-2.10.0": {
+   "aar": "sha256-XxhCl0mhg+GReNhmWuQr97YxC1A1iung4MxFKv1uC8M="
+  },
+  "androidx/lifecycle/lifecycle-livedata-core-ktx/2.9.4/lifecycle-livedata-core-ktx-2.9.4": {
+   "aar": "sha256-9Vt6jUM+m4FjFUzKpC+ivlXHDNHt5e7qUhpLS4hN1P4="
+  },
+  "androidx/lifecycle/lifecycle-livedata-core/2.10.0/lifecycle-livedata-core-2.10.0": {
+   "aar": "sha256-Et1hqYQ8zrtFR9Pr4vbQMMqPaYjSL4+tGcCvk7SpfpU="
+  },
+  "androidx/lifecycle/lifecycle-livedata-core/2.9.4/lifecycle-livedata-core-2.9.4": {
+   "aar": "sha256-6oZvDDedH5KDeZQBCrWsCl1UmdurUh78cbO8K0l9a6Q="
+  },
+  "androidx/lifecycle/lifecycle-livedata/2.10.0/lifecycle-livedata-2.10.0": {
+   "aar": "sha256-PowAn8iNocUuTtBagSadWsm9QFBG8wAwf146F+IBpt8="
+  },
+  "androidx/lifecycle/lifecycle-livedata/2.9.4/lifecycle-livedata-2.9.4": {
+   "aar": "sha256-8kDCyUqW1KXq5dN5wqhYnUJqM7mJ2Drp8OAfaVAsAYE="
+  },
+  "androidx/lifecycle/lifecycle-process/2.10.0/lifecycle-process-2.10.0": {
+   "aar": "sha256-ELtbsSdz3KEdg0PAFM/RfftAln1uzjfo8V0E2M6wd1w="
+  },
+  "androidx/lifecycle/lifecycle-process/2.9.4/lifecycle-process-2.9.4": {
+   "aar": "sha256-R4S40IPCEeB22RFb+hc39+D2K1U+gBz1DKpEAONKldY="
+  },
+  "androidx/lifecycle/lifecycle-runtime-android/2.10.0/lifecycle-runtime-android-2.10.0": {
+   "aar": "sha256-IZOhVz1iPzeyDH0n0aj5A6cvZRzG8y5XlPhd2nRP7nU="
+  },
+  "androidx/lifecycle/lifecycle-runtime-android/2.9.4/lifecycle-runtime-android-2.9.4": {
+   "aar": "sha256-hvFqEzDrI2ALqQ0DNLPh2zjTowyLHvzZLKIaqFr6gXM="
+  },
+  "androidx/lifecycle/lifecycle-runtime-compose-android/2.10.0/lifecycle-runtime-compose-android-2.10.0": {
+   "aar": "sha256-RumW1SaClZb220YmFpqWfwVv3nEDUH/1lrzRd7c8NnU="
+  },
+  "androidx/lifecycle/lifecycle-runtime-compose-android/2.9.4/lifecycle-runtime-compose-android-2.9.4": {
+   "aar": "sha256-toA/kGqJ/YXHffND3Urus0kSXKeeEtVdaNTPQvQiMfY="
+  },
+  "androidx/lifecycle/lifecycle-runtime-ktx-android/2.10.0/lifecycle-runtime-ktx-android-2.10.0": {
+   "aar": "sha256-hxiDcDM5+HKE0jLLQ24xfG9K9WEtkrQ/J8axO5IQn6c="
+  },
+  "androidx/lifecycle/lifecycle-runtime-ktx-android/2.9.4/lifecycle-runtime-ktx-android-2.9.4": {
+   "aar": "sha256-lwGZye0awT1iCqjef4q7wozoBlPDzjKNCsLxUnK1bhs="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel-android/2.10.0/lifecycle-viewmodel-android-2.10.0": {
+   "aar": "sha256-kwMocDACfKC4z5inSN3rEh7Bv6ExLABpQo5HZburzng="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel-android/2.9.4/lifecycle-viewmodel-android-2.9.4": {
+   "aar": "sha256-SyNrLlBNtcpdCTNP7wWqjNwx7jWkM8OqTQQg76lhMzI="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel-compose-android/2.10.0/lifecycle-viewmodel-compose-android-2.10.0": {
+   "aar": "sha256-IlkE5UrVFUdoYwRx4Qi5jhQ8Jh3wwIOA/0PqfoMtrX4="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel-ktx/2.10.0/lifecycle-viewmodel-ktx-2.10.0": {
+   "aar": "sha256-VClayGtniG3AYT449iHFMZldBmIAX8dj40DhmpCZT4Q="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel-ktx/2.9.4/lifecycle-viewmodel-ktx-2.9.4": {
+   "aar": "sha256-t9WLuGu44szGB9H4Vw5xSBD3z7P+ujfTdf8WRjg0NaE="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel-savedstate-android/2.10.0/lifecycle-viewmodel-savedstate-android-2.10.0": {
+   "aar": "sha256-GUBCOfpYQyLC+B6WWeFivAEbdG0p3JUKEdJgYk2DIl4="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel-savedstate-android/2.9.4/lifecycle-viewmodel-savedstate-android-2.9.4": {
+   "aar": "sha256-B5RBxD+j/46noC3zsS7sSDw+V1g/gyz6/2Y3UFJ8FCE="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel/2.10.0/lifecycle-viewmodel-2.10.0": {
+   "aar": "sha256-S4Cc+etzI9IAUE6Vkh/rd3/wgCFcrbgjd0LV7Qult5I="
+  },
+  "androidx/lifecycle/lifecycle-viewmodel/2.9.4/lifecycle-viewmodel-2.9.4": {
+   "aar": "sha256-yrQEsF1frtIJEEoq7xTAy7MWq5+r5KjwN7BD5dL0NDU="
+  },
+  "androidx/loader#loader/1.0.0": {
+   "pom": "sha256-yXjVUICLR0NKpJpjFkEQpQtVsLzGFgqTouN9URDfjF4="
+  },
+  "androidx/loader/loader/1.0.0/loader-1.0.0": {
+   "aar": "sha256-Efc1yztVxFjUcL7Z4lJUN1tRi0sbrWkmeDpwJtsPUCU="
+  },
+  "androidx/localbroadcastmanager#localbroadcastmanager/1.0.0": {
+   "pom": "sha256-oAAEH1ofeSg8UXXhu2DPNoN4D0Acap00++l1ElP6b/k="
+  },
+  "androidx/localbroadcastmanager/localbroadcastmanager/1.0.0/localbroadcastmanager-1.0.0": {
+   "aar": "sha256-5xwyjO71xKfXby2G3xtl1l/irPhosaTv2Eo/NDNhhtg="
+  },
+  "androidx/navigationevent#navigationevent-desktop/1.0.1": {
    "jar": "sha256-Q97rV3T9c3+pReCaR/k7bxpQjRf6yPO2XxyGPn99BmA=",
    "module": "sha256-kJ46U7h2B1HXmu9YZfS/SRoWCV2eGvvfueSKxovR/Gg=",
    "pom": "sha256-MluouGydEyyXeA53cbo8k51iLIfAxYcHlen0OCmd93E="
   },
-  "navigationevent#navigationevent/1.0.1": {
+  "androidx/navigationevent#navigationevent/1.0.1": {
    "jar": "sha256-PXBoRNxJYGyxqjzX1rJ/R/GA38TG1Le4DqR4/4jcvZM=",
    "module": "sha256-NrRI1xJsSW2bEryrKNzWguxI7IP6x+VizS5LZSeB7xE=",
    "pom": "sha256-h9uD3BBM9BeKnov3Wy44nbkXa1iDoTuNeiqEEGkG99k="
   },
-  "savedstate#savedstate-compose-desktop/1.4.0": {
+  "androidx/print#print/1.0.0": {
+   "pom": "sha256-YkgsBZSEG+4ku5lqu2y3syCmo7d9yp8KC6T+O+VTCqc="
+  },
+  "androidx/print/print/1.0.0/print-1.0.0": {
+   "aar": "sha256-HVx/MTWhu6Zh/Dc/1y4R6wpK27M5Z4eCbdjkGQ1dnt0="
+  },
+  "androidx/profileinstaller#profileinstaller/1.3.0": {
+   "module": "sha256-oW/lEeWZwgQtoSK+CVaa7NP0+QytN+8IvQu8ORGMksg=",
+   "pom": "sha256-EsvAHIpa5LQSyvPFoGYszSgALe3P8dvmwqs2Zb6fdYw="
+  },
+  "androidx/profileinstaller#profileinstaller/1.4.0": {
+   "module": "sha256-Ob+ZeijY7tLLMZgZ9vNSobo6eLnJeQBPvgXia499Fgs=",
+   "pom": "sha256-1f45mBo7S3w5WFEw2gv8k4NQVMg0pDjT5j4GXl94vlU="
+  },
+  "androidx/profileinstaller#profileinstaller/1.4.1": {
+   "module": "sha256-bxHPZeS/hESZXMc+WqP4GwgtZucgwFkrxfyA0/c4UPc=",
+   "pom": "sha256-bd5DgntAU15AU9HFLUsiekEVVsKJ5lQAyaHMYeK0HOM="
+  },
+  "androidx/profileinstaller/profileinstaller/1.4.0/profileinstaller-1.4.0": {
+   "aar": "sha256-1QIUH8zpAkMPYrZ0wyrs0PdSYufuLNFcdK22F80TEwo="
+  },
+  "androidx/profileinstaller/profileinstaller/1.4.1/profileinstaller-1.4.1": {
+   "aar": "sha256-tRn5MX3tHiwcKZMDjAaS4w2jJsqZCX2TMf8tOlhhpCg="
+  },
+  "androidx/savedstate#savedstate-android/1.4.0": {
+   "module": "sha256-AGJRTcuAwup+BBH6i+VFUIU7q3v2sb8UwlF8Lvh0/1A=",
+   "pom": "sha256-tEshW0zOJMpktfqlj/Rj9LkavAKvlbpAWt5IiCj093k="
+  },
+  "androidx/savedstate#savedstate-compose-android/1.4.0": {
+   "module": "sha256-K+jHU6B8kgzy9dY9Zuh0P7CKkz0EwCt6OIt3tm/KhI8=",
+   "pom": "sha256-3hmDHau4Sk0OEg6G3OsIz2LAhga12Z6RqPjmtKRliIM="
+  },
+  "androidx/savedstate#savedstate-compose-desktop/1.4.0": {
    "jar": "sha256-wCqYsMKzXN3iRcC/5uf/RTx7bQal64aB0lt/VLh06kg=",
    "module": "sha256-gI/3I6FTrM4WBImlvEtYyh1wM/6EqQYPUtF9sifqpM0=",
    "pom": "sha256-U+fXiRm8heHIjh5rDinQrjvGaT16jsVzGnJQRMdhdGE="
   },
-  "savedstate#savedstate-compose/1.4.0": {
+  "androidx/savedstate#savedstate-compose/1.4.0": {
    "jar": "sha256-hk0ggwlx+wjC7Q/E+QKwX9AuOO8wvLZaQ7DJkQqsOIw=",
    "module": "sha256-cnUhGQGgfuOXPkCjRV6K0SlV0dI03CSJ+Ghvz8gguKg=",
    "pom": "sha256-sV9HtCWFRCybap1BavwweCxp2/mldgosNxdfACTw0X4="
   },
-  "savedstate#savedstate-desktop/1.4.0": {
+  "androidx/savedstate#savedstate-desktop/1.4.0": {
    "jar": "sha256-6WXtegEb6DonGsfYIkmndjaEee46KweUjDRFtR1kCFY=",
    "module": "sha256-5z8s+IGOzjR9i13/mQ0Ntjmn37j8yF7uyyYYOD9+zvc=",
    "pom": "sha256-jxFKQnNTWta9y+0Zhs/dmNlV6804oyqP7k7n3I4hH14="
   },
-  "savedstate#savedstate/1.4.0": {
+  "androidx/savedstate#savedstate-ktx/1.2.1": {
+   "module": "sha256-lDWRhLK6UcD0mKK5BV03s3IjHvm8xUpJcqyZ8DA6//E=",
+   "pom": "sha256-0JVTIR9nA7Ga79YI1gB8dxMtJ6KBVWqOaJ2Sdk7CfTs="
+  },
+  "androidx/savedstate#savedstate-ktx/1.3.1": {
+   "module": "sha256-WQB9jTPPFm/f0am/Vsz9IS6YIsBLOnQZZvrOWRhhBlU=",
+   "pom": "sha256-FM7JH3Pd5NTHoR7GYLbF0IPd3zDvQSz2oXQ9wQpipbg="
+  },
+  "androidx/savedstate#savedstate-ktx/1.4.0": {
+   "module": "sha256-fPhogSIKpZTErRaF69DylePZe5wP3DGygwD0MYpQRag=",
+   "pom": "sha256-sIWvfMS7KX7Q8lyoXTYpYTqyU8C1MmhMbPd8Ku50ccU="
+  },
+  "androidx/savedstate#savedstate/1.2.1": {
+   "module": "sha256-W7ZW/HYNnjmWtTUWDLtBBgM8n3NukInm706wxml4UGY=",
+   "pom": "sha256-DTO8KF3x4S8ieA8WJKbws46iphgbCVXsZkHK9iDFDL8="
+  },
+  "androidx/savedstate#savedstate/1.4.0": {
    "jar": "sha256-CYWWyN+6K+9EvgN/PT+JzdARWHUF7YL6Yl8qg6ItZBU=",
    "module": "sha256-oPKsWgdgY/DIE891pG37eAvVpaLIZ3JAvKhVFVTaj9I=",
    "pom": "sha256-0raKLQzHbyPOvG1Oqbvy1j+1Nv/ZTgVRStnabF9TBJI="
+  },
+  "androidx/savedstate/savedstate-android/1.4.0/savedstate-android-1.4.0": {
+   "aar": "sha256-FlbOYs0jPUiL271C5TO4CyJDW3ppCsrm2+cwI5JRLBQ="
+  },
+  "androidx/savedstate/savedstate-compose-android/1.4.0/savedstate-compose-android-1.4.0": {
+   "aar": "sha256-DwrjAy1sbuqDTuIheciXYWDQnYQdMOR/U/VrGzQ4d0s="
+  },
+  "androidx/savedstate/savedstate-ktx/1.4.0/savedstate-ktx-1.4.0": {
+   "aar": "sha256-I1k5OURrxaFUoeNf3dh7gvGeKt8HIgfxFb8pqLQxwdM="
+  },
+  "androidx/startup#startup-runtime/1.0.0": {
+   "module": "sha256-QO/8oNbuH94yvClol+VOu8xM9KopsMUxA2y9KoJKPCQ=",
+   "pom": "sha256-GQtlQlHxEEUvZ/ahPXZuj+4IEfB+bwsPd9WJBiJqy6g="
+  },
+  "androidx/startup#startup-runtime/1.1.1": {
+   "module": "sha256-z9ls9kUMbitpdZiSRymtmgSVxaT89Ovufi+BsH5BWGU=",
+   "pom": "sha256-9BFLXGhZuxvDyvKBy21vJZmPp/cpLGTOrqdKkyEOdGs="
+  },
+  "androidx/startup/startup-runtime/1.1.1/startup-runtime-1.1.1": {
+   "aar": "sha256-4KYymjcSYv5MRQNytw/a8zt2nvaRcJRyN4fPzolrHdM="
+  },
+  "androidx/tracing#tracing/1.0.0": {
+   "module": "sha256-/Ish6+X6OnyW7gmLzc0A8HfrznPyQ/qFjisGcWFfddg=",
+   "pom": "sha256-zQKZqQ1HINePHPtf91BfTbwacNBf4j/Z9NS3fqWcoF4="
+  },
+  "androidx/tracing#tracing/1.2.0": {
+   "module": "sha256-0NjUhra9MyBtvz8abRZ+m0PCaOpjwzIciGsVQ60F7OM=",
+   "pom": "sha256-80vsTrWIcdMQApATdxCKqh6/53+m2IK4uGIAsVjibqE="
+  },
+  "androidx/tracing/tracing/1.2.0/tracing-1.2.0": {
+   "aar": "sha256-b6qQOQ0f2/Ctuamb+Z3me5TGxvNa6pUQWTqdF5c3NqI="
+  },
+  "androidx/transition#transition/1.6.0": {
+   "module": "sha256-x2PDdv1tOeUUd8kCsxXljKKh9H1LCZy5n0mhSL1hxWA=",
+   "pom": "sha256-Bw13lQEAce3vvvlLjJ1aLKxctfOxosXlWFRkOBd8jvg="
+  },
+  "androidx/transition/transition/1.6.0/transition-1.6.0": {
+   "aar": "sha256-JIxF4SVNMRgdIEewsBOU8JouU5pdnom3c9U8YsloYPY="
+  },
+  "androidx/vectordrawable#vectordrawable-animated/1.2.0": {
+   "module": "sha256-sTOjPAE0wIDnBSyixhK/R/cmeHOnT1i9JVmzZ3HmbJY=",
+   "pom": "sha256-JkHJmjkZ8MIDkkDHyH9U+Hn3PNoEQA9DeFl3PMTqRAU="
+  },
+  "androidx/vectordrawable#vectordrawable/1.2.0": {
+   "module": "sha256-UTX1gPnNQVF9j4h/zEO3V2BwO+33DoT2FkcOMHN3Edw=",
+   "pom": "sha256-lKPqq257kyBFtoovbul/BHHWvV05V3WhiSLilv1FMwY="
+  },
+  "androidx/vectordrawable/vectordrawable-animated/1.2.0/vectordrawable-animated-1.2.0": {
+   "aar": "sha256-oHC90EIioEB5Tl6fpLd41XX3uPToTQbZo47E1Zl3Cmk="
+  },
+  "androidx/vectordrawable/vectordrawable/1.2.0/vectordrawable-1.2.0": {
+   "aar": "sha256-T0S5SBetJm7YZBsLj6tObQOJAqYoQLtlKEcyIuHNz8k="
+  },
+  "androidx/versionedparcelable#versionedparcelable/1.1.1": {
+   "pom": "sha256-X1HmWHPKYS3jg4+pDS7pW40EDv0xucOQoZv5TWFc2y8="
+  },
+  "androidx/versionedparcelable/versionedparcelable/1.1.1/versionedparcelable-1.1.1": {
+   "aar": "sha256-V+jZMmDRjVuQB8nu08ZK0VnekMhgnr/HSjR8vVFFNaQ="
+  },
+  "androidx/window#window-core-android/1.5.0": {
+   "module": "sha256-W9gYaGgDvzwDf2Gg6Wr0RB6ISqik2RBi0q1Xh2+Re1A=",
+   "pom": "sha256-RjxQsiqWnGJ069t7X1a6HqHd41LpZ58KC6kPOXHbzVc="
+  },
+  "androidx/window#window-core/1.5.0": {
+   "module": "sha256-WVYE8FWhJQjsPHdPLZDF5WQUumJGx1QXLZyVyKAOwE8=",
+   "pom": "sha256-44ow/pqcy1dVMbJl/sjiMge9qYGJd6rklfP+dLnJ4fM="
+  },
+  "androidx/window#window/1.5.0": {
+   "module": "sha256-isXSdy6XyVfd3LyxwRmCKdSv5XzfXs1es81DagUZB0M=",
+   "pom": "sha256-1PIrmRppYA4v/Da0KsGZYm/ZbV8WSMO+7M013gb8w1E="
+  },
+  "androidx/window/window-core-android/1.5.0/window-core-android-1.5.0": {
+   "aar": "sha256-0NUNsHVhlKbUmmatja/ReyS0xfvYN5N1BW4uub3+ryI="
+  },
+  "androidx/window/window/1.5.0/window-1.5.0": {
+   "aar": "sha256-XeLUiqV4QC9G3rUpSpVc7mLwx9jBhA72Jvx6+4q+Ivk="
+  },
+  "com/android#signflinger/8.13.2": {
+   "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=",
+   "pom": "sha256-CfafQNTgDVIHLrDdB6xnaugjEyeaYIUw043RSAD1X8Q="
+  },
+  "com/android#zipflinger/8.13.2": {
+   "jar": "sha256-BwYAacNeRp18NDq8FfHWNivBNWuBv0YlOduIpT7WU/E=",
+   "pom": "sha256-4u7Td4LaTYx5nUxLc3w1rYjTkS9RNs/f4sAUzNQLNQw="
+  },
+  "com/android/application#com.android.application.gradle.plugin/8.13.2": {
+   "pom": "sha256-1FkMwEiO+6eC+zfRPlKBKTL37/8QIi7SqWt1IL/aoq8="
+  },
+  "com/android/databinding#baseLibrary/8.13.2": {
+   "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=",
+   "pom": "sha256-3/d3DxXM6F4bqoYuCUeh9ubuxNZJcLuz7MevDcFKbRw="
+  },
+  "com/android/library#com.android.library.gradle.plugin/8.13.2": {
+   "pom": "sha256-xYVT/MkO41ec7v/K6WH0rEciskhUkhr6rJt6ZomG670="
+  },
+  "com/android/tools#annotations/31.13.2": {
+   "jar": "sha256-O0u5YgwX0Z5b2RrBmICAVTVztMO3Of3ZJBb0Ly2vPng=",
+   "pom": "sha256-63PyFYFKl68he6cabGhZ+xx+V7E8XWzNmVneLJdCR1U="
+  },
+  "com/android/tools#common/31.13.2": {
+   "jar": "sha256-1OvhcR3gz1CcTVYiRWJLohqxR5RLzd5jUb+26NrM+CY=",
+   "pom": "sha256-JhPXZpT9SkW7xosWXBRTfVtUadvqbap32cMuj4VCFHM="
+  },
+  "com/android/tools#desugar_jdk_libs/2.1.5": {
+   "jar": "sha256-2ARL764JV4G5qAvx+qku3DA4LXXUN0dnhMG/mRWYqXY=",
+   "pom": "sha256-LhlYgPFdRUXI1gstLKxSIBzPmNt6Kdsld61YJqkw/Mo="
+  },
+  "com/android/tools#desugar_jdk_libs_configuration/2.1.5": {
+   "jar": "sha256-e8kFGzoewZgGMR3Laqm5un75wiyqb0gQ2lW94oX7d3A=",
+   "pom": "sha256-sgmXNbk5BdbwG1LhNtE2QoDNanLG5+o74nSmxncD8rQ="
+  },
+  "com/android/tools#dvlib/31.13.2": {
+   "jar": "sha256-488/3JR3iN7o1bqnbLcqZlcRdLxHQe3w47q5enypDhs=",
+   "pom": "sha256-HKqrkCIWAyLLMQfz/p4VuBXr0391aLxklStZCi3c5wY="
+  },
+  "com/android/tools#repository/31.13.2": {
+   "jar": "sha256-6VCbMNCI6JmUj4yw1zKTwe/S4fEh/Mu+JdUztki5P6E=",
+   "pom": "sha256-7+6KWA6sdHjIrvnTC85aQydT0m2UCl2VP/SCzkE8Zjo="
+  },
+  "com/android/tools#sdk-common/31.13.2": {
+   "jar": "sha256-jP35nW8XaJ5907zxg01zT23Rxk2MQ5BGMsZdVGlWWTQ=",
+   "pom": "sha256-ezPXPdQoR7BPWaUeqrcbNFLA1pn3xpZZFSuDhjzJDMQ="
+  },
+  "com/android/tools#sdklib/31.13.2": {
+   "jar": "sha256-3vmw5/ROVK3ThcrBcVSDck+CfxZlEevAwQMZdCqoCGU=",
+   "pom": "sha256-/saYRrZwqz267yBnul+YKa77gEd8n3aA+Q9Ka+NpWlg="
+  },
+  "com/android/tools/analytics-library#crash/31.13.2": {
+   "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=",
+   "pom": "sha256-+Rdh8nEZmwiOhbYjLgWYM+EU9WoT8RpVeVx2/rljZpM="
+  },
+  "com/android/tools/analytics-library#protos/31.13.2": {
+   "jar": "sha256-st7SCol/upZJ7+sYui/AYu455QDU63EgRcsONLQ7Xvs=",
+   "pom": "sha256-h+Vtxrwei3h2ACBQiqMn14SubOmq3mwenHpPPyZSXOA="
+  },
+  "com/android/tools/analytics-library#shared/31.13.2": {
+   "jar": "sha256-dUNYFvICt6PITZyvMSqJViWiRJkfj8UtBEYjnjrimpw=",
+   "pom": "sha256-iosZjZfS6noBpq5TxyRwfWa6N6BATLmCNJzs5F9VDHg="
+  },
+  "com/android/tools/analytics-library#tracker/31.13.2": {
+   "jar": "sha256-G2ZRS/KRUkIu6KGbmOAgDZLrCj0oBI60hXVk6aHHuFs=",
+   "pom": "sha256-fyfJXcqu/ZLc7ss35hsam3AUHs7oaiENnFf0bK5Pkck="
+  },
+  "com/android/tools/build#aapt2-proto/8.13.2-14304508": {
+   "jar": "sha256-ps2oLVCOw7MlqeN/ePn6hFVv80DPQ7sjxiew8550bw4=",
+   "module": "sha256-fVtyhfR2yCAI8NOfUGsLjFPxsCa9Yk163GiCFr6Opb4=",
+   "pom": "sha256-+f1XBgvd7CGC3Mk1dBbpk5DUq4t4YWVLZ7cqdOCQ/6U="
+  },
+  "com/android/tools/build#aaptcompiler/8.13.2": {
+   "jar": "sha256-9vZwbTt6Jh4kKCDaXIVRI9PCNzgVnKNybgw05IK4B3A=",
+   "module": "sha256-DjumtDrZj6aRMd4di2xqdUGzr3FEPctdUqLP/CVY7ms=",
+   "pom": "sha256-sQ/OQPXnkalYeGlI/NanTEc7yHTLScuYpnePGBz3MeQ="
+  },
+  "com/android/tools/build#apksig/8.13.2": {
+   "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=",
+   "pom": "sha256-Ij3tgmjn8O6d8BCdgEnO1hR0tevYSMLToIiTKixcyCM="
+  },
+  "com/android/tools/build#apkzlib/8.13.2": {
+   "jar": "sha256-KQkclFclL5l93+r7M91lo3OtRYQBKPlFgy2Or9kRhWE=",
+   "pom": "sha256-szSNoCWwi1M/Lm45E4aS6gsaiZVd3D4bjbF5alUxRtQ="
+  },
+  "com/android/tools/build#builder-model/8.13.2": {
+   "jar": "sha256-rl6VUVqzSNNKNb6D7TFcX7fowGZ+GG9OFWxl36omFf4=",
+   "module": "sha256-WuEdekCFfhpLC8an9CGCVclhabcBFTX5owt3tfbjJ6E=",
+   "pom": "sha256-TyWfQx/NK5q6MxCW8Q+Xq0ttX+kn32N+yy08+Vw8/eA="
+  },
+  "com/android/tools/build#builder-test-api/8.13.2": {
+   "jar": "sha256-PP7QuuwufQ5kVm9oCKAO9eBRrXb8T7qdRk0Ro8L5hqk=",
+   "module": "sha256-T3Lzqf0+n1FsNs76xpeNzAQEliELjPrX0pVMg7ug6ZA=",
+   "pom": "sha256-E1tr6DkVxZFu6TBTxUTaQb0Avc8Y6wjEsNT8SsnLyb8="
+  },
+  "com/android/tools/build#builder/8.13.2": {
+   "jar": "sha256-fTk/hVMSDH16hpyzPEJ5qtlIWYZ3P2Ovl68I6i4f83o=",
+   "module": "sha256-SooQjeXwQUKmdXhhoKV6KYuTa3t/f5xbkeXKqafv2pA=",
+   "pom": "sha256-Gqs99HpacMRsGOT6BuNjrVf3UPtGDHHvFl9xqHb3hyY="
+  },
+  "com/android/tools/build#bundletool/1.18.1": {
+   "jar": "sha256-pzNBp5RavLDmuJccexsoAb12UAZEfKDSQ3pCYNVyzqw=",
+   "pom": "sha256-XE33suMfF/IOS429YqK3hloJpJof0pMaNZ/TlOy5taU="
+  },
+  "com/android/tools/build#gradle-api/8.13.2": {
+   "jar": "sha256-qNzcbxM49wVfaxvCZTF+FNZYM+bH9yshAsVWjh3015I=",
+   "module": "sha256-G+ABgWcGZoc80BKOnexu6ZzSriB7q5CezBH/DPcpvF0=",
+   "pom": "sha256-B6fxsnM2mtT8EjpMy0f7Hg2WixGjjHPNRchTPWTOx4s="
+  },
+  "com/android/tools/build#gradle-common-api/8.13.2": {
+   "jar": "sha256-/N6AX81XOa7WB6nNwyUxb0IvoFpG4UCikdLyTso6Wf4=",
+   "module": "sha256-nm7c2Vn27YeiJzuF3g9O+sJufNy/S9ako/TgXI5+fBw=",
+   "pom": "sha256-DTY2ikCNkKt/cEhkHezZ6ALoIZdYV1651CGKRmNlUVg="
+  },
+  "com/android/tools/build#gradle-settings-api/8.13.2": {
+   "jar": "sha256-NwQ4vPd4LYxbQHNwNlsEe/Bj+Zp3ReH18YUxgzmNB6Y=",
+   "module": "sha256-5crHmMEyNO6kOtsITFyBwgrRw2zEtbV/OSLZH07AJNY=",
+   "pom": "sha256-iJlOxc2yOO23vY51Rx2NCXkvtSUEa3hBNabN6+DUwz8="
+  },
+  "com/android/tools/build#gradle/8.13.2": {
+   "jar": "sha256-5JT3znXKbBq/8wHUpwsY/dPWr4VYdfT4UIK7dgjwQd4=",
+   "module": "sha256-CqwL7hpPxlzWmmeIVIp+IdJGJQyFgBfhHjvyMWPLdac=",
+   "pom": "sha256-/H7bqTxbkc5yZ/p7/cH6SUIu/GM6wnmjY+AusP0pvK0="
+  },
+  "com/android/tools/build#manifest-merger/31.13.2": {
+   "jar": "sha256-QNJfWUDC5Qv34Y4yX3+7nIbPRdtahdHO+O+YVAQieh8=",
+   "module": "sha256-S9nUffB7eBdKcvqpJCOTWvKdF8mJaoS2WLkh9vGpI0g=",
+   "pom": "sha256-cEzxt4bSDIBGo7Ml/DKQ+pgulwlfZK0hmHzz7jN53bI="
+  },
+  "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": {
+   "jar": "sha256-TeSj0F4cU0wtueRYi/NAgrsr0jLYq7lyfEMCkM4iV0A=",
+   "pom": "sha256-fGLzhW6KvKHXkleSXybBJmhpP12VkEBWu6yIYFz9hXU="
+  },
+  "com/android/tools/build/jetifier#jetifier-core/1.0.0-beta10": {
+   "jar": "sha256-Jqu0oTkn2QYhacUEyelP6A6a46T3tauIdasAdTapH14=",
+   "module": "sha256-8JF1iaQtJ2Fj8QBAq1hC6RiD3L2x1Iv9Hx/Kpywcp7c=",
+   "pom": "sha256-XJ1C5rfjXU2NAuCjIs8maTs+w2QrEHyPC+WnIdRaDG0="
+  },
+  "com/android/tools/build/jetifier#jetifier-processor/1.0.0-beta10": {
+   "jar": "sha256-xQZ6e5KCN6EnGl6ctXEOn4C0lzKTlFvFHjpMhk6kv+0=",
+   "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=",
+   "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI="
+  },
+  "com/android/tools/ddms#ddmlib/31.13.2": {
+   "jar": "sha256-g5lX+WEQBxPqDu1iioaEzDmqR5Yxw2JJeT5t9+DNY9g=",
+   "pom": "sha256-mohLOgztXxl+011f8o3UQIJK62qMQh/GgnbrgZIq0MA="
+  },
+  "com/android/tools/emulator#proto/31.13.2": {
+   "jar": "sha256-t3+BzAdR15OT7EsusEb5ENIavNdgi1sPWh7+obMkO0g=",
+   "pom": "sha256-NPBZInrVOOvI7RkjRJDO1YpuKUhFpyy6sRTrV6MRNWo="
+  },
+  "com/android/tools/layoutlib#layoutlib-api/31.13.2": {
+   "jar": "sha256-0GvGUCR2MqSk5llrhzEgGfRekAJnxUdsR6W/puP9MTI=",
+   "pom": "sha256-ttE1l7KS5SNcEe3gBH/c5wjtnwreawOcXwJ3C6jWEFM="
+  },
+  "com/android/tools/lint#lint-model/31.13.2": {
+   "jar": "sha256-nuVdj9ACc27ZXul/sF9N964B9Pl29zj7837Kt5Xlkxk=",
+   "pom": "sha256-kmFkH147W3zkzc07dddGebywrMb65cyAh99QGJOVm4E="
+  },
+  "com/android/tools/lint#lint-typedef-remover/31.13.2": {
+   "jar": "sha256-Sjujur/Xnm/Ge872R/tOz+r1m0gbEI98LrpNHFxt6o4=",
+   "pom": "sha256-VSFuggl5u3yVA/fqPBApj3xBj/O8cvsp+v7VQdn45CE="
+  },
+  "com/android/tools/utp#android-device-provider-ddmlib-proto/31.13.2": {
+   "jar": "sha256-BHrs3WbhBhN/d6UsRC8bg9t9boSWiZgAJR8gbH853mU=",
+   "pom": "sha256-QRYjc/qmac/XQQEHfsKc8oUiLpMbqInFPmD/YOz2Yx4="
+  },
+  "com/android/tools/utp#android-device-provider-ddmlib/31.13.2": {
+   "jar": "sha256-sW6/71tjsDuAPq0KXhlO404N02HB4ZFVfZmPAVNHRP8=",
+   "module": "sha256-FXRXBPuVGjYpsaJjWsbiEIWw9uYyWWbUdyXlDDpfrFs=",
+   "pom": "sha256-0+eBcTpLa9BjVD3ktUfc3DtADzM/uSHo64fOyXihxc4="
+  },
+  "com/android/tools/utp#android-device-provider-profile-proto/31.13.2": {
+   "jar": "sha256-PnsJj24+yuMbb3kJw0O07AmqGNion0G/kgd7pLBW9FM=",
+   "pom": "sha256-1VV0td2msIt2qxCpJklZNMfdwQ9hfTNud5tgO1Vem6I="
+  },
+  "com/android/tools/utp#android-device-provider-profile/31.13.2": {
+   "jar": "sha256-lWDCWFnJwVx3FEy7WDcLrTlIguzDFp/V5Ym31OUuhm8=",
+   "module": "sha256-fM5ga+y1hTIhypALdUDQ5su4we1MKt8LBu45w20OTek=",
+   "pom": "sha256-smVzfBte/3zXQm9ii2gr4a79CsR1oRk/0eQIQOEj9Nc="
+  },
+  "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.13.2": {
+   "jar": "sha256-a6fmrCII10wbtfHRRkq6/GpF2HELIEVaLcAq34cmvIM=",
+   "pom": "sha256-ryqLvOmjdsDe9Kryh6GdzoUgLxJ7UjJC/+H4BB4U3yg="
+  },
+  "com/android/tools/utp#android-test-plugin-host-additional-test-output/31.13.2": {
+   "jar": "sha256-+q5CoWz3bXUptZsbmk2/nLG+3KWBGOuoJP3bgxLcdlU=",
+   "module": "sha256-sKPFs1jWtiZ0SOtqv+r2rQJasfB8s7ZQr1L9cCut/AU=",
+   "pom": "sha256-NGdCkqoA/jQOWfcLoOYplspdjKRkns2gsqTGjvOwTzg="
+  },
+  "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.13.2": {
+   "jar": "sha256-TythBULpGjWjlrBDaKeEA25CuHhwIUYFULmjSVu4JFs=",
+   "pom": "sha256-qL1ZxNO6Howe4EJm9q8qRtKonyCeXllrFjdZwb1IDyo="
+  },
+  "com/android/tools/utp#android-test-plugin-host-apk-installer/31.13.2": {
+   "jar": "sha256-lJxvZRIhKdPs1ZsImYYOjiTpaCzsHACNHxGlzJM2b2Q=",
+   "module": "sha256-rklFwRAtyPUwdfYeuooPZmx0N//r4rn7FnGWjMRUcxM=",
+   "pom": "sha256-bXJmUtjrmRGvrvVsYdgwhw0Nc/f2FIz+OdMHHS96owk="
+  },
+  "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.13.2": {
+   "jar": "sha256-+oZxmj3F3kZffgwCMYRBTCf4/VOjT9VXKJwL9t80AkQ=",
+   "pom": "sha256-5W3OG2cA6f1KG5tPXK2q0IZNOYLuZJM5IrXU4MCKp0U="
+  },
+  "com/android/tools/utp#android-test-plugin-host-coverage/31.13.2": {
+   "jar": "sha256-SZOpUEnlLE0xR+nE38aWzFp2r4MDpCBrtgwr+rxWOuk=",
+   "module": "sha256-2vHyeSUp3ETOxol/l/yEXbqmP+wtaTnJfifC/upNs/Y=",
+   "pom": "sha256-KZZUgBQenSuZYfNzTD+5rdkKS63o11oHur7udP6OnQ0="
+  },
+  "com/android/tools/utp#android-test-plugin-host-device-info-proto/31.13.2": {
+   "jar": "sha256-loOsdkinpBvpoTSfaYFZKUT2JxZImMPIkloL7t6LuLs=",
+   "pom": "sha256-KtC5oodv9I1QsPQIPQfj2/1Dp8Gn1sjRcKn0+uyTlR4="
+  },
+  "com/android/tools/utp#android-test-plugin-host-device-info/31.13.2": {
+   "jar": "sha256-pTufdk2AvtKeDy4O5iV23Am4c4Zgi7Yu8UU9Ay+XaWg=",
+   "module": "sha256-bBIiuD/k1MxYT29EGfak6Vcj3KpFPHoyRp/yTAgJ4qA=",
+   "pom": "sha256-O3fGvofJKUpgp6jiqEo/Sa0jIJy7fIG7WF3lRySXSzY="
+  },
+  "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.13.2": {
+   "jar": "sha256-pPNKrg+f+gJtv3FRQ23XrlO+y3JiK0DyxHnKyJQ9kxk=",
+   "pom": "sha256-jxTna0jka6UmSo+PpNmPgIWrZUxPF1p+BPQPrGAZ15Q="
+  },
+  "com/android/tools/utp#android-test-plugin-host-emulator-control/31.13.2": {
+   "jar": "sha256-cwIsKid57qz7/OZ92nz7sh47PPVhClTjX8MNj8yGCTA=",
+   "module": "sha256-AZYRJVaOGMsxJEbw4cTt/TZp/IqQxFn/UFcp7+Lgc84=",
+   "pom": "sha256-dUbsbfAjTkabNh4PLA/Lr2N4BEX4VOsqxMJ2sHyZ8o4="
+  },
+  "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.13.2": {
+   "jar": "sha256-wfbrus2tVZtu/k6qKVYVUrMxVjlfBpzZcD/aCcRi3qY=",
+   "pom": "sha256-/zDRtJGIKYz5JqMKkU21ZWm+AuRFqm0DVlIHUKyYxag="
+  },
+  "com/android/tools/utp#android-test-plugin-host-logcat/31.13.2": {
+   "jar": "sha256-9Vm3xUTimsNUczmAXF6Y2TjionZGkddOur6zbh/KD7o=",
+   "module": "sha256-3z0on/um/yj6iHVGJHfZEfAJzAlMfKVZc7lrMdoCaek=",
+   "pom": "sha256-La4mMDSObLGhRR4gJCAjk9RWErRUZmdxn6msE9gfglE="
+  },
+  "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.13.2": {
+   "jar": "sha256-1Cm5MS3/oFAzgdHuGxipmb2QHnRWYSsvtIxqXVosr4g=",
+   "pom": "sha256-NURycXV95NFmjrHctNobh2pLlEQHYky9661bHttESPo="
+  },
+  "com/android/tools/utp#android-test-plugin-result-listener-gradle/31.13.2": {
+   "jar": "sha256-9e057Np3aEcwsmFtES1p+S9Qnj1sOIKKvGqGPvd/4OU=",
+   "module": "sha256-aJrPHlaZS/50AVIYvYlZXVf+wUFXxc5mocdcfgEfiJ8=",
+   "pom": "sha256-aWdAHML+nRizUOPlQuf2l45UxA4UDLEbgrDPEDmkv9k="
+  },
+  "com/android/tools/utp#utp-common/31.13.2": {
+   "jar": "sha256-zeZ4pksTBBzdLMna0WhZkKHQkPsE/12iJh/3WoNZgQY=",
+   "pom": "sha256-su8omyDL3HUwfnQc8RXaFVRZ4aWLXQwuCh/aPK0TtnE="
+  },
+  "com/google/testing/platform#android-device-provider-local/0.0.9-alpha03": {
+   "jar": "sha256-ZnpNNbu6h9PIb1GA36Uh/b16TvXGDZSRVLAwHz4jLhs=",
+   "pom": "sha256-kTs67pWnFYGkCQOLHMonPOg10/K48qtaYAu+12nqbf0="
+  },
+  "com/google/testing/platform#android-driver-instrumentation/0.0.9-alpha03": {
+   "jar": "sha256-UHxjLsfbd7yymbVRnVmxTMYkOqxUF2fGMv2+3cYiawc=",
+   "pom": "sha256-AtXBStCZWXGhCIGQdacXXRAHa9cVJ3LO00QrsZxMG1M="
+  },
+  "com/google/testing/platform#android-test-plugin/0.0.9-alpha03": {
+   "jar": "sha256-1st+Em9DMDcZC808O5BLGbqELUaxew/SfDjMTM7L7JA=",
+   "pom": "sha256-qCucEMqqjl0fPNtjhHqbA6yXOKUlswmrcNTRZh7f6iI="
+  },
+  "com/google/testing/platform#core-proto/0.0.9-alpha03": {
+   "jar": "sha256-0AHrDMu/yMueqhk6NY5jcSl0Y5d1ZHvpSasjLCsptAc=",
+   "pom": "sha256-O7RSgN8d0clrmgFySmFFZrfWDTNFP81SwsdB+ZmcOk4="
+  },
+  "com/google/testing/platform#core/0.0.9-alpha03": {
+   "jar": "sha256-bhgG0BXEFllvU6RaMQDiV0PDE6bj/E9S8k6LJX8sgs4=",
+   "pom": "sha256-nwPalZsyYcweuciIa/iu1vXWC7lbjYY4vtVUQ65iDCo="
+  },
+  "com/google/testing/platform#launcher/0.0.9-alpha03": {
+   "jar": "sha256-ABL5gKBZoMTCFtDx0AFoZ6sx64B54/j4efHwK3vjpuc=",
+   "pom": "sha256-GLgPNKXp+hpe7CJQ/XHlRl8utLTQnhgZQOOPG24GRFI="
   }
  },
  "https://plugins.gradle.org/m2": {
@@ -430,6 +1543,10 @@
   }
  },
  "https://repo.maven.apache.org/maven2": {
+  "ca/gosyer#kotlin-multiplatform-appdirs-android/2.0.0": {
+   "module": "sha256-oqK2yFh9N35RSspPrOx2goRjJ3RdrxKOEisyLhdwYX8=",
+   "pom": "sha256-aQ7Rh42CH7HmVnVme7LzSXiMyRRb+HQn+2S+Y3raBfE="
+  },
   "ca/gosyer#kotlin-multiplatform-appdirs-jvm/2.0.0": {
    "jar": "sha256-9W8QSfNyX4LKLkFSVGpM0+g5pUN9Gktr1zoLpp9oQ3M=",
    "module": "sha256-3LnXloRopOXkX0gYiTTXm+MaEYoebg5bsJ5BiVttPSk=",
@@ -440,6 +1557,25 @@
    "module": "sha256-yGECuuKG8zdIIe+H9FO50b3XCQQ4fRWHI6FgyvTtHis=",
    "pom": "sha256-wzXWGRFakyrtcWEKbIAQIssts+vXeWpBf0rgwFyzCAM="
   },
+  "ca/gosyer/kotlin-multiplatform-appdirs-android/2.0.0/kotlin-multiplatform-appdirs-android-2.0.0": {
+   "aar": "sha256-uRGCzwx3t9BqwAtvlc+v28rT09uaZr8xuxKTC0b09KM="
+  },
+  "co/touchlab#kermit-android-debug/2.1.0": {
+   "module": "sha256-PTX96AWuxv0Wqm5CsaLzDGgvvOx3Tm12YRbe8tzQE6s=",
+   "pom": "sha256-NYv9620vxczOcluG9tEeMDUUf3P+EQi0kqJq7hnFJlg="
+  },
+  "co/touchlab#kermit-android/2.1.0": {
+   "module": "sha256-NcVcObKiKiIqskFvYAKZyJ1Yw7wRX/xi+OAJ3u5prCk=",
+   "pom": "sha256-QEC1Js97SAg4Uk4WoTQvdnG6uMaHDeWlJ3L1NR1RbVo="
+  },
+  "co/touchlab#kermit-core-android-debug/2.1.0": {
+   "module": "sha256-SmbpuYMCzXPSUgVgpFtC+1AuRIcnc6ifqSKBYsM2+3w=",
+   "pom": "sha256-buAIP6qf7d/O/w7lVuxFgaMd5Aiu3i1GPjrfLbQuESo="
+  },
+  "co/touchlab#kermit-core-android/2.1.0": {
+   "module": "sha256-X+k/0c82jnuRGBwi6pdh0DFSVgRafEcG41gdJWFRPUQ=",
+   "pom": "sha256-hYBZ6LfjBzx6TORAcgoZ8bXNJ6YVB12jTnC1jX8mg0M="
+  },
   "co/touchlab#kermit-core-jvm/2.1.0": {
    "jar": "sha256-o7+Kg6Q1Pz3UcpMjsojt0bfwR0x9MlHhYbJBodBwVDo=",
    "module": "sha256-1XB+LtLHU5Q3bjQXEux323nhpW0ouMa/Bt9AJiDyotw=",
@@ -460,12 +1596,25 @@
    "module": "sha256-j5+C8LO6FjpyFoyjtNDIreZjiYWlSHCmrmxVSiVoDMc=",
    "pom": "sha256-LttgVDFR0D1gnKQZd/mAyiPCauXJZUdfBIEsCDsWLFI="
   },
+  "co/touchlab/kermit-android-debug/2.1.0/kermit-android-debug-2.1.0": {
+   "aar": "sha256-/CXcJ5JOmeNNvcKUN2yFDwZ4L8SQ3lySEnY57bqVUa4="
+  },
+  "co/touchlab/kermit-android/2.1.0/kermit-android-2.1.0": {
+   "aar": "sha256-smFeJdqT8yKlaNKldAB8q4CZOjAAbmlzi8g5+Z5aQBE="
+  },
+  "co/touchlab/kermit-core-android-debug/2.1.0/kermit-core-android-debug-2.1.0": {
+   "aar": "sha256-Bw6RvhVuf/SIXPPXBc4h1B8czxC9cPv3oIFu5wFsSA8="
+  },
+  "co/touchlab/kermit-core-android/2.1.0/kermit-core-android-2.1.0": {
+   "aar": "sha256-4d5az3Azn+MG4UEZMLnLZPswa8EYMJ9n4MMXYHFzc4c="
+  },
   "com/akuleshov7#ktoml-core-jvm/0.7.1": {
    "jar": "sha256-wiy2Ye78deMAB6GwjTfE6ToVf386lQpHglFjLAr2BQ0=",
    "module": "sha256-nk20aBr+n8zryNDKpAaVKLW8ersNrDPrPOOkpd34XCw=",
    "pom": "sha256-bMHKxVFmEEVu3rqjgc21VgMU0VI0TUmD8vkMwoD1iLc="
   },
   "com/akuleshov7#ktoml-core/0.7.1": {
+   "jar": "sha256-ysG1EkRpNnrJBlYATheeFmG3PaFlIhlP3NMnR7P4sjc=",
    "module": "sha256-hRT4XEby1I04dPmzkG/JOIIHPDfb9tFx7+smenVd0mw=",
    "pom": "sha256-7gHJjNR9lVtZmKbK68N8H+SouOI1crHufEylupSd22w="
   },
@@ -563,27 +1712,241 @@
    "pom": "sha256-2Eq7+TR9M3sx+jAO1yMQ31QCxmGhgDp0sOjkNnb4WWA="
   },
   "com/github/skydoves#compose-stable-marker/1.0.7": {
+   "jar": "sha256-5qqgcUK5pe0tl6pzwbLot02bunA6foOyW1eXTv0jgXg=",
    "module": "sha256-m8NxIK0ge/t3eqykNy1UMYiUR7QwkTMgxG2tUHuoPm4=",
    "pom": "sha256-G3+FZj1NbgIXTUdklUmV1lmefruAviob6/6wNeJIP4U="
   },
+  "com/google/accompanist#accompanist-drawablepainter/0.37.3": {
+   "module": "sha256-M/O1/0mKSsp0U3Nccx7zo+X3FBkdEjKijeg/dtNC1VY=",
+   "pom": "sha256-ambPsAooHoQHAXIlSRPvIKN/W4QR0i69BLyAWnHk0t8="
+  },
+  "com/google/accompanist/accompanist-drawablepainter/0.37.3/accompanist-drawablepainter-0.37.3": {
+   "aar": "sha256-BFPExU7D7xOuGLgzAPHSoHixypLTo3gUN1FmMOO4UN8="
+  },
+  "com/google/android#annotations/4.1.1.4": {
+   "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=",
+   "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng="
+  },
+  "com/google/api/grpc#proto-google-common-protos/2.17.0": {
+   "jar": "sha256-TvH+DDJ/wVIdHXU7CxxKh1pUvRTr3tOv/wyjlTILbqk=",
+   "pom": "sha256-PwKBU6WFxZ9Viz5Dp8mAmmAai7XpEGHWxlj/+iTLjiY="
+  },
+  "com/google/api/grpc#proto-google-common-protos/2.48.0": {
+   "jar": "sha256-Q+x4B0WaqkAS6Dihvk7y1ZDPIzMF2mCvW1TwjsjPIwI=",
+   "pom": "sha256-ReuSeyJoX8Eb+rac5q07Q59y2Bajp95GvSP07Rm/icM="
+  },
+  "com/google/auto#auto-common/1.2.1": {
+   "jar": "sha256-9D8p/ipuuvBLJZjN7sMqTjRtSalATpkPX8GcGfOijQ4=",
+   "pom": "sha256-E7S1AGKUn4sTQ5J8WBU207sFG4r+pQmqb5AvTeKLwbI="
+  },
+  "com/google/auto#auto-parent/6": {
+   "pom": "sha256-BfdAxmSBZdsAz2GN1WwgDEcl41jm1U9YU+C+wVc06go="
+  },
+  "com/google/auto/service#auto-service-aggregator/1.1.1": {
+   "pom": "sha256-4tw+JjpdsMyBcvsuubzSMqzs/clugXED6rPI2fGQDGo="
+  },
+  "com/google/auto/service#auto-service-annotations/1.1.1": {
+   "jar": "sha256-Fqdt0AomUFaER/XW46niyAnZpCNn1WtFIVz7iXMfTSQ=",
+   "pom": "sha256-Fln9CiXOqfqav7GN6517GAzOOs6rFv+eYlRhVn5Eot8="
+  },
+  "com/google/auto/service#auto-service/1.1.1": {
+   "jar": "sha256-H0j0UVA+Yj2rp9ntNozKD4Hh44FWU6RWARPhLAEp69U=",
+   "pom": "sha256-DFPC+HlJs76PHIxnu3bAjtT0vrjbqkdcMrpZPUYXYxc="
+  },
+  "com/google/auto/value#auto-value-annotations/1.6.2": {
+   "jar": "sha256-tIsE3bpA6KwzvwNvBvxDmV/FCEvZS9qs6AfOJ9O+o/s=",
+   "pom": "sha256-HHbNRi/JbnqpbccM6C8NVAY9bfFts1ycfZzA0amdP/8="
+  },
+  "com/google/auto/value#auto-value-parent/1.6.2": {
+   "pom": "sha256-J7ZAyCF59c/2IAnAtyAz2bxg9g6ZAqZoAidLf+N/yBw="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/code/gson#gson-parent/2.10.1": {
+   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
+  },
   "com/google/code/gson#gson-parent/2.11.0": {
    "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
   },
+  "com/google/code/gson#gson-parent/2.8.9": {
+   "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
+  },
+  "com/google/code/gson#gson/2.10.1": {
+   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
+  },
   "com/google/code/gson#gson/2.11.0": {
    "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
    "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
   },
+  "com/google/code/gson#gson/2.8.9": {
+   "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
+   "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
+  },
+  "com/google/crypto/tink#tink/1.7.0": {
+   "jar": "sha256-iJcKRWoIukxmsBsj5YRsoQlcwU5Uy0g2Pl0uFaEwcwg=",
+   "pom": "sha256-Ku41I3FfjyzRCyYDyNGeVhrHWDELfiyYU5RtLF57S/c="
+  },
+  "com/google/dagger#dagger/2.28.3": {
+   "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=",
+   "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA="
+  },
+  "com/google/dagger#dagger/2.48": {
+   "jar": "sha256-H6Im0rSgLMgJUPpNSaSiNcyOztSZtYH8NYpVRGqD9Xk=",
+   "pom": "sha256-df10hXPlgHWxMG9/rhnPWwLAsIUJCPdlExsJKhFWqUQ="
+  },
+  "com/google/errorprone#error_prone_annotations/2.18.0": {
+   "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
+  },
+  "com/google/errorprone#error_prone_annotations/2.23.0": {
+   "jar": "sha256-7G858Gi2/5rDI8aOKLkpn4wKgMpRLcyx1KcPQKw+wFQ=",
+   "pom": "sha256-1auxfyMbY78Ak1j6ZAKBt0SBDLlYflmUl3g0lZwH29g="
+  },
   "com/google/errorprone#error_prone_annotations/2.27.0": {
-   "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
    "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
   },
+  "com/google/errorprone#error_prone_annotations/2.28.0": {
+   "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=",
+   "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo="
+  },
+  "com/google/errorprone#error_prone_annotations/2.3.1": {
+   "pom": "sha256-PtzmtxG6No7+Frm3qssCFPvWSEFMublllTouftiagZo="
+  },
+  "com/google/errorprone#error_prone_annotations/2.30.0": {
+   "jar": "sha256-FE86771uJ9rsVdN1OyxrE8Gv2vDPBIFs21ZFiO2S8b0=",
+   "pom": "sha256-9xOEnCOzSVPoVFZdzoqnlcrgwUFmEbcgwhRhMix5X4Y="
+  },
+  "com/google/errorprone#error_prone_parent/2.18.0": {
+   "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
+  },
+  "com/google/errorprone#error_prone_parent/2.23.0": {
+   "pom": "sha256-9UcKSzEE/jCfvpSoDRbDxU0g90j0xd5PaKQoaI8wy9Q="
+  },
   "com/google/errorprone#error_prone_parent/2.27.0": {
    "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
   },
+  "com/google/errorprone#error_prone_parent/2.28.0": {
+   "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM="
+  },
+  "com/google/errorprone#error_prone_parent/2.3.1": {
+   "pom": "sha256-dnUl2agRKc0IGWg4KYAzYye+QWKx4iUaGCkR2qczwSM="
+  },
+  "com/google/errorprone#error_prone_parent/2.30.0": {
+   "pom": "sha256-Xog0zMDl7Qxy8wbCULUY5q0Q0HWpt7kQz2lcuh7gKi0="
+  },
+  "com/google/flatbuffers#flatbuffers-java/1.12.0": {
+   "jar": "sha256-P4wIi03QSphYch8uFiUIyU2w3Yb5YeMG7mPvLtqHG/c=",
+   "pom": "sha256-yyJrr1RiYHcPIegVKmqoi6FSMNc591DfSA8qZo1D4Os="
+  },
+  "com/google/guava#failureaccess/1.0.1": {
+   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+  },
+  "com/google/guava#failureaccess/1.0.2": {
+   "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
+   "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/32.0.1-jre": {
+   "pom": "sha256-Q+0ONrNT9B5et1zXVmZ8ni35fO8G6xYGaWcVih0DTSo="
+  },
+  "com/google/guava#guava-parent/33.3.1-jre": {
+   "pom": "sha256-VUQdsn6Iad/v4FMFm99Hi9x+lVhWQr85HwAjNF/VYoc="
+  },
+  "com/google/guava#guava/32.0.1-jre": {
+   "jar": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU=",
+   "pom": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo="
+  },
+  "com/google/guava#guava/33.3.1-jre": {
+   "jar": "sha256-S/Dixa+ORSXJbo/eF6T3MH+X+EePEcTI41oOMpiuTpA=",
+   "module": "sha256-QYWMhHU/2WprfFESL8zvOVWMkcwIJk4IUGvPIODmNzM=",
+   "pom": "sha256-MTtn/BPrOwY07acVoSKZcfXem4GIvCgHYoFbg6J18ZM="
+  },
+  "com/google/guava#listenablefuture/1.0": {
+   "jar": "sha256-5K12B+XAR3xviQ7yaknLjRu03/tlC6tFAq/uZGROMGk=",
+   "pom": "sha256-U4c8rya8HtilZ+psk5qyqqP0el4y1creld31CA0jI4o="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/j2objc#j2objc-annotations/2.8": {
+   "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
+   "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
+  },
+  "com/google/j2objc#j2objc-annotations/3.0.0": {
+   "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
+   "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+  },
+  "com/google/jimfs#jimfs-parent/1.1": {
+   "pom": "sha256-xxVVdR5X4O+RKHDorJYlrnglAqalucGcz4OyqX2LJr0="
+  },
+  "com/google/jimfs#jimfs/1.1": {
+   "jar": "sha256-xIKOKNfAqTCvk4dRCzutp9qlwE18Jadce4sIHxwlfd0=",
+   "pom": "sha256-76huXNki8XtHL9/K5XI02NSsPhSLYlBzffzkVK96ekQ="
+  },
+  "com/google/protobuf#protobuf-bom/3.22.3": {
+   "pom": "sha256-E6Mt+53m/Bw8P3r1Pk1cd/130rR2uuOLdLdYHN7i5lU="
+  },
+  "com/google/protobuf#protobuf-bom/3.24.4": {
+   "pom": "sha256-BOz9UsUN8Hp1VR+bCeDvMGMO5CN9CRyg7KceW/t4zOU="
+  },
+  "com/google/protobuf#protobuf-bom/3.25.5": {
+   "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM="
+  },
+  "com/google/protobuf#protobuf-java-util/3.22.3": {
+   "jar": "sha256-xhX3aHncXDA+TfW5Smr6OVNAWMdUXbLUg/2V2fY8i/4=",
+   "pom": "sha256-tEcBsGoGSGXsm1YUqT6eKPrdfU38S0YPIcgZ71Pb4tY="
+  },
+  "com/google/protobuf#protobuf-java-util/3.24.4": {
+   "jar": "sha256-EzySniz+OZChBdGOrMxJEistL7SStCDvAtXZ+Tfq67g=",
+   "pom": "sha256-nwzsJ21NnVpD1uKcwrAk5GgEyThqlvpSfu/Xv3SI5/A="
+  },
+  "com/google/protobuf#protobuf-java-util/3.25.5": {
+   "jar": "sha256-2sxYssPS+o1L3cGsuIHnjWz3wTfdeLwdZ/aspzJDao0=",
+   "pom": "sha256-oJ0ZDqpqeWFrxfS1QE6UsMq1WYA6mMigkMQJmWL0H5I="
+  },
+  "com/google/protobuf#protobuf-java/3.24.4": {
+   "jar": "sha256-5WVVIr4apcwfLwkqoDawRFFX8pSSju3xMyrJOMe2loY=",
+   "pom": "sha256-OUEiHKZXgZ3evZX+i3QPRwr3q/MEYLE+ocmrefEPq5E="
+  },
+  "com/google/protobuf#protobuf-java/3.25.5": {
+   "jar": "sha256-hUAkf62eBrrvqPtF6zE4AtAZ9IXxQwDg+da1Vu2I51M=",
+   "pom": "sha256-51IDIVeno5vpvjeGaEB1RSpGzVhrKGWr0z5wdWikyK8="
+  },
+  "com/google/protobuf#protobuf-kotlin/3.24.4": {
+   "jar": "sha256-UIyhPZe1D1QE6qN+tEk8sHiEFi63lxv5JNj4A9TCG7Q=",
+   "pom": "sha256-O7Hm75SmpDa9L/Zq8N1gPCPtOilDsvuJn4PZ+Hktcqk="
+  },
+  "com/google/protobuf#protobuf-parent/3.22.3": {
+   "pom": "sha256-OZEz1/b1eTTddsSxjoY0j0JFMhCNr0oByPgguGZfCSk="
+  },
+  "com/google/protobuf#protobuf-parent/3.24.4": {
+   "pom": "sha256-+37AUFh2/bnseVEKztLR6wTDuM/GkLWJBJdXypgcrbM="
+  },
+  "com/google/protobuf#protobuf-parent/3.25.5": {
+   "pom": "sha256-ZMwOOtboX1rsj53Pk0HRN56VJTZP9T4j4W2NWCRnPvc="
+  },
   "com/googlecode/htmlcompressor#htmlcompressor/1.5.2": {
    "jar": "sha256-psxeXeBb7nQgj9MHj8H66uVPdK1wzlbqX0k2TFbSw4M=",
    "pom": "sha256-rmmOFrwcgawzZd0SaTETtZAB1Yf83mGBKJytHBhPTs0="
   },
+  "com/googlecode/juniversalchardet#juniversalchardet/1.0.3": {
+   "jar": "sha256-dXv+kGGTuLZR553CbNZ9a1XQdwos37A4FZFQT3edSnY=",
+   "pom": "sha256-eEY5mzXHzWQqmzoADD4tYtBOs3pFR7aTPMixi8wvCGs="
+  },
+  "com/squareup#javapoet/1.10.0": {
+   "jar": "sha256-IO9LguQ/98ZSKBohMTzzuUEJJGet0/pzUJwm9pae/as=",
+   "pom": "sha256-FpA0CiIiefLLrfNz6Igm+iD388w+wCUvNoGP7TJwGrE="
+  },
+  "com/squareup#javawriter/2.5.0": {
+   "jar": "sha256-/PsJ+w6gqpfTz+fqeSOYCBNI5GjxJrNgPLOAPyQBl/A=",
+   "pom": "sha256-4avX8RFs9eDFmUdpPiGJII7JQpayozlMlZ41EdOZp7A="
+  },
   "com/squareup/moshi#moshi-kotlin/1.12.0": {
    "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=",
    "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=",
@@ -610,6 +1973,7 @@
    "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8="
   },
   "com/squareup/okio#okio-jvm/3.9.1": {
+   "jar": "sha256-/m/pE3j5v6ewjDhkgozkGABc8orMoS6IR+tlxWXDdQA=",
    "module": "sha256-sK+pGSxC18Rj3jjWMlk2xpAdnjtxSXNf/RihHfMQNKs=",
    "pom": "sha256-VXZInO8kBTNoAPxt6VhUU18zVxpO/lpa0OybmwkNIdU="
   },
@@ -623,9 +1987,50 @@
    "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
   },
   "com/squareup/okio#okio/3.9.1": {
+   "jar": "sha256-mcjrvEmV8p3ViwXXVYP8yLlX2yHu64xdiXM/DTSVWJc=",
    "module": "sha256-m5C0J0pa1gLdV01tS0iQNmOy3ppgufw0AiSCk9hD4SE=",
    "pom": "sha256-06DDd+epr8zbsCqrXgUNwhL/2pQNvUcOo5cSpDQt8I4="
   },
+  "com/sun/activation#all/1.2.0": {
+   "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
+  },
+  "com/sun/activation#all/1.2.1": {
+   "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U="
+  },
+  "com/sun/activation#javax.activation/1.2.0": {
+   "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=",
+   "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4="
+  },
+  "com/sun/istack#istack-commons-runtime/3.0.8": {
+   "jar": "sha256-T/q7Br5FSgXkOY4gx3+itjCNS4jfvvfKMKdrW31VBe8=",
+   "pom": "sha256-wuAU00y4TtKH0GSYbEXDBaQSQiinM37M9sQh0U1wjxw="
+  },
+  "com/sun/istack#istack-commons/3.0.8": {
+   "pom": "sha256-oPBRfoUS8PvMe4KVwS9lZqPQwthtZVY53GYu+MDH6+U="
+  },
+  "com/sun/xml/bind#jaxb-bom-ext/2.3.2": {
+   "pom": "sha256-Gn3sKyfn4FV0TNuM8bkN70/Uc6zRuATv8JgTk1iVm9c="
+  },
+  "com/sun/xml/bind/mvn#jaxb-parent/2.3.2": {
+   "pom": "sha256-IN1tw0q3VJrEDaHYLpIiLsQ0etDsDLEY72xXA77VOhg="
+  },
+  "com/sun/xml/bind/mvn#jaxb-runtime-parent/2.3.2": {
+   "pom": "sha256-sk+NUfGEpovBuG1IwOPP7+shpE7eHF9zA8WK4EiFM+w="
+  },
+  "com/sun/xml/bind/mvn#jaxb-txw-parent/2.3.2": {
+   "pom": "sha256-tV0++psVj0g6MOkseMy2APkzFHM9CJ66m3RDbwGzFKQ="
+  },
+  "com/sun/xml/fastinfoset#FastInfoset/1.2.16": {
+   "jar": "sha256-BW86HhRECfIe0Wr8JoBfWOmiHz/OFUPELUAHGdJQxRE=",
+   "pom": "sha256-4UfSWKtuZpH3BZmpUkAObmx1WPjJwCjb4b4jF4MI6DA="
+  },
+  "com/sun/xml/fastinfoset#fastinfoset-project/1.2.16": {
+   "pom": "sha256-kFgkJa3B9AtBNi2vuVFzkxIlrKpeeWINXmvVL2Rikro="
+  },
+  "com/vanniktech#blurhash-android/0.3.0": {
+   "module": "sha256-1a1640mCYGf1M7DgLrfKkhvoHpJEaQYXNMT6YtjYJg0=",
+   "pom": "sha256-NcviEiaV6br3iglVQI4XXwRd8fJ1SmZetaBJGRy+Oxw="
+  },
   "com/vanniktech#blurhash-jvm/0.3.0": {
    "jar": "sha256-VIpmuA/kdWi86xPcmpr9oR4MVBVkRRN4B684HPRaob4=",
    "module": "sha256-PZDoBRHeBF1murFV1/JxP54pl7iM4RxwZViFQmT5AxY=",
@@ -636,6 +2041,21 @@
    "module": "sha256-bSIprgvwr8Ch/+IEd6qTpNOI5EAabcr5azls8CDwjy0=",
    "pom": "sha256-kLK8EYcBgB/7DW0LrSCKyBRkHzcSPd2utfINHTd+6rA="
   },
+  "com/vanniktech/blurhash-android/0.3.0/blurhash-android-0.3.0": {
+   "aar": "sha256-Mw7O8WpwCX1++g+JB2qJzYGObZ0LaIQg0+dwXLUpbjE="
+  },
+  "commons-codec#commons-codec/1.11": {
+   "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
+   "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
+  },
+  "commons-io#commons-io/2.16.1": {
+   "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=",
+   "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
+  },
+  "commons-logging#commons-logging/1.2": {
+   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+  },
   "de/jangassen#jfa/1.2.0": {
    "jar": "sha256-8cwY8VldRBroOc2hRlwIsefbRrcsHX87NzIK4WQexys=",
    "pom": "sha256-tNgod+BwsV0dTmdrQV9qVCnw4i3U75gX2F5MWcU7yr8="
@@ -663,6 +2083,18 @@
    "module": "sha256-d40CCk+mbG5vSblbLq4cErulW9nSuh0cKAwgSVrEMPM=",
    "pom": "sha256-E+C5YR2XHcDzQFgtSGZ6L7bR/dyaGdtP/UOwvI2rlnc="
   },
+  "io/coil-kt/coil3#coil-android/3.5.0-beta01": {
+   "module": "sha256-mxFKXy6ESgYWIUBygotIP1bWG7pGoy7OyIs2RBDsJNY=",
+   "pom": "sha256-I+DBB588BtBF+IF+PyniToim64WVwYKUKmIH6/M3z90="
+  },
+  "io/coil-kt/coil3#coil-compose-android/3.5.0-beta01": {
+   "module": "sha256-bo/nHPP2mxlJXIm65SnuUWiA26CBW4ObETul6FPO3CA=",
+   "pom": "sha256-H/E3U2s0HvBWq8zfxT+4DphHq5N1Wu78kHIDjczkKKw="
+  },
+  "io/coil-kt/coil3#coil-compose-core-android/3.5.0-beta01": {
+   "module": "sha256-T4aXsdYY0GTN8xwmixkwBd0uEKVbangFZrxpi3njHgw=",
+   "pom": "sha256-7aTvfZX5fJq81pn3TdYZvurl53toBSYkhaVy2ebVzfw="
+  },
   "io/coil-kt/coil3#coil-compose-core-jvm/3.5.0-beta01": {
    "jar": "sha256-1bggBh9BiCqQEFw6SNkDuyUktQq4Go+UBA3Eevj6qgw=",
    "module": "sha256-zVJuXqo+bABuVTeD63YbhDQjkjR/KAY88vQIjcnOA0A=",
@@ -683,6 +2115,10 @@
    "module": "sha256-ToGXqXT0kwOJhH9/KYq08tnXKcpuoF/lX4b+t+CyByo=",
    "pom": "sha256-t6YNifKhjJE91ps6qjUHRo0AIbRBILgd/zetl7n6PCI="
   },
+  "io/coil-kt/coil3#coil-core-android/3.5.0-beta01": {
+   "module": "sha256-YzK9ZD+e6SksOcyrF3g/AszoOy4mfzePyPZ1N2FEgpM=",
+   "pom": "sha256-SX2zjcIQwvOy3H5UZfMGX/2izxHZ/AZ1ymwAPNJRH+o="
+  },
   "io/coil-kt/coil3#coil-core-jvm/3.5.0-beta01": {
    "jar": "sha256-p12Kp4UF9dNaTpxrBUxvWMMZQmIvLlyz9sVAKQO90oc=",
    "module": "sha256-cDAPYSpXzEI3fLUXzChFIzY5kh/WJXUYh0A4onEDvZo=",
@@ -693,11 +2129,19 @@
    "module": "sha256-aPn/xzlxCbW0vYmDbfY7CP80pI7mW64NCRxprbUvSW0=",
    "pom": "sha256-XacP9kPOGyJeYbxuS1SWPl/i+UoBYlPeJ8RW6/xWavk="
   },
+  "io/coil-kt/coil3#coil-gif/3.5.0-beta01": {
+   "module": "sha256-00qJ6/w7MoGnSfCCIxo3Cl/3Q+Qw0nw26XU/vBZHqPo=",
+   "pom": "sha256-k/vcQcIbLApBXw0KWhuDP/Wn8aN0eg1BcQ52Vr+cWXc="
+  },
   "io/coil-kt/coil3#coil-jvm/3.5.0-beta01": {
    "jar": "sha256-FuRMFYG9fFczMNTIMUU9gdLKUGWtgZxFyuj/lkExepQ=",
    "module": "sha256-yeTTr2pkjU73aXVOCIk/jtQNqwUh7n9+aohRT52yoQY=",
    "pom": "sha256-ixtB8PEPMIUR0r96/u46KmooBcB6dMfi13K/UMOUSFU="
   },
+  "io/coil-kt/coil3#coil-network-core-android/3.5.0-beta01": {
+   "module": "sha256-PZfCUTC2+kjxl/bj8R/RA4Rif3P/hu1yaRi1rcJV6p8=",
+   "pom": "sha256-x98DK2vfpJBBIvMCX6Wuufn5njmgixlZna0y47pPIf4="
+  },
   "io/coil-kt/coil3#coil-network-core-jvm/3.5.0-beta01": {
    "jar": "sha256-FXEFoZjH0aZDC7ANpPfIXWhxfbpZOOuREmrsURg9B5Q=",
    "module": "sha256-3WyJ/F6rgLIVqTzMehdzvxWCWN+5vzLlzUlzVXC+H8Y=",
@@ -708,6 +2152,10 @@
    "module": "sha256-EdegVJkMBY5O5XrPhgc4GNCS88gsRzzj4/bkl15zw6M=",
    "pom": "sha256-le7vs3offwSGSLB8h3RJKI87KUXp7M1zKEERSjKKotI="
   },
+  "io/coil-kt/coil3#coil-network-okhttp-android/3.5.0-beta01": {
+   "module": "sha256-4WIYVlAJNJisD/qxQ7+eZPNIlBKubM4Wv4BLpJrC0xU=",
+   "pom": "sha256-xlr1aGiYw72NiXnhZWy/K9G3wLIxXwK1kNNeLk1dNQo="
+  },
   "io/coil-kt/coil3#coil-network-okhttp-jvm/3.5.0-beta01": {
    "jar": "sha256-wtJ1Oc/OHgyPiTQsSvPrxG2TtJlUP3MD2z4/OS9iAhY=",
    "module": "sha256-YLRVEMmdUA+N7xrPN9AmpSe0lc/bhzYVrIhdm7iiLmk=",
@@ -723,6 +2171,27 @@
    "module": "sha256-Y6u/NcatELbrNBNh0sgKcVJAqIrbu59JjywVhCCAdnk=",
    "pom": "sha256-3zQRrqSTGs/PiqV8kLDjh3scJA+2K2hA3E51LY/TFDQ="
   },
+  "io/coil-kt/coil3/coil-android/3.5.0-beta01/coil-android-3.5.0-beta01": {
+   "aar": "sha256-4eCvVI1KilNZAiHDBzZzka0GtCYZ3wQuJ8mwAjV1tX0="
+  },
+  "io/coil-kt/coil3/coil-compose-android/3.5.0-beta01/coil-compose-android-3.5.0-beta01": {
+   "aar": "sha256-qgzc8LzqR8hBTvTG20ZNNi+L/8plKD6xNqXtKE+CuNk="
+  },
+  "io/coil-kt/coil3/coil-compose-core-android/3.5.0-beta01/coil-compose-core-android-3.5.0-beta01": {
+   "aar": "sha256-h9pmGwUI0ZxjStzP/liPttoLC1/PUuC7HQAbjBC3jVE="
+  },
+  "io/coil-kt/coil3/coil-core-android/3.5.0-beta01/coil-core-android-3.5.0-beta01": {
+   "aar": "sha256-hjoM21bp6l17l7YBo+DVFqytKSaRmY5eNqAWx3eo9+s="
+  },
+  "io/coil-kt/coil3/coil-gif/3.5.0-beta01/coil-gif-3.5.0-beta01": {
+   "aar": "sha256-80lx4EcIaExv9Hgsn+6T+bVwUVzY5v/6OJPUIvhOZYU="
+  },
+  "io/coil-kt/coil3/coil-network-core-android/3.5.0-beta01/coil-network-core-android-3.5.0-beta01": {
+   "aar": "sha256-1bEVcTQ18ScKzBw9LuTUIdyDvOSRhIW/g4if+fkDcO4="
+  },
+  "io/coil-kt/coil3/coil-network-okhttp-android/3.5.0-beta01/coil-network-okhttp-android-3.5.0-beta01": {
+   "aar": "sha256-NDon7OByAjAPDmobjWI+U1PAU2aYRP76skFrGtzKdgE="
+  },
   "io/github/java-diff-utils#java-diff-utils-parent/4.12": {
    "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk="
   },
@@ -730,6 +2199,10 @@
    "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=",
    "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw="
   },
+  "io/github/kdroidfilter#androidcontextprovider/1.0.1": {
+   "module": "sha256-Yr0DpoiTACCwevVi8YDE5HAZRvhjx++mITlp3IHKWDg=",
+   "pom": "sha256-XESpbotbhEnKaAf2WDeod9P6waERqw+xKW37aTFk8D8="
+  },
   "io/github/kdroidfilter#composenativetray-jvm/1.3.0": {
    "jar": "sha256-9WFazSLSGP8smuRttNoUHImIuhz1UvP5QWDiTki6zis=",
    "module": "sha256-/evLsbosiegfNcFr6R3vJQEbCC8fi5Nr/vmM12WI/kU=",
@@ -770,6 +2243,10 @@
    "module": "sha256-MESuVblJgO2rT4HMqbFFQ+g8h0B1g96dtAHZuMdbOaU=",
    "pom": "sha256-ppnWzCJ3L+KybcWm/y+brDpIsHTVLfsjmrKRisVtTsw="
   },
+  "io/github/kdroidfilter#platformtools.core-android/0.7.5": {
+   "module": "sha256-KpEP5zXN61K8NxeuYJsKjehjClV8GHeBr9rzmQnmN/w=",
+   "pom": "sha256-4mESu4kE7J+4yEk2MpVFn9LqyqnEhk+bvrSgmOva93Y="
+  },
   "io/github/kdroidfilter#platformtools.core-jvm/0.7.5": {
    "jar": "sha256-9JW3mMkkbWaJ1rmImJcK8u+geEYBK2UfgQ+UBn35ihs=",
    "module": "sha256-CSgA7Vb/8ZxyuIBo4Y7YNhFCkUaHSj3GeVS7nuYWzaY=",
@@ -780,6 +2257,10 @@
    "module": "sha256-ITmBJcYIYR/zTyU2TGQ+r0fTpTgwe8F+XKDH+fzAvr8=",
    "pom": "sha256-aerg3Dk7+0G8E5nm7hfKSqHWIs4LoFnLkgzNaf//uNw="
   },
+  "io/github/kdroidfilter#platformtools.darkmodedetector-android/0.7.5": {
+   "module": "sha256-1s892+2kwMrt9/8tqBhG5oAT5ebTfWJ2RsdcxZbqYik=",
+   "pom": "sha256-JH9IMdvNE0vNAxpCdKxR/jCdWTn5DGsGZMM1dkXbFSI="
+  },
   "io/github/kdroidfilter#platformtools.darkmodedetector-jvm/0.7.5": {
    "jar": "sha256-iJW3nq/QvLgQynu/0Oog76P4OsQMG74qwwB2Nt4DISg=",
    "module": "sha256-JLJBlKXvtMDPlpRhjX4wnwFddgG02p/JPndzF+/X4vw=",
@@ -790,6 +2271,86 @@
    "module": "sha256-kibzxBq0koDI2ICOdnCGJkvK6Wa2HjjhoZ/Z6DjS+d4=",
    "pom": "sha256-aOCPC4VPlpixFzpkVstualPzc65tzLv3XL/ag0TiRwA="
   },
+  "io/github/kdroidfilter/androidcontextprovider/1.0.1/androidcontextprovider-1.0.1": {
+   "aar": "sha256-zDyE78B5I2BHuxmhxeY2qCZolf/3xAOpyKsQUegFF6U="
+  },
+  "io/github/kdroidfilter/platformtools.core-android/0.7.5/platformtools.core-android-0.7.5": {
+   "aar": "sha256-ScFRBvn1+2x8GkvDsJsifOa8/fJ7wtBO5kWPfiom8tI="
+  },
+  "io/github/kdroidfilter/platformtools.darkmodedetector-android/0.7.5/platformtools.darkmodedetector-android-0.7.5": {
+   "aar": "sha256-WS8N3Brt8GS7/LoEKjia5M416c6QAeh/f/5LTNvwNKc="
+  },
+  "io/grpc#grpc-api/1.57.2": {
+   "jar": "sha256-QrcuZXLAhAVaw84D5u/kM+sF72ILPa9RNqQ1n8csw+E=",
+   "pom": "sha256-x99FUaZPAoKnZugJUU1COEUKdCkFX5x3GIgdFqMQoCY="
+  },
+  "io/grpc#grpc-api/1.69.1": {
+   "jar": "sha256-qNPW3McfOrYT1miEIoK0iL3ZPT6ZoO9dyn7ub6c0woM=",
+   "pom": "sha256-vq8uR11cRdBjTU0yS/hNsqjWqSkilx5vfcJ+hRxCkH8="
+  },
+  "io/grpc#grpc-context/1.27.2": {
+   "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg="
+  },
+  "io/grpc#grpc-context/1.57.2": {
+   "jar": "sha256-m4rIjZzvKBna/+1729LyJoAjfUgsbGcf4C022j8IzwA=",
+   "pom": "sha256-iSf3fWOB4kSHaCcIGWpspyg2i4/XzrsQT9kyS2sSSRc="
+  },
+  "io/grpc#grpc-context/1.69.1": {
+   "jar": "sha256-Re+VuMFYqLW906y2e55oLvJUFLsUj0iOyEdDirZHFdQ=",
+   "pom": "sha256-beKbzqslob0L4R7qhGjQ4/HAxHbQpTMhW0/eHIKEtXA="
+  },
+  "io/grpc#grpc-core/1.57.2": {
+   "jar": "sha256-WhAHCr/rSWbsTVgJYdzE5/afqDqyUkL5LBdl77B7hgY=",
+   "pom": "sha256-CpcgGv4Xh08DX4ol/7lwZ45Jqt8pksfZfG/5+x1dohE="
+  },
+  "io/grpc#grpc-core/1.69.1": {
+   "jar": "sha256-UTUsra7L+aSkqkLZP28fxyjx/QGwUWgDg+0J5WMf+9A=",
+   "pom": "sha256-loCY9KhFG7zT17iMaoq1t6dO+A397npgUvNS//eDssU="
+  },
+  "io/grpc#grpc-inprocess/1.69.1": {
+   "jar": "sha256-t8asDjq/S41YJhDWMteUF7w9qBJU4aS89/Aejbe9Ve8=",
+   "pom": "sha256-/rswpc8jgjfQdaOSPok5khg9rxcaHrQ0rPEyEUpff4o="
+  },
+  "io/grpc#grpc-netty/1.57.2": {
+   "jar": "sha256-mAnUwQyU0R57KUbN61sohL4goJUQKJVE83Vp8CyHeiE=",
+   "pom": "sha256-ixIWHPKqz785j7Wvw7DXOiGvIGulDD2Pe/T2xLN16/g="
+  },
+  "io/grpc#grpc-netty/1.69.1": {
+   "jar": "sha256-Uqhu1m94kz6D0aP7cWKtFmdIlWTEVWNmt6NXnHAkpEc=",
+   "pom": "sha256-jwZlDMkUKMxRMRG/676r95mUGF1yREsC5d+so4vkNxQ="
+  },
+  "io/grpc#grpc-protobuf-lite/1.57.2": {
+   "jar": "sha256-/EkX3F1BmsgQ+z8nUjwU514f5QNyFU+rKTJCFe5qlVo=",
+   "pom": "sha256-YHeMHqQHo7oKfw8J3wmegnInjoq8KYIsnPUOGgUvG3U="
+  },
+  "io/grpc#grpc-protobuf-lite/1.69.1": {
+   "jar": "sha256-wp+Q+t88diD5NZokPAZ92FtzvXZbKPPZXfkQrC0zFVU=",
+   "pom": "sha256-Jj8fhE11bBXbX6uIaZZeM3IrP0/pB/4ciFqQ4EZGFzE="
+  },
+  "io/grpc#grpc-protobuf/1.57.2": {
+   "jar": "sha256-MWMNip6fCKlZhiAV4wpIY5CL42gMOmhvTB8I0v/q9wY=",
+   "pom": "sha256-xeIpKAIFOXfwRhCxcEhKmh6mrxVBwUSyfRiECsVE+p0="
+  },
+  "io/grpc#grpc-protobuf/1.69.1": {
+   "jar": "sha256-TFLvlI+4mHo7qn1GujYre/MH3TxR8pJBzVxZg5igEN8=",
+   "pom": "sha256-v0ynbSrORNlpRxT7zz/XKcmO8uWGOrkgpIPAUqIvRCM="
+  },
+  "io/grpc#grpc-services/1.57.2": {
+   "jar": "sha256-BXpDumR4M3VqsvhRusgKO5+NzgJvwawfF9TzFWSPQXI=",
+   "pom": "sha256-dHYBoDpYoYl5gZrFLO/8WGuPnGprQi4XI/Mmr0iBPrk="
+  },
+  "io/grpc#grpc-stub/1.57.2": {
+   "jar": "sha256-hNKvEnGRaPdjdfKv39brUTOoZe26kkTUDmuWjjrd4dM=",
+   "pom": "sha256-IVnmFKh5R3XrmOLhyFg0q05ZEb4cSnXHFjqZPpyJK6w="
+  },
+  "io/grpc#grpc-stub/1.69.1": {
+   "jar": "sha256-45xjJz1TBS6+n2ONiumBdnNexWcyjZoXCSzdtvI5uMI=",
+   "pom": "sha256-9a2BV+xA2KI0djKWXWoD0YpIrUYl8y62SzenpHDOU7s="
+  },
+  "io/grpc#grpc-util/1.69.1": {
+   "jar": "sha256-3Vl71nXqoELz41eGSNkFDIE8RZXF3mhp753btEkAYDE=",
+   "pom": "sha256-0g00aMt01WvlXtPUb2PKOO5LygkY2arXJ3pEj24HpbQ="
+  },
   "io/ktor#ktor-client-core-jvm/3.5.0": {
    "jar": "sha256-VPHR8goaFXYdC0RaisGyb4WVOsNf4id2N3xbQWb7N34=",
    "module": "sha256-M9wLAQXnJM5N3l37qyIws/FE+4czdSqHWXOQJ/q7YE0=",
@@ -902,10 +2463,147 @@
   "io/netty#netty-bom/4.2.12.Final": {
    "pom": "sha256-Sx6sh5HJMaM9ni+4wINDJVLPh0adtBm30kNBeONPBww="
   },
+  "io/netty#netty-buffer/4.1.110.Final": {
+   "jar": "sha256-RtdOeRJarMBVwx8YFS/cXUpWmqjWAJEgPQuqgzlzrDw=",
+   "pom": "sha256-cQrBnMAc2A32vpo/qtPCIrShoy9LVRN74HtgmdXaNWI="
+  },
+  "io/netty#netty-buffer/4.1.93.Final": {
+   "jar": "sha256-AHx9nDeN8C05BWfQ1931Qv/dsCG3MT2/UCOSET/6uwg=",
+   "pom": "sha256-g/vFTitzuG1Vsgj2GNGioVaRDsFG9+zldWUAe3UK3Xg="
+  },
+  "io/netty#netty-codec-http/4.1.110.Final": {
+   "jar": "sha256-3A1q9QVGMKcP8O81TyCqem5Gc4yfxWNu09T+d+OL1I0=",
+   "pom": "sha256-Ua6ZCvFKMh2209aIS5F7fUNj62Dd3A8Uk7GAIaFC560="
+  },
+  "io/netty#netty-codec-http/4.1.93.Final": {
+   "jar": "sha256-2s94znirLSlXAyXbTNJFHqWJY5gH3pWIGg+nFVqea1U=",
+   "pom": "sha256-o9r/8HG20oToBj2WhD3iu4PPO4iergzJ4K22SlejG4I="
+  },
+  "io/netty#netty-codec-http2/4.1.110.Final": {
+   "jar": "sha256-tUbHVEWkh7t7zVqUd5yuzOM1gs974xuLOfwOZbHuJvw=",
+   "pom": "sha256-KdL2wmw8yp/oOTZxcH/o75w+MQIKLf4GuCxCZJnCWDc="
+  },
+  "io/netty#netty-codec-http2/4.1.93.Final": {
+   "jar": "sha256-2WzAkEWhNBxtR0lDUqomO4e3L7HS6p7KFhqnOCC/6Ls=",
+   "pom": "sha256-CEQztC1UH3rEtZKH3SUyhc/aOj1l3nLnNou37D02cnE="
+  },
+  "io/netty#netty-codec-socks/4.1.110.Final": {
+   "jar": "sha256-l2BSo8m7KAvG2Z86KeZARnfPlYw94FsgUJPTjABriAw=",
+   "pom": "sha256-/+V7MWGR3U+WvuZsVwnBPL207KsIXAEMjbDGqoCav2w="
+  },
+  "io/netty#netty-codec-socks/4.1.93.Final": {
+   "jar": "sha256-DqR7W6I8odqOuRRsj8dVwScUFGM7Hivizh33ZLoP/yo=",
+   "pom": "sha256-jNgW7ZkalGBBurTLJL2cjkHuBpJRJRHy2DzvU462Bdc="
+  },
+  "io/netty#netty-codec/4.1.110.Final": {
+   "jar": "sha256-nszOmo2Ce7jOhPnDGD/sWL0clqUQEM9xEpd0YDSvNwE=",
+   "pom": "sha256-qAa7U2uzI2Zbr/fNEiPysnKi1HF6tPmxI2EIbarl3z4="
+  },
+  "io/netty#netty-codec/4.1.93.Final": {
+   "jar": "sha256-mQw3gWjcY2TG/1aXAfTy8SL//omYs+GJ66TE2GjtEIQ=",
+   "pom": "sha256-Gc3tJnoHDf8avJ0Cm1UvrSYqzBq6XGxnsiePyhE6Jqs="
+  },
+  "io/netty#netty-common/4.1.110.Final": {
+   "jar": "sha256-mFHsZlSLng1BFkzpiUPN1LvjBfaN29JOrlLkUBoNexo=",
+   "pom": "sha256-fUF/UzUwTa4eoIoGWGA4yD/orYTB01uqFe0RkhzveSA="
+  },
+  "io/netty#netty-common/4.1.93.Final": {
+   "jar": "sha256-RDuzFlmfsW47rrovtYiBgU1/8LevF2/nbjgHGm6G+MA=",
+   "pom": "sha256-QtiDsT6zjKv1SWFkYsXzMfUzO/DI/JIVdE+DwBgKT2s="
+  },
+  "io/netty#netty-handler-proxy/4.1.110.Final": {
+   "jar": "sha256-rVSrT+nEfvPnI9cSURJttT6NtUOHGtuer8lERlOe/1I=",
+   "pom": "sha256-xhPLTn4G9C76MduNiyoznti/QfAMRtONCQmkwGxlbc8="
+  },
+  "io/netty#netty-handler-proxy/4.1.93.Final": {
+   "jar": "sha256-KsX3+++gtz73g4iQaTRNVRVQWhSyMDvmk8UALEht8rQ=",
+   "pom": "sha256-bcUNoOZ/WXgSh0+B6qRUBPfQdrgZnqkIiTKoXBthAkU="
+  },
+  "io/netty#netty-handler/4.1.110.Final": {
+   "jar": "sha256-1aCNfeNkkS5ChZaN5NTM4/AdpLsEjVxpN+Xyrx+OFIo=",
+   "pom": "sha256-TUPBPRT1Y1oviw1QlNejHFCe4PUsck66DvMM/+PqFVU="
+  },
+  "io/netty#netty-handler/4.1.93.Final": {
+   "jar": "sha256-Tl9WOuFO1xM4GBbVgvX8/QYVrvspIDSGzft4LYoAoCs=",
+   "pom": "sha256-hKFSXKwLR1nvrvKZekf+Gbm1ZC+Sc/oP1YoudsegWf4="
+  },
+  "io/netty#netty-parent/4.1.110.Final": {
+   "pom": "sha256-aFra83Nmb8FUJ8gQ+K/zpP4ZSpfH7XS2nQfFSPDULxw="
+  },
+  "io/netty#netty-parent/4.1.93.Final": {
+   "pom": "sha256-sQnLdvN1/tuKnvdaxYBjFw3rfqLd0CT0Zv723GXN/O4="
+  },
+  "io/netty#netty-resolver/4.1.110.Final": {
+   "jar": "sha256-oum0rnyqkvxb10fhHR3sINgbGPwAlZVUMCJErFxWznA=",
+   "pom": "sha256-ZV80GS6MdhizxaeeSI5NqjXe9BsNFtRfo2Ujw7TJ9kE="
+  },
+  "io/netty#netty-resolver/4.1.93.Final": {
+   "jar": "sha256-5Zdwtm6Bgi5dERrE5UTX6wxUPgooX1JijlOUGs2O11k=",
+   "pom": "sha256-WzUMPJHp5V0py+aM/k7yEWzB8DKGd+v59hW6twgsefQ="
+  },
+  "io/netty#netty-transport-native-unix-common/4.1.110.Final": {
+   "jar": "sha256-UXF7t0cRQZUDkMZxOkSf2xBU0H5gc37n3acIN5bN7kg=",
+   "pom": "sha256-6hjOBMmpesDFH045exhSKf2VmX6QsRM5rc98UZRtU9g="
+  },
+  "io/netty#netty-transport-native-unix-common/4.1.93.Final": {
+   "jar": "sha256-d0FlocTbqssX+cGtZms1aaallxWugo58PUdwP0eaU+c=",
+   "pom": "sha256-Fbwltn/wpJJysnDvK4z/1iAFfKFssp3/etVmGtyirhI="
+  },
+  "io/netty#netty-transport/4.1.110.Final": {
+   "jar": "sha256-pC3Wg5DKFLT/LUBiiglsdkhbStt8GWAtUokyGgZp5wQ=",
+   "pom": "sha256-MPXaDnZG8YQNYy+IYVyLnYIFSZ1oVZucRUezsEoGg80="
+  },
+  "io/netty#netty-transport/4.1.93.Final": {
+   "jar": "sha256-paeAGbwc1D28PHt83TgBkSyibR9Jj7VgUU/uSXhkupY=",
+   "pom": "sha256-DdYqDrPLHqABpNBCbk9cCN8ccNkmVnW/+lxYNhNCLUM="
+  },
+  "io/opencensus#opencensus-api/0.31.0": {
+   "jar": "sha256-cCulXXjznVUZXc8EH9+qt6dJCprEUBNUJIftnk06TSM=",
+   "pom": "sha256-m0eVkefD4KtFOB+gQ6kWV4Fb3Yw1k68BDHrDb0yQWRk="
+  },
+  "io/opencensus#opencensus-proto/0.2.0": {
+   "jar": "sha256-DBktRR6d106Ychsn0C8OK2vKRLUVY7Xavy4hH3o+vxM=",
+   "pom": "sha256-twh5B5IPyKgVNGhrLxorMxEnr5fwFau9s3hqUfP6HlI="
+  },
+  "io/perfmark#perfmark-api/0.26.0": {
+   "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=",
+   "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=",
+   "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto="
+  },
+  "io/perfmark#perfmark-api/0.27.0": {
+   "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=",
+   "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=",
+   "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY="
+  },
+  "jakarta/activation#jakarta.activation-api/1.2.1": {
+   "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=",
+   "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": {
+   "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": {
+   "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=",
+   "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY="
+  },
+  "javax/annotation#javax.annotation-api/1.3.2": {
+   "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=",
+   "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c="
+  },
+  "javax/inject#javax.inject/1": {
+   "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
+   "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
+  },
   "junit#junit/4.13.2": {
    "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
    "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
+  "net/java#jvnet-parent/1": {
+   "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
+  },
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+  },
   "net/java/dev/jna#jna-jpms/5.18.1": {
    "jar": "sha256-RKxmAoCCMvPelQp9Dum4xrmec3M7aUYeZDV2YHvnTbY=",
    "pom": "sha256-WT8axHM+AsCT6K6oru0pgZBPOYzWqJrk7nWd7JgcQHM="
@@ -922,6 +2620,10 @@
    "jar": "sha256-rRTBsexPQ9OWIxIZ36Y16/go9zjqyfiQ6hvAd5WJLZo=",
    "pom": "sha256-OdU4qVmaRHR3CDiGXtQs+j5rPRMIbLHld7i7QxSNGmU="
   },
+  "net/java/dev/jna#jna-platform/5.6.0": {
+   "jar": "sha256-ns6ovysbOZY5OdGLcEZO72DFCP7Ygg+dyroMNVGOq/c=",
+   "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig="
+  },
   "net/java/dev/jna#jna/5.17.0": {
    "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
    "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
@@ -930,6 +2632,145 @@
    "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
    "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
   },
+  "net/java/dev/jna#jna/5.6.0": {
+   "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=",
+   "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg="
+  },
+  "net/java/dev/jna/jna/5.18.1/jna-5.18.1": {
+   "aar": "sha256-fwU+PsmeFN1xJZyCwcigJzjWShPDEiayrMFw8wYJUeA="
+  },
+  "net/sf/jopt-simple#jopt-simple/4.9": {
+   "jar": "sha256-JsWFbpVLX4ZNt28TuGkZtZxu7Pn9kwuWuqiIRia68vU=",
+   "pom": "sha256-evfi2LJLR5jwTCt9okyfvRt1V7TgF8IFRIFWWRYHkJI="
+  },
+  "net/sf/kxml#kxml2/2.3.0": {
+   "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=",
+   "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache#apache/18": {
+   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+  },
+  "org/apache/commons#commons-compress/1.21": {
+   "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=",
+   "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0="
+  },
+  "org/apache/commons#commons-parent/34": {
+   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+  },
+  "org/apache/commons#commons-parent/42": {
+   "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/69": {
+   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.14": {
+   "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
+   "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.14": {
+   "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.6": {
+   "pom": "sha256-sEK0HyOR7bANNff05Qmu0hI2SMHSRs5Y0Pe5Bcn+H3M="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.16": {
+   "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/10": {
+   "pom": "sha256-yq+WfZSvshdT82CCxghiBr0fSIJf9ZaTLM66crZdOfo="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.16": {
+   "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=",
+   "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o="
+  },
+  "org/apache/httpcomponents#httpmime/4.5.6": {
+   "jar": "sha256-CysRAsGNPH4Fp3IUubdQGm9gVhdK5WBODiVndu2nVT4=",
+   "pom": "sha256-37/W/+KnhMqYF8RjZap/ileDILgFveOdb1WgsJ2KqMo="
+  },
+  "org/bitbucket/b_c#jose4j/0.9.5": {
+   "jar": "sha256-gI+zFm8+Z9rZgRwzECmrFoEkL9Urc1vD8z8oEWf8xy4=",
+   "pom": "sha256-utAkGAobRpy9lOXy2xKEG8rFRD2VRWB/Zzz95nfB2HI="
+  },
+  "org/bouncycastle#bcpkix-jdk18on/1.79": {
+   "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=",
+   "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs="
+  },
+  "org/bouncycastle#bcprov-jdk18on/1.79": {
+   "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=",
+   "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ="
+  },
+  "org/bouncycastle#bcutil-jdk18on/1.79": {
+   "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=",
+   "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI="
+  },
+  "org/checkerframework#checker-qual/2.5.8": {
+   "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw="
+  },
+  "org/checkerframework#checker-qual/3.33.0": {
+   "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
+   "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
+   "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
+  },
+  "org/checkerframework#checker-qual/3.43.0": {
+   "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=",
+   "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=",
+   "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM="
+  },
+  "org/codehaus/mojo#animal-sniffer-annotations/1.23": {
+   "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=",
+   "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc="
+  },
+  "org/codehaus/mojo#animal-sniffer-annotations/1.24": {
+   "jar": "sha256-xyDm5by+ay9I3tdaR7zNt2Pu3nnRQzAQLg01Lj2J7ZI=",
+   "pom": "sha256-iEhPYKatQjipf+us8rMz6eCMF4uPGAoFo+2/9KOKg24="
+  },
+  "org/codehaus/mojo#animal-sniffer-parent/1.23": {
+   "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ="
+  },
+  "org/codehaus/mojo#animal-sniffer-parent/1.24": {
+   "pom": "sha256-Sd2rQ8g2HcLvDB/4fLWQ+nIxcCq59i4m1RLcGKHxzQQ="
+  },
+  "org/codehaus/mojo#mojo-parent/74": {
+   "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM="
+  },
+  "org/codehaus/mojo#mojo-parent/84": {
+   "pom": "sha256-L+UQYYsvYPzV8vuCvEssLDRASNdPML5xn8uGgp7orDA="
+  },
+  "org/eclipse/ee4j#project/1.0.2": {
+   "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8="
+  },
+  "org/eclipse/ee4j#project/1.0.5": {
+   "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
+  },
+  "org/glassfish/jaxb#jaxb-bom/2.3.2": {
+   "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c="
+  },
+  "org/glassfish/jaxb#jaxb-runtime/2.3.2": {
+   "jar": "sha256-5uCh6J+2/3hieeagCC1c71LcLr5nBT0EGABzdlK0/Rs=",
+   "pom": "sha256-lEilrX+mimCD375PQsjIPggrkgKhBUAfxo6UTCZUizQ="
+  },
+  "org/glassfish/jaxb#txw2/2.3.2": {
+   "jar": "sha256-SmqfSDOI1GG4GqmijGhbi3TAWXmTvxiEsE7dvKlfSP4=",
+   "pom": "sha256-p53QAvsDgYP/KGomNb4uaMEDuH4OZHF9jUS/0Bf9M+o="
+  },
   "org/hamcrest#hamcrest-core/1.3": {
    "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
    "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
@@ -937,6 +2778,10 @@
   "org/hamcrest#hamcrest-parent/1.3": {
    "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
   },
+  "org/jdom#jdom2/2.0.6": {
+   "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=",
+   "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0="
+  },
   "org/jetbrains#annotations/13.0": {
    "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
    "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
@@ -951,6 +2796,7 @@
    "pom": "sha256-4Fs07/GcQaRQesMEW7ngiVmInyRoRzuV1nhuhCjHgLQ="
   },
   "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.6": {
+   "jar": "sha256-shoUn+KMzMfs43tVCY0QAnq6PS4Nsx0S083JB97SNoo=",
    "module": "sha256-gF5FIbAzeYEISMesMUzzyVT8jS3zSlsJEcRW1Djc2iY=",
    "pom": "sha256-0yUq74s29h2gYJD4T+URQCGCA0Tq0dZAw3NXohkYVBk="
   },
@@ -970,6 +2816,7 @@
    "pom": "sha256-NaXwX5/pggJulEwaYuXV7Sp10zsOhJvwchSasMXYAxo="
   },
   "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.6": {
+   "jar": "sha256-rbdbK4nWjzONlCC4sk3ZulNohypPxw4yKCwvoPGToPw=",
    "module": "sha256-gAMMZAio8gsZVXh+GmE8tp8Fh26vW5GF++FZSAwPZyE=",
    "pom": "sha256-OFjDsK0gsHhobakHitFk7MbF5Y8wlvLS5vpmznPHg98="
   },
@@ -979,6 +2826,7 @@
    "pom": "sha256-t2ghIp9UPorV8uaFgF5r4FE/sV7UHvS94IDTtezoYiU="
   },
   "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.6": {
+   "jar": "sha256-ndWDtwkTbgqv5g4bkCSb9jvIDNe6bgZBznShqzYTxk8=",
    "module": "sha256-LSN78RA5ccVpZ6GVMbwI8QBuSZOoQxmpL04V+w+Qyhs=",
    "pom": "sha256-8ju8dgqLqe3xr4gbY7h84LcUMFl8DhLtXq9YJ2DTjnw="
   },
@@ -998,6 +2846,7 @@
    "pom": "sha256-eZav2khVeVAQN+XFXVwE7omQ7RT2Y+T9PtN72jfaSZg="
   },
   "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.6": {
+   "jar": "sha256-dCOTmMsfIKgROze5PTCfH1dJShT3DWV4ZI6LsIP4D10=",
    "module": "sha256-rQ264j3Z3KujqV0dCCwb+0xASxe7kySQ9ASayTgl3E8=",
    "pom": "sha256-hC0AC7vnoGloZw6B/tCSr3gLhtbjCLaqGo+QwjsrZ2w="
   },
@@ -1007,6 +2856,7 @@
    "pom": "sha256-EF3rS+RhEND7iGT0o0Qr/b1Cw90jEUCzrOa5dMkZoXA="
   },
   "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.6": {
+   "jar": "sha256-ns0rxhNl+0+j9vKEq6khSNv9PRrKOGYq1UvOysKrVUY=",
    "module": "sha256-JMv8NlN1knXknL9Wl748L+fEpqHByk+CWAWk82EbYJU=",
    "pom": "sha256-oJpT4rFQ+ZKfyN33sZ0qhl1K8TRGnYFx5aiFhEA/zsM="
   },
@@ -1053,6 +2903,7 @@
    "pom": "sha256-1VVL+PdDa479M8WdaENtV8T0woD2wK+oqBRDrGtGV78="
   },
   "org/jetbrains/compose/animation#animation-core/1.11.0-beta03": {
+   "jar": "sha256-yVDtLCc6sA4VznLQTqo4AYiNXVXkM18C1NACkAnffXo=",
    "module": "sha256-Lyg8tBqEJe4z+el2WvpqpXHe32uUCt75Me1iTUV2pyE=",
    "pom": "sha256-mzS3KMEUniUwiVW/tsQiy+opZdI24udDU1ZxhzrIRag="
   },
@@ -1076,6 +2927,7 @@
    "pom": "sha256-1cmnfoKnK6vZ+nAcHGdj76d5LFvxdIo2QCT9r8ooOXo="
   },
   "org/jetbrains/compose/animation#animation/1.11.0-beta03": {
+   "jar": "sha256-CzkZYHS7VWNHvRiSt32kT4nXysl4jRV70i5Ea2xwk64=",
    "module": "sha256-1fsd1sWN0y1qhTqpqOCYP0Gp390nBEXCF0D5aWOwuYQ=",
    "pom": "sha256-tktWrhGVzsdcUIPKOA2q6jLhheB/fa2m9prDdiNUXoo="
   },
@@ -1102,6 +2954,10 @@
    "module": "sha256-Zr648cP02SBn/9YViufb8WeZlOB1RM6NNMSpD3fZsfA=",
    "pom": "sha256-Pt165cmCi3TPEev8QyhpdWSiDIcELs9u+/SbSJfaVMc="
   },
+  "org/jetbrains/compose/components#components-resources-android/1.11.1": {
+   "module": "sha256-PWhXK+C5SgFvJ33zkg2StEn3J0RRiHB/CP87o/BLv10=",
+   "pom": "sha256-LZiynzZmuOviZ6Xw+vGfqb6ugP9i2R4IKHyZJYtvilQ="
+  },
   "org/jetbrains/compose/components#components-resources-desktop/1.11.1": {
    "jar": "sha256-BeHK13yO3nkwrSEiO4GZMrcNetlp6/75fd8nL8GnvDk=",
    "module": "sha256-wg/4XvLT1WWTJUY5RD+AXD3gGygz4nsWcZ35SwQzUXU=",
@@ -1112,6 +2968,9 @@
    "module": "sha256-FY0UPT9BXVsn8nHRP4waqwbfl3ZeCTfyMO8H3Z1L8zo=",
    "pom": "sha256-cSuuPBIodvYHy1kelwhZtLfoCscNiahBgimEPY7fv/c="
   },
+  "org/jetbrains/compose/components/components-resources-android/1.11.1/components-resources-android-1.11.1": {
+   "aar": "sha256-rf9g5bjEAWHNSfjfTD3i2ERlUoqCkf/tFZb2IMcFwTI="
+  },
   "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.11.1": {
    "pom": "sha256-H9Q2XorYZZKgFLJ/TF0JdLiY5dVwjf2tFwon3D74u2A="
   },
@@ -1149,6 +3008,7 @@
    "pom": "sha256-eQO2y+HHwzMm1B+6pWm5G60IKPCTeQNArkzQERkqhe0="
   },
   "org/jetbrains/compose/foundation#foundation-layout/1.11.0-beta03": {
+   "jar": "sha256-sUYAI/yC0pioGhcNGPPnL+39QoRI0r5gUCPbFbg2xWo=",
    "module": "sha256-tJfEXxA1kNcNo2cu6t2Zg6tsuFsFyxUG3hUx03YokKw=",
    "pom": "sha256-+JMUlJ+eHNkat9VoJAP1E7N1shrauDcTEFq/8D31TQE="
   },
@@ -1158,6 +3018,7 @@
    "pom": "sha256-1EJsKsBwAIzN/MPV/NGtBbC9xMu9+ysFRVWDnQHV9Kc="
   },
   "org/jetbrains/compose/foundation#foundation/1.11.0-beta03": {
+   "jar": "sha256-TSDNftbAbktx+pCa7iY3wVEyDzgmvarzLZt6VVZJM7I=",
    "module": "sha256-j7CB2b1ZeLldP1JPOr3UHwaoGj40lbzRfiS8vzY3xWE=",
    "pom": "sha256-2AxtwYrDqFx9D6M+dOdORh4w+UBwn/pzOsp+MhzsubM="
   },
@@ -1294,6 +3155,7 @@
    "pom": "sha256-90MTqloWvsPZAbjYKYHNKgci/dwqxqji5Psne/hTTOI="
   },
   "org/jetbrains/compose/runtime#runtime-saveable/1.11.0-beta03": {
+   "jar": "sha256-aZ+/dGYW6ifIkD9QuV04BZDB8Hw5VaI7fAvwual51A0=",
    "module": "sha256-fLfCEhxH1b+klQI+rs89V0ZXiIio7MWae+O2k+JABw4=",
    "pom": "sha256-cqHT9I2uI002RzEiBL2X5HClq0KqtlPA0zkwDJsf8sM="
   },
@@ -1303,6 +3165,7 @@
    "pom": "sha256-oE+rRUIsu/z5rnu8/DT4dIpbIev067rua1NAOQE5TnY="
   },
   "org/jetbrains/compose/runtime#runtime/1.11.0-beta03": {
+   "jar": "sha256-dJL4PPeRpyeIDFVcrCmLkd/S4MqSJK2vkiO9gj64wMw=",
    "module": "sha256-ppHzsuiouhmW3QExhh20VLnBSdBNwtCoyMGjB1Fhuew=",
    "pom": "sha256-2oRUH9Bi3rS7cag6EvyJOVSETNIZusNG9p/jiWfvHn0="
   },
@@ -1311,6 +3174,18 @@
    "module": "sha256-K16b4y2ouXH+yhrdU/OfXGb/rKuBCzFfXmJzPe2wEF4=",
    "pom": "sha256-ZiHJEdYlb9Em5YpDnSjnIWnD+XYJ2CGOeUbirgCf+Us="
   },
+  "org/jetbrains/compose/runtime#runtime/1.9.3": {
+   "module": "sha256-RoPOYaDjW2fnQuNTqNRlcXglAxwQgc+7+zojate9s9o=",
+   "pom": "sha256-4yJMwKXBCThxJVp+fmcbXoXsxKLloEg1Q7o3Tc9awq4="
+  },
+  "org/jetbrains/compose/ui#ui-backhandler-android-debug/1.9.1": {
+   "module": "sha256-19K/nVe3u0l2A4khAQPy49mvhs93P4IVgfffsTix3HM=",
+   "pom": "sha256-MddXn+UHZyPpN4ZrlXpEncv4TvYhYGlAUnmVTJRQcsk="
+  },
+  "org/jetbrains/compose/ui#ui-backhandler-android/1.9.1": {
+   "module": "sha256-wm5ZfRh4NgAA2PZvCW4XTnsqEEIY0v/gfhrg2xMkW+8=",
+   "pom": "sha256-KJdxsgWQBooM6fHuSRonOoA+9ayDWUyKVQN+A94iQr8="
+  },
   "org/jetbrains/compose/ui#ui-backhandler-desktop/1.11.0-beta03": {
    "jar": "sha256-AH+5qD+kBbi/4d2+/vPdkp3qK+QpU+ZRDORvhf9jXjA=",
    "module": "sha256-st2Y3GD0GMpEgJVEPBABE8UHQU4R0fZTDPJAv8Cdq34=",
@@ -1322,6 +3197,7 @@
    "pom": "sha256-KopUqbkj11gjfd/ZXm57NxJ2gIYDJOWN0gjlqGGH+5Q="
   },
   "org/jetbrains/compose/ui#ui-backhandler/1.11.0-beta03": {
+   "jar": "sha256-ni/S+T5C4kpwidSx1VIpp2f1G1MspEqDDpjknWrd6DQ=",
    "module": "sha256-pUJEbcbYQXGTbmYbkeiVuO12/3EGqrQub1U9e5kUowI=",
    "pom": "sha256-UBu8+9vWLgsqdhasNuIxG8NsBM8dM3Pk2eqALZEgtg0="
   },
@@ -1355,6 +3231,7 @@
    "pom": "sha256-4TnWipls4mpydKoJrfPl9yGtjse0gnVzz7N6Bn8rMAs="
   },
   "org/jetbrains/compose/ui#ui-geometry/1.11.0-beta03": {
+   "jar": "sha256-+3sqZUb2gbwrjukuVlD83kKpHaBmnYG4g4VFISnj3eI=",
    "module": "sha256-olopE+gEhIL/ohKUO1+CK/CjepWN4SEc7AG4a75IAO8=",
    "pom": "sha256-OBu9zibKolLz+sAewF0yuJlDE0mYn9dQQCiMdgSI7MY="
   },
@@ -1374,6 +3251,7 @@
    "pom": "sha256-sbg9CWCygnJssIXQPwsmx2CvmcQ1mgeuiIqmAOwZ+8U="
   },
   "org/jetbrains/compose/ui#ui-graphics/1.11.0-beta03": {
+   "jar": "sha256-txpnyyuomXi00QvmmykNVvltxuCfahAgR+8S+YFB+Kc=",
    "module": "sha256-mYh8YwTbaYZyP1ghSQE/D1DGPGjl3r1rFa4KVaHxhCk=",
    "pom": "sha256-zEM9waFzO+vESHmB5WxCeu2lbc1beO4ufZf4TOSEc2k="
   },
@@ -1397,6 +3275,7 @@
    "pom": "sha256-hcEWmHvTA0hEYx1kLTP9goNcuZqc7J2bZ94s4wNDQNE="
   },
   "org/jetbrains/compose/ui#ui-text/1.11.0-beta03": {
+   "jar": "sha256-XdkHaJyLQ6YQAFx/qGkYDCC2ozWhOnLM7Sw7w3di1ug=",
    "module": "sha256-EJFByb8fbBTakvlbvuPKoDvbwTVJC44uv8VGzhkWS50=",
    "pom": "sha256-KbvfF8yk+j4YokEW8GTX9AKu09BKnOmHe5tLC0MQ5X4="
   },
@@ -1419,6 +3298,11 @@
    "module": "sha256-eI6dM0RECTpSX6AYmyTJak3yVxX5NhV11yxzuVAyttI=",
    "pom": "sha256-n+vWaCE0Zl/E6ucbMa3AtpZcHO6nOaBH1PoovUdi06o="
   },
+  "org/jetbrains/compose/ui#ui-uikit/1.11.0-beta03": {
+   "jar": "sha256-axl+MetJAS/Qvc0HxVjrXVpXYkZoXpVBvD0rcTNa7ug=",
+   "module": "sha256-K5N3yyyrBbZ3nq9tVoLms1QKUTHXC64uAju1rvK5Cyo=",
+   "pom": "sha256-HVM/yiMbbHjNsm+U/TwdWKH1kzBuNIaBG+8vQujVk2U="
+  },
   "org/jetbrains/compose/ui#ui-uikit/1.11.1": {
    "jar": "sha256-axl+MetJAS/Qvc0HxVjrXVpXYkZoXpVBvD0rcTNa7ug=",
    "module": "sha256-ITx8vB7IvSEct1kZ2OIl1uZ4/hn+llLYJFL/6D1yvFI=",
@@ -1435,6 +3319,7 @@
    "pom": "sha256-QWbnNxm2rjaMRwE8mTjZ032FOOmST2YhsxRj92gg83s="
   },
   "org/jetbrains/compose/ui#ui-unit/1.11.0-beta03": {
+   "jar": "sha256-aoewfvoRvawJxaZZ9oLMjDc+DiwntHkWUwtzC0g9Jc4=",
    "module": "sha256-r6wiakOeSfF5efbRj/LLM03yB4qWoG+VMR0Og4uOApw=",
    "pom": "sha256-SnhCIaTl54XVT1I+RUAFPaMkJF58mE4iPGNEl/jM66c="
   },
@@ -1454,6 +3339,7 @@
    "pom": "sha256-x1kLUwQm1IyRQ+KYivDfHuWzWuIPm5kjrILdiJw4L8w="
   },
   "org/jetbrains/compose/ui#ui-util/1.11.0-beta03": {
+   "jar": "sha256-zb1LEe9BZ7FIOHnExuxS0VLBtQfwyBdBuD+UNACoOvU=",
    "module": "sha256-gn/7w7YxvAXdXY0D2z0Yh1+XHnNq6CrWoJFdlE2eTJU=",
    "pom": "sha256-GyslM5cSbeSyHcleAspH9vDiXl/mtHOcVEse9hS9K5Q="
   },
@@ -1463,6 +3349,7 @@
    "pom": "sha256-adivGuv/w0tIRdaGyLuam1IJwDhhDFDDeBO6Az5dJhg="
   },
   "org/jetbrains/compose/ui#ui/1.11.0-beta03": {
+   "jar": "sha256-8Rl3lcLsw4Vp90iVrO+UaGkydD+vEjcteM0xY9GVj9s=",
    "module": "sha256-dyfymNnS5zYkTMamtjeqjbHOLMLpFzNHgeSqgFuhfhc=",
    "pom": "sha256-hRpdUDvAR5JKomYWUTCInuzTY4rXty8flov03x/TNbM="
   },
@@ -1471,6 +3358,12 @@
    "module": "sha256-jOjNcE6cjIFg87/k3Ks2hqSNJUzQTMoyBHDn6HKifdI=",
    "pom": "sha256-XcGk1dMXvlIA7gRZYzaxb75Jl8MDNPwhzxvfn0xDETw="
   },
+  "org/jetbrains/compose/ui/ui-backhandler-android-debug/1.9.1/ui-backhandler-android-debug-1.9.1": {
+   "aar": "sha256-27zWOMnruel/YfK/EwQI5Wxs5dAB3F9ecIRc4JNXySk="
+  },
+  "org/jetbrains/compose/ui/ui-backhandler-android/1.9.1/ui-backhandler-android-1.9.1": {
+   "aar": "sha256-j4830Osz9Zdgi8IPh1AhsdgNtvg1wTjNfO+Qk8etTCQ="
+  },
   "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
    "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
    "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
@@ -1490,6 +3383,10 @@
   "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.3.21/gradle813": {
    "jar": "sha256-B5V8OelCS3WZSpThAZBKF5D6iSvJdlsh3rysg7g2fCM="
   },
+  "org/jetbrains/kotlin#compose-group-mapping/2.3.21": {
+   "jar": "sha256-T8gpfrPkZr83vKgjrbZ/LQ9lHo11OOrsxsCBIYWAVfo=",
+   "pom": "sha256-Hn0hE+XDWTfhSPFBmobsIsIr0TnEKKb20tO2q5OFkRI="
+  },
   "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.21": {
    "module": "sha256-jkdTFzSm1uiWG04P0a6GefvL0SRxPdLP5+mhLEe8c44=",
    "pom": "sha256-BY3N0jaAFCxnal7LzCDFSPmuCyDwD8+UGbnLADcRc7o="
@@ -1627,10 +3524,22 @@
    "jar": "sha256-CA6LPO7rLvzlHQI4T14i/w2N8am7qUrpAV4wrCGhdJA=",
    "pom": "sha256-uRJdcl70/Xj8L0pLc1G/apS8G7OeZT9p+u4o2FgH8n0="
   },
+  "org/jetbrains/kotlin#kotlin-parcelize-compiler/2.3.21": {
+   "jar": "sha256-K9QfTCQAbJtVM5OshtMjqUuRqs50N71EeTJF+mY1eRk=",
+   "pom": "sha256-7jcD6PKafitwaBpM+ibj16EPMcqERCgbsFNuym21TVc="
+  },
+  "org/jetbrains/kotlin#kotlin-parcelize-runtime/2.3.21": {
+   "jar": "sha256-oh1fhUde+yfxfdl9GiidZIdPLd/bUI6khEd6TPGv6Wk=",
+   "pom": "sha256-Xy5Ehc/7o28EqsBV8qgwFREz2VB09fG1icVhCaS5tAc="
+  },
   "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
    "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
    "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
   },
+  "org/jetbrains/kotlin#kotlin-reflect/1.8.21": {
+   "jar": "sha256-imzVo88JKs7idM4sRE3Dbu/bYxV5hZ3U2FezMJpSnJE=",
+   "pom": "sha256-OdeNszIizbsythjHxSI9RFfMGXQoVtEWqFCQ5KlvYjo="
+  },
   "org/jetbrains/kotlin#kotlin-reflect/2.0.21": {
    "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
    "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
@@ -1690,10 +3599,22 @@
   "org/jetbrains/kotlin#kotlin-serialization/2.3.21/gradle813": {
    "jar": "sha256-DhI+4919qUppjA+SqmDyRESVJKzeYu7KSjbixgcbM0U="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": {
+   "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=",
+   "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.0": {
+   "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=",
+   "pom": "sha256-NmDTanD+s6vknxG5BjPkHTYnNXbwcbDhCdqbOg3wgqU="
+  },
   "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": {
    "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=",
    "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.2.0": {
+   "module": "sha256-WPwNZk/Dpn5+a+n9vq7b0hLfo+Un90T4YeeSzacsDkc=",
+   "pom": "sha256-U3q0BzqEelm6dtmaZFqGCbU4L/pdJZGjVLL6MR9JlzM="
+  },
   "org/jetbrains/kotlin#kotlin-stdlib-common/2.3.21": {
    "module": "sha256-atL1eJGlTZamkiES91jflXzhq4o9WlchXLdPo+EF4lU=",
    "pom": "sha256-3kz/N522KFN9r20aYfAqIL8YVIDxIMq0IU/uPcMzo+g="
@@ -1702,21 +3623,37 @@
    "module": "sha256-sDh/gRgDrxUU8aojhbRgw7gTxvQ861bPreavqiBpedg=",
    "pom": "sha256-/RpljtvteICsPgoNvSCuGkbJh+QK9UTjprEQglu+/PU="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": {
+   "jar": "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=",
+   "pom": "sha256-NiLRBleM3cwKnsIPjOgV9/Sf9UL2QCKNIUH8r4BhawY="
+  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
    "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=",
    "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": {
-   "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=",
-   "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224="
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.0": {
+   "jar": "sha256-DRC8DUK4YF8jYpo/MeonwZzbyp3N9PU/bSLNY2aDbRg=",
+   "pom": "sha256-lcIYnDXve/xIlRwyrXCEeyHzgJ0m9dCnbiNXCHmYjDA="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": {
+   "jar": "sha256-45i2eXdiJxi/GP+ZtznH2doGDzP7RYouJSAyIcFq8BA=",
+   "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI="
   },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
    "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=",
    "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": {
-   "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=",
-   "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc="
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.0": {
+   "jar": "sha256-rcFmSNu881sNEOfsMBw110bRwv5GDGBqulnxKxF8+bA=",
+   "pom": "sha256-I00G/b3CncvAdEfijEomq6uVmdXD2qPZKjTmrt6iNqY="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": {
+   "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=",
+   "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.0": {
+   "jar": "sha256-Na7/vi21qkRgcs7lD87ki3+p4vxRyjfAzH19C8OdlS4=",
+   "pom": "sha256-N3UiY/Ysw+MlCFbiiO5Kc9QQLXJqd2JwNPlIBsjBCso="
   },
   "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
    "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
@@ -1731,6 +3668,11 @@
    "module": "sha256-DTc1BD1ot6WvtE0n3mX4Cp0rIIRicJwu27SP1bOVrYo=",
    "pom": "sha256-xVJAhso+SaZ5ht+P3M1mA3uvXzxaNYt2+d1gm+57tjg="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.0": {
+   "jar": "sha256-ZdEthaO4ZcFg25FHhRcSpksQ2t1osi7qIqlb+KhnDco=",
+   "module": "sha256-pbmP3NnbAX1ULhlyJdzuGNZYpW3h2yzEHhMZbWsXaaQ=",
+   "pom": "sha256-jDyCEAfBNBFVhzm589U4LrgVUds4lc/7iVYeVsD03BY="
+  },
   "org/jetbrains/kotlin#kotlin-stdlib/2.3.21": {
    "jar": "sha256-b2TqxzbblDTdaSW0pRi50dFxd2UjIMN5Fs+bo859fXo=",
    "module": "sha256-e06ksiQrsXektKu2PD89hXMx1A01hl42/MPbZm7BAXQ=",
@@ -1782,14 +3724,35 @@
   "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.3.21": {
    "pom": "sha256-SecF24pUPn5ZxAyx4RYz2bw3NIv/5PEV8Zec34ifkig="
   },
+  "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.3.21": {
+   "pom": "sha256-KK59VS1Dtw4MZAgfAqu9IZa8qOElBe86H7+f9aJcF7Q="
+  },
   "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.3.21": {
    "pom": "sha256-yIhTYIUUX6NyHzlWQ7PIDLYim9iayrC4etXTYuOd7Gk="
   },
+  "org/jetbrains/kotlinx#atomicfu-jvm/0.22.0": {
+   "jar": "sha256-LaBzcn86teVYTnTBLhFRnJCK4t+vausl3tQrZoIpeII=",
+   "module": "sha256-NQcPkjzmn4fG+Q5TBXIOJwRAm2miN0SSrEW+cAde5Jo=",
+   "pom": "sha256-CSM9N5NaKWh4/H6+92ECEmT64oBb+SZCAyi3y5DWelY="
+  },
   "org/jetbrains/kotlinx#atomicfu-jvm/0.28.0": {
    "jar": "sha256-OVduxGuDQS/3opCdJMzLupBADpH5qmeyUDCbwIcuz1I=",
    "module": "sha256-NLYjr5wlyn8uUkBvEElcRub0EINdegWMYLo2kj1oljU=",
    "pom": "sha256-3X+tXV1LIcqdsHiHULCZe6HbaILe2G5SEvXIP8UfrOw="
   },
+  "org/jetbrains/kotlinx#atomicfu/0.22.0": {
+   "module": "sha256-XIdu9+HuB90wchxDtG6tjtojzisiJg5w+TPL4AToBgc=",
+   "pom": "sha256-lsP4fQNiioMRHD35NOgD134Q1hNCD3vE0wBZg4bI7zc="
+  },
+  "org/jetbrains/kotlinx#atomicfu/0.23.1": {
+   "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=",
+   "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=",
+   "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas="
+  },
+  "org/jetbrains/kotlinx#atomicfu/0.27.0": {
+   "module": "sha256-umecB1fjmeaKmfl9c4QosvtwB3F93/Dx3uuoYrr0RpA=",
+   "pom": "sha256-e3Fbn9t9MTr8hRjV/Kv0LrSfzNbNf/RHNqEF6AmUBdg="
+  },
   "org/jetbrains/kotlinx#atomicfu/0.28.0": {
    "jar": "sha256-09oifhoGwZVcEQFM3vpZlpqwygUHqB6ooP0Fq2xNvJw=",
    "module": "sha256-U1VoySkaPadwXEtAU16s7fhrJI31cKxSZpyQfUu4VYs=",
@@ -1810,6 +3773,20 @@
    "module": "sha256-hcc5iv+JMuodhuYKsl/IsngaVsbrZIVfz/TcZaG3d6U=",
    "pom": "sha256-NPZcN43q2J+3yi0Sr4Pdg0A8uoXI7bOlxrxa1R/+90k="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-android/1.11.0": {
+   "jar": "sha256-wssgbScBfH0b9f8Xl4c5dUPRN0jbq7DXI34VheCykEQ=",
+   "module": "sha256-e30d3fGIgX3qrXOOkuEfqlq9+TfIcSDN8DYQJWatS+M=",
+   "pom": "sha256-IkVnQg0+DtX+9A94n97UXf1RsWIxnijXfTyajexIIbg="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-android/1.6.4": {
+   "module": "sha256-aFFlWeb4SmIbl4PNiSpkYwzNeHWENYjds/BQFCXjPxU=",
+   "pom": "sha256-SffjJHTWQ5bs4sAU29wiBNZlz6j9c+aaahs/qxOBmLc="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-android/1.9.0": {
+   "jar": "sha256-vXg6zS+XOIRdWDgPRvRbXN6V0MsDAn1WclM4smv8TXI=",
+   "module": "sha256-ffHgTXfwzEEYkNmZqUSbDjvNTxWaRsMGCxECBMpgfUM=",
+   "pom": "sha256-voYCDNW5O4poykMYWgSbmwuqNF/Rvh/aoBT9rvktbnw="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": {
    "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY="
   },
@@ -1819,9 +3796,15 @@
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
    "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": {
+   "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": {
    "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.9.0": {
+   "pom": "sha256-vqVRHpAB8sWTq1CA3xMbIZq14ghcxZec5YPqzUlG/Xg="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.2": {
    "jar": "sha256-XKF1s43zMf1kFVs1zYyuElH6nuNpcJs21C4KKIzM4/0=",
    "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=",
@@ -1837,12 +3820,23 @@
    "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
    "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.7.3": {
+   "jar": "sha256-GrOsw48+c1XE+dHsYhB6RvpzyJnzBw0FXl1Dc9/mfhI=",
+   "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=",
+   "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": {
    "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=",
    "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=",
    "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.9.0": {
+   "jar": "sha256-rYnCiSI15nDyItgZyz2BGIFDyxmgW1nfmImuQmn1xwo=",
+   "module": "sha256-syGomeQNPONFcHqiz9qZg60NzGn+p0qbi/kGoWwc+Kk=",
+   "pom": "sha256-GcSImUGzqgmL1XzGTwL5razGVNVxoSqVbeS1uxSMZJk="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": {
+   "jar": "sha256-MZtlMAnUnHCYL5jfKcyE/HAlsJLLBXHI51MuOtQ2ba4=",
    "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=",
    "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw="
   },
@@ -1851,6 +3845,23 @@
    "module": "sha256-Hhl4XTRyi3Ul16d/8y6tRUfVHMekXUrETU3mCBabDA0=",
    "pom": "sha256-QbbnjBsNEbyZ3nlTkN+eTs5k3BE/SC1uMI8bekIcHTA="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.6.4": {
+   "module": "sha256-pu7UoYNViOfIT817BHX86aezREyHDrx5e4i6ZMz0V2s=",
+   "pom": "sha256-E2tO24ekfhUlHwhC8xifoxl560q1Gs+0I5tL+NFtRYg="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": {
+   "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=",
+   "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": {
+   "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=",
+   "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.9.0": {
+   "jar": "sha256-cInDPBRYZQIHYNPbyl5GNBM8w91/65Jugw9t5u3iisY=",
+   "module": "sha256-rVNANKlTtOEsvuuHTGat+LHKFN8V/g0uZUeqNOht/so=",
+   "pom": "sha256-dw8nk9BeKwJ7nHmZOOwdLU7xQc5YGceAwyw5lcrbCkc="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.11.0": {
    "jar": "sha256-EENHHn1fmWgN86BWz3ZiduD+M55IAw3qUD/ByUwzdD4=",
    "module": "sha256-eJRlqAo7YbMcJwBZ9nF42iYEXcLd85sBtFQ6YCrc9wY=",
@@ -1867,6 +3878,7 @@
    "pom": "sha256-hNEZMm3mSWuPIKmFq+M9GOLSYrDPIEUwWpHrxX+x9bY="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.11.0": {
+   "jar": "sha256-hWeg71jaDUNVtz9wg3HoT7Ob0o4HeIAEqHZONwbrd4A=",
    "module": "sha256-uh54xTl6qTSnS555nSkOa3afYE2q2zBkD5Gub8r4HW0=",
    "pom": "sha256-n+XNTGBseFzBT8RpLtHsbLQFPB9eZ/qLP6Ot8cca+ao="
   },
@@ -1881,6 +3893,7 @@
    "pom": "sha256-ZqScb1N5kQZRonMqtzhY+IimhqVpybHL8vYAoDRYKCc="
   },
   "org/jetbrains/kotlinx#kotlinx-datetime/0.7.1-0.6.x-compat": {
+   "jar": "sha256-Mp/yxos4TqGgxNQNScdfMzu0pCItaQEX5j6jQCu2dIg=",
    "module": "sha256-Z9HcRg78U5nv5IcpK32V8vIY4kmAamOO/FxJrqptU+I=",
    "pom": "sha256-iBoHz8YixkJPjy675W0bZLzLqjqLs43i5MCbTpcR/8g="
   },
@@ -1943,6 +3956,7 @@
    "pom": "sha256-MTN3P7z5gip/Ol6FqxmUHme9KJv1/DGC2dtNHKuG6yI="
   },
   "org/jetbrains/kotlinx#kotlinx-serialization-core/1.7.3": {
+   "jar": "sha256-SFBoLg5ZdoYmlTMNhOuGmfHcXVCEn2JSY5lcyIvG83s=",
    "module": "sha256-OdCabgLfKzJVhECmTGKPnGBfroxPYJAyF5gzTIIXfmQ=",
    "pom": "sha256-MdERd2ua93fKFnED8tYfvuqjLa5t1mNZBrdtgni6VzA="
   },
@@ -1956,6 +3970,11 @@
    "module": "sha256-RM5rdW+TyQrD2nPzXtCrA29Dtz9X81Y8ysnhUvQRJy0=",
    "pom": "sha256-3G/845DzKNm8p0CmO5EJKv0J9Ec6HyqA131ks8W1BdM="
   },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.7.3": {
+   "jar": "sha256-sekThJntjSA3Xt2j8rHJXzEDoljv9q+e3F6gcQDyspw=",
+   "module": "sha256-D/cOITHypldYIvdhHAXig8SuCBczA/QQSUy0Eom9PvY=",
+   "pom": "sha256-0zRdKAgXvgfpwnrNYHPUleF73/VxxHADTglmQgeGp90="
+  },
   "org/jetbrains/kotlinx#kotlinx-serialization-json/1.10.0": {
    "module": "sha256-yfNeuGIPLTiZoFgoXEF3NciVbu0rGFO+2jrBPHeCuMc=",
    "pom": "sha256-+uXntE6iGb3qzoSlC/8y06x/bdGb5KjiRTbhgzxUoNY="
@@ -1965,12 +3984,18 @@
    "module": "sha256-kxa2Th0N4KjHQTS0YJFtz20Z5ieUG0xO62PgfpBxEa8=",
    "pom": "sha256-K9jF550v7oGDpF7YaQJOHXRXGTaWCxgSXWA7Bxj1NuM="
   },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.7.3": {
+   "jar": "sha256-qpP6PJY5LLE5WTE0Qw3C1RNn9Z1VPl43R+vYAHsmPxs=",
+   "module": "sha256-HPAiijWIcx1rrzvLvbCKMiUB9wQg1Q4pKrUB5V2Mz08=",
+   "pom": "sha256-BaiftqSvoKHUB51YgsrTSaF/4IqYv5a30A0GplUh3H0="
+  },
   "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.7.3": {
    "jar": "sha256-dMdtR+VdhmvBjZ7Yia45y859sLd95acgENqx8kR5NXc=",
    "module": "sha256-Mes2Fe5po0XkuEjgxBiDLAvNX8hGCk3gZsGG9Ss3oRA=",
    "pom": "sha256-PIUWIFu9DIjtNXCwnGS+f7WvEMGapgJFBu/Su7WSrMk="
   },
   "org/jetbrains/runtime#jbr-api/1.5.0": {
+   "jar": "sha256-ZX7efX+OF1yQmyPKoQ/NTUpREwT9k4qpzIRXtDeJUNU=",
    "pom": "sha256-/jziiqT0Ga0GcErRyoIzTQ6HFmfKWxE8UVfnUXzhMh4="
   },
   "org/jetbrains/runtime#jbr-api/1.9.0": {
@@ -1999,6 +4024,7 @@
    "pom": "sha256-hYumSDgVeq/Oe0lvNq3HPyLLjfk4W4Rw3G6UYp7Ckos="
   },
   "org/jetbrains/skiko#skiko/0.144.5": {
+   "jar": "sha256-JwF75Q+DlQyJgm9TM/FkMYqcEfyA+CXTbyRL3cKTRvE=",
    "module": "sha256-664bLBc2v4iUWHH8gkyRG8p4KA+x2CpVkiqoyfvCVs0=",
    "pom": "sha256-oUr6OtK+4DmVwrXu5DtCHrPNhINUuMQJIlSMhVZ5k0o="
   },
@@ -2016,10 +4042,22 @@
    "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
    "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
   },
+  "org/junit#junit-bom/5.10.2": {
+   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+  },
   "org/junit#junit-bom/5.13.4": {
    "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
    "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
+  "org/junit#junit-bom/5.9.2": {
+   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
+   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
+  },
+  "org/jvnet/staxex#stax-ex/1.8.1": {
+   "jar": "sha256-IFIlSQVunlCqNe8LRFouR6U9Br4LCpRn1wTiSD/7BJo=",
+   "pom": "sha256-j8hPNs5tps6MiTtlOBmaf2mmmgcG2bF6PuajoJRS7tY="
+  },
   "org/kodein/emoji#emoji-kt-jvm/2.4.0": {
    "jar": "sha256-jL2rOkWG0lnx6+ZGOy5xcp8lgjfPDgj2HRbTsnELPqI=",
    "module": "sha256-/p9USod54adSeMfnwx/Xz1hD+oiVaAvpcFhCcjerF5k=",
@@ -2030,6 +4068,41 @@
    "module": "sha256-hsBQw028DEH5wilvWN9qascAMhn99EHUpncrRNPyZyE=",
    "pom": "sha256-Z36gCnKoilousQexig/VsSnPvFq9jUz1J/rfHQHpG3M="
   },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-analysis/9.8": {
+   "jar": "sha256-5kBzL7zTxicZJaUE8SXjg4Roj037v5LIYi387g0J7bk=",
+   "pom": "sha256-xXR+JccuGwfVJjx1x4rWGmJt0kWPr8r8I/gdMlPuQu0="
+  },
+  "org/ow2/asm#asm-commons/9.8": {
+   "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=",
+   "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI="
+  },
+  "org/ow2/asm#asm-tree/9.8": {
+   "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=",
+   "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c="
+  },
+  "org/ow2/asm#asm-tree/9.9.1": {
+   "jar": "sha256-DzVVCWtyC4ILusqwtRVYm+4CAL7gmb2hTFYXOK6De6E=",
+   "pom": "sha256-Z/7kRrpRKHEwBzjw+Vb2GlAKhS9oYf9w8KPHvwwPpAU="
+  },
+  "org/ow2/asm#asm-util/9.8": {
+   "jar": "sha256-i6BGDsso/Q4pgOXz7zQzpROkV7wHf4GlO9x1tYegjRU=",
+   "pom": "sha256-JNCXDhceKRe4Oo8PBdUKHNtcguUIVVtS28ydM2HE8Ow="
+  },
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  },
+  "org/ow2/asm#asm/9.9.1": {
+   "jar": "sha256-bzgoohXJIAWaXvovtVwjPWxU7FytypnOGxvdEAd8fd0=",
+   "pom": "sha256-rKaN7pui9s2Q/95yjv3H4+v89Z8/Qfv+JI0tAdW4Zq8="
+  },
+  "org/slf4j#slf4j-api/1.7.30": {
+   "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=",
+   "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
+  },
   "org/slf4j#slf4j-api/2.0.17": {
    "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
    "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
@@ -2044,6 +4117,9 @@
   "org/slf4j#slf4j-bom/2.0.18": {
    "pom": "sha256-khmqtgFXUSbE5m4TMesrDGwXozCsTVoH480R1YCgwS0="
   },
+  "org/slf4j#slf4j-parent/1.7.30": {
+   "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
+  },
   "org/slf4j#slf4j-parent/2.0.17": {
    "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
@@ -2052,13 +4128,32 @@
   },
   "org/sonatype/oss#oss-parent/7": {
    "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/tensorflow#tensorflow-lite-metadata/0.2.0": {
+   "jar": "sha256-6fGLikHwF+kDPLDthciiuiMHKSzf4l6uNlkj56MdKnA=",
+   "pom": "sha256-D+MTJug7diLLzZx11GeykfAf/jzG4+dmUawFocHHo2A="
   }
  },
- "https://www.jitpack.io": {
-  "com/github/beeper/matrix-messageformat-compose#messageformat-jvm/5ac720dbe1a46f228df673cc2c554584731f932c": {
+ "https://www.jitpack.io/com/github/beeper": {
+  "matrix-messageformat-compose#messageformat-android/5ac720dbe1a46f228df673cc2c554584731f932c": {
+   "module": "sha256-rgzSoj3H+Kt7ysCZ3I0jbYflLLj2giWHR81XGSSve8E=",
+   "pom": "sha256-5ULao2clDL2jQKAP/YkfNDdrMEJJgvHbZRpQMfFAheU="
+  },
+  "matrix-messageformat-compose#messageformat-jvm/5ac720dbe1a46f228df673cc2c554584731f932c": {
    "jar": "sha256-XiHH93nwFIKa1kM6f3jhnohGGw2XRaZ7vNGt2QS8rfo=",
    "module": "sha256-xFighI7x4M2UzBxhuUhqbY9/zMAH+9nbKnOmUxfCs5s=",
    "pom": "sha256-Tgml1Kjr3pI9GWxuk+6llGmih5zkApnz2i/Ny4VTKUs="
+  },
+  "matrix-messageformat-compose#messageformat/5ac720dbe1a46f228df673cc2c554584731f932c": {
+   "jar": "sha256-swtSuuU+MpS8OiDuKQqxIvX8j/5M1+maux3D93XE8j0=",
+   "module": "sha256-dn5zinoZXu7Pm03e06QBSNOgKGAI6znPLC1p9qsVsX4=",
+   "pom": "sha256-2dxqevZRD0Uap1g3MFzRk+fLc0tUKqJsTVqmWICO3CQ="
+  },
+  "matrix-messageformat-compose/messageformat-android/5ac720dbe1a46f228df673cc2c554584731f932c/messageformat-android-5ac720dbe1a46f228df673cc2c554584731f932c": {
+   "aar": "sha256-oRcxncL4PiTd3Kb2OzTfgOoA+IHajXOBMnkgG+M2FLM="
   }
  }
 }
diff --git a/pkgs/by-name/sc/schildi-revenge/package.nix b/pkgs/by-name/sc/schildi-revenge/package.nix
index d89d99f377db..bbd599cc7d6b 100644
--- a/pkgs/by-name/sc/schildi-revenge/package.nix
+++ b/pkgs/by-name/sc/schildi-revenge/package.nix
@@ -14,20 +14,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schildi-revenge";
-  version = "26.06.06";
+  version = "26.07.13";
 
   src = fetchFromGitHub {
     owner = "SchildiChat";
     repo = "schildi-revenge";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bj2pSS+kUAs800c/OyK4fIrckB/hAWV3Iypwei8P/W4=";
+    hash = "sha256-1Akm57GxGtEymDbfq879uglxEoENp/g+aFUNM1O0qRo=";
     fetchSubmodules = true;
   };
 
   cargoRoot = "matrix-rust-sdk";
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src cargoRoot;
-    hash = "sha256-ZUMX6Y2kT0CEUFVcn8fAlxoCnQT5ipAi5YqZ3Geet4A=";
+    hash = "sha256-TIpT2g00f99qTGPA+bBaEz4kj5BC1scEywv6oDCFlkQ=";
   };
 
   nativeBuildInputs = [

From 419ba3c4514caec178192225a01e59db3539fa67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 16:31:04 +0000
Subject: [PATCH 0324/1386] chirpstack-rest-api: 4.18.0 -> 4.19.0

---
 pkgs/by-name/ch/chirpstack-rest-api/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
index 7cef8d846206..64238e9b3c6d 100644
--- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix
+++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "chirpstack-rest-api";
-  version = "4.18.0";
+  version = "4.19.0";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-rest-api";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-d8DoU5iqBtWLu8I0xzM8+ny16iylAbjRku7EC1m0o50=";
+    hash = "sha256-DOQ6S0o9kWYdIoR/SWW29hhsVJ9gKE3cRHrunhXHXJg=";
   };
 
-  vendorHash = "sha256-b0m3a0U/XgRFR1lvfOUB1yQFZZ9j558WBiymnysjuGg=";
+  vendorHash = "sha256-5TEXM7sigSN6NpWUC3bv4rXhuArz1j8+R8P/arXa5rg=";
 
   ldflags = [
     "-s"

From 61af9b9ab1c612fd4e2f1d91db26ca1b3c89ecd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ila=C3=AF=20Deutel?= <root@ilai.dev>
Date: Tue, 26 May 2026 01:48:42 -0400
Subject: [PATCH 0325/1386] amber-lang: add versionCheckHook, include unstable
 in updateScript

---
 pkgs/by-name/am/amber-lang/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index a704fbd47fa1..40efcab57a60 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -7,6 +7,7 @@
   gnused,
   makeWrapper,
   installShellFiles,
+  versionCheckHook,
   stdenv,
   runCommand,
   amber-lang,
@@ -62,8 +63,13 @@ rustPlatform.buildRustPackage rec {
       --bash <($out/bin/amber completion)
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
     tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } ''
       diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World')
       touch $out

From 9d5147209a2c02b9997a6f08b4cd524fed3d3475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ila=C3=AF=20Deutel?= <root@ilai.dev>
Date: Tue, 26 May 2026 01:48:42 -0400
Subject: [PATCH 0326/1386] amber-lang: 0.5.1-alpha -> 0.6.0-alpha

---
 .../am/amber-lang/fix_word_boundaries.patch   | 38 ------------
 pkgs/by-name/am/amber-lang/package.nix        | 61 ++++++++++++-------
 2 files changed, 39 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/by-name/am/amber-lang/fix_word_boundaries.patch

diff --git a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch b/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch
deleted file mode 100644
index ec73631eccae..000000000000
--- a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From efdbecaf721ccb217ece34a5105eaac68e27aa51 Mon Sep 17 00:00:00 2001
-From: Max Karou <maxkarou@protonmail.com>
-Date: Sun, 4 Jan 2026 01:47:51 +0100
-Subject: [PATCH] sed_version: remove word boundary assertions
-
-Word boundary assertions (\b) are GNU regex extensions that may fail
-on systems using non-glibc C libraries (e.g., musl, macOS).
-
-This was previously fixed in replace_regex() via NixOS/nixpkgs#388412,
-which was subsequently upstreamed in amber-lang/amber#686.
-
-Changes in amber-lang/amber#717 reintroduced the same portability issue.
----
- src/std/text.ab | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/std/text.ab b/src/std/text.ab
-index 5f2d935..a5dac3f 100644
---- a/src/std/text.ab
-+++ b/src/std/text.ab
-@@ -51,12 +51,12 @@ const SED_VERSION_BUSYBOX = 2
- fun sed_version(): Int {
-     // We can't match against a word "GNU" because
-     // alpine's busybox sed returns "This is not GNU sed version"
--    trust $ re='\bCopyright\b.+\bFree Software Foundation\b'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $
-+    trust $ re='Copyright.+Free Software Foundation'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $
-     if status == 0 {
-         return SED_VERSION_GNU
-     }
-     // On BSD single `sed` waits for stdin. We must use `sed --help` to avoid this.
--    trust $ re='\bBusyBox\b'; [[ \$(sed --help 2>&1) =~ \$re ]] $
-+    trust $ re='BusyBox'; [[ \$(sed --help 2>&1) =~ \$re ]] $
-     if status == 0 {
-         return SED_VERSION_BUSYBOX
-     }
--- 
-2.51.2
-
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index 40efcab57a60..f35e9b533e2f 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -4,7 +4,6 @@
   rustPlatform,
   bc,
   util-linux,
-  gnused,
   makeWrapper,
   installShellFiles,
   versionCheckHook,
@@ -12,31 +11,23 @@
   runCommand,
   amber-lang,
   nix-update-script,
+  bash,
+  ksh,
+  zsh,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "amber-lang";
-  version = "0.5.1-alpha";
+  version = "0.6.0-alpha";
 
   src = fetchFromGitHub {
     owner = "amber-lang";
     repo = "amber";
     tag = version;
-    hash = "sha256-v1uJe3vVGKXaZcQzdoYzu/bJKMQnS4IYET4QLPW+J8Y=";
+    hash = "sha256-pyMsxb9XPtseroH2MORhMOg9+iaLyoxmgpUTCej+i+Y=";
   };
 
-  patches = [
-    # Upstreamed in #995, can be removed in >= 0.5.2
-    # github.com/amber-lang/amber/pull/995
-    ./fix_word_boundaries.patch
-  ];
-
-  cargoHash = "sha256-aXcxlmmDYLFbyRJYyGE1gbQMbdysHx4iWXsrUj10Eco=";
-
-  preConfigure = ''
-    substituteInPlace src/compiler.rs \
-      --replace-fail 'Command::new("/usr/bin/env")' 'Command::new("env")'
-  '';
+  cargoHash = "sha256-7TZIRg4NK2uOivUUg09T5mbxrNlRmmVyec2xhmzSNvY=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -44,15 +35,23 @@ rustPlatform.buildRustPackage rec {
   ];
 
   nativeCheckInputs = [
+    bash
     bc
     # 'rev' in generated bash script of test
     # tests::validity::variable_ref_function_invocation
     util-linux
   ];
 
+  preCheck = ''
+    substituteInPlace src/tests/cli.rs \
+      --replace-fail 'Command::new(amber_bin())' "Command::new(\"target/${stdenv.targetPlatform.rust.cargoShortTarget}/$cargoBuildType/amber\")"
+    substituteInPlace src/tests/cli.rs \
+      --replace-fail 'cmd.env("AMBER_SHELL", "/bin/bash")' 'cmd.env("AMBER_SHELL", "bash")'
+  '';
+
   checkFlags = [
     "--skip=tests::extra::download"
-    "--skip=tests::formatter::all_exist"
+    "--skip=tests::stdlib::test_stdlib_src_tests_stdlib_http_fetch_ab"
   ];
 
   postInstall = ''
@@ -70,21 +69,39 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
-    tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } ''
-      diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World')
-      touch $out
-    '';
+    tests =
+      let
+        testHelloWorld =
+          type: pkg:
+          runCommand "amber-lang-test-eval-hello-world-${type}"
+            {
+              nativeBuildInputs = [
+                amber-lang
+                pkg
+              ];
+            }
+            ''
+              diff -U3 --color=auto <(amber eval --target ${type} 'echo("Hello, World")') <(echo 'Hello, World')
+              touch $out
+            '';
+      in
+      {
+        eval-hello-world-bash = testHelloWorld "bash" bash;
+        eval-hello-world-bash-3_2 = testHelloWorld "bash-3.2" bash;
+        eval-hello-world-ksh = testHelloWorld "ksh" ksh;
+        eval-hello-world-zsh = testHelloWorld "zsh" zsh;
+      };
   };
 
   meta = {
     description = "Programming language compiled to bash";
     homepage = "https://amber-lang.com";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.lgpl3Only;
     mainProgram = "amber";
     maintainers = with lib.maintainers; [
       cafkafk
       aleksana
+      ilai-deutel
     ];
-    platforms = lib.platforms.unix;
   };
 }

From 0cea6a5d5daac28a38df04848e0122be88270b89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 16:36:51 +0000
Subject: [PATCH 0327/1386] python3Packages.monarchmoneycommunity: 1.3.2 ->
 1.5.1

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

diff --git a/pkgs/development/python-modules/monarchmoneycommunity/default.nix b/pkgs/development/python-modules/monarchmoneycommunity/default.nix
index eca4f1de0689..e9883c862776 100644
--- a/pkgs/development/python-modules/monarchmoneycommunity/default.nix
+++ b/pkgs/development/python-modules/monarchmoneycommunity/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "monarchmoneycommunity";
-  version = "1.3.2";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bradleyseanf";
     repo = "monarchmoneycommunity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WWwxCL5LNIMqt+K2AmFuCQtx/i7MtyCsTxagz1GMw+g=";
+    hash = "sha256-3dOBFXzWJzLQ3Lr1lqwYxJ7s4uiUZatwEdZx3lRnhGs=";
   };
 
   build-system = [ setuptools ];

From c4b7b3a7bdd5d5d9362ec92fce611c1165109038 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 16:53:54 +0000
Subject: [PATCH 0328/1386] pop: 0.2.2 -> 0.3.0

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

diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix
index 2793314a8f2c..8e01b0cf022f 100644
--- a/pkgs/by-name/po/pop/package.nix
+++ b/pkgs/by-name/po/pop/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pop";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "pop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MG6mkWT+cjtE646P4K7I+jW9VxFSrI8wJ2D8Kwtia7k=";
+    hash = "sha256-2114PK3xcIykC4QTTzj54S4EjHVbcxpy8D7C735xdew=";
   };
 
-  vendorHash = "sha256-ZF/nINEqAgcsYwkzCepHX/vqODrzcEKoL3LvQmjRphU=";
+  vendorHash = "sha256-v3rozaY/kp/M4K397c+qtktIPyJJ+RIvPtPvd9qVpwU=";
 
   env.GOWORK = "off";
 

From f3a062f38fa84802d05149fdd8e3c1db141d9c35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 17:02:00 +0000
Subject: [PATCH 0329/1386] python3Packages.opensfm: odm-4-unstable-2026-07-01
 -> odm-4-unstable-2026-07-13

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

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index c1b4583a80c7..e26fdaeddaf2 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -53,15 +53,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "opensfm";
-  version = "odm-4-unstable-2026-07-01";
+  version = "odm-4-unstable-2026-07-13";
   pyproject = true;
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mapillary";
     repo = "OpenSfM";
-    rev = "a677b6f0648ff3caf439aebbe9aad0ca8abc175b";
-    hash = "sha256-Bxpfaj87N2QxP/AczpP3fOl6G8ciMJq5jaaIn7oGR9g=";
+    rev = "238744cdf3b5d50149c50d136a87f7fea25ad5cd";
+    hash = "sha256-3T9wjuuN5AjM/MtSo3xGoHJcvXOI8Keyxcqv7BQavlw=";
   };
 
   patches = [

From 40924799a9733fc7da95ba44ed8c63a07343e2de Mon Sep 17 00:00:00 2001
From: Stephen Checkoway <s@pahtak.org>
Date: Mon, 13 Jul 2026 13:33:46 -0400
Subject: [PATCH 0330/1386] rbenv: install the man page

Compress and install the man page to `$out/share/man/man1`.

Fixes: #541138
---
 pkgs/by-name/rb/rbenv/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/rb/rbenv/package.nix b/pkgs/by-name/rb/rbenv/package.nix
index 5d4f6928b373..e5994e79f861 100644
--- a/pkgs/by-name/rb/rbenv/package.nix
+++ b/pkgs/by-name/rb/rbenv/package.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/bin
     mv libexec $out
     ln -s $out/libexec/rbenv $out/bin/rbenv
+    mkdir -p $out/share/man/man1
+    gzip -c share/man/man1/rbenv.1 >$out/share/man/man1/rbenv.1.gz
 
     installShellCompletion --zsh completions/_rbenv
     installShellCompletion --bash completions/rbenv.bash

From 3cfda093b161efcd040e2408c5a2a0beb93f69c5 Mon Sep 17 00:00:00 2001
From: Andreas <asamonik@student.tugraz.at>
Date: Mon, 13 Jul 2026 15:19:08 +0200
Subject: [PATCH 0331/1386] expresslrs-configurator: 1.7.11 -> 1.8.1

Release notes:
https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/tag/v1.8.1

Drop the serialport node_gyp_bins workaround because the path is no
longer present in the 1.8.x bundle. Add the C++ runtime library to the
wrapper for the updated serialport native module.
---
 pkgs/by-name/ex/expresslrs-configurator/package.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ex/expresslrs-configurator/package.nix b/pkgs/by-name/ex/expresslrs-configurator/package.nix
index 4a63c931b5a8..467ee1798c86 100644
--- a/pkgs/by-name/ex/expresslrs-configurator/package.nix
+++ b/pkgs/by-name/ex/expresslrs-configurator/package.nix
@@ -12,7 +12,7 @@
 
 let
   pname = "expresslrs-configurator";
-  version = "1.7.11";
+  version = "1.8.1";
   installPath = "share/${pname}";
   resourcesPath = "${installPath}/resources";
 in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   src = fetchzip {
     url = "https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/download/v${version}/${pname}-${version}.zip";
     stripRoot = false;
-    hash = "sha256-BIbJzNWjYFbbwCEWoym3g6XBpQGi2owbf2XsQiXwHmw=";
+    hash = "sha256-3f2/ifXLs/gHZVVDI0EUBP05FEHH8exDvBzALDXq0Wo=";
   };
 
   nativeBuildInputs = [
@@ -52,10 +52,6 @@ stdenv.mkDerivation {
     cp -r $src/locales $src/resources $out/${installPath}/
     chmod -R u+w $out/${resourcesPath}
 
-    # broken symlink
-    rm -f $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
-    touch $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
-
     # patch asar absolute paths
     asar extract $out/${resourcesPath}/app.asar $TMPDIR/app
     substituteInPlace $TMPDIR/app/dist/main/main.js \
@@ -70,6 +66,7 @@ stdenv.mkDerivation {
     makeWrapper '${lib.getExe electron}' "$out/bin/${pname}" \
       --add-flags "$out/${resourcesPath}/app.asar" \
       --prefix PATH : ${lib.makeBinPath [ git ]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]} \
       --set ELECTRON_OVERRIDE_DIST_PATH "${electron}/lib/electron" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
 

From ff3d8044cf03949139a2994ff605b0cd1dd10bbe Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Mon, 13 Jul 2026 16:51:52 +0200
Subject: [PATCH 0332/1386] cpplint: fix build on Python 3.14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Backport upstream’s removal of deprecated codecs.open(), whose warnings cause the test suite to fail under Python 3.14.

https://github.com/cpplint/cpplint/pull/405

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/cp/cpplint/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix
index f28a21289b99..35df50e7375c 100644
--- a/pkgs/by-name/cp/cpplint/package.nix
+++ b/pkgs/by-name/cp/cpplint/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  fetchpatch2,
   versionCheckHook,
 }:
 
@@ -17,6 +18,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hash = "sha256-4crTuqynQt8Nyjqea6DpREtLy7ydRF0hNVnc7tUnO1k=";
   };
 
+  # Fix Python 3.14 test failures. Remove with the next release.
+  patches = [
+    (fetchpatch2 {
+      name = "drop-codecs-open.patch";
+      url = "https://github.com/cpplint/cpplint/commit/89bff410afed72e58d23ae084de4103986ea8630.patch?full_index=1";
+      hash = "sha256-Jdeewj3GM7GMoRF7+Qz/9n1hc8PYPcXLgtSGwSUpT1E=";
+    })
+    (fetchpatch2 {
+      name = "use-universal-newlines.patch";
+      url = "https://github.com/cpplint/cpplint/commit/d15a8715a6e848f784fda700758c4ac2d252fd31.patch?full_index=1";
+      hash = "sha256-Oo2doknEGnuxDJA0y17n1DCaKwadtMW/14a5wnIgfkw=";
+    })
+  ];
+
   # We use pytest-cov-stub instead
   postPatch = ''
     substituteInPlace pyproject.toml \

From aae8cda0c3029700b146166d9e267a99c1f3f884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Bariteau?= <numkem@numke.org>
Date: Mon, 13 Jul 2026 14:52:33 -0400
Subject: [PATCH 0333/1386] recoll-kio: init at ${recoll.version}

The KIO working is already in the recoll source but just isn't built by
default. This package uses the recoll source and version so it stays
consistent.
---
 pkgs/by-name/re/recoll-kio/package.nix | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/re/recoll-kio/package.nix

diff --git a/pkgs/by-name/re/recoll-kio/package.nix b/pkgs/by-name/re/recoll-kio/package.nix
new file mode 100644
index 000000000000..fbb87cb18230
--- /dev/null
+++ b/pkgs/by-name/re/recoll-kio/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  kdePackages,
+  recoll,
+  xapian,
+}:
+
+stdenv.mkDerivation {
+  pname = "recoll-kio";
+  version = recoll.version;
+
+  src = recoll.src;
+
+  strictDeps = true;
+  buildInputs = [
+    kdePackages.kio
+    recoll
+    xapian
+  ];
+
+  postPatch = ''
+    cp ./kde/kioslave/kio_recoll/CMakeLists-KF6.txt ./kde/kioslave/kio_recoll/CMakeLists.txt
+  '';
+
+  dontWrapQtApps = true;
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeDir = "../kde/kioslave/kio_recoll";
+
+  __structuredAttrs = true;
+  meta = {
+    homepage = recoll.meta.homepage;
+    description = "Plasma KIO worker for recoll";
+    license = recoll.meta.license;
+    maintainers = with lib.maintainers; [ numkem ];
+    platforms = lib.platforms.linux;
+  };
+}

From c182425f543b87f28b9510d7231eaeff13753c22 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 13 Jul 2026 21:04:16 +0200
Subject: [PATCH 0334/1386] matrix-appservice-irc: use nodejs-slim_22

nedb (bundled in matrix-appservice-irc 4.0.0) calls util.isDate which
was removed in Node.js 24. Pin to Node.js 22 until the package is
updated to a version that no longer depends on nedb.
---
 pkgs/by-name/ma/matrix-appservice-irc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-appservice-irc/package.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
index 52e4d4b8d854..6dcf8c5c3366 100644
--- a/pkgs/by-name/ma/matrix-appservice-irc/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
@@ -5,7 +5,7 @@
   fetchYarnDeps,
   fixup-yarn-lock,
   node-gyp-build,
-  nodejs-slim,
+  nodejs-slim_22,
   matrix-sdk-crypto-nodejs,
   nixosTests,
   nix-update-script,
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     fixup-yarn-lock
-    nodejs-slim
+    nodejs-slim_22
     yarn
     node-gyp-build
   ];

From 95ec73c5cb5e74f908400323df90ccb545ca0713 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 19:29:44 +0000
Subject: [PATCH 0335/1386] radsecproxy: 1.11.2 -> 1.11.3

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

diff --git a/pkgs/by-name/ra/radsecproxy/package.nix b/pkgs/by-name/ra/radsecproxy/package.nix
index a894ce2a174d..50009224d609 100644
--- a/pkgs/by-name/ra/radsecproxy/package.nix
+++ b/pkgs/by-name/ra/radsecproxy/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "radsecproxy";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "radsecproxy";
     repo = "radsecproxy";
     tag = finalAttrs.version;
-    hash = "sha256-E7nU6NgCmwRzX5j1Zyx/LTztjLqYJKv+3VU6UE0HhZA=";
+    hash = "sha256-QSRK7uljYn2kqGypfkZBWhVPGk/x1y6WT9FT5pqwWS0=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From f74eee78438d1a71823bfa3a73eb11c8e2b5206a Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 10 Jul 2026 18:00:21 +0200
Subject: [PATCH 0336/1386] incus-lts: 7.0.0 -> 7.0.1

---
 pkgs/by-name/in/incus/lts.nix | 153 +---------------------------------
 1 file changed, 3 insertions(+), 150 deletions(-)

diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix
index 2b0318ca1a25..07d2b749ca21 100644
--- a/pkgs/by-name/in/incus/lts.nix
+++ b/pkgs/by-name/in/incus/lts.nix
@@ -1,155 +1,8 @@
 import ./generic.nix {
-  hash = "sha256-7s2gc+78O8jKypVe1itaUrsLPa2mLjNgUUrR/cv7ITA=";
-  version = "7.0.0";
-  vendorHash = "sha256-6irMB3hpWcxDuMQBxWXnhMLAOwTAl63JX6JJZMQXf5E=";
+  hash = "sha256-Ivj0vWKuhgb4VvyxcuB+CXsJ02zwo65rqxD5/cLUmSk=";
+  version = "7.0.1";
+  vendorHash = "sha256-F3LhWVjckU0ypgOppHztjR6hDB6enHxoDmRWcSDfwQE=";
   lts = true;
-  patches = fetchpatch2: [
-    (fetchpatch2 {
-      name = "doc-devices-disk_Fix-broken-link.patch";
-      url = "https://github.com/lxc/incus/commit/faa636b70c05a5cca0346492a0586d5747e4b117.patch?full_index=1";
-      hash = "sha256-UsfzSeLJq0B9xDmd124ITzFBJzg2w1xXNK6TavQ5iMs=";
-    })
-    (fetchpatch2 {
-      name = "incusd-instance-qemu_Fix-version-detection-for-qemu-kvm.patch";
-      url = "https://github.com/lxc/incus/commit/a5f50d36eaa41580f2233b05936bd29fe1b15100.patch?full_index=1";
-      hash = "sha256-Qwu2oljB7COZB2m3W/9Y5wCCZyxvLj4ZUHcNqtoDGzk=";
-    })
-    (fetchpatch2 {
-      name = "incusd_Re-introduce-core-scheduling-detection.patch";
-      url = "https://github.com/lxc/incus/commit/1e6ce18e8cd92b5b3eb4346e7bd27fd4a7d1fb9b.patch?full_index=1";
-      hash = "sha256-RLy8bcod55g8vtXxChte4oalApw7d/gZg8No6BUZQS0=";
-    })
-    (fetchpatch2 {
-      name = "incusd-instance-lxc_Fix-swap=false-failure.patch";
-      url = "https://github.com/lxc/incus/commit/5f2cdf7545c5398290dc507313de9ee547fe803f.patch?full_index=1";
-      hash = "sha256-Ux6mm8Y4q68fj//hG7k+bXMjqhGDOxGNm64De1pwcYY=";
-    })
-    (fetchpatch2 {
-      name = "incusd-forknet_Persist-DHCPv6-client-DUID-across-restarts.patch";
-      url = "https://github.com/lxc/incus/commit/47377e345930e77d3fbce29d037fc7dbd6823dcf.patch?full_index=1";
-      hash = "sha256-CWaNaDYuBBLahxkqnM0FQZraVkvBSbrx1+8dcB8Vfbg=";
-    })
-    (fetchpatch2 {
-      name = "incusd-forknet_Include-FQDN-in-DHCPv6-INFO-requests.patch";
-      url = "https://github.com/lxc/incus/commit/d7f1c9d75ca33eb2ddb0bf10cec934fd6e352089.patch?full_index=1";
-      hash = "sha256-3zyADLiPUuiGLwdeISj5lUk3tkAayQGaRI+/yBHrvuM=";
-    })
-    (fetchpatch2 {
-      name = "incusd-forknet_Properly-renew-stateful-DHCPv6.patch";
-      url = "https://github.com/lxc/incus/commit/3b127758c17752302b3f4bf907f42e926ab664e4.patch?full_index=1";
-      hash = "sha256-+dcdeZwuyTWH7yfPEDqKOax/lS1Yqvwn9ooqJxKD3jA=";
-    })
-    (fetchpatch2 {
-      name = "incusd-forknet_Add-jitter-to-DHCPv6-renewal.patch";
-      url = "https://github.com/lxc/incus/commit/2b24a260b6177c033047f270286933563f05a999.patch?full_index=1";
-      hash = "sha256-grMspYyqn4Zl1Kn+hFeUfeIevdwszJc0x2YDC2JILKw=";
-    })
-    (fetchpatch2 {
-      name = "incusd-device-nic_bridged_Fix-swapped-IPv4-IPv6-DNS-record.patch";
-      url = "https://github.com/lxc/incus/commit/33ffcf71745e138dd4f3546839115c293e6be083.patch?full_index=1";
-      hash = "sha256-E8Plz9qdoTt3id9I5jbZYMKQt+kUrKmXmtMJ6IXlRJg=";
-    })
-    (fetchpatch2 {
-      name = "doc-authorization_Fix-reference-to-old-manager-relation.patch";
-      url = "https://github.com/lxc/incus/commit/c65ac0f4e6e94859b8565bce41bbf1595f4a8085.patch?full_index=1";
-      hash = "sha256-6wEz3uxWauIibBkH+OdB7+VsFySmugt6wk61qMayzYo=";
-    })
-    (fetchpatch2 {
-      name = "incusd-network-acl_Fix-issue-with-instances-in-different-project-than-ACL.patch";
-      url = "https://github.com/lxc/incus/commit/2a3584b6fccf152be42cf5614e54241bdb13e671.patch?full_index=1";
-      hash = "sha256-CXE5Bowk3ZPup6oVDEJb9ucsJoXhXu/kU7gGCghhtjQ=";
-    })
-    (fetchpatch2 {
-      name = "incusd-projects_Fix-targeting-on-project-delete.patch";
-      url = "https://github.com/lxc/incus/commit/3a104e4dc24897f0d6543136bb1043fcd4a33632.patch?full_index=1";
-      hash = "sha256-kTFkJqbjzdq5jvNxKw8YMPR04WRj4t5IS6ymoGyXDXE=";
-    })
-    (fetchpatch2 {
-      name = "test-network_acl_Add-test-for-ACL-used-by-instance-in-different-project.patch";
-      url = "https://github.com/lxc/incus/commit/41878729f06e9c31df9d4fac20fb8c384608577c.patch?full_index=1";
-      hash = "sha256-YR2Akus4vp3vNvHEmsJUh/3gbEf3R/cFUOVvt9u/wEU=";
-    })
-    (fetchpatch2 {
-      name = "incusd-instance-qemu_Remove-deprecated-QEMU-flag.patch";
-      url = "https://github.com/lxc/incus/commit/c1f18c78fc6bc4850df20574bdcc541e5eefc4ac.patch?full_index=1";
-      hash = "sha256-kbn4Yd/G23FCFA0Ch0+d81HUxCbcoiOzHfZ0MW+VlzE=";
-    })
-    (fetchpatch2 {
-      name = "incusd-cluster_Re-order-evacuations-to-happen-earlier-on-shutdown.patch";
-      url = "https://github.com/lxc/incus/commit/5b29ecc164ef28239d2e2a874a7c871a2e419083.patch?full_index=1";
-      hash = "sha256-jpyJYjiZvRw/aOGsykEx8uotRBF7p1q5O08PVhyQtvk=";
-    })
-    (fetchpatch2 {
-      name = "incusd-storage_Fix-unsafe-access-to-backup-data.patch";
-      url = "https://github.com/lxc/incus/commit/d71c5053a4c8318e6eb07337a7a4a07a6608ef73.patch?full_index=1";
-      hash = "sha256-/mH0/KmX9sG8HZTcdk8MT+QZtNqZa934wcHptvdVtXM=";
-    })
-    (fetchpatch2 {
-      name = "incusd-storage_Guard-nil-ExpiresAt-in-CreateCustomVolumeFromBackup.patch";
-      url = "https://github.com/lxc/incus/commit/ab6b7dff0c770044875d9d26a6254a7075b4d00b.patch?full_index=1";
-      hash = "sha256-d7VUetQzUTBq3GLYM1JKy2KDbBxOW5Lg7Di1/JPNzSE=";
-    })
-    (fetchpatch2 {
-      name = "incusd-storage_Guard-nil-fields-in-createDependentVolumesFromBackup.patch";
-      url = "https://github.com/lxc/incus/commit/98e64f0a6fcfdc9676eea0246418d490c53297bf.patch?full_index=1";
-      hash = "sha256-+lB7eHsGZ/dW7aL4/wIWD4AF6t7s4QYfAld1bQOw2tQ=";
-    })
-    (fetchpatch2 {
-      name = "incusd-storage-s3_Confine-multipart-uploads-with-os.Root.patch";
-      url = "https://github.com/lxc/incus/commit/a6012422b45c86f3b1956788cff5d75c604ad838.patch?full_index=1";
-      hash = "sha256-u3NLKE8Rh8i6HMbJ0KNhH7gbuwIpJ1SPqiyVoiuw9Sc=";
-    })
-    (fetchpatch2 {
-      name = "incusd-instances_Check-source-instance-access-on-copy.patch";
-      url = "https://github.com/lxc/incus/commit/1e3ffc53a10950e55de62ac1e0d612be597b84eb.patch?full_index=1";
-      hash = "sha256-1foxIu1rWcK1QbpmAPoQ46Tl1mrPvoctPnDhKRTWbd0=";
-    })
-    (fetchpatch2 {
-      name = "incusd-storage_Check-source-volume-access-on-copy.patch";
-      url = "https://github.com/lxc/incus/commit/2e01078366e2653712719dec82318e51c6d21b28.patch?full_index=1";
-      hash = "sha256-FP9v/8V0ZFLgy1tODKLJlw5f/6qJ8AMP/yme2YhYSaA=";
-    })
-    (fetchpatch2 {
-      name = "incusd-images_Validate-fingerprint-on-direct-download.patch";
-      url = "https://github.com/lxc/incus/commit/46d6ef232186df5535c49ca9f3597cab381f9b86.patch?full_index=1";
-      hash = "sha256-R8gsvdmb7KVC6W1vFH1CojzhrGNgNiFOOTYbCrDAajg=";
-    })
-    (fetchpatch2 {
-      name = "shared-validate_Reject-compression-algorithm-arguments.patch";
-      url = "https://github.com/lxc/incus/commit/873a032a461df6b09b7586435b592873863a4e88.patch?full_index=1";
-      hash = "sha256-QvxGxwHvswUZFst71zA12ZdxNIErl1LkaNyQdcPiglI=";
-    })
-    (fetchpatch2 {
-      name = "incusd-instance_Confine-template-access-to-instance-root.patch";
-      url = "https://github.com/lxc/incus/commit/cbefa31ae0da8fd96361178aed3a3c631e098fef.patch?full_index=1";
-      hash = "sha256-ZOHqnlIG6LyIUO6WP76SZJKTeqoiw9qj2YByGxqGP+E=";
-    })
-    (fetchpatch2 {
-      name = "incusd-instance_Enforce-project-restrictions-on-snapshot-restore.patch";
-      url = "https://github.com/lxc/incus/commit/3fe3bc99891940fcd3e758d49f65a853104fcd6b.patch?full_index=1";
-      hash = "sha256-j+lTbDaUjnZRY0lmaOSH4oKNAeIe5GXTwd1oM50it+Y=";
-    })
-    (fetchpatch2 {
-      name = "incusd-exec_Reject-exec-output-symlink.patch";
-      url = "https://github.com/lxc/incus/commit/e109655d642c7cb7c9039b7c06323000407f76dd.patch?full_index=1";
-      hash = "sha256-v/H12n8u+aqm9+ZxrarBxQEQSMN1gpX13oyummGWXl8=";
-    })
-    (fetchpatch2 {
-      name = "incusd_Reject-rootfs-symlink-for-instances.patch";
-      url = "https://github.com/lxc/incus/commit/7e58425ca7ffeb21bb116869e71a0d002dae9e72.patch?full_index=1";
-      hash = "sha256-MU+Khx+DhYQWUVs71D05PnJGamrhRXxsahtdXZeSfvU=";
-    })
-    (fetchpatch2 {
-      name = "shared-logger_Add-WarnOnError-helper.patch";
-      url = "https://github.com/lxc/incus/commit/1bc4d3feb8cd3bd005b7406c0d44ad3ea59400bf.patch?full_index=1";
-      hash = "sha256-ima4IGl0CyL30yZVdQ2pmp9SukIzrdBftGkO/GUPB3g=";
-    })
-    (fetchpatch2 {
-      name = "incus-0001-incusd-daemon_images-Add-missing-import.patch";
-      url = "https://raw.githubusercontent.com/zabbly/incus/a7fd42d2f5115c4e6893b23e64209db511fff828/patches/incus-0001-incusd-daemon_images-Add-missing-import.patch";
-      hash = "sha256-xtuuASy9bck+BgXbea9goNhrMV8Yme9cmFp4WNrkIdI=";
-    })
-  ];
   nixUpdateExtraArgs = [
     "--version-regex=^v(7\\.0\\.[0-9]+)$"
     "--override-filename=pkgs/by-name/in/incus/lts.nix"

From 44603154e28da7f191e1421ece679e6a881565fc Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Mon, 13 Jul 2026 22:30:45 +0300
Subject: [PATCH 0337/1386] microfetch: 1.1.0 -> 1.2.0; re-enable checks & add
 Darwin to platforms

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I0b85aad1f06925802e7e1fbe1a2bac966a6a6964
---
 pkgs/by-name/mi/microfetch/package.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix
index 6ecf01979deb..6ce77db31bfe 100644
--- a/pkgs/by-name/mi/microfetch/package.nix
+++ b/pkgs/by-name/mi/microfetch/package.nix
@@ -9,25 +9,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "microfetch";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "NotAShelf";
     repo = "microfetch";
     tag = "${finalAttrs.version}";
-    hash = "sha256-akJ44+X1POnV1dZnWq66X5vWokp9TGgJ5/Ey6kh/icA=";
+    hash = "sha256-Hi9U1WqCCoXnZx8ZgT5+fT2grTdNPC73fTAn0l9kzkg=";
   };
 
-  cargoHash = "sha256-mVS1fv/FI3rDoNm2D7ToiqZJZuySggK2zW2KbbxtpuQ=";
+  cargoHash = "sha256-7tN5E95uEJBUT1OMAnjkXnbSZjO23KWi8Vc3Cic9nek=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ mold ];
 
   passthru.updateScript = nix-update-script { };
 
-  # For whatever reason the cargo test build in the checkphase attempts to use dynamic libraries.
-  # Could be wrong, but rectifying this is probably more of an investment than it's worth.
-  doCheck = false;
-
   meta = {
     description = "Microscopic fetch script in Rust, for NixOS systems";
     homepage = "https://github.com/NotAShelf/microfetch";
@@ -37,6 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       NotAShelf
     ];
     mainProgram = "microfetch";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ [ "aarch64-darwin" ];
   };
 })

From 5e9b25225de9fe7b0f5fd6c2772e01c19d8d3122 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 19:41:32 +0000
Subject: [PATCH 0338/1386] stress-ng: 0.21.03 -> 0.21.04

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

diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix
index 32d8ec13be7a..247b9bfddc00 100644
--- a/pkgs/by-name/st/stress-ng/package.nix
+++ b/pkgs/by-name/st/stress-ng/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "stress-ng";
-  version = "0.21.03";
+  version = "0.21.04";
 
   src = fetchFromGitHub {
     owner = "ColinIanKing";
     repo = "stress-ng";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-gk66OY9QLDRKf4qQuPnRP0jPz+nArLbTKW5sKKiw5gY=";
+    hash = "sha256-v+IGPJZL54E0rSQLfj3tOHPdGTruK+v+IT+a2I2uriA=";
   };
 
   postPatch = ''

From 17f7883f6077e0840bfa8d8832cabfdafd841905 Mon Sep 17 00:00:00 2001
From: Ian Holloway <72767437+IanHollow@users.noreply.github.com>
Date: Mon, 13 Jul 2026 13:00:41 -0700
Subject: [PATCH 0339/1386] mole-cleaner: 1.31.0 -> 1.46.0

---
 pkgs/by-name/mo/mole-cleaner/package.nix | 84 ++++++++++++++++--------
 1 file changed, 57 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/mo/mole-cleaner/package.nix b/pkgs/by-name/mo/mole-cleaner/package.nix
index ad79f8ac2612..bc4b9adb7479 100644
--- a/pkgs/by-name/mo/mole-cleaner/package.nix
+++ b/pkgs/by-name/mo/mole-cleaner/package.nix
@@ -4,27 +4,45 @@
   fetchFromGitHub,
   makeWrapper,
   coreutils,
-  gnused,
   gawk,
   fd,
-  gitUpdater,
+  nix-update-script,
   versionCheckHook,
   writableTmpDirAsHomeHook,
+  writeShellScript,
 }:
 
+let
+  duForTests = writeShellScript "mole-cleaner-du-for-tests" ''
+    args=()
+    while (( $# > 0 )); do
+      case "$1" in
+        -I)
+          shift
+          args+=("--exclude=$1")
+          ;;
+        *)
+          args+=("$1")
+          ;;
+      esac
+      shift
+    done
+
+    exec ${lib.getExe' coreutils "du"} "''${args[@]}"
+  '';
+in
 buildGoModule (finalAttrs: {
   pname = "mole-cleaner";
-  version = "1.31.0";
-  __structuredAttrs = true;
+  version = "1.46.0";
 
   src = fetchFromGitHub {
     owner = "tw93";
     repo = "Mole";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-dalmW3W/seGZreSWuYP7JN/nMUbs3WyDHzKU83EveeY=";
+    hash = "sha256-rIoVXEz4K0RFb1ir1gRCyDw5euNwQvLS0GwBsJhuApE=";
   };
 
-  vendorHash = "sha256-LznLZ0NO8VBWP95ReAVORUMIDhh7/pgTY5mGNN2tND8=";
+  vendorHash = "sha256-hLFlAy4AE1eNOxd4d75Mbo3ZKlwvNK7QV2DNVPd7NHc=";
 
   subPackages = [
     "cmd/analyze"
@@ -39,13 +57,11 @@ buildGoModule (finalAttrs: {
     versionCheckHook
     writableTmpDirAsHomeHook
     coreutils
-    gnused
     gawk
   ];
 
   postInstall = ''
     install -Dm755 mole $out/libexec/mole/mole
-    install -Dm755 mo $out/libexec/mole/mo
     cp -r bin lib $out/libexec/mole/
 
     mv $out/bin/analyze $out/libexec/mole/bin/analyze-go
@@ -53,45 +69,59 @@ buildGoModule (finalAttrs: {
 
     patchShebangs $out/libexec/mole
 
-    makeWrapper $out/libexec/mole/mole $out/bin/mole \
+    mkdir -p $out/libexec/mole/nix-bin
+    ln -s ${lib.getExe' coreutils "timeout"} $out/libexec/mole/nix-bin/timeout
+
+    makeWrapper $out/libexec/mole/mole $out/bin/mo \
+      --run '
+        case "$1" in
+          update|remove)
+            echo "mo $1 is unsupported for Nix-installed Mole; update or remove it through your Nix profile or configuration." >&2
+            exit 1
+            ;;
+        esac
+      ' \
       --prefix PATH : ${
         lib.makeBinPath [
           fd
-          coreutils
-          gnused
-          gawk
         ]
-      }
-    makeWrapper $out/libexec/mole/mo $out/bin/mo \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          fd
-          coreutils
-          gnused
-          gawk
-        ]
-      }
+      }:$out/libexec/mole/nix-bin:/usr/bin:/bin
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    mkdir -p "$TMPDIR/mole-test-bin"
+    ln -s ${duForTests} "$TMPDIR/mole-test-bin/du"
+    PATH="$TMPDIR/mole-test-bin:$PATH" go test ./...
+    runHook postCheck
   '';
 
   doInstallCheck = true;
-  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckKeepEnvironment = [
+    "HOME"
+    "PATH"
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/mo";
   versionCheckProgramArg = "--version";
   installCheckPhase = ''
     runHook preInstallCheck
-    $out/bin/mole --help > /dev/null
     $out/bin/mo --help > /dev/null
+    test -w "$HOME"
+    test ! -e $out/bin/mole
     runHook postInstallCheck
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "V"; };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^V(.*)$" ];
+  };
 
   meta = {
     description = "CLI tool for cleaning and optimizing macOS systems";
     homepage = "https://github.com/tw93/Mole";
     changelog = "https://github.com/tw93/Mole/releases/tag/V${finalAttrs.version}";
-    license = lib.licenses.mit;
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ IanHollow ];
-    mainProgram = "mole";
+    mainProgram = "mo";
     platforms = lib.platforms.darwin;
   };
 })

From ea1660a4f74c5ba1e425a0eae1a5a2094235430c Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 27 Jun 2026 07:56:35 +0000
Subject: [PATCH 0340/1386] wheelwizard: 2.4.5 -> 2.4.11

---
 pkgs/by-name/wh/wheelwizard/deps.json   | 19 +++++++------------
 pkgs/by-name/wh/wheelwizard/package.nix | 12 ++++++------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/wh/wheelwizard/deps.json b/pkgs/by-name/wh/wheelwizard/deps.json
index 40b8dabbc900..7bf77ef57451 100644
--- a/pkgs/by-name/wh/wheelwizard/deps.json
+++ b/pkgs/by-name/wh/wheelwizard/deps.json
@@ -321,8 +321,8 @@
   },
   {
     "pname": "SharpCompress",
-    "version": "0.39.0",
-    "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
+    "version": "0.48.1",
+    "hash": "sha256-Y1lH1TrxBua3Ux6trRUQGeSfYjE3qld6TQDz/ABy6Ws="
   },
   {
     "pname": "SkiaSharp",
@@ -349,11 +349,6 @@
     "version": "2.88.9",
     "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
   },
-  {
-    "pname": "System.Buffers",
-    "version": "4.6.0",
-    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
-  },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "10.0.0-preview.3.25171.5",
@@ -396,12 +391,12 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.21.2",
-    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+    "version": "0.21.3",
+    "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI="
   },
   {
-    "pname": "ZstdSharp.Port",
-    "version": "0.8.4",
-    "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
+    "pname": "YamlDotNet",
+    "version": "17.1.0",
+    "hash": "sha256-Zdlw62rVud2U94BQKqrp5OFQiDcQ9rRrKeaVnNxREjY="
   }
 ]
diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix
index da7ed7932bc8..4233249b2fa8 100644
--- a/pkgs/by-name/wh/wheelwizard/package.nix
+++ b/pkgs/by-name/wh/wheelwizard/package.nix
@@ -12,15 +12,15 @@
   # passthru
   nix-update-script,
 }:
-buildDotnetModule rec {
+buildDotnetModule (finalAttrs: {
   pname = "wheelwizard";
-  version = "2.4.5";
+  version = "2.4.11";
 
   src = fetchFromGitHub {
     owner = "TeamWheelWizard";
     repo = "WheelWizard";
-    tag = version;
-    hash = "sha256-/85ts++S+A7XEgjCjcqJPWk2NBrvOyQ3+hq7lbSEN0g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8Dex2PDgwnxKguf0jtC1T0+jm7bA7jDfvspwkiqJgUg";
   };
   postPatch = ''
     rm .config/dotnet-tools.json
@@ -53,7 +53,7 @@ buildDotnetModule rec {
     cp -r WheelWizard/bin/Release/net8.0/*/* $out/lib/wheelwizard/
 
     makeWrapper $out/lib/wheelwizard/WheelWizard $out/bin/WheelWizard \
-      --prefix PATH : ${lib.makeBinPath [ dotnet-runtime ]}
+      --prefix PATH : ${lib.makeBinPath [ finalAttrs.dotnet-runtime ]}
 
     install -D $desktopItem/share/applications/* -t $out/share/applications
 
@@ -82,4 +82,4 @@ buildDotnetModule rec {
     mainProgram = "WheelWizard";
     maintainers = with lib.maintainers; [ DerHalbGrieche ];
   };
-}
+})

From eb1cd91dca03f20e6ccfa8281b6a48a90b79d1c9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 13 Jul 2026 13:26:16 -0400
Subject: [PATCH 0341/1386] python3Packages.weasyprint: fix darwin tests

Assisted-By: Claude <noreply@anthropic.com>
---
 .../python-modules/weasyprint/default.nix      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index c94c45b94efb..4e141f68ed36 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -4,6 +4,7 @@
   pkgs,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   fontconfig,
   glib,
   harfbuzz,
@@ -55,6 +56,11 @@ buildPythonPackage (finalAttrs: {
       pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
       pangoft2 = "${pango.out}/lib/libpangoft2-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
+    (fetchpatch2 {
+      name = "fix-unicode-test";
+      url = "https://github.com/Kozea/WeasyPrint/commit/b2efb459fbe7f7fd35ab9078734121cb87d3d65a.patch?full_index=1";
+      hash = "sha256-uixfpg9fvkdNmSTqz/M1c1vkV/mJDqOs7zDAunn2rEY=";
+    })
   ];
 
   build-system = [ flit-core ];
@@ -105,9 +111,17 @@ buildPythonPackage (finalAttrs: {
 
   env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
 
-  # Test include some emoji characters that require a custom fontconfig configuration to be found.
+  # Custom font configuration for tests
   preCheck = ''
-    export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = [ twemoji-color-font ]; }}
+    export FONTCONFIG_FILE=${
+      makeFontsConf {
+        # include some emoji characters
+        fontDirectories = [ twemoji-color-font ];
+
+        # Darwin builds without sandbox can pollute the build
+        impureFontDirectories = [ ];
+      }
+    }
   '';
 
   # Set env variable explicitly for Darwin, but allow overriding when invoking directly

From 3bd8e77a71ce2e90aacd0504abcad38033bda960 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 20:04:29 +0000
Subject: [PATCH 0342/1386] nixdoc: 3.1.0 -> 3.2.0

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

diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix
index 3d6c90120f14..95d03967b5d5 100644
--- a/pkgs/by-name/ni/nixdoc/package.nix
+++ b/pkgs/by-name/ni/nixdoc/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixdoc";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixdoc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA=";
+    hash = "sha256-FW8yZLO+hVDn2vs4pEUfjMM/5P508WKCLxd4AozLElk=";
   };
 
-  cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc=";
+  cargoHash = "sha256-pV/KEg3/UaT7bbgtRgjZZGq+RVyN1xY28YqzfslYoQo=";
 
   meta = {
     description = "Generate documentation for Nix functions";

From c1904aff0e2d4021803c1ed7333259d229062a1b Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Mon, 13 Jul 2026 22:04:58 +0200
Subject: [PATCH 0343/1386] nginx: add nginx-lua to passthru.tests

Forgot to add it in #535081
---
 pkgs/servers/http/nginx/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 217cff7cff3f..9344a7310b45 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -288,6 +288,7 @@ stdenv.mkDerivation {
           nginx-etag-compression
           nginx-globalredirect
           nginx-http3
+          nginx-lua
           nginx-proxyprotocol
           nginx-pubhtml
           nginx-sso

From 078eb1886dc3fe56d180491cd768f64d3ef150e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 20:11:39 +0000
Subject: [PATCH 0344/1386] openfga-cli: 0.7.17 -> 0.7.19

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

diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index c6472e3d5b8d..23d6877db17a 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openfga-cli";
-  version = "0.7.17";
+  version = "0.7.19";
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cx1lKyEeXpQS3NePd5JSylAU7qqfGidx9gGQh/WPeCY=";
+    hash = "sha256-/DhvUvcvopYGAdLCAqsLxTs09q0sqOd1BglxaM4as/0=";
   };
 
-  vendorHash = "sha256-f/gJr7cBO2G7USqujuBPmlbcCDrLw495RLG0pncQ97I=";
+  vendorHash = "sha256-sIBD7Diqx16X7OHNpVCgD1XVByu8TGwFlIR6FIITTlc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From d9b034b8471091ad356917843580fbd504f07b2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 20:15:51 +0000
Subject: [PATCH 0345/1386] mdbook-bib: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/md/mdbook-bib/package.nix b/pkgs/by-name/md/mdbook-bib/package.nix
index 8f6955dbba22..4c6816a923ee 100644
--- a/pkgs/by-name/md/mdbook-bib/package.nix
+++ b/pkgs/by-name/md/mdbook-bib/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdbook-bib";
-  version = "0.5.2";
+  version = "0.5.3";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "francisco-perez-sorrosal";
     repo = "mdbook-bib";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xgGJYnOYUuxHs2sXzYKSZd0jLm/x/PoPsNHQcWpXkn8=";
+    hash = "sha256-IhGwVnUYjnwZmZJkt1Z9yFlNcJ2EObnqFHmmfJNco/M=";
   };
 
-  cargoHash = "sha256-QyP+Mw/95NvjaAkr5eoeC49nLXCE9/TMPIWahJayqBQ=";
+  cargoHash = "sha256-A1rOfXZP4rFtLX3pmLwB99FBws1wMotKnMPfqnYW9m0=";
 
   nativeBuildInputs = [
     pkg-config

From fa5a848cf648e29fa2780bfaaf0b74cfda21adce Mon Sep 17 00:00:00 2001
From: Ian Holloway <72767437+IanHollow@users.noreply.github.com>
Date: Mon, 13 Jul 2026 13:26:34 -0700
Subject: [PATCH 0346/1386] mole-cleaner: fix CI and update guard

---
 pkgs/by-name/mo/mole-cleaner/package.nix | 44 +++++++++++++++---------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/mo/mole-cleaner/package.nix b/pkgs/by-name/mo/mole-cleaner/package.nix
index bc4b9adb7479..bd5380f824d0 100644
--- a/pkgs/by-name/mo/mole-cleaner/package.nix
+++ b/pkgs/by-name/mo/mole-cleaner/package.nix
@@ -44,10 +44,7 @@ buildGoModule (finalAttrs: {
 
   vendorHash = "sha256-hLFlAy4AE1eNOxd4d75Mbo3ZKlwvNK7QV2DNVPd7NHc=";
 
-  subPackages = [
-    "cmd/analyze"
-    "cmd/status"
-  ];
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     makeWrapper
@@ -60,15 +57,27 @@ buildGoModule (finalAttrs: {
     gawk
   ];
 
-  postInstall = ''
+  buildPhase = ''
+    runHook preBuild
+    go build -p "$NIX_BUILD_CORES" -o analyze ./cmd/analyze
+    go build -p "$NIX_BUILD_CORES" -o status ./cmd/status
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
     install -Dm755 mole $out/libexec/mole/mole
     cp -r bin lib $out/libexec/mole/
 
-    mv $out/bin/analyze $out/libexec/mole/bin/analyze-go
-    mv $out/bin/status $out/libexec/mole/bin/status-go
+    install -Dm755 analyze $out/libexec/mole/bin/analyze-go
+    install -Dm755 status $out/libexec/mole/bin/status-go
 
     patchShebangs $out/libexec/mole
 
+    substituteInPlace $out/libexec/mole/mole \
+      --replace-fail 'update_message="$(read_update_message_cache "$msg_cache")"' 'update_message=""'
+
     mkdir -p $out/libexec/mole/nix-bin
     ln -s ${lib.getExe' coreutils "timeout"} $out/libexec/mole/nix-bin/timeout
 
@@ -80,16 +89,20 @@ buildGoModule (finalAttrs: {
             exit 1
             ;;
         esac
-      ' \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          fd
-        ]
-      }:$out/libexec/mole/nix-bin:/usr/bin:/bin
+        export PATH=${
+          lib.makeBinPath [
+            fd
+          ]
+        }:'"$out"'/libexec/mole/nix-bin:/usr/bin:/bin:''${PATH}
+      '
+
+    runHook postInstall
   '';
 
   checkPhase = ''
     runHook preCheck
+    # Keep buildGoModule's test behavior: tests can rely on their source paths.
+    export GOFLAGS="''${GOFLAGS//-trimpath/}"
     mkdir -p "$TMPDIR/mole-test-bin"
     ln -s ${duForTests} "$TMPDIR/mole-test-bin/du"
     PATH="$TMPDIR/mole-test-bin:$PATH" go test ./...
@@ -97,10 +110,7 @@ buildGoModule (finalAttrs: {
   '';
 
   doInstallCheck = true;
-  versionCheckKeepEnvironment = [
-    "HOME"
-    "PATH"
-  ];
+  versionCheckKeepEnvironment = "HOME PATH";
   versionCheckProgram = "${placeholder "out"}/bin/mo";
   versionCheckProgramArg = "--version";
   installCheckPhase = ''

From 8ebf5dad522fcd36815fcbd3892d27084ce070d9 Mon Sep 17 00:00:00 2001
From: Tommy Chiang <ototot@google.com>
Date: Tue, 14 Jul 2026 04:23:21 +0800
Subject: [PATCH 0347/1386] blackhole: 0.6.1 -> 0.7.1

Add kNumber_Of_Channels preprocessor definition so the driver
uses the correct number of audio channels matching the channel
parameter, instead of always defaulting to 2.

Changelog: https://github.com/ExistentialAudio/BlackHole/releases/tag/v0.7.1
Assisted-by: opencode/deepseek-v4-pro
---
 pkgs/by-name/bl/blackhole/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bl/blackhole/package.nix b/pkgs/by-name/bl/blackhole/package.nix
index b84a1a42b8b1..fa3f1a861c34 100644
--- a/pkgs/by-name/bl/blackhole/package.nix
+++ b/pkgs/by-name/bl/blackhole/package.nix
@@ -7,15 +7,18 @@
   nix-update-script,
   channel ? "256ch",
 }:
+let
+  numChannels = lib.toIntBase10 (lib.removeSuffix "ch" channel);
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackhole";
-  version = "0.6.1";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "existentialaudio";
     repo = "BlackHole";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jFKi5LJdTOMFa1mErH6WsjgCtLCKzwpgn2+T3Fp9MtQ=";
+    hash = "sha256-kuIaoXA0K7SFPXKFHqcilTbf1zn9Ol3JYVpnkFuQEZg=";
   };
 
   nativeBuildInputs = [
@@ -31,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
     "-configuration"
     "Release"
     "PRODUCT_BUNDLE_IDENTIFIER=${finalAttrs.bundleId}"
-    "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kDriver_Name=\\\"blackhole${channel}\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\""
+    "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kNumber_Of_Channels=${toString numChannels} kDriver_Name=\\\"BlackHole\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\""
   ];
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/Library/Audio/Plug-Ins/HAL
-    mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/Blackhole${channel}.driver
+    mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/BlackHole${channel}.driver
 
     runHook postInstall
   '';

From 48af59c2ef85c8f636fbba82c3ba863b112b5920 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 13 Jul 2026 22:59:24 +0200
Subject: [PATCH 0348/1386] ioquake3: fix riscv cross-compilation

---
 pkgs/by-name/io/ioquake3/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/io/ioquake3/package.nix b/pkgs/by-name/io/ioquake3/package.nix
index 59fcc1e7a882..d10726ced535 100644
--- a/pkgs/by-name/io/ioquake3/package.nix
+++ b/pkgs/by-name/io/ioquake3/package.nix
@@ -20,6 +20,7 @@
   mumble,
   unstableGitUpdater,
   bc,
+  buildPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,6 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OszPRlS5NTvajDZhtGw2wa275O8YodkIgiBz3POouYs=";
   };
 
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
+    "NO_STRIP=1"
+  ];
+
   nativeBuildInputs = [
     copyDesktopItems
     makeBinaryWrapper
@@ -55,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
     mumble
   ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   enableParallelBuilding = true;
 
   preConfigure = ''

From bc2dd8a42ec2109a96f98a0ba4bc33d86c23b390 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 21:25:41 +0000
Subject: [PATCH 0349/1386] python3Packages.types-html5lib: 1.1.11.20251117 ->
 1.1.11.20260518

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

diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix
index 98f0b14ae5d6..9197b9b6ff2d 100644
--- a/pkgs/development/python-modules/types-html5lib/default.nix
+++ b/pkgs/development/python-modules/types-html5lib/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "types-html5lib";
-  version = "1.1.11.20251117";
+  version = "1.1.11.20260518";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_html5lib";
     inherit version;
-    hash = "sha256-Gmo6xTlKoSv1R/rl1e/5Hc7sRrbQfENn2bOaN/QvIBo=";
+    hash = "sha256-TzPAh8sRGdZcTIDspDI8K1Afnq+K+WFri3Mu1Njq6Po=";
   };
 
   build-system = [ setuptools ];

From 7d7d2071ca0d31880ae91eec163e9115e3e43dd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 21:28:07 +0000
Subject: [PATCH 0350/1386] collectl: 4.3.20.2 -> 4.3.20.3

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

diff --git a/pkgs/by-name/co/collectl/package.nix b/pkgs/by-name/co/collectl/package.nix
index 8251bf100985..279557a86322 100644
--- a/pkgs/by-name/co/collectl/package.nix
+++ b/pkgs/by-name/co/collectl/package.nix
@@ -68,13 +68,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "collectl";
-  version = "4.3.20.2";
+  version = "4.3.20.3";
 
   src = fetchFromGitHub {
     owner = "sharkcz";
     repo = "collectl";
     rev = finalAttrs.version;
-    hash = "sha256-xIfimx7IbC5WHLCLPXGAhL9gkC4F+/JHDFYb0wwAK3I=";
+    hash = "sha256-hokovb6uqPiMFlDS0g2F/J1rHTkyNBegcgOC3g3ykEs=";
   };
 
   strictDeps = true;

From 48d7193846b8402eb2e36f7f0f0b3a97330bcadd Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Mon, 13 Jul 2026 16:31:32 -0500
Subject: [PATCH 0351/1386] skypilot: add orjson to dependencies

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

diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix
index 7dca34a57abf..75fe6a325923 100644
--- a/pkgs/by-name/sk/skypilot/package.nix
+++ b/pkgs/by-name/sk/skypilot/package.nix
@@ -78,6 +78,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       jinja2
       jsonschema
       networkx
+      orjson
       packaging
       pandas
       paramiko

From 292b81408e1702eff0a887f2c8a80a707ff443de Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Tue, 14 Jul 2026 04:07:40 +0800
Subject: [PATCH 0352/1386] mistral-rs: fix build with LLVM 21

Assisted-by: Codex (GPT-5)
---
 pkgs/by-name/mi/mistral-rs/package.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index 33a343496199..b7799c0aa1a6 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -34,6 +34,7 @@
 
 let
   inherit (stdenv) hostPlatform;
+  rustc = rustPlatform.callPackage ({ rustc }: rustc) { };
 
   accelIsValid = builtins.elem acceleration [
     null
@@ -94,6 +95,26 @@ rustPlatform.buildRustPackage (finalAttrs: {
         --replace-fail \
           "lto = true" \
           "lto = false"
+
+    ''
+    # LLVM 21 cannot select the VPDPBUSD intrinsic because its argument types are incorrect.
+    # Fixed by https://github.com/rust-lang/llvm-project/commit/94e2c19f86a699d7a19ff0f4130b696699189c8d.
+    + lib.optionalString (hostPlatform.isx86_64 && lib.versionOlder rustc.llvm.version "22") ''
+      substituteInPlace "$cargoDepsCopy/source-git-0/candle-core-0.11.0/src/quantized/mod.rs" \
+        --replace-fail \
+          '#[cfg(target_arch = "x86_64")]' \
+          '#[cfg(any())]' \
+        --replace-fail \
+          '#[cfg(not(any(target_arch = "aarch64", target_arch = "x86_64")))]' \
+          '#[cfg(not(target_arch = "aarch64"))]'
+
+      substituteInPlace "$cargoDepsCopy/source-git-0/candle-core-0.11.0/src/quantized/repack.rs" \
+        --replace-fail \
+          '#[cfg(target_arch = "x86_64")]' \
+          '#[cfg(any())]' \
+        --replace-fail \
+          '#[cfg(not(any(target_arch = "aarch64", target_arch = "x86_64")))]' \
+          '#[cfg(not(target_arch = "aarch64"))]'
     ''
     # Prevent build scripts from attempting to clone cutlass (which would fail in the sandbox anyway).
     # Instead, we provide cutlass in buildInputs.

From aeceb34b5c0ae9f50c9dd75c281ae7995d93af2d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 13 Jul 2026 23:42:46 +0200
Subject: [PATCH 0353/1386] lomiri.lomiri-session: 0.3 -> 0.4

---
 .../1001-Unset-QT_QPA_PLATFORMTHEME.patch     | 12 +++----
 .../lomiri/data/lomiri-session/default.nix    | 33 ++++++++++++++++---
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch b/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch
index fc03f734ca6d..74fc9ddbf63e 100644
--- a/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch
+++ b/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch
@@ -13,13 +13,13 @@ index 50dd4cb..ffc20c4 100755
 --- a/lomiri-session.in
 +++ b/lomiri-session.in
 @@ -55,6 +55,7 @@ dbus-update-activation-environment --systemd MALIIT_FORCE_DBUS_CONNECTION=1
- dbus-update-activation-environment --systemd QT_IM_MODULE=maliit
- dbus-update-activation-environment --systemd GTK_IM_MODULE=maliit
- dbus-update-activation-environment --systemd QT_QPA_PLATFORM=wayland
+ dbus-update-activation-environment --systemd QT_IM_MODULE="${QT_IM_MODULE}"
+ dbus-update-activation-environment --systemd GTK_IM_MODULE="${DEFAULT_GTK_IM_MODULE:-maliit}"
+ dbus-update-activation-environment --systemd QT_QPA_PLATFORM="${QT_QPA_PLATFORM}"
 +dbus-update-activation-environment --systemd QT_QPA_PLATFORMTHEME=
- dbus-update-activation-environment --systemd SDL_VIDEODRIVER=wayland
- dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION=1
- dbus-update-activation-environment --systemd QT_ACCESSIBILITY=1
+ dbus-update-activation-environment --systemd SDL_VIDEODRIVER="${DEFAULT_SDL_VIDEODRIVER:-wayland}"
+ dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION="${DEFAULT_QT_WAYLAND_DISABLE_WINDOWDECORATION:-1}"
+ dbus-update-activation-environment --systemd QT_ACCESSIBILITY="${DEFAULT_QT_ACCESSIBILITY:-1}"
 -- 
 2.44.1
 
diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
index 27e3ef9d30fe..5a0011b0ae1b 100644
--- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
@@ -8,23 +8,26 @@
   cmake,
   dbus,
   deviceinfo,
+  glib,
   inotify-tools,
   lomiri,
+  lomiri-schemas,
   makeWrapper,
   pkg-config,
   systemd,
+  wrapGAppsHook4,
   xdg-user-dirs,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "lomiri-session";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-session";
     rev = finalAttrs.version;
-    hash = "sha256-XduE3tPUjw/wIjFCACasxtN33KO4bDLWrpl7pZcYaAA=";
+    hash = "sha256-zEH1VNBgOs9xP18toBc2VqMloDM6uL+tSIIEKZTHY0c=";
   };
 
   patches = [ ./1001-Unset-QT_QPA_PLATFORMTHEME.patch ];
@@ -41,10 +44,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --replace-fail '@CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session' '${lib.getExe' xdg-user-dirs "xdg-user-dirs-update"} && @CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session'
   '';
 
+  # Checks for run-time tools at configure-time
+  strictDeps = false;
+
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     cmake
+    glib # hook for wrapper arguments
     makeWrapper
     pkg-config
+    wrapGAppsHook4
   ];
 
   buildInputs = [
@@ -53,9 +63,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     dbus
     inotify-tools
     lomiri
+    lomiri-schemas # for hook to pick up schemas
     systemd
   ];
 
+  dontWrapGApps = true;
+
   cmakeFlags = [
     # Requires lomiri-system-compositor -> not ported to Mir 2.x yet
     (lib.cmakeBool "ENABLE_TOUCH_SESSION" false)
@@ -63,14 +76,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   postInstall = ''
     patchShebangs $out/bin/lomiri-session
-    wrapProgram $out/bin/lomiri-session \
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
       --prefix PATH : ${
         lib.makeBinPath [
-          deviceinfo
+          deviceinfo # device-info
+          glib # gsettings
           inotify-tools
           lomiri
+          systemd # systemd-detect-virt
         ]
       }
+    )
+  '';
+
+  postFixup = ''
+    wrapGApp $out/bin/lomiri-session
   '';
 
   passthru = {
@@ -79,7 +102,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       # not packaged/working yet
       # "lomiri-touch"
     ];
-    tests.lomiri = nixosTests.lomiri;
+    tests = nixosTests.lomiri;
     updateScript = gitUpdater { };
   };
 

From 68bc1452c072da30032b98a344fa1237ac166a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 13 Jul 2026 23:31:53 +0200
Subject: [PATCH 0354/1386] lua-language-server: add smoke test

This was mostly taken from vtsls.
---
 .../lu/lua-language-server/package.nix        | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix
index a87504ce7502..f5ab88f987bf 100644
--- a/pkgs/by-name/lu/lua-language-server/package.nix
+++ b/pkgs/by-name/lu/lua-language-server/package.nix
@@ -15,6 +15,8 @@
 
   versionCheckHook,
   nix-update-script,
+  runCommand,
+  lua-language-server,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -128,7 +130,26 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests.smoke = runCommand "lua-language-server-smoke-test" { } ''
+      export XDG_CACHE_HOME=$(mktemp -d)
+
+      INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}'
+      CONTENT_LENGTH=''${#INIT_REQUEST}
+
+      RESPONSE=$(
+        {
+          printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST"
+          sleep 1
+        } | timeout 3  ${lib.getExe lua-language-server} --stdio 2>&1 | head -c 1000
+      ) || true
+
+      echo "$RESPONSE" | grep -q '"capabilities"'
+      touch $out
+    '';
+  };
 
   meta = {
     description = "Language server that offers Lua language support";

From 47c09a712b8e7254df2c4ab8769c4e0f55561fca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 22:18:12 +0000
Subject: [PATCH 0355/1386] python3Packages.pyexploitdb: 0.3.34 -> 0.3.35

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

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index d6b5407628ad..3092d9a37cd4 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyexploitdb";
-  version = "0.3.34";
+  version = "0.3.35";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-vKp4tExq2QOdlsq4poJQfd4jqDdV/3BvnGw5eX2SFP8=";
+    hash = "sha256-/yt39/XaLzqxlviFRzk+JR4TM8PHZYLYpNP0i9N4tvI=";
   };
 
   build-system = [ setuptools ];

From 8814f3ae1a8e7071e690ac7c68e13b65880b9443 Mon Sep 17 00:00:00 2001
From: Rine Amakawa <Misaka13514@gmail.com>
Date: Tue, 14 Jul 2026 07:27:15 +0900
Subject: [PATCH 0356/1386] ipatool: fix build with proxyVendor

---
 pkgs/by-name/ip/ipatool/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix
index 25cfe240f238..7ea5aa5d8e93 100644
--- a/pkgs/by-name/ip/ipatool/package.nix
+++ b/pkgs/by-name/ip/ipatool/package.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   testers,
   ipatool,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -18,7 +19,13 @@ buildGoModule (finalAttrs: {
     hash = "sha256-ZGy7Oxpjb5ONe//ImAN3bQwl+G9udvaf9V7heLq625c=";
   };
 
-  vendorHash = "sha256-3H7ct0FIvOabXp8ShpRWltdMhyPRyuUAAxtLQTvgzF8=";
+  vendorHash = "sha256-PZDlJIIW+teFu6XuaTLB5eHHSeVJMUVAuq/StvyIVlc=";
+
+  # Fixes "import lookup disabled by -mod=vendor" for onepassword-sdk-go on macOS
+  proxyVendor = true;
+
+  # Fixes "unable to open output file '/homeless-shelter/.cache/clang/ModuleCache/" on macOS
+  nativeBuildInputs = [ writableTmpDirAsHomeHook ];
 
   ldflags = [
     "-s"

From 7168ff819ba911776e0bfd96ad949d05854339d7 Mon Sep 17 00:00:00 2001
From: Samiser <github@me.samiser.xyz>
Date: Mon, 13 Jul 2026 23:45:07 +0100
Subject: [PATCH 0357/1386] blueutil: fix build by linking with lld

---
 pkgs/by-name/bl/blueutil/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix
index 31d6eaf1cadd..6f13a65ab4f1 100644
--- a/pkgs/by-name/bl/blueutil/package.nix
+++ b/pkgs/by-name/bl/blueutil/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  llvmPackages,
   testers,
   nix-update-script,
 }:
@@ -17,7 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Qw5c9dp7wpuOcQSLsg1pfJ+NbrEtme2o6nKD3Ba3A3M=";
   };
 
+  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+  nativeBuildInputs = [ llvmPackages.lld ];
+
   env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth";
+  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+  env.NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
 
   installPhase = ''
     runHook preInstall

From 023f5cbc13e335a868e07c1ce691961fca06e306 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 22:48:07 +0000
Subject: [PATCH 0358/1386] hugo: 0.163.3 -> 0.164.0

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 30119aa33239..671d3614c1cb 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hugo";
-  version = "0.163.3";
+  version = "0.164.0";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o8MoGrdOXBN/HkcuRsHyyyFLvPvNo3PI0oWBlO6Xfpw=";
+    hash = "sha256-hpxz5zOggqqYVTUkgwpkWcOa7sdGaWrRJUnXjJx59cA=";
   };
 
-  vendorHash = "sha256-Bn+RA+EHd3gAKL4N/ibydX7yWNKOSYnIl2pfecfOu1k=";
+  vendorHash = "sha256-35VeZOtnwgYVuabzJ3+FjvhtoJGZcVRo+TWPTBAWVC4=";
 
   checkFlags =
     let

From dbe568905083a8f7beaaafdaf88f71632da20fdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 22:58:04 +0000
Subject: [PATCH 0359/1386] python3Packages.pyrainbird: 6.3.1 -> 6.5.0

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

diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix
index 4adc6007e3db..4b24953a0af0 100644
--- a/pkgs/development/python-modules/pyrainbird/default.nix
+++ b/pkgs/development/python-modules/pyrainbird/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyrainbird";
-  version = "6.3.1";
+  version = "6.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "pyrainbird";
     tag = finalAttrs.version;
-    hash = "sha256-0hjHPoUJP/sRljn0VS3qXUa5OhbxzYl5u/086kksLiE=";
+    hash = "sha256-JPnp77NhgT878sQJ7Az58R6JnMuprr69rPiZjkh+E1I=";
   };
 
   build-system = [ setuptools ];

From 9867f6abef8dd26797a39884289b69f23ea3b13c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 22:58:59 +0000
Subject: [PATCH 0360/1386] uutils-tar: 0-unstable-2026-07-02 ->
 0-unstable-2026-07-09

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

diff --git a/pkgs/by-name/uu/uutils-tar/package.nix b/pkgs/by-name/uu/uutils-tar/package.nix
index 3df37c3c7da0..cf88b0dca259 100644
--- a/pkgs/by-name/uu/uutils-tar/package.nix
+++ b/pkgs/by-name/uu/uutils-tar/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-tar";
-  version = "0-unstable-2026-07-02";
+  version = "0-unstable-2026-07-09";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "tar";
-    rev = "70c59758d0eeb65c097a95df49e455448061ccbc";
-    hash = "sha256-PMsW+p7ps/6eRNuSbzxIDVEgTmHAh0vFjVqSelAfvVE=";
+    rev = "d1e56e3cf1f450e5add1b24785dd654e4b745b18";
+    hash = "sha256-LnDTnzAxRNrDmf/vns6xqPEEYC5PrlT4dC8nfSPU2Kc=";
   };
 
-  cargoHash = "sha256-YBpXvD8hhjlxZHRDv6hsRqqD0Wm8ADDdgOrX1/yziL8=";
+  cargoHash = "sha256-FobHV37gdez4GQf6MToYfd4cJufroygP+ge37eFtsmc=";
 
   cargoBuildFlags = [ "--workspace" ];
 

From 3875c90d61bdf55f0372435e921cb653805ac1c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 23:09:35 +0000
Subject: [PATCH 0361/1386] python3Packages.pubnub: 10.7.1 -> 10.7.2

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

diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix
index 44f4c1d85cf4..7e1063408826 100644
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pubnub";
-  version = "10.7.1";
+  version = "10.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pubnub";
     repo = "python";
     tag = finalAttrs.version;
-    hash = "sha256-AbWTzaWjX9n3wjs785LxAYbHswMJbTer4bGghFAA1V8=";
+    hash = "sha256-qHLkRWq30o6F1P5z+hxUkGLOh15ReOVtto0ttKCiPqg=";
   };
 
   pythonRelaxDeps = [ "httpx" ];

From 26c85a9f352852fcc621eac14488e87a25881afb Mon Sep 17 00:00:00 2001
From: ulic-youthlic <ulic.youthlic@gmail.com>
Date: Tue, 14 Jul 2026 06:19:49 +0800
Subject: [PATCH 0362/1386] factorio-experimental: 2.1.9 -> 2.1.10

---
 pkgs/by-name/fa/factorio/versions.json | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 1aace8201fa6..13296e1da5bb 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,14 +3,14 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.1.9.tar.xz"
+          "factorio_linux_2.1.10.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.1.9.tar.xz",
+        "name": "factorio_alpha_x64-2.1.10.tar.xz",
         "needsAuth": true,
-        "sha256": "9e2d3d9a6f323c2d34215f264751599d9c9a87a9af2c7c4bdcbee8fb8d7c7245",
+        "sha256": "3c3f885061fe3f066574797edd5e59bd9e848f0373dcd944c59d2b79bfbfb6b3",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.1.9/alpha/linux64",
-        "version": "2.1.9"
+        "url": "https://factorio.com/get-download/2.1.10/alpha/linux64",
+        "version": "2.1.10"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -51,14 +51,14 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.1.9.tar.xz"
+          "factorio-space-age_linux_2.1.10.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.1.9.tar.xz",
+        "name": "factorio_expansion_x64-2.1.10.tar.xz",
         "needsAuth": true,
-        "sha256": "481d1b1b7f4652f6dd5bd1f3a20a3f8aaddfe8f6866f8bde086986601be190e5",
+        "sha256": "35e42240a70c56e046489cb1cca8b6c7e17cf5fd4bdfb52c08422497bb57bb6c",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.1.9/expansion/linux64",
-        "version": "2.1.9"
+        "url": "https://factorio.com/get-download/2.1.10/expansion/linux64",
+        "version": "2.1.10"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -75,15 +75,15 @@
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.1.9.tar.xz",
-          "factorio_headless_x64_2.1.9.tar.xz"
+          "factorio-headless_linux_2.1.10.tar.xz",
+          "factorio_headless_x64_2.1.10.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.1.9.tar.xz",
+        "name": "factorio_headless_x64-2.1.10.tar.xz",
         "needsAuth": false,
-        "sha256": "2cf94327877c92b95857356f7629f674a1314abd2c09e5c992f345707d165980",
+        "sha256": "5aab961c026a35d5ee28b2846260812098ed8b362b1251edf6bbd15c7355cb6c",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.1.9/headless/linux64",
-        "version": "2.1.9"
+        "url": "https://factorio.com/get-download/2.1.10/headless/linux64",
+        "version": "2.1.10"
       },
       "stable": {
         "candidateHashFilenames": [

From f2722a7fade8fdda3a0ee2d682c9009f543d2b06 Mon Sep 17 00:00:00 2001
From: Mukul Agarwal <vcs@agarmu.com>
Date: Mon, 13 Jul 2026 19:21:36 -0400
Subject: [PATCH 0363/1386] noti: fix build on Darwin

---
 pkgs/by-name/no/noti/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix
index 264e5e34fbfe..a51018ab362d 100644
--- a/pkgs/by-name/no/noti/package.nix
+++ b/pkgs/by-name/no/noti/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromCodeberg,
+  llvmPackages,
   installShellFiles,
 }:
 
@@ -18,10 +20,19 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
 
   subPackages = [ "cmd/noti" ];
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # Work around ld64's libc++ hardening issue.
+    # TODO: Remove once #536365 reaches this branch.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   ldflags = [
     "-s"
     "-w"

From c0984aabedab91dd368f572dad3e7c6015abed3f Mon Sep 17 00:00:00 2001
From: Mukul Agarwal <vcs@agarmu.com>
Date: Mon, 13 Jul 2026 19:38:31 -0400
Subject: [PATCH 0364/1386] mactop: fix build on Darwin

---
 pkgs/by-name/ma/mactop/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix
index e54d58aec534..7b0a15ee20c7 100644
--- a/pkgs/by-name/ma/mactop/package.nix
+++ b/pkgs/by-name/ma/mactop/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  llvmPackages,
   versionCheckHook,
   nix-update-script,
 }:
@@ -21,6 +22,14 @@ buildGoModule rec {
 
   proxyVendor = true;
 
+  nativeBuildInputs = [ llvmPackages.lld ];
+
+  env = {
+    # Work around ld64's libc++ hardening issue.
+    # TODO: Remove once #536365 reaches this branch.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   ldflags = [
     "-s"
     "-w"

From 8491821091195f710f5bb476f0d55cbae8ae9a79 Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Tue, 12 Nov 2024 10:08:31 -0800
Subject: [PATCH 0365/1386] gradle: setup hook respects java override

Before this commit, an expression like `pkgs.gradle_8.override { java = pkgs.openjdk17; }` would produce a
gradle package which uses jdk 17, but has a setup hook which uses jdk 21.
---
 pkgs/development/tools/build-managers/gradle/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 05dae5e6a5d9..d4247b7a1329 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -307,7 +307,7 @@ let
               '';
         };
       };
-      passthru.jdk = defaultJava;
+      passthru.jdk = java;
       passthru.wrapped = callPackage wrapGradle {
         gradle-unwrapped = mkGradle genArgs;
       };

From 97dcf43f5b6805dcc7b067dc05508c4467ea1165 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 23:56:12 +0000
Subject: [PATCH 0366/1386] subsurface: 6.0.5504 -> 6.0.5576

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

diff --git a/pkgs/by-name/su/subsurface/package.nix b/pkgs/by-name/su/subsurface/package.nix
index fbc41a4b5e54..6eb0faa2e8c6 100644
--- a/pkgs/by-name/su/subsurface/package.nix
+++ b/pkgs/by-name/su/subsurface/package.nix
@@ -23,14 +23,14 @@
 }:
 
 let
-  version = "6.0.5504";
+  version = "6.0.5576";
 
   subsurfaceSrc = (
     fetchFromGitHub {
       owner = "Subsurface";
       repo = "subsurface";
-      rev = "28ad7132d2283a3fc06872de6526bc19c077d203";
-      hash = "sha256-PQwBfm4oPGLU1HRFIcbgTYOYLeVhmEBgN5U8fnUMMlQ=";
+      rev = "87a5ba9fd00712e71b90115b7566d4228a5c0d98";
+      hash = "sha256-ILy5M2m2rKPP77x7cMiqNzpd6NOnQS8UpqZemf/SHf4=";
       fetchSubmodules = true;
     }
   );

From 6d9cb42451cb5048e214affd7688801180870703 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 23:56:30 +0000
Subject: [PATCH 0367/1386] lunar-client: 3.7.9 -> 3.7.11

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

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 7714186e91c0..a23f1a5bbe70 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.7.9";
+  version = "3.7.11";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-7rVPN/CmnaA91mnNQkuK4/pmPtHeLvsLeuzBlEBbRT2RrYtSxF3eEnHiFndlMzmRor8FWuFITz43QFPgFVMJpQ==";
+    hash = "sha512-mKs/ZfTW+QrHQF86W7nutiGhVu/M5orbXyjPjlAjQDwusJ01A7eZzbXG9Le31QLqu4eX0mLl/SrzByYHiipYEQ==";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 19424a317093537aafc121e3f6f731c36064731e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 00:11:03 +0000
Subject: [PATCH 0368/1386] python3Packages.nicegui-highcharts: 3.3.0 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/nicegui-highcharts/default.nix b/pkgs/development/python-modules/nicegui-highcharts/default.nix
index bb84800e51be..107efc786a6a 100644
--- a/pkgs/development/python-modules/nicegui-highcharts/default.nix
+++ b/pkgs/development/python-modules/nicegui-highcharts/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nicegui-highcharts";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui-highcharts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wzpgTDXTI3INQrkio6lgge07r+76wUKd193mt5ugc6g=";
+    hash = "sha256-QvhvQU/na33ZYQbAuCJvsVDDRkTy+Z4STJg9vlZrQbY=";
   };
 
   pythonRelaxDeps = [ "docutils" ];

From 23c83f33eca0e330ce1304cc5d9fdfe8bad7b538 Mon Sep 17 00:00:00 2001
From: Mukul Agarwal <vcs@agarmu.com>
Date: Mon, 13 Jul 2026 20:16:46 -0400
Subject: [PATCH 0369/1386] qtspeech: fix build on Darwin

---
 pkgs/development/libraries/qt-6/modules/qtspeech.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
index 4867bcaf7ee9..f87953f6fe81 100644
--- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
@@ -2,6 +2,7 @@
   qtModule,
   lib,
   stdenv,
+  llvmPackages,
   qtbase,
   qtmultimedia,
   pkg-config,
@@ -12,7 +13,10 @@
 
 qtModule {
   pname = "qtspeech";
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     flite
     alsa-lib
@@ -22,4 +26,9 @@ qtModule {
     qtbase
     qtmultimedia
   ];
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # Work around ld64's libc++ hardening issue.
+    # TODO: Remove once #536365 reaches this branch.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
 }

From e7de95a9f2958965745b55c421bdfb28ac793523 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 00:22:33 +0000
Subject: [PATCH 0370/1386] python3Packages.alibabacloud-ecs20140526: 7.9.0 ->
 7.9.1

---
 .../python-modules/alibabacloud-ecs20140526/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/alibabacloud-ecs20140526/default.nix b/pkgs/development/python-modules/alibabacloud-ecs20140526/default.nix
index 92ac4d69c58a..c102a168ab1c 100644
--- a/pkgs/development/python-modules/alibabacloud-ecs20140526/default.nix
+++ b/pkgs/development/python-modules/alibabacloud-ecs20140526/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "alibabacloud-ecs20140526";
-  version = "7.9.0";
+  version = "7.9.1";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "alibabacloud_ecs20140526";
     inherit (finalAttrs) version;
-    hash = "sha256-m1eaDj6VLGwJwfF3Dg6nN+YISHQuY+ij7uJ1KMFKvDU=";
+    hash = "sha256-ntrWxB3W/fR4RBGrX4I+fcyJScCri+9V9RxAZbJQeHE=";
   };
 
   build-system = [ setuptools ];

From 5a2a1365efd9b13f3b80f186b8b3f21f88f4f85b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 00:23:40 +0000
Subject: [PATCH 0371/1386] python3Packages.alibabacloud-cs20151215: 7.0.1 ->
 7.0.2

---
 .../python-modules/alibabacloud-cs20151215/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/alibabacloud-cs20151215/default.nix b/pkgs/development/python-modules/alibabacloud-cs20151215/default.nix
index a09a2d70d41a..bf9afc28b594 100644
--- a/pkgs/development/python-modules/alibabacloud-cs20151215/default.nix
+++ b/pkgs/development/python-modules/alibabacloud-cs20151215/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "alibabacloud-cs20151215";
-  version = "7.0.1";
+  version = "7.0.2";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "alibabacloud_cs20151215";
     inherit (finalAttrs) version;
-    hash = "sha256-BCv0RALhKwlRSjIYPXpwbPAZklohnD65YhKWzyRRuJ8=";
+    hash = "sha256-H+8v+T5Bpcs0q88VcHeL9ofsyJHxCMaQLljoqZeCOzE=";
   };
 
   build-system = [ setuptools ];

From 2df5c8807d71dde36b26cc259f7b9a996512b90c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 00:31:50 +0000
Subject: [PATCH 0372/1386] python3Packages.copier: 9.16.0 -> 9.17.0

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

diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index 1635a1bff085..89594122e76b 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.16.0";
+  version = "9.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-A7tfiFyEeQ3JFZkHSbv0EOE3rQzCJ3l1euMU93nKonA=";
+    hash = "sha256-I98GGrFSKgDlFQU3dAYsu7Z2mtO8NWPT0CoMtdw/EI8=";
   };
 
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = version;

From 33b8f2b84133a09103b956ce6dc511093803b54e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 00:32:25 +0000
Subject: [PATCH 0373/1386] watchlog: 1.263.0 -> 1.266.0

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

diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix
index 5b07a4353d4c..31f5ff8b1e74 100644
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "watchlog";
-  version = "1.263.0";
+  version = "1.266.0";
 
   src = fetchFromGitLab {
     owner = "kevincox";
     repo = "watchlog";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OGndYvlfuTVjOwWilWJINNNcBYNANHXxF+O7bdaoXp0=";
+    hash = "sha256-YNwb1HYJnsSGVo30FZLb7iXLq7XNUp4l0DmroJN70xs=";
   };
 
-  cargoHash = "sha256-fu7LQH75i/6xcAXMCM4YW8URku1MjnT18rBa+FUrNCw=";
+  cargoHash = "sha256-zgtzbLArB2GFnaA//BNmV9UkTxMj7RzW5xEgiQTr/4A=";
 
   meta = {
     description = "Easier monitoring of live logs";

From 3aad607343efb414fdf22fc1284c99c3f640ed3e Mon Sep 17 00:00:00 2001
From: Mukul Agarwal <vcs@agarmu.com>
Date: Mon, 13 Jul 2026 20:48:49 -0400
Subject: [PATCH 0374/1386] darktable: fix build on Darwin

---
 pkgs/by-name/da/darktable/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index c954ded2f1f6..d70fc071213a 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -103,7 +103,8 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapGAppsHook3
     saxon # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
 
   buildInputs = [
     SDL2
@@ -184,6 +185,12 @@ stdenv.mkDerivation rec {
     "-DUSE_KWALLET=OFF"
   ];
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # Work around ld64's libc++ hardening issue.
+    # TODO: Remove once #536365 reaches this branch.
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   # darktable changed its rpath handling in commit
   # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
   # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in

From 962708f17c4aef6598e0651c534d3e9d05849461 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 13 Jul 2026 20:56:25 -0400
Subject: [PATCH 0375/1386] vikunja: Set version metadata at build time

Otherwise About modal shows the frontend version as "dev".

Assisted-by: Codex gpt-5.6-sol high
---
 pkgs/by-name/vi/vikunja/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix
index 0f1bbf22d5f6..5d0aa4dcef05 100644
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -47,6 +47,11 @@ let
       pnpm_10
     ];
 
+    postPatch = ''
+      substituteInPlace src/version.json \
+        --replace-fail '"dev"' '"${finalAttrs.version}"'
+    '';
+
     doCheck = true;
 
     postBuild = ''

From 3803da710737c60b215c045746d8998151b5c8d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 01:07:56 +0000
Subject: [PATCH 0376/1386] zensical: 0.0.46 -> 0.0.50

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

diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix
index d6b758b881e8..3a8d0de45d54 100644
--- a/pkgs/by-name/ze/zensical/package.nix
+++ b/pkgs/by-name/ze/zensical/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "zensical";
-  version = "0.0.46";
+  version = "0.0.50";
   pyproject = true;
 
   # We fetch from PyPi, because GitHub repo does not contain all sources.
@@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
   # We could combine sources, but then nix-update won't work.
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-PsIfT7HnjNfA1rB64zawR3Die6Ag2rxFeyeQ5dNPGXg=";
+    hash = "sha256-cEDlLr5eaideTt6zUb8rwxTQB/P7V1DxeKONhAcj5pw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-RNd7C6dRfH59ah2rbwYuwJGU+mDZKqXUwFX8+NfLkgY=";
+    hash = "sha256-4f2nd+amOD6A8XX1470Z7PFXXpd+xFQdx7iepCKzTq0=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 6f87954079cd101cc6bbc2ab528b018a12aea850 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 01:15:01 +0000
Subject: [PATCH 0377/1386] goreman: 0.3.16 -> 0.3.19

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

diff --git a/pkgs/by-name/go/goreman/package.nix b/pkgs/by-name/go/goreman/package.nix
index c490c7480a78..3100f4df50c3 100644
--- a/pkgs/by-name/go/goreman/package.nix
+++ b/pkgs/by-name/go/goreman/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "goreman";
-  version = "0.3.16";
+  version = "0.3.19";
 
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "goreman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hOFnLxHsrauOrsbJYKNrwFFT5yYX/rdZUVjscBIGDLo=";
+    hash = "sha256-WVgMJ/9HTwNY7M0hXW7ag8vyQkIrUg+n0e7RX3LQ6a4=";
   };
 
-  vendorHash = "sha256-Udm0xdrW8Aky26oxUhdbpsNTWziZxkM0G1ZRKLwyl1Q=";
+  vendorHash = "sha256-KaqihJ5lu65EQQZGZ6Ym1Q/7jbN6zBdZ2AFovTpQ9S8=";
 
   ldflags = [
     "-s"

From 9378c61fae7fb462717da17405bee1f14bc7e5fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 01:20:23 +0000
Subject: [PATCH 0378/1386] sigma-cli: 3.0.3 -> 3.1.0

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

diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index 29236e94a306..077e419ba548 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "sigma-cli";
-  version = "3.0.3";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7zPB2eb+PeJ0xKygf/oRGZfntHiHHkk9L5Pr7oUfvkY=";
+    hash = "sha256-cr9MFKot/A08q0fg4RnSU1Rl7YAOvfoyIC8Loas/+X8=";
   };
 
   pythonRelaxDeps = [ "click" ];

From e8ce0d1e2c22133cf70d4b61d046600949e77882 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 01:47:58 +0000
Subject: [PATCH 0379/1386] pmbootstrap: 3.10.3 -> 3.11.1

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

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 256e1533000e..62c43e31df8f 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.10.3";
+  version = "3.11.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "pmbootstrap";
     tag = version;
-    hash = "sha256-Zl7Ti0HwMQSjMeW4GjdEKIRoCNjV15Qiv8bzhktNoyQ=";
+    hash = "sha256-8i2CUJL/FALS3B/q39OlpQbhrY4ar2qdn0gnbFuJjUk=";
     domain = "gitlab.postmarketos.org";
   };
 

From d42ebe9b0d33792508d985162bc11ecb0e04e0e9 Mon Sep 17 00:00:00 2001
From: Vinicius Deolindo <git@vini.cat>
Date: Mon, 13 Jul 2026 22:25:19 -0300
Subject: [PATCH 0380/1386] maintaners: rename `iniw` to `wini` and update
 email

---
 maintainers/maintainer-list.nix        | 12 ++++++------
 pkgs/by-name/li/linear/package.nix     |  2 +-
 pkgs/by-name/re/reflex-app/package.nix |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7667360d7624..084fe0812f6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11890,12 +11890,6 @@
     name = "Silvan Mosberger";
     keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D  DA1A 422E 9EDA E015 7170"; } ];
   };
-  iniw = {
-    email = "git@vini.cat";
-    github = "iniw";
-    githubId = 30220881;
-    name = "Vinicius Deolindo";
-  };
   insipx = {
     email = "github@andrewplaza.dev";
     github = "insipx";
@@ -30300,6 +30294,12 @@
     githubId = 22803888;
     name = "Lu Hongxu";
   };
+  wini = {
+    email = "dev@vini.cat";
+    github = "iniw";
+    githubId = 30220881;
+    name = "Vinicius Deolindo";
+  };
   winpat = {
     email = "patrickwinter@posteo.ch";
     github = "winpat";
diff --git a/pkgs/by-name/li/linear/package.nix b/pkgs/by-name/li/linear/package.nix
index f8a2122dd09e..c7052fffb023 100644
--- a/pkgs/by-name/li/linear/package.nix
+++ b/pkgs/by-name/li/linear/package.nix
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://linear.app/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
-      iniw
+      wini
       pradyuman
     ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/re/reflex-app/package.nix b/pkgs/by-name/re/reflex-app/package.nix
index 2a166e14e9cb..2a3519f751d0 100644
--- a/pkgs/by-name/re/reflex-app/package.nix
+++ b/pkgs/by-name/re/reflex-app/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Media key forwarder for Music and Spotify";
     homepage = "https://stuntsoftware.com/reflex/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ iniw ];
+    maintainers = with lib.maintainers; [ wini ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };

From e28925fd2c9ebe59645eb658b675112e244edbac Mon Sep 17 00:00:00 2001
From: mochie~! <187453775+mochienya@users.noreply.github.com>
Date: Tue, 14 Jul 2026 03:52:45 +0200
Subject: [PATCH 0381/1386] godsvg: 1.0-alpha15 -> 1.0-alpha16

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

diff --git a/pkgs/by-name/go/godsvg/package.nix b/pkgs/by-name/go/godsvg/package.nix
index 13affaf2ac5a..de1255ca0c0a 100644
--- a/pkgs/by-name/go/godsvg/package.nix
+++ b/pkgs/by-name/go/godsvg/package.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "godsvg";
-  version = "1.0-alpha15";
+  version = "1.0-alpha16";
   src = fetchFromGitHub {
     owner = "MewPurPur";
     repo = "GodSVG";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vEwkpYMIqiqCFVNE7UzEts/lSS9zR+AgvvSr+vj0Aas=";
+    hash = "sha256-MuPEPnoBmqAg0vLQ7rQidWHA2DFpfNx7evPYeG311co=";
   };
 
   nativeBuildInputs = [

From c1ade53cd177cdf2df3009be9fd63d27f594e8ea Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 03:02:32 -0500
Subject: [PATCH 0382/1386] luaPackages.compat53: 0.14.4-1 -> 0.15.0-1

https://github.com/lunarmodules/lua-compat-5.3/compare/v0.14.4...v0.15.0
---
 pkgs/development/lua-modules/generated-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index e9abdb69085d..631f3cc9ca20 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -471,18 +471,18 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "compat53";
-      version = "0.14.4-1";
+      version = "0.15.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/compat53-0.14.4-1.rockspec";
-          sha256 = "01ahfb6g7ibxrlvypvrsry4pwzfj978afjfa9c5w1s7ahjf95d40";
+          url = "mirror://luarocks/compat53-0.15.0-1.rockspec";
+          sha256 = "0389ghggjdbfxxa6nrb7364z55dmb832qyb8v4474nzcws0b0aqf";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.14.4.zip";
-        sha256 = "16mvf6qq290m8pla3fq3r6d6fmbbysjy8b5rxi40hchs4ngrn847";
+        url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.15.0.zip";
+        sha256 = "164hcigjz7my1zlgccdbvsld89bvz6y16v82rjc8n2qa8ah5j45d";
       };
 
-      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      disabled = luaOlder "5.1" || luaAtLeast "5.6";
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua-compat-5.3";

From 6339b3fb94470a47d93d32cc92f3471882bd9a86 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 03:03:53 -0500
Subject: [PATCH 0383/1386] luaPackages.grug-far-nvim: 1.6.72-1 -> 1.6.74-1

https://github.com/MagicDuck/grug-far.nvim/compare/c69859c1d5427ab5fc7ed12380ab521b4e336691...1cc080f55706b38aabfa97d40acb6adf59ac4a5a
---
 pkgs/development/lua-modules/generated-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 631f3cc9ca20..6b58e53ad67e 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1167,15 +1167,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.72-1";
+      version = "1.6.74-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.72-1.rockspec";
-          sha256 = "1ky24vksn0wvv058pvv03r163ba07s8b051mwi99qna2y77js2ds";
+          url = "mirror://luarocks/grug-far.nvim-1.6.74-1.rockspec";
+          sha256 = "0g8nb4w6l6bwnpy54xy5qncwn3hp0dcay1gfqrjfsf9j5pm3ysmg";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/c69859c1d5427ab5fc7ed12380ab521b4e336691.zip";
-        sha256 = "0yp64zp64zk5skf3blx359dmchy9wwfv4nf30hhdagvm8phbkkpx";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/1cc080f55706b38aabfa97d40acb6adf59ac4a5a.zip";
+        sha256 = "0aybgj5h8d6ydm304ybgw506rrrvmcdis3pclyjv9adi4z61a9fn";
       };
 
       disabled = luaOlder "5.1";

From fc6b797fcf5021a6bef84ffa77458bc4e2e8be38 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 03:10:31 -0500
Subject: [PATCH 0384/1386] luaPackages.nvim-cmp:
 scm-1-a1d504892f2bc56c2e79b65c6faded2fd21f3eca ->
 scm-1-2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3

https://github.com/hrsh7th/nvim-cmp/compare/a1d504892f2bc56c2e79b65c6faded2fd21f3eca...2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3
---
 pkgs/development/lua-modules/generated-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 6b58e53ad67e..dc59ec9181f5 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -5186,8 +5186,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hrsh7th";
         repo = "nvim-cmp";
-        rev = "a1d504892f2bc56c2e79b65c6faded2fd21f3eca";
-        hash = "sha256-uzfM8DLRKshESsYmUAbSfXtos9COWpe/fVkxNJPIUFw=";
+        rev = "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3";
+        hash = "sha256-YN8KAXVv1AFc3DajWVIl+EppOx/s3vdxiKMlb/lj5qc=";
       };
 
       disabled = luaOlder "5.1" || luaAtLeast "5.4";

From 8797e541c3876dbbcac733f10b40758887284e77 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 03:11:56 -0500
Subject: [PATCH 0385/1386] luaPackages.teal-language-server: 0.2.0-1 ->
 0.2.1-1

https://github.com/teal-language/teal-language-server/compare/0.2.0...0.2.1
---
 pkgs/development/lua-modules/generated-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index dc59ec9181f5..5146a9936fe4 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -6125,17 +6125,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "teal-language-server";
-      version = "0.2.0-1";
+      version = "0.2.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/teal-language-server-0.2.0-1.rockspec";
-          sha256 = "16345jk69raavia6gnx6qcnllwlhmjqbnaffbr67if20iglgwyy6";
+          url = "mirror://luarocks/teal-language-server-0.2.1-1.rockspec";
+          sha256 = "0dfqalvzsmvspmxp54pp9z4icx6k7ah6xz99lrnkhx01f798kf8z";
         }).outPath;
       src = fetchFromGitHub {
         owner = "teal-language";
         repo = "teal-language-server";
-        tag = "0.2.0";
-        hash = "sha256-ZjvGvdyd+NLQU1lSYvHQYtt9ShbszMKqhNtOoWpzO1g=";
+        tag = "0.2.1";
+        hash = "sha256-nrgop5L9RARx64ZbyIWzW3/8n9Vm4YSugLHgOnznVSs=";
       };
 
       propagatedBuildInputs = [

From 995c9a8e547df77eecd294767a2be83011f689cb Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 20:57:57 -0500
Subject: [PATCH 0386/1386] knot-resolver: allow local networking in Darwin
 tests

---
 pkgs/by-name/kn/knot-resolver_5/package.nix | 1 +
 pkgs/by-name/kn/knot-resolver_6/package.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/by-name/kn/knot-resolver_5/package.nix b/pkgs/by-name/kn/knot-resolver_5/package.nix
index 1bc541bb9498..26dbd427f5a4 100644
--- a/pkgs/by-name/kn/knot-resolver_5/package.nix
+++ b/pkgs/by-name/kn/knot-resolver_5/package.nix
@@ -140,6 +140,7 @@ let
       rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
     '';
 
+    __darwinAllowLocalNetworking = true;
     doInstallCheck = with stdenv; hostPlatform == buildPlatform;
     nativeInstallCheckInputs = [
       cmocka
diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix
index f8058a3ad70e..5223af3b2463 100644
--- a/pkgs/by-name/kn/knot-resolver_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver_6/package.nix
@@ -121,6 +121,7 @@ let
       rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
     '';
 
+    __darwinAllowLocalNetworking = true;
     doInstallCheck = with stdenv; hostPlatform == buildPlatform;
     nativeInstallCheckInputs = [
       which

From 0e5f71cc30566595ce016954c72cd3d092baee21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 02:03:42 +0000
Subject: [PATCH 0387/1386] neocmakelsp: 0.10.3 -> 0.10.4

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

diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
index 38af546416d0..5c9d81724dfc 100644
--- a/pkgs/by-name/ne/neocmakelsp/package.nix
+++ b/pkgs/by-name/ne/neocmakelsp/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "neocmakelsp";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "neocmakelsp";
     repo = "neocmakelsp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HfoVAUg9StAUXmP66LVRzCj4sd4kl6pCzWUS3lZEKtU=";
+    hash = "sha256-HTyLLhpCDlWoOHllVsB6V6BGvRpFQgsx7KCOfRq5UhE=";
   };
 
-  cargoHash = "sha256-yddefmK5ftu1rUpK3QcjocJiWQq5Y9CTJGjn2LbubbU=";
+  cargoHash = "sha256-PA9KP17l9EVJQn9sUoZ02EZsw3xgiIMidDXk+tYdsIY=";
 
   nativeBuildInputs = [
     installShellFiles

From 9a2b9bf6becff18e47374d99cf4d674800a07a7f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 13 Jul 2026 21:08:08 -0500
Subject: [PATCH 0388/1386] pinnacle: fix build with compat53 0.15

---
 pkgs/by-name/pi/pinnacle/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/pi/pinnacle/package.nix b/pkgs/by-name/pi/pinnacle/package.nix
index 7c62582fa34e..3e42a9c08ed8 100644
--- a/pkgs/by-name/pi/pinnacle/package.nix
+++ b/pkgs/by-name/pi/pinnacle/package.nix
@@ -53,6 +53,12 @@ let
     src = pinnacle-src;
     sourceRoot = "${src.name}/api/lua";
     knownRockspec = "${pinnacle-src}/api/lua/rockspecs/pinnacle-api-0.2.4-1.rockspec";
+
+    postConfigure = ''
+      substituteInPlace "$rockspecFilename" \
+        --replace-fail '"compat53 ~> 0.14"' '"compat53 >= 0.14"'
+    '';
+
     propagatedBuildInputs = with lua54Packages; [
       cqueues
       http

From 4ec7e7cd4c6a1afe240fec2297fdabbb5eb8959b Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 22:14:24 -0400
Subject: [PATCH 0389/1386] sequoia-sop: 0.37.3 -> 0.38.0

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix
index ec64a9a8a39d..7625477777f2 100644
--- a/pkgs/by-name/se/sequoia-sop/package.nix
+++ b/pkgs/by-name/se/sequoia-sop/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sequoia-sop";
-  version = "0.37.3";
+  version = "0.38.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7fyItwtzNia97fbLJ1YkpkS7KmCo3I81uksh3lNvxwU=";
+    hash = "sha256-3PxUXMLRBqw9GO0+wRiwI7P6/RH9vuAkSN4OnSxV0SQ=";
   };
 
-  cargoHash = "sha256-NrJYFf2bK/QwfFpIrPD8Zc9N/tKVbN2I48jA2B0rNWk=";
+  cargoHash = "sha256-iKC6vIT8fVFv/Yx3YJUSCHyTOZ7X860Ak0l/+7lrU9Y=";
 
   nativeBuildInputs = [
     pkg-config

From c0a8af02fba98cdc9dfb76ed38a2c4fe1da08730 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 22:17:14 -0400
Subject: [PATCH 0390/1386] sequoia-sop: write build assets to target dir

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sop/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix
index 7625477777f2..e9c95640b17e 100644
--- a/pkgs/by-name/se/sequoia-sop/package.nix
+++ b/pkgs/by-name/se/sequoia-sop/package.nix
@@ -35,15 +35,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildFeatures = [ "cli" ];
 
-  env.ASSET_OUT_DIR = "/tmp/";
+  env.ASSET_OUT_DIR = "target";
 
   # Install manual pages
   postInstall = ''
-    installManPage /tmp/man-pages/*.*
+    installManPage ${finalAttrs.env.ASSET_OUT_DIR}/man-pages/*.*
     installShellCompletion --cmd sqop \
-      --bash /tmp/shell-completions/sqop.bash \
-      --fish /tmp/shell-completions/sqop.fish \
-      --zsh /tmp/shell-completions/_sqop
+      --bash ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sqop.bash \
+      --fish ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sqop.fish \
+      --zsh ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/_sqop
     # Also elv and powershell are generated there
   '';
 

From c65c60a46ed444abd3a8a7f7622ef0b4ba303ea2 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 22:19:11 -0400
Subject: [PATCH 0391/1386] sequoia-sop: enable strictDeps and structuredAttrs

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sop/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix
index e9c95640b17e..470a27bd179a 100644
--- a/pkgs/by-name/se/sequoia-sop/package.nix
+++ b/pkgs/by-name/se/sequoia-sop/package.nix
@@ -22,6 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-iKC6vIT8fVFv/Yx3YJUSCHyTOZ7X860Ak0l/+7lrU9Y=";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook

From 5e98ca786e3c0a8ab27f1ba7bfca5068acf69178 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 22:21:00 -0400
Subject: [PATCH 0392/1386] sequoia-sop: add versionCheckHook

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sop/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix
index 470a27bd179a..20efef5537c2 100644
--- a/pkgs/by-name/se/sequoia-sop/package.nix
+++ b/pkgs/by-name/se/sequoia-sop/package.nix
@@ -7,6 +7,7 @@
   rustPlatform,
   sqlite,
   pkg-config,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -51,6 +52,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   doCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "version";
 
   passthru.updateScript = nix-update-script { };
 

From 4473aa96d041ddcead374a7bc77f1fd9bcd9d4de Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 22:24:33 -0400
Subject: [PATCH 0393/1386] sequoia-sop: add anish as maintainer

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sop/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix
index 20efef5537c2..b1763023acc5 100644
--- a/pkgs/by-name/se/sequoia-sop/package.nix
+++ b/pkgs/by-name/se/sequoia-sop/package.nix
@@ -63,7 +63,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://gitlab.com/sequoia-pgp/sequoia-sop";
     changelog = "https://gitlab.com/sequoia-pgp/sequoia-sop/-/blob/${finalAttrs.src.tag}/NEWS";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ doronbehar ];
+    maintainers = with lib.maintainers; [
+      doronbehar
+      anish
+    ];
     mainProgram = "sqop";
   };
 })

From aa0354f232f7e742fe6dfb0c9786b8392f63aced Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 02:43:03 +0000
Subject: [PATCH 0394/1386] fishMinimal: 4.8.0 -> 4.8.1

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

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 1aa932517d06..565619aecf2e 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -150,13 +150,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.8.0";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-ttjLM1uBY8sL+jVcxdHUnHYlRFe5jGjnkgBLy17qGso=";
+    hash = "sha256-i9Ng9RYqlMGRShu2sDSXCZ6KD7n7A0TKzLdyatXjBmY=";
   };
 
   env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-w8MuabpZ5ronQL3iaXbLErxPlTe1Mg8OsRb5foR59II=";
+    hash = "sha256-ikHv1WP38ClHGZy3StiyGS+lDHOjBT8ohJ/HdJwtYgw=";
   };
 
   patches = [

From 01b6100486ef25b9bd7c9ced38bc6b1a81261595 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 02:43:39 +0000
Subject: [PATCH 0395/1386] grpc-client-cli: 1.24.5 -> 1.24.6

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

diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix
index 42f0ce06eff5..71a31fea8340 100644
--- a/pkgs/by-name/gr/grpc-client-cli/package.nix
+++ b/pkgs/by-name/gr/grpc-client-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "grpc-client-cli";
-  version = "1.24.5";
+  version = "1.24.6";
 
   src = fetchFromGitHub {
     owner = "vadimi";
     repo = "grpc-client-cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-oN6+INV1psGa0nV5vPuNl9arnXaIU+pipwacHi7rHVY=";
+    sha256 = "sha256-5T5Ks98nOQmK3wexnSEZ5q1J9JNGorXpkLGWG5ie6Y4=";
   };
 
-  vendorHash = "sha256-hE+iwPP9hlj/taVKKY+On8RCRIUynZnvVXnAn2y5sxA=";
+  vendorHash = "sha256-lwat8cp+Tr2KeUc5S2yNZtd3Jadxug0eQKLSsDZlT54=";
 
   meta = {
     description = "Generic gRPC command line client";

From 4377a04c33c9771c71ba60ca455187032c6241fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 02:52:15 +0000
Subject: [PATCH 0396/1386] python3Packages.cloudflare: 5.4.0 -> 5.5.0

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

diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index b5058ee3e3bb..33f08b7e66d4 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "cloudflare";
-  version = "5.4.0";
+  version = "5.5.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hj8qI0p9LM6ff/nErgt+YvOfWFBElLxJ2QI6IT0prOs=";
+    hash = "sha256-pXFvBqv/FyHQLsuc6DuhXYeVwhbQHCEtTlWzvKb6hiE=";
   };
 
   postPatch = ''

From f4915f5b1ee89ac6a3c89e95acd9405893786f98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 03:01:31 +0000
Subject: [PATCH 0397/1386] python3Packages.langchain-aws: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 8cdfe2866918..a3ca3be192d9 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-aws";
-  version = "1.6.1";
+  version = "1.6.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: {
     owner = "langchain-ai";
     repo = "langchain-aws";
     tag = "langchain-aws==${finalAttrs.version}";
-    hash = "sha256-gvp4iS5cU7QhFNpHuS+ytxGVh+vWSlcS4cPV9O6c+tw=";
+    hash = "sha256-MFlC9/9ZC1b5jAkvLRy2alcSYU5+KETJ6rIW05nLR5I=";
   };
 
   postPatch = ''

From acb6a16f2bd8b5c24732b1de95e48fb061243ab9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 22:20:49 +0000
Subject: [PATCH 0398/1386] python3Packages.sqlite-utils: 3.39 -> 4.1.1

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

diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix
index acc78be8aea7..adda0b1e6696 100644
--- a/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -17,7 +17,7 @@
 }:
 buildPythonPackage rec {
   pname = "sqlite-utils";
-  version = "3.39";
+  version = "4.1.1";
   pyproject = true;
 
   build-system = [ setuptools ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "sqlite_utils";
-    hash = "sha256-v6Lqwps+PrXJZHKDeXUn/rz079Spu7Mdl5oUoR75280=";
+    hash = "sha256-z5fmILOUDNVByukRfMJK+WGm2kJhif22YvIPGVC6H0k=";
   };
 
   dependencies = [

From 1b5f703ee58aa0fab7a7f5e56771e7f8bade5bf4 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Sat, 11 Jul 2026 07:27:07 +0000
Subject: [PATCH 0399/1386] python3Packages.sqlite-migrate: 0.1b -> 0.2

---
 .../python-modules/sqlite-migrate/default.nix  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/sqlite-migrate/default.nix b/pkgs/development/python-modules/sqlite-migrate/default.nix
index 7aea7adb1bbf..34e490010981 100644
--- a/pkgs/development/python-modules/sqlite-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlite-migrate/default.nix
@@ -1,23 +1,29 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
   setuptools,
+  uv-build,
   sqlite-utils,
 }:
 
 buildPythonPackage rec {
   pname = "sqlite-migrate";
-  version = "0.1b0";
+  version = "0.2";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-jVArPKS5xF5WASvTXAPSMjXwgjyXbUzpQMu0DjMIfe0=";
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "sqlite-migrate";
+    tag = version;
+    hash = "sha256-0fU3yOujqc4mZS4XcsM9xH2iK9fFX5MUsmuc/o+I+nY=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    setuptools
+    uv-build
+  ];
 
   propagatedBuildInputs = [ sqlite-utils ];
 

From bc0681ea1ecc90a0f45c22b1d10952a2a501ad8f Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Sat, 11 Jul 2026 08:28:12 +0000
Subject: [PATCH 0400/1386] python3Packages.llm: 0.30 -> 0.31.1

---
 .../python-modules/llm/default.nix            | 11 +++-
 ...ommit-inside-content_hash-embeddings.patch | 66 +++++++++++++++++++
 2 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/llm/do-not-commit-inside-content_hash-embeddings.patch

diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 17794a696d85..b880a546ef78 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -5,6 +5,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
+  fetchpatch2,
   pytestCheckHook,
   replaceVars,
   setuptools,
@@ -167,7 +168,7 @@ let
 
   llm = buildPythonPackage rec {
     pname = "llm";
-    version = "0.30";
+    version = "0.31.1";
     pyproject = true;
 
     build-system = [ setuptools ];
@@ -176,11 +177,17 @@ let
       owner = "simonw";
       repo = "llm";
       tag = version;
-      hash = "sha256-+8fwx7sS1vFSTqb+p2uDLqWW/UIx8WoW3kYJihznRRg=";
+      hash = "sha256-XxQ6IQyuO1rxQtiyb4VGrM7uGoffuNN5BhyI4YDxnZg=";
     };
 
     patches = [
       ./001-disable-install-uninstall-commands.patch
+      # Remove when https://github.com/simonw/llm/pull/1525 gets merged.
+      ./do-not-commit-inside-content_hash-embeddings.patch
+      (fetchpatch2 {
+        url = "https://github.com/simonw/llm/commit/67adad2c10be5c1898e3e1a664adb573f5d032cf.patch";
+        hash = "sha256-7+sBQvef94ZTUrqNKVzHzjFADNj1KNzA2tbGs5btwNA=";
+      })
     ]
     # See https://github.com/NixOS/nixpkgs/issues/476258 and https://github.com/simonw/llm/pull/1334
     # TODO: Remove when sqlite 3.52.x is released.
diff --git a/pkgs/development/python-modules/llm/do-not-commit-inside-content_hash-embeddings.patch b/pkgs/development/python-modules/llm/do-not-commit-inside-content_hash-embeddings.patch
new file mode 100644
index 000000000000..003786de207a
--- /dev/null
+++ b/pkgs/development/python-modules/llm/do-not-commit-inside-content_hash-embeddings.patch
@@ -0,0 +1,66 @@
+From db03b44068e71f5266b720eb68ecae50e3e14303 Mon Sep 17 00:00:00 2001
+From: Ewerton Silva <ewertoncom297@gmail.com>
+Date: Sat, 11 Jul 2026 23:50:58 -0300
+Subject: [PATCH] fix: do not commit inside the content_hash embeddings
+ migration
+
+---
+ llm/embeddings_migrations.py | 21 ++++++++++-----------
+ tests/test_migrate.py        | 12 ++++++++++++
+ 2 files changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/llm/embeddings_migrations.py b/llm/embeddings_migrations.py
+index 96444bd65..595a692d9 100644
+--- a/llm/embeddings_migrations.py
++++ b/llm/embeddings_migrations.py
+@@ -62,17 +62,16 @@ def random_md5():
+     db.conn.create_function("temp_md5", 1, md5)
+     db.conn.create_function("temp_random_md5", 0, random_md5)
+ 
+-    with db.conn:
+-        db.execute("""
+-            update embeddings
+-            set content_hash = temp_md5(content)
+-            where content is not null
+-        """)
+-        db.execute("""
+-            update embeddings
+-            set content_hash = temp_random_md5()
+-            where content is null
+-        """)
++    db.execute("""
++        update embeddings
++        set content_hash = temp_md5(content)
++        where content is not null
++    """)
++    db.execute("""
++        update embeddings
++        set content_hash = temp_random_md5()
++        where content is null
++    """)
+ 
+     db["embeddings"].create_index(["content_hash"])
+ 
+diff --git a/tests/test_migrate.py b/tests/test_migrate.py
+index 705021100..e74b1554b 100644
+--- a/tests/test_migrate.py
++++ b/tests/test_migrate.py
+@@ -117,6 +117,18 @@ def test_migrations_for_embeddings():
+     assert db["embeddings"].foreign_keys[0].other_table == "collections"
+ 
+ 
++@pytest.mark.skipif(
++    not hasattr(sqlite_utils.Database, "atomic"),
++    reason="sqlite-utils 4 and higher run each migration inside a transaction",
++)
++def test_embeddings_migrations_do_not_commit():
++    # https://github.com/simonw/llm/issues/1523
++    db = sqlite_utils.Database(memory=True)
++    for migration in embeddings_migrations.pending(db):
++        with db.atomic():
++            migration.fn(db)
++
++
+ def test_backfill_content_hash():
+     db = sqlite_utils.Database(memory=True)
+     # Run migrations up to but not including m004_store_content_hash

From efd0032ac7cb1c234c91df81066aece94316d4a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 13 Jul 2026 20:14:45 -0700
Subject: [PATCH 0401/1386] python3Packages.pymodbus: 3.13.1 -> 3.14.0

Diff: https://github.com/pymodbus-dev/pymodbus/compare/v3.13.1...v3.14.0

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

diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index fc0afe74e614..97243550c4ef 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pymodbus";
-  version = "3.13.1";
+  version = "3.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymodbus-dev";
     repo = "pymodbus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gaCD3bhwBXF08vn3v9OU2mT1WJycrqgtxUC8sRLmZ8Y=";
+    hash = "sha256-abU7hOXXJuoBHqSCL4++4ZHZcG8hcyLCMw56eBz1eQc=";
   };
 
   __darwinAllowLocalNetworking = true;

From 39a38fd4fa1b5970243866625d16253ea6a60fcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 03:17:59 +0000
Subject: [PATCH 0402/1386] python3Packages.pylitterbot: 2025.6.0 -> 2025.6.1

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

diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index 69dc994c5b91..0cb74cfa8db0 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylitterbot";
-  version = "2025.6.0";
+  version = "2025.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "natekspencer";
     repo = "pylitterbot";
     tag = finalAttrs.version;
-    hash = "sha256-shn218uasWtZidnmhAVU0bG9BVfrN/0Gy1iy01LGfrc=";
+    hash = "sha256-KKedO+NN/yeFYIGuiAJbch4SJ1QBsRfehVWx0y3SltQ=";
   };
 
   build-system = [

From d023df074d3e31a67dcc3fb3d24a787ea5232301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 13 Jul 2026 20:20:05 -0700
Subject: [PATCH 0403/1386] python3Packages.modbus-connection: 3.4.1 -> 3.6.0

Diff: https://github.com/home-assistant-libs/modbus-connection/compare/3.4.1...3.6.0

Changelog: https://github.com/home-assistant-libs/modbus-connection/releases/tag/3.6.0
---
 pkgs/development/python-modules/modbus-connection/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/modbus-connection/default.nix b/pkgs/development/python-modules/modbus-connection/default.nix
index ad330e5d70be..5d16c2544027 100644
--- a/pkgs/development/python-modules/modbus-connection/default.nix
+++ b/pkgs/development/python-modules/modbus-connection/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "modbus-connection";
-  version = "3.4.1";
+  version = "3.6.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
     owner = "home-assistant-libs";
     repo = "modbus-connection";
     tag = finalAttrs.version;
-    hash = "sha256-jWS6quM+hZTMGNyxopC4RS3mUaYAqD/MOsmTU7sD+pg=";
+    hash = "sha256-qDrtLziEMH0lsJ2o3p/6lMlPTdNIFqCvhtpbMJ89uKw=";
   };
 
   nativeBuildInputs = [

From 915363b7aa0e8e4bea852fef44ff5a697d58db5f Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 01:45:07 +0000
Subject: [PATCH 0404/1386] python3Packages.llm-tools-sqlite: fix test

---
 .../python-modules/llm-tools-sqlite/default.nix     |  4 ++++
 .../python-modules/llm-tools-sqlite/fix-test.patch  | 13 +++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-tools-sqlite/fix-test.patch

diff --git a/pkgs/development/python-modules/llm-tools-sqlite/default.nix b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
index 494c4c5994e5..94d623124cc8 100644
--- a/pkgs/development/python-modules/llm-tools-sqlite/default.nix
+++ b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
@@ -22,6 +22,10 @@ buildPythonPackage rec {
     hash = "sha256-VAmK4cXzZWTWCU92TwMdhNJPvYPZ88t5BZe8vo60SZY=";
   };
 
+  patches = [
+    ./fix-test.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ llm ];
diff --git a/pkgs/development/python-modules/llm-tools-sqlite/fix-test.patch b/pkgs/development/python-modules/llm-tools-sqlite/fix-test.patch
new file mode 100644
index 000000000000..802b73d8583e
--- /dev/null
+++ b/pkgs/development/python-modules/llm-tools-sqlite/fix-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_llm_tools_sqlite.py b/tests/test_llm_tools_sqlite.py
+index a676007..4d653b6 100644
+--- a/tests/test_llm_tools_sqlite.py
++++ b/tests/test_llm_tools_sqlite.py
+@@ -47,7 +47,7 @@ def test_tool(monkeypatch, tmpdir):
+         {"name": "SQLite_query", "output": '[{"n": 3}]', "tool_call_id": None},
+         {
+             "name": "SQLite_schema",
+-            "output": "CREATE TABLE [pelicans] (\n   [name] TEXT\n);",
++            "output": "CREATE TABLE \"pelicans\" (\n   \"name\" TEXT\n);",
+             "tool_call_id": None,
+         },
+         {

From 09058f4d2844723d7791fcc83f7480d4b2b61102 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 13 Jul 2026 23:25:30 -0400
Subject: [PATCH 0405/1386] prismlauncher: 11.0.2 -> 11.0.3

Diff: https://github.com/PrismLauncher/PrismLauncher/compare/11.0.2...11.0.3

Changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/11.0.3
---
 pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index ded8fff6818d..b5ffa065ab24 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prismlauncher-unwrapped";
-  version = "11.0.2";
+  version = "11.0.3";
 
   src = fetchFromGitHub {
     owner = "PrismLauncher";
     repo = "PrismLauncher";
     tag = finalAttrs.version;
-    hash = "sha256-GvAfrZxQSlBnCJ59nvK87jDTVo60D8n25K42SokE1q8=";
+    hash = "sha256-0o31pLKnYY0mulLrZKzZtaTPzCviGsgCnEcBt0Y/aG4=";
   };
 
   postUnpack = ''

From 9b21672212706e874a3faa8a73dc83b9ee4beab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 13 Jul 2026 20:29:47 -0700
Subject: [PATCH 0406/1386] home-assistant-custom-components.systemair: unpin
 pymodbus

---
 .../home-assistant/custom-components/systemair/package.nix    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index e549e8d87c87..be387f0dd7aa 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -19,6 +19,10 @@ buildHomeAssistantComponent rec {
     hash = "sha256-6JLcWBZU5YXgdcZUuCIs2KAJJJ8U7nawYwOgSjsNajc=";
   };
 
+  ignoreVersionRequirement = [
+    "pymodbus"
+  ];
+
   dependencies = [
     pymodbus
     async-timeout

From 6bcec2f1ba292e793774212d03749f86f5631712 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 03:34:17 +0000
Subject: [PATCH 0407/1386] ku: 0.7.1 -> 0.8.2

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

diff --git a/pkgs/by-name/ku/ku/package.nix b/pkgs/by-name/ku/ku/package.nix
index ed4d43993cde..60d613cc5158 100644
--- a/pkgs/by-name/ku/ku/package.nix
+++ b/pkgs/by-name/ku/ku/package.nix
@@ -8,17 +8,17 @@
 
 buildGo126Module (finalAttrs: {
   pname = "ku";
-  version = "0.7.1";
+  version = "0.8.2";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "ku";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KaD2DUPkkCT5vG6nNOL/TGXUK6Q/KErZhhE2Zb/D78s=";
+    hash = "sha256-vUv4eKTCucJ/ol76z0Q3jOigYBSwM823ZxjvBFqv1yY=";
   };
 
-  vendorHash = "sha256-0gLwvJSEMgCw23YG8rMzoI7ubo0I5nvguex2HBJE1dU=";
+  vendorHash = "sha256-x7O2/uKnIIFDr8WK0ej3FJiIGxN5Fq5Czqrv4OJ5A44=";
 
   ldflags = [
     "-s"

From 2cff798269b41c6d25a09b7b357a305ae08f15b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 03:41:02 +0000
Subject: [PATCH 0408/1386] python3Packages.nox: 2026.04.10 -> 2026.07.11

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

diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index e9325dc9fa87..301d18f67452 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nox";
-  version = "2026.04.10";
+  version = "2026.07.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wntrblm";
     repo = "nox";
     tag = finalAttrs.version;
-    hash = "sha256-ArSA9I86hTKM+fkTdzOeheYVxpdjweMs2I0mUwR14sQ=";
+    hash = "sha256-Ve9mKZ6C9X/SjscEIO11fyMqokjlYZqbqXWC1R1+Kmc=";
   };
 
   build-system = [ hatchling ];

From 4303643fbdbe5864d64ad0e6bb5d4a72981e7f5e Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 04:04:52 +0000
Subject: [PATCH 0409/1386] python3Packages.llm-tools-sqlite: modernize

---
 .../python-modules/llm-tools-sqlite/default.nix          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/llm-tools-sqlite/default.nix b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
index 94d623124cc8..ee2d2df02a67 100644
--- a/pkgs/development/python-modules/llm-tools-sqlite/default.nix
+++ b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
@@ -10,15 +10,16 @@
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalATtrs: {
   pname = "llm-tools-sqlite";
   version = "0.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-tools-sqlite";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-VAmK4cXzZWTWCU92TwMdhNJPvYPZ88t5BZe8vo60SZY=";
   };
 
@@ -43,8 +44,8 @@ buildPythonPackage rec {
   meta = {
     description = "LLM tools for running queries against SQLite";
     homepage = "https://github.com/simonw/llm-tools-sqlite";
-    changelog = "https://github.com/simonw/llm-tools-sqlite/releases/tag/${version}/CHANGELOG.md";
+    changelog = "https://github.com/simonw/llm-tools-sqlite/releases/tag/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ philiptaron ];
   };
-}
+})

From c8ff7a886a108d91983ec41aca24eb6c144e93b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 04:07:39 +0000
Subject: [PATCH 0410/1386] surfpool: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/by-name/su/surfpool/package.nix b/pkgs/by-name/su/surfpool/package.nix
index fe11aa675706..2a624b1ccfc4 100644
--- a/pkgs/by-name/su/surfpool/package.nix
+++ b/pkgs/by-name/su/surfpool/package.nix
@@ -18,18 +18,18 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "surfpool-cli";
-  version = "1.4.0";
+  version = "1.5.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "solana-foundation";
     repo = "surfpool";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6sE1YILQIrqtDzrNtc8ApGWESHurTEmUP7FE9IDBQ60=";
+    hash = "sha256-DszqgmMW+hQ3wKhh3ZMioX1sAca333WzRIikKJFuyXg=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-nkeOO6Ix5FwhIT6M/LU8HwU00qOfAK43ELkBCK/KhEo=";
+  cargoHash = "sha256-eOgPoHQVQVm+aSLsxAokjMyAyZBia/j/Bxux69WfklI=";
 
   env = {
     RUSTFLAGS = "-Aunused";

From 634bccc9b0b629261dbc74c41d8c6ead8fc260dc Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Sat, 27 Jun 2026 01:29:53 -0400
Subject: [PATCH 0411/1386] mlt: 7.38.0 -> 7.40.0, add new dep rnnoise

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

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 85216c588e67..4f9f8cb9d754 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -18,6 +18,7 @@
   makeWrapper,
   movit,
   opencv4,
+  rnnoise,
   rtaudio,
   rubberband,
   sox,
@@ -44,13 +45,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mlt";
-  version = "7.38.0";
+  version = "7.40.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tZWkgDffNZwJgfrFQNKfS+QzpcjaM0SEBbyxrVBqubc=";
+    hash = "sha256-rw1jnQJzbtpGsIe/AFMiy7k/3X0vkfkY3rG4E419aVM=";
     # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
     # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
     # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545
@@ -84,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     libvorbis
     libxml2
     movit
+    rnnoise
     rtaudio
     rubberband
     sox

From f7d66fa955bfa18c43a66fa632d7a7e08e3a0b16 Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Sat, 27 Jun 2026 01:39:21 -0400
Subject: [PATCH 0412/1386] mlt: Enable missing module support

---
 pkgs/by-name/ml/mlt/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 4f9f8cb9d754..db580fba2944 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -1,4 +1,5 @@
 {
+  alsa-lib,
   config,
   lib,
   stdenv,
@@ -8,16 +9,22 @@
   which,
   ffmpeg,
   fftw,
+  fontconfig,
   frei0r,
   libdv,
+  libebur128,
+  libexif,
   libjack2,
   libsamplerate,
+  libspatialaudio,
   libvorbis,
   libxml2,
   libx11,
+  lilv,
   makeWrapper,
   movit,
   opencv4,
+  pango,
   rnnoise,
   rtaudio,
   rubberband,
@@ -78,19 +85,28 @@ stdenv.mkDerivation (finalAttrs: {
     (opencv4.override { ffmpeg-headless = ffmpeg; })
     ffmpeg
     fftw
+    fontconfig
     frei0r
     libdv
+    libebur128
+    libexif
     libjack2
     libsamplerate
+    libspatialaudio
     libvorbis
     libxml2
+    lilv
     movit
+    pango
     rnnoise
     rtaudio
     rubberband
     sox
     vid-stab
   ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_cudart
   ]

From 079a6f481f4e42e8c3ff670f7582403a8b47e84a Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Sat, 27 Jun 2026 01:46:53 -0400
Subject: [PATCH 0413/1386] mlt: update --replace and match opencv to PR in
 staging

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

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index db580fba2944..4d07ef764a36 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \
-      --replace '=''${prefix}//' '=/'
+      --replace-fail '=''${prefix}//' '=/'
   '';
 
   passthru = {

From c2b5d1b3cd232f80250d8c521eb92f22ff722960 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 04:10:43 +0000
Subject: [PATCH 0414/1386] dbmate: 2.33.0 -> 2.34.1

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

diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix
index 37f6029cba35..0cf43002520c 100644
--- a/pkgs/by-name/db/dbmate/package.nix
+++ b/pkgs/by-name/db/dbmate/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dbmate";
-  version = "2.33.0";
+  version = "2.34.1";
 
   src = fetchFromGitHub {
     owner = "amacneil";
     repo = "dbmate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qdW7hutxjdhT8ypQOmVrcTMzuySy0zkS8SeTbvaGVK4=";
+    hash = "sha256-rDnXLNltUxtzJRw3kc1nQ0HnrWZYQKA+o1nup/WsD7E=";
   };
 
-  vendorHash = "sha256-kKj3KOWq1IeQcR2/QJYsKZh6Kxryj0y687CKzyeO4ZM=";
+  vendorHash = "sha256-+P9K/uOLFhsSwOxWPvTVu5MBCkP+9rGAA9efmgw4R60=";
 
   tags = [ "fts5" ];
 

From 39d2c3431132f7581505a59a05d5ad471588edd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 04:23:22 +0000
Subject: [PATCH 0415/1386] symfony-cli: 5.17.1 -> 5.18.1

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

diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index bb8dbd5b4423..6130898cd958 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -12,14 +12,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "symfony-cli";
-  version = "5.17.1";
-  vendorHash = "sha256-eCvlfkUH80EXshBkWz4+ehVlRXPsKyydixo76+kxSgE=";
+  version = "5.18.1";
+  vendorHash = "sha256-xAOp03sbtJv31nikkWHhBEHNQkDJ0RtPTPVPpw/6Eho=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6FqfbVfNGfIGJFBemwfUVwVR7fwrnZT38vF+8Qr8p3s=";
+    hash = "sha256-sd1C33n0Eo/lV9Uas+EcEojIYLRosuzcZn9se5dwukU=";
     leaveDotGit = true;
     postFetch = ''
       git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE

From 1e85b6cba66cf2b96064a86603898258baf91345 Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Tue, 14 Jul 2026 00:30:28 -0400
Subject: [PATCH 0416/1386] xsetroot: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/by-name/xs/xsetroot/package.nix b/pkgs/by-name/xs/xsetroot/package.nix
index 82f9e885c00f..0b78956c354b 100644
--- a/pkgs/by-name/xs/xsetroot/package.nix
+++ b/pkgs/by-name/xs/xsetroot/package.nix
@@ -12,11 +12,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xsetroot";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/xsetroot-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YIG0Wp60Qm4EXSWdHhRLMkF/tjXluWqpBkc2WslmONE=";
+    hash = "sha256-ExWj9+mr4GNXNjuTRh4nJgH2ciXOC8B1xDDM41BzNis=";
   };
 
   strictDeps = true;

From 4f6a0382827adf5fbcdb8029d01f5b355a34e936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 04:37:57 +0000
Subject: [PATCH 0417/1386] python3Packages.aioaudiobookshelf: 0.1.22 -> 0.1.24

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

diff --git a/pkgs/development/python-modules/aioaudiobookshelf/default.nix b/pkgs/development/python-modules/aioaudiobookshelf/default.nix
index 0cfeb1b26e4c..ceeba52942e1 100644
--- a/pkgs/development/python-modules/aioaudiobookshelf/default.nix
+++ b/pkgs/development/python-modules/aioaudiobookshelf/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "aioaudiobookshelf";
-  version = "0.1.22";
+  version = "0.1.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "aioaudiobookshelf";
     tag = version;
-    hash = "sha256-K0UOP9qfSn4syS3rmcyX0qHmxIW+EtRqtC045SBmc8k=";
+    hash = "sha256-rVHkmfcEtnQPHb6s8KeNRToDhloDcNnqBjPyTUgIygc=";
   };
 
   build-system = [

From 8e38748dffb2b90169c6e4f7d0d8b5a8f93569d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 04:50:35 +0000
Subject: [PATCH 0418/1386] python3Packages.pydo: 0.38.0 -> 0.39.0

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

diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix
index ac60fe63767e..e0bf13efd786 100644
--- a/pkgs/development/python-modules/pydo/default.nix
+++ b/pkgs/development/python-modules/pydo/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydo";
-  version = "0.38.0";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "pydo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NTQIRyG+ysGgq9TTyLG4yXpx+YvLNkRQz29NwTAdz1o=";
+    hash = "sha256-wo1qg8mromlI+DsYns0IYtCwsYQgLisSSpkHPtnoR/E=";
   };
 
   build-system = [ poetry-core ];

From 9408bd6e7aa564dde40ed4b5d7fb64c3a16980d9 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 04:05:18 +0000
Subject: [PATCH 0419/1386] python3Packages.sqlite-migrate: modernize

---
 .../python-modules/llm-tools-sqlite/default.nix          | 2 +-
 .../python-modules/sqlite-migrate/default.nix            | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/llm-tools-sqlite/default.nix b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
index ee2d2df02a67..11ae7b29cb1f 100644
--- a/pkgs/development/python-modules/llm-tools-sqlite/default.nix
+++ b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
@@ -10,7 +10,7 @@
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage (finalATtrs: {
+buildPythonPackage (finalAttrs: {
   pname = "llm-tools-sqlite";
   version = "0.1";
   pyproject = true;
diff --git a/pkgs/development/python-modules/sqlite-migrate/default.nix b/pkgs/development/python-modules/sqlite-migrate/default.nix
index 34e490010981..bf6f670e1d75 100644
--- a/pkgs/development/python-modules/sqlite-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlite-migrate/default.nix
@@ -8,15 +8,16 @@
   sqlite-utils,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "sqlite-migrate";
   version = "0.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "sqlite-migrate";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-0fU3yOujqc4mZS4XcsM9xH2iK9fFX5MUsmuc/o+I+nY=";
   };
 
@@ -34,8 +35,8 @@ buildPythonPackage rec {
   meta = {
     description = "Simple database migration system for SQLite, based on sqlite-utils";
     homepage = "https://github.com/simonw/sqlite-migrate";
-    changelog = "https://github.com/simonw/sqlite-migrate/releases/tag/${version}";
+    changelog = "https://github.com/simonw/sqlite-migrate/releases/tag/${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aldoborrero ];
   };
-}
+})

From ca1f0c2fd09b39cefca97ef4bcb8d908493d09b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 05:26:14 +0000
Subject: [PATCH 0420/1386] rqlite: 10.2.6 -> 10.2.7

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

diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index 2a774b5903a5..9ba8dcdbae55 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -12,16 +12,16 @@ buildGoModule (
   in
   {
     pname = "rqlite";
-    version = "10.2.6";
+    version = "10.2.7";
 
     src = fetchFromGitHub {
       owner = "rqlite";
       repo = "rqlite";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-YFEvsEjpJSYoGEqYxVP9Qo6JRTD1peVP9a3Bf1hsdLU=";
+      hash = "sha256-T7ymv0nG5ZA4uUzT2Br6N2qFCggQYs28fAX6bTdUNKo=";
     };
 
-    vendorHash = "sha256-rWyDyypKbettuwL8tfXmkvKtIg5fm5EzZud2/5RL0kY=";
+    vendorHash = "sha256-hfuVxcI1tGdkY1CWP1p5r1kMJfvNzqZlVI3Ge/gRNqo=";
 
     subPackages = [
       "cmd/rqlite"

From 950bb2ca0416dfe2d519eb99a5835bc61a9674cc Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 04:05:53 +0000
Subject: [PATCH 0421/1386] python3Packages.llm: modernize

---
 .../python-modules/llm/default.nix            | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index b880a546ef78..eeb9194dbafb 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -4,7 +4,6 @@
   callPackage,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   fetchpatch2,
   pytestCheckHook,
   replaceVars,
@@ -165,18 +164,18 @@ let
       '') withPluginsArgNames
     )
   );
-
-  llm = buildPythonPackage rec {
+  llm = buildPythonPackage (finalAttrs: {
     pname = "llm";
     version = "0.31.1";
     pyproject = true;
+    __structuredAttrs = true;
 
     build-system = [ setuptools ];
 
     src = fetchFromGitHub {
       owner = "simonw";
       repo = "llm";
-      tag = version;
+      tag = finalAttrs.version;
       hash = "sha256-XxQ6IQyuO1rxQtiyb4VGrM7uGoffuNN5BhyI4YDxnZg=";
     };
 
@@ -188,14 +187,6 @@ let
         url = "https://github.com/simonw/llm/commit/67adad2c10be5c1898e3e1a664adb573f5d032cf.patch";
         hash = "sha256-7+sBQvef94ZTUrqNKVzHzjFADNj1KNzA2tbGs5btwNA=";
       })
-    ]
-    # See https://github.com/NixOS/nixpkgs/issues/476258 and https://github.com/simonw/llm/pull/1334
-    # TODO: Remove when sqlite 3.52.x is released.
-    ++ lib.optionals (sqlite.version == "3.51.1") [
-      (fetchpatch {
-        url = "https://github.com/simonw/llm/commit/6e24b883c3e3c4ddd2ec9006714d0a9ec17b59da.patch";
-        hash = "sha256-4AKQdZCr6qxuWnjWoSW6I44hPL5e7tnvREx2Ns0WwNc=";
-      })
     ];
 
     postPatch = ''
@@ -272,7 +263,7 @@ let
     meta = {
       homepage = "https://github.com/simonw/llm";
       description = "Access large language models from the command-line";
-      changelog = "https://github.com/simonw/llm/releases/tag/${src.tag}";
+      changelog = "https://github.com/simonw/llm/releases/tag/${finalAttrs.src.tag}";
       license = lib.licenses.asl20;
       mainProgram = "llm";
       maintainers = with lib.maintainers; [
@@ -281,6 +272,6 @@ let
         philiptaron
       ];
     };
-  };
+  });
 in
 llm

From 47aa26a790372f0fc3f26c3a451e19722ee027d0 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 04:06:17 +0000
Subject: [PATCH 0422/1386] python3Packages.sqlite-utils: modernize

---
 .../python-modules/sqlite-utils/default.nix    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix
index adda0b1e6696..b60e68605e07 100644
--- a/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   click,
   click-default-group,
   python-dateutil,
@@ -15,17 +15,19 @@
   sqlite-utils,
   setuptools,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "sqlite-utils";
   version = "4.1.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   build-system = [ setuptools ];
 
-  src = fetchPypi {
-    inherit version;
-    pname = "sqlite_utils";
-    hash = "sha256-z5fmILOUDNVByukRfMJK+WGm2kJhif22YvIPGVC6H0k=";
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "sqlite-utils";
+    tag = finalAttrs.version;
+    hash = "sha256-igf4d+5iyC+gYb9TL2JCNzTmTrCgRdR9gscTcfslDng=";
   };
 
   dependencies = [
@@ -51,11 +53,11 @@ buildPythonPackage rec {
     description = "Python CLI utility and library for manipulating SQLite databases";
     mainProgram = "sqlite-utils";
     homepage = "https://github.com/simonw/sqlite-utils";
-    changelog = "https://github.com/simonw/sqlite-utils/releases/tag/${version}";
+    changelog = "https://github.com/simonw/sqlite-utils/releases/tag/${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       meatcar
       techknowlogick
     ];
   };
-}
+})

From 8ce80b5e6df44d62bae058e1cbc7f4fa3d092ade Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 05:40:40 +0000
Subject: [PATCH 0423/1386] python3Packages.leanclient: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/leanclient/default.nix b/pkgs/development/python-modules/leanclient/default.nix
index e1f138c1d6ae..2ab16fd05b88 100644
--- a/pkgs/development/python-modules/leanclient/default.nix
+++ b/pkgs/development/python-modules/leanclient/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "leanclient";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oOo0oOo";
     repo = "leanclient";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fNtgJqGtAR9fRvGW0eN8VZYHZET/D/bL1/xkzlDtlEQ=";
+    hash = "sha256-h90AMErcwdmHfIBgFerFEaUwjfRkJMl1iesXjtEpdlA=";
   };
 
   build-system = [ hatchling ];

From c2e3e89005c96bd5079fba7e6fa63fd2be913f1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 05:45:25 +0000
Subject: [PATCH 0424/1386] python3Packages.oath: 1.4.4 -> 1.4.5

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

diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix
index fc245e0b94f2..7a386c4c640c 100644
--- a/pkgs/development/python-modules/oath/default.nix
+++ b/pkgs/development/python-modules/oath/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "oath";
-  version = "1.4.4";
+  version = "1.4.5";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vWsg0g8sTj9TUj7pACEdynWu7KcvT1qf2NyswXX+HAs=";
+    hash = "sha256-DFxT7SW1LvYh18CPNZwhIH/i42qJ34s80m+1S0/2E7g=";
   };
   nativeCheckInputs = [ pytestCheckHook ];
 

From 1cf2ffbc22b79c71dcac21c70a81ee58d1f96f5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 05:52:30 +0000
Subject: [PATCH 0425/1386] temporal-cli: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix
index 88feaede9fb2..9ab7845ea125 100644
--- a/pkgs/by-name/te/temporal-cli/package.nix
+++ b/pkgs/by-name/te/temporal-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal-cli";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HlG/zBfyd120ENERqdpfPuHPwu84bWijzoE4tEOsOeE=";
+    hash = "sha256-Z5Ba4oVQR6g/HyaBd/0iLIWq6Ht2SJAdylTVaErRFL0=";
   };
 
-  vendorHash = "sha256-GI+rLSCwBRcZytbJsxqCL1+3p5/UbCvTxUHn2ele3+c=";
+  vendorHash = "sha256-9lO9uhy1n85QYyoh27cKhdlcuL4GT98aCNWwe8tOwoQ=";
 
   __structuredAttrs = true;
 

From 3095d644af0b55b3e37acf6cb1851d90ea2357f0 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Tue, 14 Jul 2026 07:45:26 +0200
Subject: [PATCH 0426/1386] leo3-bin: 1.2 -> 1.7.18

https://github.com/leoprover/Leo-III/releases/tag/v1.7.18

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/le/leo3-bin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/le/leo3-bin/package.nix b/pkgs/by-name/le/leo3-bin/package.nix
index dfdd5f0eb22d..718e2c281425 100644
--- a/pkgs/by-name/le/leo3-bin/package.nix
+++ b/pkgs/by-name/le/leo3-bin/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "leo3";
-  version = "1.2";
+  version = "1.7.18";
 
   src = fetchurl {
-    url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3.jar";
-    sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7";
+    url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3-v${finalAttrs.version}.jar";
+    sha256 = "sha256-HEUi8Krxv9u9Rq/2Gu0Tts86sseaAZq+pccJ4Q5MRr0=";
   };
 
   dontUnpack = true;

From 211f7270b0b953ca299238c365c5bfeebcf48985 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 06:10:46 +0000
Subject: [PATCH 0427/1386] sunsetr: 0.12.3 -> 0.12.4

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

diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix
index 8ed957040af3..7bdd81c31611 100644
--- a/pkgs/by-name/su/sunsetr/package.nix
+++ b/pkgs/by-name/su/sunsetr/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sunsetr";
-  version = "0.12.3";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "psi4j";
     repo = "sunsetr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hbr7NpJCi2dulzgN2JVtUJewoo7s4rr1zGt+KpKYTWE=";
+    hash = "sha256-HPNb5XF6YtAgjqll9JC6O5Ru45QeahXz3TCoMae2W3c=";
   };
 
-  cargoHash = "sha256-yOU96xWnpMKzvBo64ewhzktRHLzSBn4ZXdSFrhrejZE=";
+  cargoHash = "sha256-OBT6m3a/e78HJy5PkhqGeyFNlaexBgHSP4fJYH1qN28=";
 
   checkFlags = [
     "--skip=config::tests::test_geo_toml_exists_before_config_creation"

From 03b7330961687c7f2394960df691013490084a02 Mon Sep 17 00:00:00 2001
From: Mukul Agarwal <vcs@agarmu.com>
Date: Tue, 14 Jul 2026 02:14:51 -0400
Subject: [PATCH 0428/1386] zed-editor: add git to buildInputs

---
 pkgs/by-name/ze/zed-editor/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index df93ce557473..d662d9af996a 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -171,6 +171,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libGL
     libx11
     libxext
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # required by installPhase
+    git
   ];
 
   cargoBuildFlags = [

From ec3327048366853e58afb5132b0d9908f811cb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Tue, 14 Jul 2026 08:12:09 +0200
Subject: [PATCH 0429/1386] rectangle: fix darwin build (second attempt)

---
 pkgs/by-name/re/rectangle/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index 2726452ff546..c0cd0994b03f 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -199,10 +199,11 @@ stdenv.mkDerivation (finalAttrs: {
     ) masShortcutSources}
 
     nixLog "linking MASShortcut dylib"
+    # `-fuse-ld=lld`: fix for ld64 hardening issue
+    # TODO: Clean up on `staging`
     clang -dynamiclib "''${masObjFiles[@]}" \
       -framework AppKit -framework Carbon -framework Foundation \
       -install_name "@rpath/MASShortcut.framework/MASShortcut" \
-      # TODO: Clean up on `staging`
       -fuse-ld=lld \
       -o "$buildDir/libMASShortcut.dylib"
 

From 9b2567d84a182035ee4372321b63593e92ce823f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 06:21:00 +0000
Subject: [PATCH 0430/1386] postgresqlPackages.pgvector: 0.8.4 -> 0.8.5

---
 pkgs/servers/sql/postgresql/ext/pgvector.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
index 761fb99f0ea9..4c7db028c84e 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgvector";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "pgvector";
     repo = "pgvector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DczatZRfNHb2OHRkJMqshOuRCgI7+7r25o8E2rc+qLU=";
+    hash = "sha256-uGvp76uGEKVq+UH4zd4yf4RQenL3linf9SO/X+P2GH8=";
   };
 
   meta = {

From 6bf8502dae4ed277de7151799578d4f64cd66bc7 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 14 Jul 2026 08:21:40 +0200
Subject: [PATCH 0431/1386] claude-code: remove x86_64-darwin

Nixpkgs 26.11 has dropped support for x86_64-darwin, so the platform can
no longer be evaluated.

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index ccf91a8aab7d..4eba181c8c9c 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];

From 1f20df8a20c5172d0ef19918fd3be75318da86f1 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 14 Jul 2026 08:21:40 +0200
Subject: [PATCH 0432/1386] vscode-extensions.anthropic.claude-code: remove
 x86_64-darwin

Nixpkgs 26.11 has dropped support for x86_64-darwin, so the platform can
no longer be evaluated. This also broke the update script, which iterates
over the supported platforms to refresh the per-arch vsix hashes and
aborted on x86_64-darwin.

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../vscode/extensions/anthropic.claude-code/default.nix      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index f547aec1465c..e29ed08e55e1 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -27,10 +27,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
           arch = "linux-arm64";
           hash = "sha256-lgE5dld8lvt/dyGVNjR1ZiV2qtBu9pMZayNe5dBfHo0=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-AnqO7aZ3uybYnAHYCi5ppZ/5xOuiTqs+75TflN7bVow=";
-        };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
           hash = "sha256-KKuUXjfIsngnKrSLTMYNzb6XVZkJszUwIihCGHQJ0gU=";
@@ -60,7 +56,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };

From 1206a85277280ef60207df861e1a2bbd2de0f273 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 06:31:26 +0000
Subject: [PATCH 0433/1386] python3Packages.bthome-ble: 3.23.4 -> 3.23.5

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

diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 0f7fd3529bdf..640c6d005ce0 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "bthome-ble";
-  version = "3.23.4";
+  version = "3.23.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bthome-ble";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZXCqwadNWl2Yct+rlZViFO2pFV4ZY0glKvD3xElY3Mg=";
+    hash = "sha256-cD0wTdUbG+3tgCvLhx8DLBRujZ1EeeghVcoUqDoLB+A=";
   };
 
   build-system = [ poetry-core ];

From 0fefeaa83683e328596b68501808c87c9a312531 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 06:33:58 +0000
Subject: [PATCH 0434/1386] python3Packages.textx: 4.3.0 -> 4.4.0

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

diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix
index 30d2ba3a19d9..0a64ffc22f2a 100644
--- a/pkgs/development/python-modules/textx/default.nix
+++ b/pkgs/development/python-modules/textx/default.nix
@@ -12,14 +12,14 @@
 let
   textx = buildPythonPackage rec {
     pname = "textx";
-    version = "4.3.0";
+    version = "4.4.0";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "textx";
       repo = "textx";
       tag = version;
-      hash = "sha256-2sRMMbWJN9H34zD++9T499Y4+wv5ZSSkN6xevH2fuVs=";
+      hash = "sha256-bwwINUJiMG6Isi0/p1DsIzzlSa0y7xR4Q6OnpKy894s=";
     };
 
     outputs = [

From e2b74d42e2c494d0d3ad180392e54727ae33bf31 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 14 Jul 2026 08:48:48 +0200
Subject: [PATCH 0435/1386] claude-code: 2.1.207 -> 2.1.209

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 42 ++++++++++++-----------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 964233ccd1eb..f32f16ee3d24 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.207",
-  "commit": "bc512d56332530b2be3f5079e29ec17aa20b8553",
-  "buildDate": "2026-07-10T21:39:38Z",
+  "version": "2.1.209",
+  "commit": "0fe048596fd45e79e99353cbe2c3d1b1ac069568",
+  "buildDate": "2026-07-14T03:58:29Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "1397a062c6889675055e3314dd956376ac51262a7734ad9e819c26975d71547a",
-      "size": 241237136
+      "checksum": "59d2de7f49db2f75d5c33bbb46a6b8f288ad24d40b61e30602a502bb7ddc380c",
+      "size": 240377264
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "8a4355d251a60c90d8cf08f32fdb22a8157dd3d085542f95d0da0475f9a2c57c",
-      "size": 249273680
+      "checksum": "4cc3f44b905d45bd27a6db9306ec6de928aea758537205329851ae478f2fa2c6",
+      "size": 249886224
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "8bc14a284065383460f37981d724b8f7aa7ca93c9849d2fe367e08f03383f454",
-      "size": 256228080
+      "checksum": "278cb68ef7217cfcc5c949d2573bb8e59a8b1305f76689fba88eb722b0d9e2f0",
+      "size": 256817904
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "85e7e988a392d859f90802ca21fb26e89d3c9ab527f5ed0b08df3955e34d5c83",
-      "size": 259402552
+      "checksum": "b882f4b8b27772f897540df50f24000206f43a9426e8f7d19bd065959b69e9dd",
+      "size": 259951416
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "ec3b657344dcf6693f434fe11ffe4592381d31d4e6a7976649c1a610770dcc74",
-      "size": 249476280
+      "checksum": "d5785d7c25f86a00ba5d5fe81d98726c89ea7d6f45dca90fcc4cbabef6a9e0b5",
+      "size": 250066104
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "09a43ff41e33cbb0c4903a4939353933ee8f0d1964abab4b837004a951edb9ee",
-      "size": 254091648
+      "checksum": "7ad8e7d428e1ddef18040fe43f54110541ced063a7b5903091aac8f45c57ee21",
+      "size": 254607744
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "781fdc2c89868b1cb05cc22c253ef142a0b44e7cc36236aecd6335745c7d42d0",
-      "size": 249485472
+      "checksum": "b9d5e8542338a0918534e55d046a7c960ae4af5ee214c7e4e80a89067b63ea2c",
+      "size": 251303072
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "fa0c887a3f944ba1915766b525538b82b029ca8078ed6ee180c3b83c1b862521",
-      "size": 243952800
+      "checksum": "a29607da80ac0d6f2620553e52026ecc7744b27d49128f143eacd120e5f2ad9d",
+      "size": 245652640
     }
   },
   "sdkCompat": {
@@ -61,7 +61,9 @@
       "0.3.201",
       "0.3.202",
       "0.3.204",
-      "0.3.205"
+      "0.3.205",
+      "0.3.207",
+      "0.3.208"
     ],
     "harnessSchema": 1
   }

From 7c9b842a0b09b0046c41d5d847e7624f7e6a2362 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 14 Jul 2026 08:48:48 +0200
Subject: [PATCH 0436/1386] vscode-extensions.anthropic.claude-code: 2.1.207 ->
 2.1.209

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../vscode/extensions/anthropic.claude-code/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index e29ed08e55e1..2382c040f5c6 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-QxZa6ugaMC7otLQmDZU54Fv3OGMNYO5iyjqjCLDNdbI=";
+          hash = "sha256-YVomTY/KpBcR4dZr0EN4egkuzvQXUCj7RvwgMo88z9Q=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-lgE5dld8lvt/dyGVNjR1ZiV2qtBu9pMZayNe5dBfHo0=";
+          hash = "sha256-jbTFmXqtdt6+1SdhfOLcnhOhtSESYM9th8k5EJ4Nex4=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-KKuUXjfIsngnKrSLTMYNzb6XVZkJszUwIihCGHQJ0gU=";
+          hash = "sha256-YFLVhDckeXIItc+AvHlJ/B45c43Ubi3BKr8gy3Ui68w=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.207";
+      version = "2.1.209";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From b1811846e82b31ddaf7d385634b0619b942ac868 Mon Sep 17 00:00:00 2001
From: mfukuba <12195032+mfukuba@users.noreply.github.com>
Date: Tue, 14 Jul 2026 15:52:01 +0900
Subject: [PATCH 0437/1386] ruby_4_0: 4.0.5 -> 4.0.6

https://github.com/ruby/ruby/releases/tag/v4.0.6
---
 pkgs/development/interpreters/ruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index e6eae5b7f7d2..87565c7fb650 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -411,8 +411,8 @@ in
   };
 
   ruby_4_0 = generic {
-    version = rubyVersion "4" "0" "5" "";
-    hash = "sha256-fWFJB5pj+K4dMmyfplxgGbotwxVerns5FZgXkRyIlY4=";
+    version = rubyVersion "4" "0" "6" "";
+    hash = "sha256-g30pno993yvjGiKaen4BnTVJeYJRF5iayzsysam+Jio=";
     cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0=";
   };
 

From f7e7b1e37c52a9948924434ea123516f7afd7a7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 07:48:08 +0000
Subject: [PATCH 0438/1386] code-cursor: 3.11.13 -> 3.11.19

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

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 31ac9cbdd27f..11bed61cd65f 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "3.11.13",
+  "version": "3.11.19",
   "vscodeVersion": "1.125.0",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/linux/x64/Cursor-3.11.13-x86_64.AppImage",
-      "hash": "sha256-MXBXgGe7HXiL3kAMKxBSRTZxWMbh15D5dfXw6iemG9g="
+      "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/linux/x64/Cursor-3.11.19-x86_64.AppImage",
+      "hash": "sha256-EE5QuTM16sib4MYAkz34PLbAOXjb7hcdwVtrYSEKt/I="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/linux/arm64/Cursor-3.11.13-aarch64.AppImage",
-      "hash": "sha256-UCjZFxXjzeovYrZWp6xrZGp+eH4uGo41Tl9Uj9q16W4="
+      "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/linux/arm64/Cursor-3.11.19-aarch64.AppImage",
+      "hash": "sha256-lFAK6xTIA3d0kmjybDYsMTYZhDbr/xasDG/NuZmE83Y="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-FbSBuRaWKjTD7vdg0GvFsizmbpNvnNyzB6yAljMAtSs="
+      "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-gM0FOE9dTet5Fp7PG0DHsHSXb5fLohuNiiEt1J2wbSE="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-j1k40mFZDWnNTl/IwCB39JZ+Zc4/JwEthNh8SPCXAZE="
+      "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-WQ2OfTaGqELWTfjgU4n5tgfgTHQSA06RxERa6pkdukU="
     }
   }
 }

From 783748a79c225eb082635fe875142442cf3dd014 Mon Sep 17 00:00:00 2001
From: Leonardo Taglialegne <leonardo@taglialegne.it>
Date: Tue, 14 Jul 2026 09:45:36 +0200
Subject: [PATCH 0439/1386] elmPackages.elm-test-rs: 3.0.2 -> 3.2.0

---
 .../compilers/elm/packages/elm-test-rs/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
index e01e18cd7418..c0b8f07b2838 100644
--- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "elm-test-rs";
-  version = "3.0.2";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "mpizenberg";
     repo = "elm-test-rs";
     tag = "v${version}";
-    hash = "sha256-H9InR28T0PQjxqT99ojw8ey29tk79BPeXpkHL3VNnkU=";
+    hash = "sha256-RP0VTYMrQ8I/Szi1TFcYHmWpdDh1F1jAhWDYlYVoqyM=";
   };
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
-  cargoHash = "sha256-Y3hqSw8SyU9uVE9jBsLV9bL5KzaB9pw96Yqy3Dvh4QA=";
+  cargoHash = "sha256-BrWN4rXTFHXj5aDvdn55ThSAF+NqMbUg7LnQcrapI0U=";
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;

From d3d63aaad3741aa6f16427efe410e7685e1398fb Mon Sep 17 00:00:00 2001
From: KangaZero <samuelyongw@gmail.com>
Date: Tue, 14 Jul 2026 16:52:01 +0900
Subject: [PATCH 0440/1386] asciiquarium-transparent: 1.4 -> 1.6

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

diff --git a/pkgs/by-name/as/asciiquarium-transparent/package.nix b/pkgs/by-name/as/asciiquarium-transparent/package.nix
index 85ee2cb78c7c..bc18abe19e21 100644
--- a/pkgs/by-name/as/asciiquarium-transparent/package.nix
+++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "asciiquarium-transparent";
-  version = "1.4";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "nothub";
     repo = "asciiquarium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lUNPg+/R/UwnHxjVXROMjvQxBZuCPBrYWB546OHplJM=";
+    hash = "sha256-p9P9sJZhcNdlIxyz5ulFXFrwJaE7b48D4aWeoTWmIgk=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 349e06e61f65e7e4245adb01cb79728080b15c63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 08:02:09 +0000
Subject: [PATCH 0441/1386] hacksguard: 0.1 -> 0.3

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

diff --git a/pkgs/by-name/ha/hacksguard/package.nix b/pkgs/by-name/ha/hacksguard/package.nix
index 72f93cb69085..06b11fa8d32e 100644
--- a/pkgs/by-name/ha/hacksguard/package.nix
+++ b/pkgs/by-name/ha/hacksguard/package.nix
@@ -9,7 +9,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hacksguard";
-  version = "0.1";
+  version = "0.3";
 
   __structuredAttrs = true;
 
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Rhacknarok";
     repo = "hacksguard";
     tag = finalAttrs.version;
-    hash = "sha256-kS8VF1zD4VV9rSLz4euvNwtOUFWLeW2isAjgjw/iay0=";
+    hash = "sha256-3HD6FFZBJ7x5uDy0UEwQVaxpuNt4O2wmJgMspeFF6iQ=";
   };
 
-  cargoHash = "sha256-7Wt2cFKwWT82P2uxOy/lGEWZcCUSu0BNr9JdgRLwBnw=";
+  cargoHash = "sha256-LLAPbXz8QAEUGs+37ZIFVNW1WfCVQbROfI7wQFaiy3E=";
 
   nativeBuildInputs = [ pkg-config ];
 

From dc05c223eaaa6ee93eb5fb8783391c58a8ded665 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 08:03:03 +0000
Subject: [PATCH 0442/1386] python3Packages.crawl4ai: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/crawl4ai/default.nix b/pkgs/development/python-modules/crawl4ai/default.nix
index 42422ab60e3c..76367c8fbe48 100644
--- a/pkgs/development/python-modules/crawl4ai/default.nix
+++ b/pkgs/development/python-modules/crawl4ai/default.nix
@@ -52,7 +52,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "crawl4ai";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -61,7 +61,7 @@ buildPythonPackage (finalAttrs: {
     owner = "unclecode";
     repo = "crawl4ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MHCnhp7itaJ6y++uUCnObBjiJ9Jw/aFBtd35WzDBz1A=";
+    hash = "sha256-8sUsve3ha+CXElnvYjOzqoIR16KEJP5UekGMB27sGeU=";
   };
 
   pythonRelaxDeps = [

From c72226733c3715898724946e20816d3df8936b46 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Tue, 14 Jul 2026 04:08:25 -0400
Subject: [PATCH 0443/1386] keycloak.plugins.keycloak-home-idp-discovery: init
 at 26.2.1

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/ke/keycloak/all-plugins.nix      |  1 +
 .../keycloak-home-idp-discovery/default.nix   | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix

diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix
index 5e36541557b5..e401c60749be 100644
--- a/pkgs/by-name/ke/keycloak/all-plugins.nix
+++ b/pkgs/by-name/ke/keycloak/all-plugins.nix
@@ -8,6 +8,7 @@
   keycloak-2fa-sms-authenticator = callPackage ./keycloak-2fa-sms-authenticator { };
   keycloak-discord = callPackage ./keycloak-discord { };
   keycloak-enforce-mfa-authenticator = callPackage ./keycloak-enforce-mfa-authenticator { };
+  keycloak-home-idp-discovery = callPackage ./keycloak-home-idp-discovery { };
   keycloak-magic-link = callPackage ./keycloak-magic-link { };
   keycloak-metrics-spi = callPackage ./keycloak-metrics-spi { };
   keycloak-orgs = callPackage ./keycloak-orgs { };
diff --git a/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix b/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix
new file mode 100644
index 000000000000..7cd29ceaaeaf
--- /dev/null
+++ b/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  maven,
+  nix-update-script,
+}:
+maven.buildMavenPackage (finalAttrs: {
+  pname = "keycloak-home-idp-discovery";
+  version = "26.2.1";
+
+  src = fetchFromGitHub {
+    owner = "sventorben";
+    repo = "keycloak-home-idp-discovery";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4zZVDl50LOYv6OeBsBevxM9u3PNQPrn4ZxSNTa8dN7M=";
+  };
+
+  mvnHash = "sha256-+Urd07v2mYQjPCGAP4OnJr/dE/lmLrq8M7RAEdhyX3Y=";
+
+  # e2e tests need docker (testcontainers/selenium)
+  mvnParameters = "-DskipTests";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 -t "$out" target/keycloak-home-idp-discovery.jar
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/sventorben/keycloak-home-idp-discovery";
+    changelog = "https://github.com/sventorben/keycloak-home-idp-discovery/releases/tag/v${finalAttrs.version}";
+    description = "Keycloak authenticator to redirect users to their home identity provider by email domain";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ anish ];
+  };
+})

From 047afa86279fac1b6d39ee9a4e6ee3323885f090 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 08:22:43 +0000
Subject: [PATCH 0444/1386] secretspec: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index 83fae43fdf7f..e5d0ea5c77be 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "secretspec";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-pOlfDWFjhndp+Wq/UzL/bYcgQHkWTrnuUd7w2WiqJog=";
+    hash = "sha256-PlI2+cQbP/CfilYX2fJnQv8yw4euxvqYT0XqlYsU0QI=";
   };
 
-  cargoHash = "sha256-ITv4MGpg11mnp5YbfUd/xd7dLl2ll21ybGCyTO4UAx4=";
+  cargoHash = "sha256-UfeVqZaH04Ucu+FgXX2bqgqiHJNpN3OIN0lKhWFn1j0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];

From 843bcd4905d5875de275d31e0505aebc1d1db6c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 08:33:57 +0000
Subject: [PATCH 0445/1386] libretro.stella2014: 0-unstable-2026-07-04 ->
 0-unstable-2026-07-06

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella2014.nix b/pkgs/applications/emulators/libretro/cores/stella2014.nix
index 863d375c6617..9432548683f3 100644
--- a/pkgs/applications/emulators/libretro/cores/stella2014.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella2014.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella2014";
-  version = "0-unstable-2026-07-04";
+  version = "0-unstable-2026-07-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "stella2014-libretro";
-    rev = "8ddf2146ed2d2053cff9df64192f920e57709629";
-    hash = "sha256-VDywbP7PhcQPHhu/KMvV1LlI/iOGjMzRooqvoT+Tnxc=";
+    rev = "4a7da82595d27b8df7af1ecb467a64b642a41bc9";
+    hash = "sha256-uwtYNo6hUR6u2OicFYcbfgCGNlpDfIOF7Q5bNuJ/uMM=";
   };
 
   makefile = "Makefile";

From 5d683e49fc3825debd3bde90595dfc9fef76ddf1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Tue, 14 Jul 2026 15:34:05 +0700
Subject: [PATCH 0446/1386] python3Packages.signalslot: remove outdated
 workaround

---
 pkgs/development/python-modules/signalslot/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix
index 18689588d685..44d1d5f8a541 100644
--- a/pkgs/development/python-modules/signalslot/default.nix
+++ b/pkgs/development/python-modules/signalslot/default.nix
@@ -37,10 +37,6 @@ buildPythonPackage (finalAttrs: {
     six
   ];
 
-  pythonRemoveDeps = [
-    "weakrefmethod" # needed until https://github.com/Numergy/signalslot/pull/17
-  ];
-
   nativeCheckInputs = [
     eventlet
     mock

From c69eb2e658d4858160e56832443c8ce1a43ed0c2 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Tue, 14 Jul 2026 15:36:13 +0700
Subject: [PATCH 0447/1386] python3Packages.simanneal: use pytestCheckHook

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

diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
index ff553295916a..2cdbf44c10d5 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   buildPythonPackage,
   setuptools,
-  pytest,
+  pytestCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -22,8 +22,7 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytest ];
-  checkPhase = "pytest tests";
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "simanneal" ];
 

From 1b031faf6c255560a3d71c83f123912d5dcb7baa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 10:53:38 +0200
Subject: [PATCH 0448/1386] firefox-unwrapped: 152.0.5 -> 152.0.6

https://www.firefox.com/en-US/firefox/152.0.6/releasenotes/
---
 .../networking/browsers/firefox/packages/firefox.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 16ec61822d5d..c996851021db 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "152.0.5";
+  version = "152.0.6";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "6cf2dc7f28a6a3430f2866df4ca35063cbadf234c82a34fa651e02d909e5741e50cd986fef1bd97d486b51244cb639b2b103514688347bf7f94fd16d264cc4f2";
+    sha512 = "c4d877837d7007fb611c38d49d9b6dd3bc4c5c9ca900b54e722e140ce7ecd0924f69b5cedc7f8c1fe602e7efe1d7159b019de27999e29235cd631821bb13e6b0";
   };
 
   meta = {

From 7aee77157e7c144f3ab3a627fb9cbcdcd3a8a385 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Jul 2026 10:54:42 +0200
Subject: [PATCH 0449/1386] firefox-bin-unwrapped: 152.0.5 -> 152.0.6

https://www.firefox.com/en-US/firefox/152.0.6/releasenotes/
---
 .../browsers/firefox-bin/release_sources.nix  | 1238 ++++++++---------
 1 file changed, 619 insertions(+), 619 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 441bd02ec555..9bb86c82dc54 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1859 +1,1859 @@
 {
-  version = "152.0.5";
+  version = "152.0.6";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ach/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ach/firefox-152.0.6.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "159545eaae8f56fd1cbb103d0e01cb58eec82957250c8e308f3e0526a911e825";
+      sha256 = "53da6c76e669896c25752d5a306433641885be91873131b767ba450ac8a96ab8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/af/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/af/firefox-152.0.6.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "da652c456b722b76ef5d193c2193164436886a6e6de9d073037a6df1c262cec1";
+      sha256 = "81cf2cf2ceb3914907591054d38799e1b0b835ea37c13d50cd4363e54ce25e59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/an/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/an/firefox-152.0.6.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "11c90e7bcf3d5409c3c4f9e3495b9f0df9564dd93df5ed0ebbee613aefc3ce22";
+      sha256 = "866dde5e094c2441b9cab44707237ab350f0753cbb321a9911332664a7d1497e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ar/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ar/firefox-152.0.6.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "d2a0ee4d04d5b9398f9239315c6d8c333b74265eeadd436a299aea6076ebab0d";
+      sha256 = "36fc703ace26d95dbe1718648324e30fa1184799559619ef3e1708f9fb67d7a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ast/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ast/firefox-152.0.6.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "02e01f3ed5614ca860905ca76bc1f2f5a44ce02907e5470ffc64f55c564c019c";
+      sha256 = "85fd36179af5fbf16636ef58e10d3a132d0b4d96286f83c45fbc7a66634a4ca6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/az/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/az/firefox-152.0.6.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "56b9c8db95d05b8f21b4a2b990a0728fbb1bb9203921fa030d17ed391357acc8";
+      sha256 = "251e5c4e1eaec93d4939b950a85b8d8802533485c349f037f89fb1466360e704";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/be/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/be/firefox-152.0.6.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "a00a2aac468fc0cdbe7e8415ad03576b72730ee244a90c4e83bf0257a0b7a624";
+      sha256 = "8057cdf0b8e86648c033549d2e63d6aedd2ed0a95f771c721c28e5bd5c2794c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/bg/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/bg/firefox-152.0.6.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "3e2ee087bd915860213d4fb1c3c03c759c183c14983cf7bc74ce5cfa4f11690c";
+      sha256 = "428696f168888b01a530da727bd07d810ea42bcba23c34820bccfe26acb70ae1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/bn/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/bn/firefox-152.0.6.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "e3ddd1f61a421ea726f45b3fa18312d3c8dd415e1cd08fa54ce96b62698d5ba0";
+      sha256 = "b22e1940a9e60a40da6d5127d0c29f43e01f1271a15939f7ab93ae5902b484dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/br/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/br/firefox-152.0.6.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "2618d8bb5d17eb1f7b9faa1c34eb0a74e8b23971339275d702cb8b6926d70403";
+      sha256 = "f9a4fc964002c8ce9f82167017768c24320a9c076070635870dfda737e893bfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/bs/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/bs/firefox-152.0.6.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "fe500ef5afe20ccfc93494f88d121ded4214d3a872cced1f415a63f281fb691f";
+      sha256 = "54a1b10fd2ac56b1d6b6d80b8c64815677403f49f74032ed8b7cce07a43ed468";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ca-valencia/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ca-valencia/firefox-152.0.6.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "79a4cebf167dbaaa442bdec7795e1ccd7c96e5cdc8d9aafeeeb28bb20022e204";
+      sha256 = "b39d78823ee3fad16094abe5ece3f60d96d13a475e6d6ad00b65f8b5dbe467e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ca/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ca/firefox-152.0.6.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "583e8617382f42ba261c4bf1a8e14a9d18d8dcd79683551113ca995e756c05f4";
+      sha256 = "de5ed038ac006e03769cdb36e3525901535ab9d1fba9113b5845535a19f18d1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/cak/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/cak/firefox-152.0.6.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "41dd315aea022db5ef8c6f7560943010baeb51e27f9637263113f37a900f4fe8";
+      sha256 = "b5a2478d59b49486e8b41cf1dd685437395121797ff0f69e0faecb9f1c245d44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/cs/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/cs/firefox-152.0.6.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "21adabd938f94d26a33da917f25537e0a8523f1952de5f68d7fa6abebe5d9911";
+      sha256 = "749adb2d28369ae4e5a9b93e20af4da004ed947b03f2056253264fb8978adf70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/cy/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/cy/firefox-152.0.6.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b8494d6eb13ab896c3cf42f3e451e135eddf772bec484ef4375531a632506460";
+      sha256 = "d2817f96925193e3b44a7231c7b0a472b00e08d75d64b2d346138b64d1f7f45a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/da/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/da/firefox-152.0.6.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "70ed9794b6f01eeba4c99166b2cbec3c3de7aaa635d916325fc09b59cf6b4b12";
+      sha256 = "c2161e6e98dc7bc6bd774edc38daf266a863ac35779bda128ca619b598c15236";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/de/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/de/firefox-152.0.6.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "5db7b0b8d4ef9992de180c5eab4d3d36c23657def92729d265c31bab36d3be51";
+      sha256 = "99554068e8f4714cd48585d12ea6580206079dad8a95a582a0da48f7801c1037";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/dsb/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/dsb/firefox-152.0.6.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "d347b5fbb2bbe3633a346254a4a41b9b024ba91dbde79308e19949c257e34be3";
+      sha256 = "4f574a79933c91ea4ab987fee2e7085d4086658fb0152e887e7c4232b8f317ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/el/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/el/firefox-152.0.6.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "6783167303ff8387e35c6729860583065a95e8e65f7a4904d56d1138e7367c67";
+      sha256 = "55164fc88776cc710475cdf91cfe6ff9d0188b011c891b1a00b53fb5eb6687dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/en-CA/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/en-CA/firefox-152.0.6.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "ba6c34845af3f0fb7ff9922530f24798f2431bbcccadbe4b82f91704449ce919";
+      sha256 = "27d760ec9000f5e45fa251189e6269569a363ab4ed8783a30b776b7c6b2e609f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/en-GB/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/en-GB/firefox-152.0.6.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "1568e6666b2a8c3cdf97e435ab002967cf93bd7ef37c22531040b7f0fa1c9b85";
+      sha256 = "f6bdbfa3dfed4d6bea87398620139d842395c64178847d338e63a09e7d690d9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/en-US/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/en-US/firefox-152.0.6.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "0e19ef84ab8a40f92f84db29d63032a746f43286423c91dfbf141633ac1ed935";
+      sha256 = "c8080dad034d8c9119651463807639c6a648cb0186909988da6acc3ef2467322";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/eo/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/eo/firefox-152.0.6.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "5a601ed43ef3bd54f659c489fcc63bed83498fc2599703333d7d85b9ef276b70";
+      sha256 = "a65bc9c90fdb162f2edc84f3b292797b6a99035029045b2c2608bea395fb4f17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-AR/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-AR/firefox-152.0.6.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "853e771c41b44a6a4dc1e32d6ac426878629498c0fef0d34bda58a1e6bfadb15";
+      sha256 = "e0b95e8cca697a5cd91c906e34f1c5b00e5003ee544173926bedde15a77511ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-CL/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-CL/firefox-152.0.6.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "ac2e52d7e3e5698ead9e7f0869d282b08f75e4866a5a552e6460c60ad828d10a";
+      sha256 = "ece947f5b1c16e859c32b80444beebbd56e82e2476976ebe90a79aff473c4abd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-ES/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-ES/firefox-152.0.6.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "aae72112a0f59824c032f527ee1fd6d234785367b448cf9427e23b92a33f1aec";
+      sha256 = "a71d9b3ecc26deca901baa97c73423311a2e837938073705397f001029724ab0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-MX/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-MX/firefox-152.0.6.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "ffb14ac97035c1e18b4fe387f3eb51fc6e360f732ea2cc6412cb7db3fd2c609a";
+      sha256 = "6947588fd3bd7c0329611554befff3e1ff5ee86a1ea9446a7ef35a491b588172";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/et/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/et/firefox-152.0.6.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "04c096df3a6d54dc9dcac7629c11bc5ea9ec4701e3d9446266aa6a9f8c44797f";
+      sha256 = "430f87de21c9e70e70f5d49d642c00092dabfb5f44c7e3e0ef5a75c57b82eef3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/eu/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/eu/firefox-152.0.6.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "c42744a0791ae22749728c66b3f73d155f684f9fc3fd9a1b7a9de9a9b6df2c7f";
+      sha256 = "c79923e7b7a3851a395ee0ce2a4fac7be51f8dfa9bb5614390d27ed4475f47d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fa/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fa/firefox-152.0.6.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "180bb07209f8acb2ed5d7234bb6803501ec893e3d9cc8dcc93c04460cd2a887c";
+      sha256 = "61613573e5f5cc5b2eb539d8400e5c46e09e29f736e17b5373dbfa7b7ed2cd07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ff/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ff/firefox-152.0.6.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "3cd3a3b926d4f9eca2e6e389e7e97a6ea8855f1f93107be5480fc0970a3530e0";
+      sha256 = "a2c23937ad3942858b418365de1eacd3d13284970880850db8e3c2112094c06a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fi/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fi/firefox-152.0.6.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "be130c3cc2b9505dd803543de8a50f3e90f7e66be67081bd16ea07b2fae94c6d";
+      sha256 = "6e8160b8c1b26d610acf042de3ff4e790c3b432576f68167f2e8952b20906812";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fr/firefox-152.0.6.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "d0b7c4477a50768507a2ccf538c7c1962433348a43812e253027918cd7ccd695";
+      sha256 = "bb7c4ca390eb48fca70cf3d4cc34685d262249bed76d277d663cf23fb0e4aae8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fur/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fur/firefox-152.0.6.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "2bcc33430701c5db07d4a3b2000a7124345fe2f73c9c3d2aac787c518fb68f16";
+      sha256 = "71d7aefd95caa229dbb4bba68159321b089ba7d415954a06cc0b58abe06b7661";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fy-NL/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fy-NL/firefox-152.0.6.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "edc76bff0745e918024f2821ead6d9eb52ecc944248086d54cc41e08c859ef31";
+      sha256 = "3961c26a5fdf799378018b5a3cb462b39c4402b07c18e349b8d56a2fb16f9852";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ga-IE/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ga-IE/firefox-152.0.6.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "7155779cc7a9069f2a6c5d30c3eb720796627ccb6f942ddc0f82082ee2a3ec58";
+      sha256 = "8796f9353a65ca6ab3d8e096e3290c42402a9b14436c66ef5fca7903ece83030";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gd/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gd/firefox-152.0.6.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "6e815731ee8ab36f04c0d79ea1530451a58ff60dafe5a13607ae93c72fb8d12d";
+      sha256 = "58c11c1f1c5f7e84204d607d765a593abd1a250bcaf816ceee0a4857457eccdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gl/firefox-152.0.6.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "b9742a5e2d7e778e9e7c73343b3a1754619cf72f11e330930f5b5700347c6335";
+      sha256 = "6b9901802d48babdd5dade4fadfea8631e204e9c1e786d3654803c5388690052";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gn/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gn/firefox-152.0.6.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "7f354afe4344fc4702c65accf1b58423fa80e8d4b0160d8e9a7804520b52e762";
+      sha256 = "54654efdc6d6c10163641c87a36d83df7bd781023574ee69b15919971cfa5bca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gu-IN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gu-IN/firefox-152.0.6.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "34430bf374dabcd3393447b5dc95ad386a74d6c1ad71a8f44018f715004b4e76";
+      sha256 = "d130b2318c53ba672d7efd65ad4689ff3dd30e75cce03e1bb4dc044518f57b73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/he/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/he/firefox-152.0.6.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "825759b9b9b24163bd31a7060df690267cc50e80da3319e35e5e2d536860bed6";
+      sha256 = "4ab6b712a94c6ac7480ea0b30cdc7dec7a5ab295de25362603074c8fb28f4c8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hi-IN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hi-IN/firefox-152.0.6.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "5638231e4e5b6163dc50a0df0372fa864a844cf2b97a7945bc34757061efbd0f";
+      sha256 = "8af84d1922251e689e7318d33e4da0df49633c571675ecf43352f718f15a2ece";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hr/firefox-152.0.6.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4f1fa1394ad46afe6826ea2e6d781f8105c74e4aaa988d37786f2243a826b4f8";
+      sha256 = "3ee63e71c27b2a54c44b87a345b4eb98d065712723381d52cd6eb9ebcb3469c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hsb/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hsb/firefox-152.0.6.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "be479390fde0dae1fb49885e0f912e4ac8df508df9a4b60b544380cfe4766c54";
+      sha256 = "a258a09304462c7c1b265a48a45dd4b72326d56fe981edffe51845cc40cc4e49";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hu/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hu/firefox-152.0.6.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "05ed70ed5d9371e4b707d5fe401e2c68c4d6f99fbba27aa1354ad45ca4f4dcf9";
+      sha256 = "37aa1752daf059445c40ef76742f435677f609242a62c940a5225d434adfda30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hy-AM/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hy-AM/firefox-152.0.6.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "82b1b8eee1485abcd544ad2242d9f2fe39c1fa258a850fa54cfa2826ee8ef74b";
+      sha256 = "356274551767fb2c250a918bb3cdbcb71fb471f90908d73e0f936cdf1376a555";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ia/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ia/firefox-152.0.6.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "c9f4daba881eadd1b1c24e4c28e46db87e8e7682085f0ce4d079067d8e040230";
+      sha256 = "75edb40814e3b45e48a92a437c489fb4b5e85add6a332e658a2cd50758eaccfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/id/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/id/firefox-152.0.6.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "2e1c5bad315225edd7f7f0f25a0ce6700fd85027a525a0cd1b4e5df5d2fc8e4e";
+      sha256 = "33890a2e1d2ee5662c267441eb4332b7b19c730469936eb1064398afe4e8cca9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/is/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/is/firefox-152.0.6.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "552afe39cca9eaa99caf76c42f53cd7cb7328332bc3f16ebac3dc10240b6ad50";
+      sha256 = "313191e2d176875ef3cd9831be75620c4dc6079f56ef5959dca686495e255e67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/it/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/it/firefox-152.0.6.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "6483b544e81e2cb7753b2668f98134ce043ed53ffd6272a7d3616b5dfc12b82e";
+      sha256 = "eec5937b854c34030574b14d51706ac2f0afe83bcc0bd3d7dee11f8978d91479";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ja/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ja/firefox-152.0.6.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "615ec2a10b741475458e3fc0779e34a8a67cd1f8939f6d32529ee56d3570a331";
+      sha256 = "dd7f675b6b84ec05d1673c74af563caf1fbe393f51913a8ce9218cb1f8f5b525";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ka/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ka/firefox-152.0.6.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "522602223fdedf84d93a26a94453e94a0ad972aa2a32f592d67d652ba7de85e4";
+      sha256 = "74398db859fdb80b8cb5396a5f2737260f0a74933a4b631478ef7bb64470a60e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/kab/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/kab/firefox-152.0.6.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "44bd2f057937fdbbb8f64e6065facee405d112dbad67fd21018a1f2ba71b5abd";
+      sha256 = "d2988e524e272bec87d857aa2e47281b6e6ca14e7915d821bc71fe0b39bd4b89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/kk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/kk/firefox-152.0.6.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "0c67eb728bdb479b0ee76466b1a92c2d05cd7f8568a002b0a3ca8f451b9bee06";
+      sha256 = "3d7f23e184d3053315a8d2f253122db483cb73ca9d0ccb18f22674d1659e0772";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/km/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/km/firefox-152.0.6.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "cc57ebc42f5caba691fa9d27c98319fcab5405ecdbe704a2a03491533bd74369";
+      sha256 = "b8b4422e29b9b97e6ba7d6431f6cea68e27b8939603e08c6a0a99e9a8ca072dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/kn/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/kn/firefox-152.0.6.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "30015a7039773ac7388c0f3a040a8ab2d9ece4cb8a6f5e19a8af45f5b22d3952";
+      sha256 = "b4c6cb0f179bca038a11d4f346be5b531d45e9551dca19c1fed0f2169a6c5725";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ko/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ko/firefox-152.0.6.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "205aab8711871331a4036ecb92c95d5e947b424bb4be724c8222982e205a7bdb";
+      sha256 = "68f93a85d9b72ffdeb0ff8656854b815ec8fa700fd3765cb189a0301f12459b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/lij/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/lij/firefox-152.0.6.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "6de1e2cf2f6e0f85064a665f71a4c7946ed0f9174d8f80ae0d271a6cbe8a1077";
+      sha256 = "249d4996dbbaf4bc75df24fc0b95bd290c4596dcd9585daa7cf728d24cb32370";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/lt/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/lt/firefox-152.0.6.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "05b76d77dea3d5ca21431b2174c597a5a73c1ff8a9c29330a75b8fbd75542730";
+      sha256 = "8cef49b9464b6ee3e7f321b3aa56b37361748cc28f639460bffe83cc4d57ac91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/lv/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/lv/firefox-152.0.6.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "0b1fb21c52564c24ba6c7fd412ab3d1aa5336ae1c91056b210e0aa35786838b2";
+      sha256 = "ddf7c0d835a5140481c26379db9f8191b249ff2eab20a20c50f58b9aae129d29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/mk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/mk/firefox-152.0.6.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "bba5081504d5afc88766952e15a1b7bd9d98e599d6b2b15c79ba4d53f18cc1b3";
+      sha256 = "aa3755cdb2004e34b11b4a5b47c317fe8bd7f57ba87ce90c1458c04fdc5806d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/mr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/mr/firefox-152.0.6.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "059f455a1489e7add710a16d2b809b7688d435b78d0ea04a5d2ec92185a8d0f3";
+      sha256 = "ae5d0ac7ee6994ac828b87a4ae19a8702f07a8c67e1b8e992f8e61e54a87375c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ms/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ms/firefox-152.0.6.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "105444ebe08e0ff46e3b710f715226038ed3b7199a16322e4bd3958c0f9f655d";
+      sha256 = "8c8e8c46ab834ae69f8c01303b7c2adff5d4c45fc545b656d9a9f4309529db38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/my/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/my/firefox-152.0.6.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "d401b5aa812464929366ab03ac0f7b48a1a385999c0d5cdf721dd3499f801460";
+      sha256 = "e4926ce17645dcf71d433cfd36df1798cb9b897c20cedf0d894e542f1ffeb1c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/nb-NO/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/nb-NO/firefox-152.0.6.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "fc1c0c2a096ac2fa73326c3ad3144613f7aa318fc16f40312060ca25a85a46bf";
+      sha256 = "b60d7ede2aa2f5b27174dd4dfa9b65a1b7b56fe94aa266ae94ec98ccd5ac39d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ne-NP/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ne-NP/firefox-152.0.6.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "e626a9df7478e7ae6f186da0addf351a84e4051a83fff22759e835b71e98cd3b";
+      sha256 = "18381c921e0f93170d918359dc810bf627faa142975f6d064a6ae5ce08c0548f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/nl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/nl/firefox-152.0.6.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "58aa58bdd1429efde7e28a3bf908e4f7995b55f75a7c929bf77be489b4c9dedc";
+      sha256 = "4c90c0b9189fad5dc81a8f533d8017c68e845ff97d6bac1de0a3d048f8697ba2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/nn-NO/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/nn-NO/firefox-152.0.6.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "95f1b863cdc5bbfc60911b81b2ad7470106dd21ff8ba816e1307e2f3ba0c7c54";
+      sha256 = "a7176dd2a2f2d50e87d16819d903c75867655f005c05c64636b8d1cb513b820b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/oc/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/oc/firefox-152.0.6.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "39def0c09ef8b8ec1a1b5de177343671e4869789dcfd6c03600a25e0400bfadd";
+      sha256 = "d7eebad6e90eec1af95ae54cad0e3484d5422bfa3a6b0cf557212559f36ab78a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pa-IN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pa-IN/firefox-152.0.6.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c214169cfd3c24a178090772d69025dbad41bf5984e3e4055c6470f9a5e4ece7";
+      sha256 = "e3ec832291b60d06e2f337c9bde8e9f9c532667b33feff3483f75ec74633fe56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pl/firefox-152.0.6.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "9f8824d0413f94ac3b173e65f014cd8dcdc5defd302d8b79ede5958f9f4b3345";
+      sha256 = "bb7cc5735e841ebe18f947d84af36828cf6ba9ecf9f6dfc8087ebb0ae1a29ae9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pt-BR/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pt-BR/firefox-152.0.6.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "9fe02014b4116fa50c3da0054ce050033ed74e0986505fde78b3245eee8e18f1";
+      sha256 = "13b362ef838dc3593713beb90ea2ca66c73e219ba4ac6f3660e820ee63300959";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pt-PT/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pt-PT/firefox-152.0.6.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "9f7efeea3a4d3399513f7af79b2b90e4cc11d8aedab715d48406907440f2925b";
+      sha256 = "c0e16aa34ff6f030252027c171281675fa6cafcc746c76f1b637c077730caf39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/rm/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/rm/firefox-152.0.6.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "524be9df7f85b81c5dcf8c362f683f947d82c8933292314b176091954a47cc94";
+      sha256 = "3e5ed0848557fdb53101f0458736e8ff4280d6bf038a510dcbd0746c5dcf82ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ro/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ro/firefox-152.0.6.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "6fcdc3dd7d066d71b061168e382acdc8b53eed1361cead66cd0119b1530dffc2";
+      sha256 = "4a5c733a0fbcd61d83c729cb2226eec991b9c1bc53e564244e83bdb064d4e0ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ru/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ru/firefox-152.0.6.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "5c05da9234d8993104f5443b8dcc0973ef2a36df7537a23958d9ed91ab715cde";
+      sha256 = "db8d188de7c68c98e756e3281f3b967165fd82a7c024ecf7135ceb3986b8c947";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sat/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sat/firefox-152.0.6.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "6713a7c93312fc43d885e0df1d24b8fa6a5320bad01f806e776cde503586046b";
+      sha256 = "4451e794f9c09d2437a5243f38bb601fe0b994ae28f8e0d34b5bb4acd460139a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sc/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sc/firefox-152.0.6.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "c9b33ed62e94fd21ed321ceca2a9c0203d8cc0116e0890022d81f05deb1c9a0b";
+      sha256 = "12ddc9ff45f9fd9dbf718e41f8d95e7df8c9b18f58dfdb1e15c305c17bc552e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sco/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sco/firefox-152.0.6.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "345d9495dc84fd47b5bdbf4843dbba44d4f289998c5693936d87c6c3958305ad";
+      sha256 = "4f2174c2b829af5ca223ccb51e66cafc29a9fa8b455a8a1aa5b5441e2e012cef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/si/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/si/firefox-152.0.6.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "25a9cc09b4fa15f23ab11e377bc02de63bf83009d6df3dc17ccc24c569aa8acf";
+      sha256 = "61503385700d9bacd620c494b390620c776b40cf44aba87ad500e44098f1e4d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sk/firefox-152.0.6.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "46d824f7977d0e5b06985064a658926f8db65c5af249dcf7cf0b62dbb66b6991";
+      sha256 = "9c6a8de041c617f3541b00474be3125c0b0b9afcc4a3a783b8d1a87f44888eed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/skr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/skr/firefox-152.0.6.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "287239dbf01839824f3bf57cf9ea67efe74ced6e421e3875dd10e698b532a8de";
+      sha256 = "957c2dc79ef5bf23255265d3689332cfdbe94e6d682f77365210014f84cea0d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sl/firefox-152.0.6.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "f7b5483b3514ea62851aa192ebf964e863889146a6e5b015c4cc2205e00d4cb3";
+      sha256 = "3662f3df195666971ee316f4fcfd078c53372d1b87bea99b2cfed7688d814066";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/son/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/son/firefox-152.0.6.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "df4db03580beadf07c92efe423ce0b6604fb4cf5fb0d1e9c8b3e00667e761714";
+      sha256 = "4e0aa93c4ee80d71b0ccb4e7e031764ef033ed5d9bb01decd5644dba882f86d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sq/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sq/firefox-152.0.6.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "ae31bc0f06cd9318f5b8a18e4217f3965a66fe52a103ed2faf5788ed1dd76115";
+      sha256 = "6a9a821eda43b8184958c00b94cc1b5c9f55bfb1ed0f64881ef1c6c5f1bb59e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sr/firefox-152.0.6.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d97ee53463a081b5c508eb74e5a950166d3f64b9d1b55fff23f3f5ea9a567bec";
+      sha256 = "89bea824d6b3af9ea7a4585b526c2314bb55a769d0e0bb57812fe1609c14cb3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sv-SE/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sv-SE/firefox-152.0.6.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "6d30cb63fcffc13fc2debf7508f23eed40cfb4c2a9c91f5ddbf73e94f4771416";
+      sha256 = "b460bb49aa32129cf808e84af83b7c1d1463e6758a49d6b12b7f79d221d7d542";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/szl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/szl/firefox-152.0.6.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "f39197b1d4e630437073f4e79e1fa9446e6a68fe45f7a15a762ee34528926992";
+      sha256 = "51840862bbac6e8e9f11f65ec1278655721668e5cf9c13831a309610431bdd6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ta/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ta/firefox-152.0.6.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "3e4c6cf0a455b7e2558c00565a2d65c143968b6be3983a4952ea99959953423d";
+      sha256 = "7b4e4687f4de0de3e09327c345f21cfb2d1bf538f93fc34ec11ddbb4cb358c59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/te/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/te/firefox-152.0.6.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "10101d931d044fb6122789c10f6af41e5ee488ccc0b89ee10386bd7b081771d7";
+      sha256 = "001a00cb5af359b5779adbadd73ec1225a962e8c07b2661fc3cc530d91ba60d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/tg/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/tg/firefox-152.0.6.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "b461f00db572ec9032514bd5b365a3ce310e89004f4403898719dd98391813e0";
+      sha256 = "2dd4be301936348f49e5b16a73c4bbef5fe72c3f38c6f61aadd06a0438e548fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/th/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/th/firefox-152.0.6.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "127d2493e64d6fc03740a44467f62210bcf70d8c7e6eb14b0c9470eebf19e7cc";
+      sha256 = "3f326bc7a8779f10de934954cd1324344e1dbd1077324283b9a8cb53d816005e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/tl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/tl/firefox-152.0.6.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "1ab0bda8c002a2508b37395d4fb5c215aa7d0fde7a1731f0b454f9f8e65de503";
+      sha256 = "b3a3c7d001e16affd4fc8c4a17616ab72c9270779b8af4434e142bbafc35b1ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/tr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/tr/firefox-152.0.6.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "49be9eba0fa3154531d786c757bd182b7de5466a6f0485069e17bac660e26e2b";
+      sha256 = "1973b7f4de327515b80a37f84c0dfecd6386d0ae886d8a02633cf67bef51f347";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/trs/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/trs/firefox-152.0.6.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "36212c55718ae5b817fe2d28442840a07243957e2613dc3b488ecd4f5970d216";
+      sha256 = "7655bb8dc2bee88f8fc5fb96f2d2c42f59f751407031fad4fef2cf87e4073b59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/uk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/uk/firefox-152.0.6.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "3bdb92b52d69817b27950595d9024b98b9f97afa5ed9f7eb93ccecd7807b9c48";
+      sha256 = "595acb9a96bdafe3e102c0e01f13b754715c58ef856a6e6607a9d90c153b82f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ur/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ur/firefox-152.0.6.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "8a79f37fd05c8157367cb953dfdb52d16ad36af3c010ee8d55e8380dafc9b92e";
+      sha256 = "433b58b71194dad432bd282694a3fd0e456e3f240409c0b31673e88365c28071";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/uz/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/uz/firefox-152.0.6.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "578e4221e9514b070b864e52b5a0618aa18b0a14204d6c2ff3410b4929631131";
+      sha256 = "39b60eed98c54332d68c2649cb422e48605bd9a51d50f4e9e455207e7cb95466";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/vi/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/vi/firefox-152.0.6.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "f3fe9a5ce4188e61ddad6bdf39b715d2b7a75b18b7b0f62081f658098a2dcdfb";
+      sha256 = "25b86bcfa86df3e457ccb348f8d9d2e4bb4a0f46f3015d99aeb839baca9b431b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/xh/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/xh/firefox-152.0.6.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "62bbddff08e0b5cadca2726971bf7bf5c0f4fc1dc2ca245ee39c280615803b14";
+      sha256 = "c2e34f6777c7e2afb893d26c33e03d5c01a1f285837c6247a692cc59cdca6f36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/zh-CN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/zh-CN/firefox-152.0.6.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "da152b95089ea18d1fdb4b52c919c8eeca3f39f27276469c51d9a5460b324699";
+      sha256 = "a096637efb88b76d1e3d7c1eca3652c27a0f65295a044c1cb4c74f7c1ea8bdba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/zh-TW/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/zh-TW/firefox-152.0.6.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "8d4b62626a8592cef6c576cd613083e17b500e48df827d83f82569513c2f5506";
+      sha256 = "85b418b03df923727561f667bbef20c24d2c7c826f50e6ca324e1e5ab0a82797";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ach/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ach/firefox-152.0.6.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "0224879bbb3314d8565dc91dc7c8cb5db530590201d0e3d002be9ee220d46fc3";
+      sha256 = "ad6a241592a9a7874a06bc45b741583c93c0d6c4c0e9e993a08e69c6c0e95497";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/af/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/af/firefox-152.0.6.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "53faf820d8060149fa68ad10d7908dd5d52e8819c076df66c6fc512cfe79d5cb";
+      sha256 = "c703f95d30f8dfd84bc018329665b6fa2f89b4d6a28a55774246f89274d3605a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/an/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/an/firefox-152.0.6.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "b41fe9009d73b43d8b480b0e702f1674b34cac756b6a8bae5e515a584ea1d72d";
+      sha256 = "bfa940096dbed0f5a6e7359496aade86c0451eb91e20a5fd53cfe542bc5e0425";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ar/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ar/firefox-152.0.6.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "2b6d36db0f3aa69c3249045365038935317fb52b9fdd8f249474bf0f1acb12a5";
+      sha256 = "3b65e1165756d1c861f1c462d795dc305537f0a0605a45025f9de07f3ef3ddcb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ast/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ast/firefox-152.0.6.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "ccd4772bc15c770deb805f92e20ff27748087e43c267ba49a6e822b9998ca190";
+      sha256 = "61cd83337415c038f9104b29e92e36fcdbeecb3a5d97815f48f93e6622e233f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/az/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/az/firefox-152.0.6.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "61529dd7a721ef5e14e7c10c32ec39407efcbe5bf96806b1f2f1034729874f4b";
+      sha256 = "e3de19ca5f2eda2742522219a90702ba9fd56665a42f6a0e8534fbb7a79a9c9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/be/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/be/firefox-152.0.6.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "0fa932a138fe42a98dfdb81ac828f5f06988778ebf3643602b00abae2f6ae929";
+      sha256 = "e3e0f06eb4d8628290a369780b2db59d4e36693956474e9caca660cdfad3b22b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/bg/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/bg/firefox-152.0.6.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "3c21cf3c9b353c717670e59e33125f918e202136b39836e7372a0108b7a93bc4";
+      sha256 = "60e153954527a2c0e835cdf250d28d1246b6d38f3a41d7c779a49fd859308889";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/bn/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/bn/firefox-152.0.6.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "a8f01f935de912a2f88f4f710a1f2996def0f95e63383d851a4ac568847abf0b";
+      sha256 = "295eecd93269750f041f33d33d0295fcbb117fa2ec06c69792867ecffaad88fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/br/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/br/firefox-152.0.6.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "86305f075c5291e208ad46d34d58b6e804527abb97aa0282a9a5879b8265dfb2";
+      sha256 = "a20e77c06aa3d4565ff7f1a77c3b2479f0977f7ee2a21b30ef79bba6da9bd133";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/bs/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/bs/firefox-152.0.6.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "c179176b64b52b856f750d635076e02518aeab0605f3b6b24f0384f311cb60c1";
+      sha256 = "ec40fed088658b474de00df7ca5db52670b8394cff18d381e0c4122d5b28deb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ca-valencia/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ca-valencia/firefox-152.0.6.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "e0aa6116a2fd021a73fc10a43f5ed890b34768e89e00251aff8a50451aff4f6e";
+      sha256 = "08c368b9fce36ecf6e924a327a9086c407324e56ef628d6dc26e73eaf511407a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ca/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ca/firefox-152.0.6.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "3aa984864a93605621e137995cbab3867549cb574c7b0ca76c0daac0f35328dd";
+      sha256 = "0d04a36848a57e25c3a2eedceb7542a3de17c5dda9437f3bbb9558b425699bf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/cak/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/cak/firefox-152.0.6.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "46b68b94179c1ebf538023303cf32d01f60993c8517eb9057e4302de2ebb2f56";
+      sha256 = "f987348d67b18f860945b86a02badaf01d91c03bae4bb655415a211be2d8f267";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/cs/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/cs/firefox-152.0.6.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "69bfc54784d3f9f94306e6448eac05843dbae228d48a9f313fcb6ddbd09a7ba9";
+      sha256 = "9919bdf63d63dbb9663b9daed196b44fc4b335ff85789d3768fc4ef3279420db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/cy/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/cy/firefox-152.0.6.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "e265a374d73327161a0bd655b7f84269dfb1d5fe9d0aeecc71ff73d592efceba";
+      sha256 = "44becbbd4622067267c131b45fe18a3e2d01206a4f73667bc870e3a71a806b0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/da/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/da/firefox-152.0.6.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "e078f923b0404763fed60d8b1a67f18ed966099b52e787e0d0648bc9d2e06d42";
+      sha256 = "1215ed44589b3daab8e0a9753a899a2fd417bb5d4b84947fe56ad9c287b9567b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/de/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/de/firefox-152.0.6.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "5163954e882a4889932b567624dd4af89669df33851b7eb58826d36a6777e8f9";
+      sha256 = "e5f7dfe9ca335058a83a402e6963fa0e40b8819d5ebb417fb33d456649c9d4b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/dsb/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/dsb/firefox-152.0.6.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "5fe4e7e0a1e82ed7dcbf9d29e2c5329a11a2625c3cffbaf92b7016ee3be2164f";
+      sha256 = "86248815018556abed1824520d593d1ad4321d3b54a8bd325026bace61e0165d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/el/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/el/firefox-152.0.6.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "f702f72563e1f71ce4b267dda784240117bb39524adfebf1ecb45c1263a24b9c";
+      sha256 = "f459ef4cae1117ae3a68b664d85e9cddab9ae669c10dc524f61748622a02bdd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/en-CA/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/en-CA/firefox-152.0.6.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "e7899ae1aa25b109f2a63c628f5f0f22f9dc37ec8bb71e4358d8268ef14ecc22";
+      sha256 = "13099c841caad527692493503f4a0500304c7419177376c70159d0b8f170b875";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/en-GB/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/en-GB/firefox-152.0.6.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "d1f6d5a7add468fc39265af94ee572e4942c6bc4709aa726483003dd49cb98c4";
+      sha256 = "68222cbbcf1cf81698ede8a058c11e696cbaaae1903992e6b76e2620e13136a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/en-US/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/en-US/firefox-152.0.6.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "6ea600b7c20a38042157817bd18c921e15de3508d0f073377c179d5f1b3e8c2d";
+      sha256 = "2a715a4c13a0d19e6e12dabf133d53cb39ff06dfcaab3bad9ab1aa8ff24a65c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/eo/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/eo/firefox-152.0.6.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "6859aac9fec4a911bd1ff8e682a17ad417bc4446fc87eee6560a1052c9355e94";
+      sha256 = "d394bc1478a5b23eed8bcaba6a8500fdbf9b841fe101e18418d8365ceb828684";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-AR/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-AR/firefox-152.0.6.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "fbb10387e14791b8615b5ac0e7fe0449db41a57a8b76adccbd70a9a954bd9105";
+      sha256 = "c9475393d768a6b30cb3410cbfe437bf5f8e6bd50801b89316d2af298a40b1dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-CL/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-CL/firefox-152.0.6.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "ca52fd9af14d6223f9ad46d808c6cc606802a65375ca02bd4b290e0fb4b9475c";
+      sha256 = "1622501737e265f80e90fa3dedd3b7ebe2e5e5ccd8c3f636b34e3ffc91f71da9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-ES/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-ES/firefox-152.0.6.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "4a15bac88be36cc84786a9df066d274087755032c1762a8cfee350de0ebfe0dd";
+      sha256 = "e99b4d1327d675c0cc7bb53479a5340098d6d7b84c667ad228666abea1a3ac22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-MX/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-MX/firefox-152.0.6.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "ab8d36e66bbb61046875003ce57322f6cdb32f16a29beda32c14535fedebb4a7";
+      sha256 = "f1638977316239bfe3cbcb82cc7dc819b0bbadd054c0b4de448de58c40f62924";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/et/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/et/firefox-152.0.6.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "d4727a60700603d04775a5109614dce7aa6a7e0da3ca6940a98215b0413de9e3";
+      sha256 = "93f24651029c6eba7144cbe58c1e866ab3992f931e165acc841424263f18ddcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/eu/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/eu/firefox-152.0.6.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "3fa6cc8abe42a23e469b9bb6e520304291583dd080abc656e868e93eb7e18baa";
+      sha256 = "7f5ca7ebc4fa374c4c3a92785b92537f627497021b32df54e442e7b40b81bd65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fa/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fa/firefox-152.0.6.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "0d1ae98e7038c59596aa126a22476e73459b6ff3ebf785a9e836ad31c660e377";
+      sha256 = "73e8dd05940ad42ba208e02ef8308dc456cd0b2fe7940577eea6d850dbba6846";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ff/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ff/firefox-152.0.6.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "00d36157affa3392f8330779ae64a8f682f74500f7d5d1999f253230061c1761";
+      sha256 = "d30c6019b5c8139e96b1db8fd99d1ce3d4159c2399bf320520970879c4bbdff7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fi/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fi/firefox-152.0.6.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "7f788d3e350d53af1db649f3ea36281ddd2b0adda7c76ecf571606ac32e35184";
+      sha256 = "de1273cbc6210de19aafcf5a23b7c8c669466727219be819a955f887fc1ce4b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fr/firefox-152.0.6.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "fd5bf7f0e5b37c52e7ad8b103f05dcc9a71dd586bd0c34e05a02aa942acb7611";
+      sha256 = "7552fd2335b129043702815a2948c4d8c50927a23579241ce38810fedaeb7216";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fur/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fur/firefox-152.0.6.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "00ef471419b1b215971ddf0327e3ad898d4ea9bf1542a2ec4a478663f1897019";
+      sha256 = "639cd75ab14775f833b986e610bf5aa4258b4fbbd7b77fc72100050c5820ed2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fy-NL/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fy-NL/firefox-152.0.6.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "d3fea2001182fa418f9686c16eebee5f3000647e2895b59a6ac067ad78233095";
+      sha256 = "12a828f423f9f1c99f5b32bd2fd4e5a94d35ade5b3f2a8f2b9572b88ba0351ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ga-IE/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ga-IE/firefox-152.0.6.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "0a803e4208bfc8b28707ee3ca83d06a1aee3114ecf50604b57effab1daa5ba28";
+      sha256 = "b74e3b3d196d80f047605963a724f1433741cc3932c7cc8f302756413c25a58a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gd/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gd/firefox-152.0.6.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "230da448fe43ebcd243a39c14b14fb16c30b12358c51cba4d1f1c0adab753e48";
+      sha256 = "2dcbf505caa903b72d2df4f774bd5fcdeb98f97bb51488d430eb75e8487b0a38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gl/firefox-152.0.6.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "afc9cd4e79de0d72dae6cc60526b0d3271aae3c457a4c2a7b5203d928ee2912e";
+      sha256 = "35cb06c379c7b6988d72749dd8e2d358705fc9b6ca47dbf55985f095c250b4c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gn/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gn/firefox-152.0.6.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "724f551ead657a85b0bd1f84f28e90920d1565c990e1635d662b7a4605680dd2";
+      sha256 = "267b63e160a47345442d0e09371f300cb607fe1b423e44f7fccfa8312ed43831";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gu-IN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gu-IN/firefox-152.0.6.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "c018f9e675b9fc522a868255e16dd2e54a758a2463446f915dbac5b97e1b08ca";
+      sha256 = "02fcce1dfc328cdf0077b317b44cec3dc7ce61c66e04145bc3d0caf11e971eac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/he/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/he/firefox-152.0.6.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "fb2e66148e9a43ffdf51cddd8ebf0bbe4d40cade36aca313cae1b50e339a3088";
+      sha256 = "5af91bfd37da388c9f09b3ea918e889c4fcbe1d426ee16f874a6c505ad26799d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hi-IN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hi-IN/firefox-152.0.6.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "fb45fea713173ece732ba944b13cd5630251db1fc57679211ece5cf1f53316cc";
+      sha256 = "c62e6f00b8cdd08cc0e83d6c48399751a8a8195f522c00ba0d536d945fe820a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hr/firefox-152.0.6.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "7691bd6c66a92a1415f08296014a0f8da3202bfcd3f1e447da602cd254af2956";
+      sha256 = "f325e2703e28fe824798b99170509f87babc8a83818c82bf4ae31028fc4d86d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hsb/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hsb/firefox-152.0.6.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "fe13b096a020b70032c57e95e7fa8a82c0be0e1f3fcefc8e23aaf56fbe76d3ae";
+      sha256 = "d5f74b0085541d703e11487c54774a779a0e9c179c0ecef1d99c142918c957be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hu/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hu/firefox-152.0.6.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "4ac1f5a69b8b6f07adfcff78ca8dd2334e8389bb6e29177270d19a4738337045";
+      sha256 = "944e49b8df69e113db385e3355c834fbc3eada5c28c926b49ac8c3d55039ea75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hy-AM/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hy-AM/firefox-152.0.6.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "70d2acc0eb84cc7927787360f8d4627db91b2615767250373c6fed13e439dd2d";
+      sha256 = "ead5cc80da72a570bbcb2b3c5caf6a1e4a2813576b5e7fbc38474fed25a8845c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ia/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ia/firefox-152.0.6.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "d68b839a410aef3a7d35ad161f7ae6f5d4903dfc77c5d3f62bdbc2407ce4b9d2";
+      sha256 = "0b713f4978c2f853d2ea370c9fb693e9e663a736a8b7975228fff0ab7052f18c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/id/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/id/firefox-152.0.6.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "d93ed1a908ede8d4eda7102a94fad46bc5bad08841f7c034f0ee6801f192eda1";
+      sha256 = "26dce62510661e58e457d59f15446211101ac26429889a1b4713f51d67a540dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/is/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/is/firefox-152.0.6.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "41709c14dae4868577f0891da2e231a41a7e39d121acede500770b636cfcb991";
+      sha256 = "2349fb719de0276df080801281acdd6dfc439bb4419cb9db7553b3629ed82324";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/it/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/it/firefox-152.0.6.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "982dc854b4852e5ca501fef9403291a8e6f36bcde063243f6a4b886b281c2c10";
+      sha256 = "e0e006991cc6a72b7ba2f38b4796a221ccdf6ebbf20c5ba3dde0a233cd92fc2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ja/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ja/firefox-152.0.6.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "c71518e189294b2a0cda6434d8871693fb0b62814638439e901dd97b35fc1d1b";
+      sha256 = "af5a86fb73e8bd0c5b2538ad8732cbd00df2a383baf0b617294fd5ec86f21c91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ka/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ka/firefox-152.0.6.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "b81ce817978672cc35f13f7160f1f31a6c72dcd5c1eebfb67122ada8383eea3b";
+      sha256 = "abfd9da4c8b522005d015e0f7e9d4ac8227aeff2be23db66784e7d93e632fb7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/kab/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/kab/firefox-152.0.6.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "18f971d979fee918b4696d11abb3cac10bfada008fbca8166d2849ab6fa285a5";
+      sha256 = "1a6a15e2a1dfa187064fd996e48469fb5b2633f137947796f826a5dfea6375a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/kk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/kk/firefox-152.0.6.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "fcc3ccd6b8b34122787d248f0c64b2318bdf75ab0b37ca239c5dc1564ee54546";
+      sha256 = "e39b5b6016ac1d000654e6fa8e53030b2d6a538399465e9ccd84a0b3038183e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/km/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/km/firefox-152.0.6.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "030f42cafb1d9321743d129b72abfa55369e9c953fb398066f5052bc5c83d6d5";
+      sha256 = "cc2220a040547dfba8e9257c357b98f4a3de5875b7994502baad6db8f4693ad2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/kn/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/kn/firefox-152.0.6.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "f29e80c2523ef575f0e506d556a4bd01829918ea81804858f44f28860e348792";
+      sha256 = "ee3b529fce8d86d7f5294e2058b3ca1e55bd999a7cdb04785dc832f2a921b03c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ko/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ko/firefox-152.0.6.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "2e11f9ce27b1961e3d396e7b8566a525e5d5bd516143853c18ead3c3e9de88a3";
+      sha256 = "9233e3b7d811c84ceeab5073726354789f6d09d8abdc034f200ce3bba45eb02f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/lij/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/lij/firefox-152.0.6.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "b826e4f9c2d6aed5b5e9a0503f8ad9376dd614b6b9aad0a4b00e625e0ecb9cbb";
+      sha256 = "ada61d1b1f3434a367be104e11566536425ff7d07be550717adefcff16e63bf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/lt/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/lt/firefox-152.0.6.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "73d5d344fe10353e27043c93a34fc35c6f752eee358c6cae8929a0b6fc532c43";
+      sha256 = "6de81bd18ec6d5affe6da940a2de77afdc5989c062866708cac0e6bb2db9bb64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/lv/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/lv/firefox-152.0.6.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "d60198752bcb14bacafe633722ef17aedafe93a2184f6aa40e5ee7fdc3d60c03";
+      sha256 = "22653f76e11dd9d057f14c645ccbd3fda202a48d8c612a4df4c407c9c45c4f7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/mk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/mk/firefox-152.0.6.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "9f5787ba891e3a5e027107be70ed5c830b20f1c7cb4c0bf018922d9ce945fe2c";
+      sha256 = "4c4614b451a888da0e9e4c1c779fa1b68a58c86623091b35d129a46a024c7359";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/mr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/mr/firefox-152.0.6.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "31b6101936ec6813afaa44e0dc68eb8b5fdfc9626d4a06a59bee661307208e26";
+      sha256 = "23efc57c74c656138b50d465fac0cac95ebb56e863535bf76e126b2b59d1c5a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ms/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ms/firefox-152.0.6.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "70dcbb9086fcac3e5dc2697468e17ffd73f2656f48328ba6c712e448f699bfb6";
+      sha256 = "6ddf31ac846ca8f3d08f89280bb2742abc91c67c2e5aa64b37da7c09602260a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/my/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/my/firefox-152.0.6.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "2083e5930446ad496f3b49274e6f55f566531c587fe15c14644aa182ea03eb48";
+      sha256 = "a688ecd50257411edd28e460125d2a5be9b5c7f001dd81c275097e31e2cdcd93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/nb-NO/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/nb-NO/firefox-152.0.6.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "279ef7228447ea3fd47abcdaa91ddba2f4bd044320f6eade0e6c057ae5ae820b";
+      sha256 = "ae664f30a1f0ab560a4acb3fbb086128fef826d7cc40a9a2e84494a3bb3ddab2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ne-NP/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ne-NP/firefox-152.0.6.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "1d25e3ab937e3599aefcf4b2b7a48d4c5074b7a4bb1d535d650c5d5fde5dc4be";
+      sha256 = "9169417b385206fc17e3463a035a48ff26927a75226f839942b96727c02ee8eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/nl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/nl/firefox-152.0.6.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "e62103a45295fed353658f76dbdbc4cbb0cb4ecf429792ccfbf59402af30b6b8";
+      sha256 = "e7ff94e0d4bf471e579668fee12511951b3eb7f40ec7ce5570c62a700a5f9d11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/nn-NO/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/nn-NO/firefox-152.0.6.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "4147d574547fceed38472b47b0edd47328909bcf18d916623a134cfcce9ba18e";
+      sha256 = "05d464216716a07bcdb931ddcbbbc26008d47b93ce7a71d8fcd9860f11ce657a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/oc/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/oc/firefox-152.0.6.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "056ed35c465195b18aa55f162de501362e9ec261e1e64def3cfd26cf98255eba";
+      sha256 = "e58747fba4281c5aaddbde426ebb22e70dbc065abcd6b124a78eedee1c8f80f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pa-IN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pa-IN/firefox-152.0.6.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "6aa82951a0301a1bfa15a02e0ea4719867257a140fd5d056e01cd9d48dd1792a";
+      sha256 = "e42db2e26ffb1cec00326ee664661e7550ca0ab3b2bf38f8e8c99cac7b97134f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pl/firefox-152.0.6.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "15874772160eb9693e24548591d3a583bdc8f967cd8590b8354ddcb20ce28b56";
+      sha256 = "b129d354e0795685e63a9fa3625cee1bac12f9683558a2db270c24e922458acb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pt-BR/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pt-BR/firefox-152.0.6.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "aa82d56620f28936c49a46faada0b6bb1922d1c7ea124326e73d1c4813691f18";
+      sha256 = "e3677917eb800ccb72bde49d5c959e039220b20617393c3a8b58c1f4cbf87bea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pt-PT/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pt-PT/firefox-152.0.6.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "87a9871edeb4bb60c4ae55c27954e0ba6ca29941c17d2432fc6beba75780c8ef";
+      sha256 = "3b93aa680c21a353a33d22544bd3173a2b56e5dd6848d775b56c56050b8a7892";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/rm/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/rm/firefox-152.0.6.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "bd043b0fa5f7d52c6b9f4feb9c30dbbc3bbee8d0666ae2f730e0ee3a44508c8d";
+      sha256 = "8c785cd66fd08a31079b0c265294d2194653123f0874d8e23c2de90c6cac54a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ro/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ro/firefox-152.0.6.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "0073610ee8b2962fb44ed47f0ffb32b95cd6d036e3749d079e45db93d95ddb63";
+      sha256 = "5724f5d8306cbe9cc6e72988dbc0c7dc15335f83c6c8e6ad8937f48793e7aa97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ru/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ru/firefox-152.0.6.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "f7f5ceed47a77c622aae15ea789b453b0a4923d7522f503ec0b0e07cda1886e6";
+      sha256 = "32a0ae38f48fdf8a98fca3a33c2ed40d8fe3eeb9b920ed3794111be218fa8957";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sat/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sat/firefox-152.0.6.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "9b06a3ea6ed971ccec16510d96be8bf47817a5253e3c8261e20d5209c12d02f0";
+      sha256 = "b1376f88a788ea93035900e2f7b2852078a6047222a635f1a77a9b8d0941951b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sc/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sc/firefox-152.0.6.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "7187f4c9daf496e537ef032a30228272167a134bfd6f32d4384b347c183907c4";
+      sha256 = "38746af0b8690c38113b08be1420c50ec665b78ca2a6a8b1549cc6246b2274ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sco/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sco/firefox-152.0.6.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "bd7d4275e6185784fd3018365d0d1536cb631013983d7cfc8bd5d089ef8d87d1";
+      sha256 = "6711c93a5ae80f6697dd471e048b4b1a12adb96ee6f03bd0228712c29bbbc288";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/si/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/si/firefox-152.0.6.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "afbeffd406351c3f3e12a4f9de8a6c93f4e58151e87ecb6e475f8eb3ab760b51";
+      sha256 = "8f657f0a6b30913ec1749f7af61e737a7bed9dec49d2daaab2e55078f9af2468";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sk/firefox-152.0.6.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "3d9e39964d9b05d0f3a74d809a8a254236cc37051ab4e0186f52f8113f8236a9";
+      sha256 = "4fd91a70b04c2ccb200a8149456811e63f8435124227eb794f7729ba857e7fd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/skr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/skr/firefox-152.0.6.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "bb9b4b3aa6edb39bfff7f7dace57a74d8f0a25bac79f6f9fb88aed9c10ac38a3";
+      sha256 = "6bd5c41748acb81e8840bccac5eb2c2a60379bf932fab91d4f85c6d38674a12d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sl/firefox-152.0.6.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "af258951d11c47155a4e6708eae63164e5c0a0b074b3917ab8c69e62e3bd250d";
+      sha256 = "7edd3131c0231760adb624e3a533283cb53b5967cd6acc7b5a6172701044abe9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/son/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/son/firefox-152.0.6.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "0dcb4fc85e5cda4dde8b544c4520ee7fa86604f44bbc4dd3f2bc9a4da3f43637";
+      sha256 = "3f9078a5fad247532eb1ef22af2dad1bf87fef9f464c998cca71981f29078060";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sq/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sq/firefox-152.0.6.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "be76a686ff19458436338a0149f01e6ae15e7c6a914270f499de53cde9bc9220";
+      sha256 = "7e39ad43b88056b81b1cbaca424e567aeb572ebe7feb2f2af50796b622d2b2cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sr/firefox-152.0.6.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "3edd944e610e41fa6d078c4fee006c973ad308aebab79da51e39786678b42c86";
+      sha256 = "8f5db4dcbec611b22dfc9d2d3a8afca2626713513735ad89c16e03ce14ac75a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sv-SE/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sv-SE/firefox-152.0.6.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "dac56a61934480c57eb5cd80d1e1cf284334ff482685ce95ae05bf3ff91026cf";
+      sha256 = "e750cdf718dd9e410206e1caa87fbe528e87c2e1e68a5295a86b4dc75770c7f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/szl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/szl/firefox-152.0.6.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "b31069b20bc118599eba6bbb25791d3228cbfdc0740f4051a88bd681012867d8";
+      sha256 = "b68f3cf6cf9dbd72a14d9c82f90ccc25c64969a80521cb51503a551d38ba61ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ta/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ta/firefox-152.0.6.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "d8dc7374505b287aab6ad5ac17e74f1a69812ca2ffc7e6faffc4abe84dcebb57";
+      sha256 = "7ec026e6db911abf4f5cd35b296cc86ebadf76160a95f96f50bcb95d7a0bf4ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/te/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/te/firefox-152.0.6.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "52270e848e907b181e36d2d0bf30f1b2d6e55b87ec7f89c20cf09f394713098c";
+      sha256 = "42a19ce881dce4afbcf016a3178eaa500e630a87147677177aa65bf2bc8c91ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/tg/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/tg/firefox-152.0.6.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "14f23dd875db658f6a4d35d18dc1b431de5208300a25c45f43b9454a3aac6880";
+      sha256 = "24101cced228902589500bc88ad6e404ff4ecfdf626405b00193a5bef6a1ac87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/th/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/th/firefox-152.0.6.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "0f74e394a54970aee132f61b35527b02cc73a22b708b351da2c82ac691f8f1b4";
+      sha256 = "0b0678122f231e3d86a7aa6691a57cb70cc1ce2d61cb5374e0196b7fe091e886";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/tl/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/tl/firefox-152.0.6.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "160063bb897b8dc65f66b79bc80fde51f2cfb5e926a52c7a82ebd24eac46fd70";
+      sha256 = "02b78938427804be1b1f72da89f21203467787c5f46f2a9572206c8996f76d9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/tr/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/tr/firefox-152.0.6.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "d3b4d2a7eab5c0a1d4cce248656d23efa864dc152be980803c9c22a757e3a1d3";
+      sha256 = "d1536eae6dfc828aa965185f0c5e8797eac3bc92eb5ad9d73de6f8d7299b1559";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/trs/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/trs/firefox-152.0.6.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "d66fcc3070df87735f149ebd1c47bc404420eca6bf7f193ef29f94b1d6a9ea96";
+      sha256 = "98c140d4c7f855d5d172cfa72ef0db294c6ec2b24af57484aaa055d7428d15d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/uk/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/uk/firefox-152.0.6.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "0824270266808c34a8be3da4713828642cfe6810a711f22dd0fb7f82d23666ba";
+      sha256 = "1617250a8b6a87633716fe66e246c01278acc1f07dbd17c7a5cbecabed15d875";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ur/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ur/firefox-152.0.6.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "6d21259cd467f22b6084dea81d7a84f42f537e84e69980e507852c0725b97c87";
+      sha256 = "8e158bfcc2cac983eeca3f9aeafe773d6bfa34b6826c8bd551a527a836cb8435";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/uz/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/uz/firefox-152.0.6.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "ea4f5ed877f771fd707ea2c47d36a79a6b4a93a91ccc98a71b892296629cf0aa";
+      sha256 = "b0de859de993eca5acb1c920fc4a48828ffcd8a1168403b26b4a345af4cab50a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/vi/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/vi/firefox-152.0.6.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "61d17a982cb88cad8fa3088ce785617249592f4cefd3b77bede7a824a55fddbe";
+      sha256 = "e3a92cbf7c033e5a3f9a53a46c993979c868828fc79e46411082ca0c1f89a962";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/xh/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/xh/firefox-152.0.6.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "9ea959b6687611b9c2f414fe8bfcd739e1f710255a59bade2607586f100894ec";
+      sha256 = "5fb463d72d8fe2524537abf504536d524d2fb3409387f5988fa06e491a4b9cfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/zh-CN/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/zh-CN/firefox-152.0.6.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "97a769af0e6303d420b5656db0abf15d6abb4588a3f12e0798ba1f9196ee88a5";
+      sha256 = "8797b2f2f42061fc27f266b79a61a0bbcea643ffa61940fa9c42c6e10793f0ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/zh-TW/firefox-152.0.5.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/zh-TW/firefox-152.0.6.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "179af0cf28f95851f06f1a3fcdabae368dcc9fef2a12372a9f06bb6a3c2d0a90";
+      sha256 = "7c362aa4d91cb5616e442cf50badd42209305c7c99e87bf39431a4820e49f7b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ach/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ach/Firefox%20152.0.6.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "21b534b3ffac7a4979a109e20ae648e0ddd0cb26e9d136b9e445c67dde049363";
+      sha256 = "6a0c4a57f5372fe81613cb7be8ff05dcc009351d7167575f02b527babd04b0e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/af/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/af/Firefox%20152.0.6.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "a1d19103162acdd555cd508a9aa069240b9c8ef61fe0f3c67819ebc814b66979";
+      sha256 = "8f87b1ed2de2430400fc6d774789dd42708564abb2acbc93fcf17532b4de7ca6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/an/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/an/Firefox%20152.0.6.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "b90f0cc93135879200a59c93f3bcfadffaaefe44f5abc8df368bfc8fc1b38e70";
+      sha256 = "578054b050c0ac3efd1d922fdc1dfaf38c31d162071e7a8dd67ab65a09aa8000";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ar/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ar/Firefox%20152.0.6.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "c924be38a8cbe22e558acb5cc07a1a75706e148f05d5e0a0bff6108489aa28bc";
+      sha256 = "90f75e532cc72c70c0b36519dd2dcb68fa355cb5e498acd78ec2ffb8376fd106";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ast/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ast/Firefox%20152.0.6.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "0460aff72204b0cbbac04368c6b484c241bb9010fe966bf9870caa382a8b06c4";
+      sha256 = "de557d310f0850a8e5fc56939110f09773033e6677625b02d3a76b9735394fdd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/az/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/az/Firefox%20152.0.6.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "2491125901cd56c4bae56fe71466d52a0ecd27db569d19ff90e2da9c45dbeea0";
+      sha256 = "3dca06e7d9d39cb7edbf69f7d530632b2033411aeb4ed4415cb9f4022e17cf97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/be/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/be/Firefox%20152.0.6.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "713d3aa9f331122f7cf3c3f881755220565fc8a511736165802c29958a5ce89b";
+      sha256 = "24d3e36b7dcb4e73ea28c0d915b4fea55ea883e4fbe4c45ff01e7a3e8c634bb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/bg/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/bg/Firefox%20152.0.6.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "ceee812e2d8d5f04a09ce3da49879f5ffefcf78e8a20bfe8d9b2ef7e61399567";
+      sha256 = "77a80dc800cba5f3fc923ed7f195bd9919382ddaeb22734007c61b0e28f75250";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/bn/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/bn/Firefox%20152.0.6.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "3087719e9936d87d64fd259b4df1c0cdcba9f8a568b2bbe25ccba3f4ecb85a3e";
+      sha256 = "729d1be845f289c8125ef477c1aa20e4091e94282da1d267d2517a684c082cd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/br/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/br/Firefox%20152.0.6.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "dc8df5a0f265886f54413fb0b283280b7d0f54c6f49c2b094a0f897223f3de7c";
+      sha256 = "0c09c70b1cd31cb5fc66cd7915ec73d38ccd0221a9268e8635e340e5c4979254";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/bs/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/bs/Firefox%20152.0.6.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "eb14e4b22f4d806ce047a437189d60f22eed1a74b0fec952655aed150a64163f";
+      sha256 = "5e2d6c95a2c6f37b57535028f60cbe90855c4cf7c45d429ceba7af53b143a4f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ca-valencia/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ca-valencia/Firefox%20152.0.6.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "a6a2326ce1eba819792b250c55fb19f861a923556e67528c9d9cdaef6d8fcd96";
+      sha256 = "159b64b2cca6d3f0c53c46b643c9b4dbd19bba8876f3b0f73f82e6d0422ebe91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ca/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ca/Firefox%20152.0.6.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "0ab7fd5ed33c0c4aa71c1d26e0447f507aae27105981078cdf470b9373725943";
+      sha256 = "8001006a0505c8b8f9ea61cb8077f7af0228fc642ce8b2be8e9868257f1a6b75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/cak/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/cak/Firefox%20152.0.6.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "1e019ad3df351d782e69053cbc8f72401a4636e605c8dfcae7c8826042409bba";
+      sha256 = "e20f8a9802f279d4681c3309cdf77df1b4705b1d2718bd4bfa5edf8b1a83e4d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/cs/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/cs/Firefox%20152.0.6.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "8dfaf95b0969e42c5e9bcce364a1d58254484f9f718d795df99f97b812639345";
+      sha256 = "b02f700b1022509d955e1aa3dd52a7b5349dbd67ba9c1c2cbb32ba59acb83e95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/cy/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/cy/Firefox%20152.0.6.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "4dab9578fa2dfa6a3ad066aecb1cb54e3d1ca6ddcef9e4ed0fc9b889520606c1";
+      sha256 = "48fc3800d924cf8b39dafa560b82c3b7fe2f2e30aa83decf8ec00031f036604a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/da/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/da/Firefox%20152.0.6.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "3808a7be55ef6bb50b7f38ff76d05e8122c30eb6746499ca22f4d6b5f47f834c";
+      sha256 = "36d24a2b9881c79324a82cab9697bec989cae4e8d1b8f72d38e32cd497e8f2d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/de/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/de/Firefox%20152.0.6.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "5a6f5900215d893dd78a2621715ccf9a62eebddfef6e89e987a01d6737770a4d";
+      sha256 = "100889eb8444c05c488e83f3d8ca6c4e5cb67dbdf40b5ce578044466daf0bdfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/dsb/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/dsb/Firefox%20152.0.6.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "99a91bf8ba89fa121bd78d3f30ee0906b246b43ccf3354f3fc1fa209f38a4763";
+      sha256 = "6f076e41d40149071e508349dcc259c5536ce9a687565d1070e7c6b87b05d14a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/el/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/el/Firefox%20152.0.6.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "98b619d0658ff5a4ca4f2ead669df89c0ef1c73cb2399ed4e96ec1de20c1e744";
+      sha256 = "335d3d43b19f85b6100d38fd5bff454429b442d76e80dadcd1024036622824f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/en-CA/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/en-CA/Firefox%20152.0.6.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "00e9993474a68f43bb056c351243103ad83eb88e70fb40855ae856a4dcea9afd";
+      sha256 = "d8598c687183eca9b3e4fb4bf226071f779a8b3850b14996917cec79be89a016";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/en-GB/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/en-GB/Firefox%20152.0.6.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "5bf257049dfea7083399665b4b8b86c936811cc57e626b1bf2a9f26fbb23fc8f";
+      sha256 = "f0562088dfc7660d69cec4730682a9c80d883b1e6431d361ddd629dce7f26de4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/en-US/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/en-US/Firefox%20152.0.6.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "69295aed9b9de3a1d5b625b423bff724ab44079a4ed37d21072e0558fe969796";
+      sha256 = "747002d592063e0b106de0c500b34fe6d84438b3b866621521c8e7be9ea7816c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/eo/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/eo/Firefox%20152.0.6.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "c4bd2bddf0e87e251c9db789bd5b8cc04a964c8938bac8a74c6e58c499b91d9c";
+      sha256 = "ed29ca89e0df849885dd816d43199cfb73721e45c083d3eac53860685a6970b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-AR/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-AR/Firefox%20152.0.6.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "0009d5d55b69a44cee3982d3c2c055614b5a1beb8127576bc0e5ee2576a69efd";
+      sha256 = "55aa27872fda22d77a32b35d4ddfb8410deabde8ae75385741dec1071c573984";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-CL/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-CL/Firefox%20152.0.6.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "a05df58105fe20ce0ece208b0f276ffc3d9f5d0685edb9ee8bac58a3c30ca249";
+      sha256 = "8fe69c1e196267e936390ac455993993f58556ff7e0aa018c5e4b4a9a28cb3fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-ES/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-ES/Firefox%20152.0.6.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "5b65bd03d6f854432e541ce90266d3ad9c427684a7d13ba83a615cc9a56a38a8";
+      sha256 = "e547743f842482c6c6d285b63629747a388acec54efea4b5b1e6a30e8b430929";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-MX/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-MX/Firefox%20152.0.6.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "a1f182db4541e99d31224b7be68e89317e11c269f5701548937022f183d075c3";
+      sha256 = "1e3d9fb6bd8e26099cb68b29f0a79c8d14c1ed3f2cd60a5ca5f7c5c43bc778dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/et/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/et/Firefox%20152.0.6.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "b4e7b50a198375e95a3e43981f62b85a5844e256aa8e74cadce44437e3a87484";
+      sha256 = "a64b3070e1fc361cfcaa7070d6b41d1937add2e094ac899d3530f60306b8643c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/eu/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/eu/Firefox%20152.0.6.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "1fd4570ad45d27d414e8044067973a19af38d1d57a0de0dddd4cf4b004034aee";
+      sha256 = "22ff141db9d52617936cbae5f993ac3204ab08bfdfea84f16a1c1b9b3a5926fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fa/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fa/Firefox%20152.0.6.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "14c4db4a3bbcbbcb422c464ee79ebc6c9737e3fdd95a55a542594975b96ab2d8";
+      sha256 = "3b35f5e8827f345a51b838761f1c3222e417313a355271bed07fd4f776bda91a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ff/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ff/Firefox%20152.0.6.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "6462c6f607d4cdc49cdc701db8890d30d81411a41977220fbced4c4664389215";
+      sha256 = "3025be112a000792de23595aa9b62ce8f73899d9a93a95fbefed1dd5aa452a3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fi/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fi/Firefox%20152.0.6.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "a83ad6a3ad23b0a0f9d9c38d4f6042fc331fc52ca47162390527161ba11c938f";
+      sha256 = "3a66c6daec7cd7fafaf1037a350c0e3d54812466938f6d5fb0bf7af304ed13e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fr/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fr/Firefox%20152.0.6.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "c00eeb475d44e76a5494a53f4c5a5aebd5a565badebe7675fda073f7f0637038";
+      sha256 = "628a385c012bc9e9621d5a6f7f2e42b2271c0b3d50261f3b3c6c1acf639cf568";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fur/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fur/Firefox%20152.0.6.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "df8b257d006387dad2ff0936fe323c36f1fc7b9d4825b4f9c6d8b39533a0c0ba";
+      sha256 = "dc08e1fd9b31388875d9db1748308a55a1014e9c514f418c8500ccfdf2bb1e5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fy-NL/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fy-NL/Firefox%20152.0.6.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "d5179a6dd283f24a520b21087edd56395f94c5585861c4e6d9b88e176eeb2121";
+      sha256 = "023ef715ac2b88904ab77ed7dcc1f3b65533d875137af7a0aaa3083737b2b3fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ga-IE/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ga-IE/Firefox%20152.0.6.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "0f634f6a192d076d83143d2a9cba2923e3b27a8078a06a62d2c7ad3816c13c51";
+      sha256 = "64eddaf14f6e04330d1db1479c6172c4c92c23dfe60e8031f5ce9bef076fbda4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gd/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gd/Firefox%20152.0.6.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "934ef59921cfb746c73d589e39f55ec1198b03da8e3ec776275f759eb75c9c5e";
+      sha256 = "9d7ccb6cd53650cb31b13d1d55f59688bf07f8e15261700355335e96d46f4c0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gl/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gl/Firefox%20152.0.6.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "02ee2ed4290aeb401c93419b5aef79ae6da8c529b74824f92ef1d8af7c0a6046";
+      sha256 = "5d897c1e6033997c915e16bf9fd6cdc999077ba336cc414d535eaac96d2dffc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gn/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gn/Firefox%20152.0.6.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "77a1b6b6176ac78af2a527620b9b05b66bc4c8a10479b88a6259872cbbc74ced";
+      sha256 = "4ef673445c8637a53a700bf41a37aeb876d6861d8ab6c605de20da349a0b7b1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gu-IN/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gu-IN/Firefox%20152.0.6.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "7b30bf7a0e4bc884c0cbe070d6207364b6b380b1b144c62f4978b83eb1608b02";
+      sha256 = "caf52727a469b6fca1899bcd595f33241bc7d28ca4ddfd14c5692908de35c36a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/he/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/he/Firefox%20152.0.6.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "1e6e63dfe0680d3dfd31d4551716b629915d41e44a436d977df106d8258904ed";
+      sha256 = "b47703d32020037154ff936425114e9baa44885364fce623ef86e38f7d645183";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hi-IN/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hi-IN/Firefox%20152.0.6.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "e20dc094af7fae96b5175e6d37ae0d7fa2ba4c4a170ea231c7cacdd5de4f9161";
+      sha256 = "616383532ddb7897bb66bcd0d2cffc40b7cd586dbb878c32e1545f688cc3c989";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hr/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hr/Firefox%20152.0.6.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "0602ec19e8ca98da8a59ba43e9dd6af5152c646ac42d69c7a53422b7263e7f61";
+      sha256 = "2827bb593da69cdb2f42bc2fd2b2eb4759c6f591d5c6078736fe03976f6d12ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hsb/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hsb/Firefox%20152.0.6.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "4ac863122b0f8f1d3810da95d22b76c76f030f0f311bc22b92a2e5519c88d068";
+      sha256 = "7967ff85ab2cb8c72b19ddb5e0bbbf801f03a10da0095cef10be0288ecb6d2f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hu/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hu/Firefox%20152.0.6.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "f5a2af2aaa10b94a4047c89ca64c30a5995834836a6361261731d74d45526f3e";
+      sha256 = "c3cff12c5c947e480563cfd7a6b244dc8c663dfdffb72d2a21138ba410eeef17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hy-AM/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hy-AM/Firefox%20152.0.6.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "37eaada6943e6f3fb6e31d646b481d5646df17d3419fa48c4974e9b19a8a8457";
+      sha256 = "e29dd68f6c42007bddbcc98f19f4de3a5ddb39a8e04b24309ff0790272cbdd52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ia/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ia/Firefox%20152.0.6.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "ccbcacc121fb64caa4be00ed29da9efec9b1e8238ccbb397031fca25100f6822";
+      sha256 = "e38d2543c8f978cf22977569533092a4f093633a43bff54a356211be31c968bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/id/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/id/Firefox%20152.0.6.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "5276ec8bef1848f67af48d254603fc262b9350c08181ec8994fb8ccb7a1ec527";
+      sha256 = "f416b9aa3506d6948c837f27513a8c52b20970abf9a3566143e4d2062379ef2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/is/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/is/Firefox%20152.0.6.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "247991f77f4cafc1a8a9ffa445ef572ddebe52b54efbcd271d1554d22eb7587a";
+      sha256 = "63d227f0884dbdcdb202d0e58dec31c3d440aa3c2f6a63162ae16688e1e3e56a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/it/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/it/Firefox%20152.0.6.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "c70cadf056e3dc1e3154218824535dfbe68a0859af776308fe9d5e33354ff7a0";
+      sha256 = "94cc0a5778549e00fbd23ed4a29cfab33e8732cb6b4af5c29b3341fbcab11b75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ja-JP-mac/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ja-JP-mac/Firefox%20152.0.6.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "ea2a1278a04b28eea1683105ae83c9ba905ceed486d17d5dcd441d6d7eca46a4";
+      sha256 = "74ca80f964982e8b9afb78b32a6d58a85295a8e4f205027835c115c4edca830b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ka/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ka/Firefox%20152.0.6.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "a894b345489df373f15014a62c6e6be5c715634df00115095b0b1bb90969f190";
+      sha256 = "0a6b7deb1470f02a4f1ccb85b3afa4ecb4fd31bbf8e311c992fd417acf468afb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/kab/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/kab/Firefox%20152.0.6.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "cffd8abb0404c8d5f9dfca027a151305de518a749480e7145e88eb8298f7e731";
+      sha256 = "465bb2c06dfc886e13eb3f22ef8ba4e41921a4a13b8990c9b7a71ef7d82503c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/kk/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/kk/Firefox%20152.0.6.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "b9bb544d94cf28d51500df939664372455fe9d92843fc407bed4a12eae1c425a";
+      sha256 = "ce6be2a5cb1da6004e8eed6d030c5ccf13d5bf617d706071653bed80ea27933b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/km/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/km/Firefox%20152.0.6.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "c22f7fe126e65bc97372cc0a1094bb6e0dba88bab43e98195b9009226f660bd4";
+      sha256 = "b1bea283124f337471ab0a63142a3fe21c613c111568177b8dc8bb870bf0e3a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/kn/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/kn/Firefox%20152.0.6.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "c86413a67bf8a6d4ab9e27416cf93cfba49a2985fba357f065fb2daa98aab770";
+      sha256 = "1ea6aef8cfa8b63ebe401a167aef52ceca86608570d4281f89771dad4ad850b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ko/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ko/Firefox%20152.0.6.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "327b887eafec061ace9641f9f9f6e6f317ac63a21c4949161c45cfce45b39fcc";
+      sha256 = "9ff389139e18e07169498e8d63741e7df93ddb59a45c40eca7475dde08c48139";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/lij/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/lij/Firefox%20152.0.6.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "6807fafa6a0a48bab2ee036f8841102dcbfc5414f309d36f86e48f5ac1de7775";
+      sha256 = "1b5bf426383ea8983953da975f130ab9a960513386232f7f7b78fa7538ba6b97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/lt/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/lt/Firefox%20152.0.6.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "f6b47dc482404bf982e4620eb3b43878a9b78ba3a412d1f5fd65121407986787";
+      sha256 = "122666ca4d32467872b8ed96975c3491d335183338bc5b8caeae66093e9a9c38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/lv/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/lv/Firefox%20152.0.6.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "909fdaab26f051a7f4266b73acc877b1116a73be9c38ed83791532f57af6009e";
+      sha256 = "23752290e10db884c025af66a6dcb7bc940dbee0071837aa101f1d35370c0fba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/mk/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/mk/Firefox%20152.0.6.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "c0384f378f5203106b64b7dc041f2205a5caad0c7a4c558923c92f86e7f0952e";
+      sha256 = "48352370384b97ddfaac1bb7f3069604bc36e4ef6f4e978f53c8be7ec5b00a50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/mr/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/mr/Firefox%20152.0.6.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "149a62f981f438ca365a10e1e4c31be9045f4cc85c9e4e8eceec777053ceacfd";
+      sha256 = "86d03a5f5464eaa3ef8444c5ec1dd787080bb7cc4ab2595243536c6126ec7dc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ms/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ms/Firefox%20152.0.6.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "b63c2458cec31631febc7b14925b90384e4e18bba57319fd7f71b5d85fb030b5";
+      sha256 = "2081da2ec820722d8c17455d3f4aedb439bb57d4224b8ff474ca1da9577d42e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/my/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/my/Firefox%20152.0.6.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "d6c1702c52d108fbf00e9ee2efea581ae5ae9912f939cfaadc9389c9b53c93b4";
+      sha256 = "f085e1dc3b716bbe4d0c089664cd3a516ee8dc9d14454c04e0501e3a1a05e80e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/nb-NO/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/nb-NO/Firefox%20152.0.6.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "5b98c9141514ea47626cf0f3961a59cbc9283ec538ac351d944b3ed5056d96cc";
+      sha256 = "82b9e1be9e090363c559d1f2b7999a6954f369dc4553ae7ace5e49288fbd0c9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ne-NP/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ne-NP/Firefox%20152.0.6.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "bd4b4ec8b8a7fe255cd4c128a6197a540501700d6d765e6ab6530b77f9bf974e";
+      sha256 = "a62958201afd74b9fb03ab99ce1db5a7476228805f6116d453b779a04ce8dff8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/nl/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/nl/Firefox%20152.0.6.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "89e903851de3640ef6070d0cad3ff360f80063cc8e100af446d324baa8995655";
+      sha256 = "f67bcf13867030263c5aa5acd7db9c0462d26b6c663540db8592312226d56124";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/nn-NO/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/nn-NO/Firefox%20152.0.6.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "7c5f7e214712d99ee9365f59868593885ace6b841ea9f25112245ee44a6f750e";
+      sha256 = "cf159557c5bb41f205cf56de769298d14562fc8d4065a3439c28f8eac59b4d36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/oc/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/oc/Firefox%20152.0.6.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "8456dd6a5c14a24ad680fcdb4b0c7588ea03cfa8ab6b83e7fd6e1dc090e01325";
+      sha256 = "d949a354ba41a93c4903dd49180d1b946e9b10e51da97bdf04bbc5119ebcd2e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pa-IN/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pa-IN/Firefox%20152.0.6.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "4ef36dd3b8b6fe63e590137f15113f3a938c8ce9826882dce21c8fe12ad0488c";
+      sha256 = "00c40704639b103eb2193b7bb309708925ba4487d8e64ce7f422a95000e022fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pl/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pl/Firefox%20152.0.6.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "66cee424a764f604f947030e3c6a1ed26035f98f0c6acef724386c66cc46383b";
+      sha256 = "29c697ce9dcbcfedda3761e8b1093e7111deaa7b917b11f674ce5d8a89ed43b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pt-BR/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pt-BR/Firefox%20152.0.6.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "8f4abc16a06184c87e6dd33c052489864516cbeb163d0c966c024ba25089ba2f";
+      sha256 = "42565bba90aff96250d6924e60bd039928acbc929cda68bab4e7e2034965ae10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pt-PT/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pt-PT/Firefox%20152.0.6.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "3e6e4f4ef79440e84d60cf8579c185c5926270055c00f5e114556edcbf6c7c24";
+      sha256 = "e432d785806800557641911ca1657c7107c976617fa472450f93f4417b647dbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/rm/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/rm/Firefox%20152.0.6.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "bf7083f12b2d849d84ff5c01fa9746b104e862ac8715ea0bc4580f0fe577166f";
+      sha256 = "5600f25f99a9630e51296bb3972ceddf7eb36254c6dfc4f0da363f62433e3370";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ro/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ro/Firefox%20152.0.6.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "88c400fcd2d751dc8fd2d27c926ee94e0f4f8ecca0cfafe84ee18802e0255718";
+      sha256 = "42caca7179b5fe870a4bd6c1abf4944e5f2c69f720c94cb9594f2cd59f98f14c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ru/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ru/Firefox%20152.0.6.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "f54ba43b4bf267634d21a2d1dd4449c7cfb16990c9451a0cf3074348742e6095";
+      sha256 = "54209bba0052b808c9c6c02c25e8bf9ad72774047aa596ade3e8a7550031ba8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sat/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sat/Firefox%20152.0.6.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "715684a3c3336c438cd0ba121351cfdc20e4d4294e2ced1241afea657dd62324";
+      sha256 = "1ab4eb843736aeadfd4702f487e090ccf2457e8c40a2a8d136f65c1746b40d28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sc/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sc/Firefox%20152.0.6.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "1f55a8b02774c7d8ab1ea51f2fbdde2561aa4d4ef0741204426ecf8ba00cf158";
+      sha256 = "9509a852b0303fc12204fcfa231e2300634e628964b5d805aad9d8f8c9e4a8f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sco/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sco/Firefox%20152.0.6.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "7931c9a844ffab20aaf9be1ccad89324570326f24506117b4a9382e50c15db07";
+      sha256 = "29039af009a5197689c516f3d08c869f80a7f78413fe478a76a7cf7201111166";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/si/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/si/Firefox%20152.0.6.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "b579ca47fd9adae2b1ffd2c3dc754369eae47c50ed740c10f001ed3654cc0aa8";
+      sha256 = "76d591eed0dcaa5f7d3c707a46819919760c3b32b97597c281b28556aa6060d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sk/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sk/Firefox%20152.0.6.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "e233dadd5f9dcffea1c2db9459cc6a4fbb73f91d93284a3796b8922577ce4068";
+      sha256 = "a82a55040edcd02eadfdb5be9afc96eee8895faec3c135bb29810870d0dd2c0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/skr/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/skr/Firefox%20152.0.6.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "9ffcd4c26ef8a8a5fbdd8ca6133cfbbbf22043094c73444005a3f7df61d26cb2";
+      sha256 = "470926f0aae969714eb9844fa66aa789691672b65a76efbd9fbcfed00f8fc52e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sl/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sl/Firefox%20152.0.6.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "345a71f80c0fd98b422ed3be7ffe1ef2fe46dba167b955986566024d910b55b0";
+      sha256 = "460907d6e7bdd1006c14fd08ef178bb1efba353aa7e307c62298fc14fa674a01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/son/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/son/Firefox%20152.0.6.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "d296ebc52b3a795c2e8da8194ae207d76e47cace9f68b29a0ea79ce0a196e454";
+      sha256 = "1800661b190fdc51d5e731eff00ca071b72ed4068bf30c6b005ed932d0765772";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sq/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sq/Firefox%20152.0.6.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "1d74a1fc016eaa619cfaec922a8816a990e7a6351f458ca3067ae48e7d8e28aa";
+      sha256 = "94454b310a116c0ea6e4a9b742c816058eb5f984fa9cab9a99b63a5f26908afe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sr/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sr/Firefox%20152.0.6.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "a9f8d2de27469c31cf01c470b417016f4301e8fad16e7f9298ad845fbde8a6b9";
+      sha256 = "2676dd843140239442d044bfc42e51fa466362a0e12e65027fbd213773e6cb99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sv-SE/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sv-SE/Firefox%20152.0.6.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "1bdb500fafe8ec10322fd78d47496160fb7ad6b5b3abb5297233ac9abd2ff42f";
+      sha256 = "d2925c3dfef57e94e70ba1604d18eb9d3b76a5b611e52a955f8aad7410cf2528";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/szl/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/szl/Firefox%20152.0.6.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "dcdd05fc822a0d58ca67f3cda7d9ad4b39c2c42b7c8fd22707c9bf6bf89e8fd9";
+      sha256 = "d52063bd4eea4deba671d83265d9bca95b11147e4ebebc0d25eae8e1cd671c43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ta/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ta/Firefox%20152.0.6.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "82c739cb7cbd734f8d7385e385a42a5f1c138395c503063e9f8de95eb2293566";
+      sha256 = "0a134af2838b431a9fc9a7ee41b81d769f9062414fa6aeae189ddbbfb50efc3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/te/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/te/Firefox%20152.0.6.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "6ef36dfdbded72513aa3d351c792a025311b83fecb704095aa6d79f00fed1f64";
+      sha256 = "2757f5630368121e2767ec85058c65c3729dfa084f585ead678536aefd8aa406";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/tg/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/tg/Firefox%20152.0.6.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "40ab48ece74d955d0ab0e3f9e2d281cef347ce5f97d259e876a45cc27221a576";
+      sha256 = "cd2ac95907ad6f91f73a7ccc30c3bf505c10edd797c1a3ea7ad27c025ec07668";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/th/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/th/Firefox%20152.0.6.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "cecee2e9dc8efa06503e3ef99ff1df9347414b428b78da4c18155b92783f67a0";
+      sha256 = "d40fc728551be930f33f29cb641eb1475da3feb14be48382bbcea381cf55c8e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/tl/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/tl/Firefox%20152.0.6.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "b946a7e6de82d467b24cee7365ca2011d067d4e06bb3871c74ea67cff9b065cf";
+      sha256 = "50c15d68fc1fbf8a923b36fb4dbfb48547cdca093776e6dde5f4da472afd96c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/tr/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/tr/Firefox%20152.0.6.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "28fb15081a46a6c5c467ffe0e21a814585c4f6bf0a6d46c3512f6cf33749f8fb";
+      sha256 = "2947dee7fd29f947a04ef6c638ee7a854dc060bfdb8eb62d46221b92d7e216dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/trs/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/trs/Firefox%20152.0.6.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "7a7522b90d8de1b8902feb41757b8307d41258faeb464d7e65273ed72e34a17d";
+      sha256 = "4874731cab707e50231e23b9ab9d46eb8ec1d51c6a07b31d8c52a5fb13238c9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/uk/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/uk/Firefox%20152.0.6.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "527ad38dc945c62610d41531d1a71817ad7327ea145cf11e1e22f0acc0026fb7";
+      sha256 = "9ce4d54265b808b86fd1d83009c0fa88c8f405a1f5ea1710f40ec5be3753e66d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ur/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ur/Firefox%20152.0.6.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "586aed3f8f1f18b283bfd91421e6e73c8a027877fea337a3da31ebc65399ba5f";
+      sha256 = "fa6acebf921fb52513e58df630907784955a3dff707af1c56b8bc0ff8aced260";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/uz/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/uz/Firefox%20152.0.6.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "0a407929707d1669c65d8e5b99703a8a909c4fe07f32cb740bf962f04322d889";
+      sha256 = "aaa9414510113b8985ba13d67ba42e03d0e41d53ab12f2878d8e62de63d4e966";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/vi/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/vi/Firefox%20152.0.6.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "030bb044c393a72315b53d8c4efb983507558e103a9f0975c1c62b976b89608e";
+      sha256 = "0d59114aba52524058aaf5b819db8ecbb34c85904e532558160c24a85af77e73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/xh/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/xh/Firefox%20152.0.6.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "f0eb143ea34e4c315af614744e2a62280ea865118fdeffbb30aea967501c68b2";
+      sha256 = "5b1db86e888a1fb34a761a46656d0db47e12acba3ffa7fc0b5a2f222cb8fcdb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/zh-CN/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/zh-CN/Firefox%20152.0.6.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "1a72c7471bebf56aea589930198311a047ea248acb423a4f374b36e323cec9d1";
+      sha256 = "29efe4d3373a06cb57977c20261b81bab21fbd470f674492f2059e931f9f977c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/zh-TW/Firefox%20152.0.5.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/zh-TW/Firefox%20152.0.6.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "86eff428f777aca1ec642312475a9fbf0b86ca20b41fd6055ce149cf1b8821ef";
+      sha256 = "304bc1d395517f9961e8e26e10e27ab1525b7b78ccd9fccb188bb68f8a8aa83b";
     }
   ];
 }

From 3f146ea07fc0e206e877156eec08f85103ab98cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 10:55:11 +0200
Subject: [PATCH 0450/1386] python3Packages.tencentcloud-sdk-python: 3.1.131 ->
 3.1.132

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.131...3.1.132

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.132/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 eeed8592bc0d..47f0ed598f08 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.131";
+  version = "3.1.132";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-0J0UnWoXNe9vzQeJBACPp7C90UsvJ0Puh2h9roueCZw=";
+    hash = "sha256-jfjArHN7+HARacfaePaP6+LsXNFK1uOHGoylc4FO46I=";
   };
 
   build-system = [ setuptools ];

From fa0ab06902ab712725889ad6d6eeab361504cb3d Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Tue, 14 Jul 2026 04:08:50 -0400
Subject: [PATCH 0451/1386] keycloak.plugins.apple-identity-provider-keycloak:
 init at 1.17.0

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/ke/keycloak/all-plugins.nix      |    1 +
 .../default.nix                               |   54 +
 .../deps.json                                 | 1335 +++++++++++++++++
 3 files changed, 1390 insertions(+)
 create mode 100644 pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix
 create mode 100644 pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json

diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix
index e401c60749be..50992f4199b3 100644
--- a/pkgs/by-name/ke/keycloak/all-plugins.nix
+++ b/pkgs/by-name/ke/keycloak/all-plugins.nix
@@ -5,6 +5,7 @@
   junixsocket-native-common,
 }:
 {
+  apple-identity-provider-keycloak = callPackage ./apple-identity-provider-keycloak { };
   keycloak-2fa-sms-authenticator = callPackage ./keycloak-2fa-sms-authenticator { };
   keycloak-discord = callPackage ./keycloak-discord { };
   keycloak-enforce-mfa-authenticator = callPackage ./keycloak-enforce-mfa-authenticator { };
diff --git a/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix
new file mode 100644
index 000000000000..7bda6aa7651c
--- /dev/null
+++ b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle_8,
+  nix-update-script,
+}:
+let
+  gradle = gradle_8;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "apple-identity-provider-keycloak";
+  version = "1.17.0";
+
+  src = fetchFromGitHub {
+    owner = "klausbetz";
+    repo = "apple-identity-provider-keycloak";
+    tag = finalAttrs.version;
+    hash = "sha256-0/uHQwgyHwy+5ynRHs0ot0iIBVUckEs65YxkWLQNgbY=";
+  };
+
+  nativeBuildInputs = [ gradle ];
+
+  mitmCache = gradle.fetchDeps {
+    pkg = finalAttrs.finalPackage;
+    data = ./deps.json;
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 -t "$out" build/libs/apple-identity-provider-${finalAttrs.version}.jar
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/klausbetz/apple-identity-provider-keycloak";
+    changelog = "https://github.com/klausbetz/apple-identity-provider-keycloak/releases/tag/${finalAttrs.version}";
+    description = "Keycloak identity provider extension for Sign in with Apple";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ anish ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # mitm cache
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json
new file mode 100644
index 000000000000..b8c6df951b03
--- /dev/null
+++ b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json
@@ -0,0 +1,1335 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://repo.maven.apache.org/maven2": {
+  "com/apicatalog#titanium-json-ld/1.3.3": {
+   "jar": "sha256-d53h2I8XNIbw6p8bS3d5lwrCGnrUmyoDcPX5m23+9yw=",
+   "pom": "sha256-VM++dai2e/vf/1mf+be016mun7h1GQHKu9f1+OTbxL0="
+  },
+  "com/fasterxml#classmate/1.7.0": {
+   "jar": "sha256-y4aPIxxczrideV6gDm4bepO49Kwc4di+dt3jIt/0oEY=",
+   "pom": "sha256-ZHEa3vDskvH2zap7LqwGsuVmekppkez7i/rEZoHVuTE="
+  },
+  "com/fasterxml#oss-parent/56": {
+   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
+  },
+  "com/fasterxml#oss-parent/65": {
+   "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4="
+  },
+  "com/fasterxml#oss-parent/69": {
+   "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18="
+  },
+  "com/fasterxml/jackson#jackson-base/2.19.0": {
+   "pom": "sha256-Noz4ykJkRni737F6sUfJC8QyWaWZUJfD8cT7au9Mdcg="
+  },
+  "com/fasterxml/jackson#jackson-base/2.19.2": {
+   "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.16.1": {
+   "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.19.0": {
+   "pom": "sha256-sR/LPvM6wH5oDObYXxfELWoz2waG+6z68OQ0j8Y5cbI="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.19.2": {
+   "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.16": {
+   "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.19": {
+   "pom": "sha256-bNk0tNFdfz7hONl7I8y4Biqd5CJX7YelVs7k1NvvWxo="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.19.3": {
+   "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.19.2": {
+   "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=",
+   "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=",
+   "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.19.2": {
+   "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=",
+   "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=",
+   "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.19.2": {
+   "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=",
+   "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=",
+   "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.19.0": {
+   "module": "sha256-qLWWRYzQPkdOAwOUJpAQeKzOtwMSau5jaUo0HpbWXoo=",
+   "pom": "sha256-p8eH3uN+tGj3MxtELbwPFUDxQnRveVmBu7YkgRY56K8="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.19.2": {
+   "jar": "sha256-RQ268UVD98LoE4cKousG/Nu3kxbYCzDMT32oMfNYLPM=",
+   "module": "sha256-tEgT9KJg3WOlW7Xcc9OsavHi+RwzrD8FfebYE6EiXeA=",
+   "pom": "sha256-o4vv9jT/C41ZaXIiP2tD7UtWatoxSBB5rwj9Hxn/mLs="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.2": {
+   "jar": "sha256-gKIT59mYJEkiq3vPCTjqA+t4aOiOLQWoQHxiKMiFo34=",
+   "module": "sha256-bpyu0tDwqryZNnVPNzN+Dxc2MdahWxjE2QRpVtZ1U24=",
+   "pom": "sha256-1UeZ1Ba/pn91wvGU3IgKE1dPvVXmQCqH45NImPebgM4="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.19.0": {
+   "pom": "sha256-D8yK4bXILDgeQPw9uULCgMHMSECz5sDekmOu9v4D0Zg="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.19.2": {
+   "pom": "sha256-z8A2j768TpMUNzf2pDHWjpLPPDXMlFmLo1U+1wYYEQk="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.2": {
+   "pom": "sha256-F5LLcfGWGg/nXi21/CckZovisBQX8LzHOee1AOIoFAE="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.19.2": {
+   "jar": "sha256-YFX+8QdW6L0bDogHqh2IEzjGPKldWSceHaSSK5oXWB4=",
+   "module": "sha256-cJMXXvltnjxoFL59n5uQeZzGsd/JDqi8ZUVP9byleEo=",
+   "pom": "sha256-u2kaYgtZPgNo7zrOifnc1dY3VtXlvAXdyay3ih/Ny+c="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.19.2": {
+   "jar": "sha256-lwn0Pg+lYlYz7mbbbAePsejHygIJJpa6lep4Xb8PpqE=",
+   "module": "sha256-HNFClAh9xmpIvf8+t1CZyHsK0paspR6AgMuc3yCRF6E=",
+   "pom": "sha256-sa5Nojzw/imhXWUC4XcpfAssYp3Nlpy2RFfVVLZacS8="
+  },
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-base/2.19.2": {
+   "jar": "sha256-F/5iz/a/euqvdBNgCa9cS0mVSIxTe7bpKPcO2s7I4LA=",
+   "module": "sha256-1+OmfyY5twuE4/7bwZqTZKfMClnh7rl5lihDoARyjKg=",
+   "pom": "sha256-cuutsSEGvT1wp4JQT6g1ZL/R7oZHn5ZWPYMrnWt96rs="
+  },
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-providers/2.19.2": {
+   "pom": "sha256-B2S/Gps0yugUzz8hO2oCKSBV4P0dxXOuixNfE/xre2M="
+  },
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-yaml-provider/2.19.2": {
+   "jar": "sha256-zWNZeK73fG8NxbLTOhKhOo8HDmOjSVt9bCxrJRIwoSA=",
+   "module": "sha256-LLWfJRGJTBuWIQyhhK8LGvrXD+4HLMIfSo2OmEQe9wo=",
+   "pom": "sha256-JEYduYSE7ns8yTkLEKZyXfXp8JfN0XXnlwdnHCAmRcU="
+  },
+  "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.19.2": {
+   "jar": "sha256-u69EflB7FOb/s/dVxLHmD1I5nHPzM4BfNK+6Z+8XWSs=",
+   "module": "sha256-HhkceCnIbeQvm7s6uph3Gdgcs49aDZdx5nQFHka3EDI=",
+   "pom": "sha256-mRKux2ADWIe3cb5/imHAWPOSt6WClRANzzqay8nAKec="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-base/2.19.2": {
+   "pom": "sha256-V6S5QhVKz4VVeikvO4O3cnMAfjxwJak5UDScL9GoYVo="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": {
+   "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ="
+  },
+  "com/github/ben-manes/caffeine#caffeine/3.1.8": {
+   "jar": "sha256-fdFfnfG+I4/6o2fOb1VnN6iAMd5ClNrRju9XxHTd8dM=",
+   "module": "sha256-SazUz4G+Hk6GgFTw00/PXHdWCEWVBzB86HjNuk/dTYQ=",
+   "pom": "sha256-Rj9PiWOKroLGVLPyhC6NA/eg1IGUxCYEbdnJXOBjJu4="
+  },
+  "com/github/jai-imageio#jai-imageio-core/1.4.0": {
+   "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=",
+   "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw="
+  },
+  "com/github/ua-parser#uap-java/1.6.1": {
+   "jar": "sha256-/z4eudgH34vBl5UN5dVV0YkqfO7Q/f91s+sqp4u+UcU=",
+   "pom": "sha256-ZnXK/DBSoJQXycUnGv5owrSrpuu8ya8FUfh10k6r6ck="
+  },
+  "com/google/api/grpc#proto-google-common-protos/2.29.0": {
+   "jar": "sha256-7px1HwaxEukrN/deT3OhfQPvLDMCxujZhq28xyG2PLA=",
+   "pom": "sha256-buHqFliOzsn79BLXrRulV7xFbOCXUg3uXkzQiuYcJ4Q="
+  },
+  "com/google/code/gson#gson-parent/2.11.0": {
+   "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
+  },
+  "com/google/code/gson#gson/2.11.0": {
+   "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
+   "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
+  },
+  "com/google/errorprone#error_prone_annotations/2.30.0": {
+   "jar": "sha256-FE86771uJ9rsVdN1OyxrE8Gv2vDPBIFs21ZFiO2S8b0=",
+   "pom": "sha256-9xOEnCOzSVPoVFZdzoqnlcrgwUFmEbcgwhRhMix5X4Y="
+  },
+  "com/google/errorprone#error_prone_parent/2.30.0": {
+   "pom": "sha256-Xog0zMDl7Qxy8wbCULUY5q0Q0HWpt7kQz2lcuh7gKi0="
+  },
+  "com/google/guava#failureaccess/1.0.1": {
+   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+  },
+  "com/google/guava#failureaccess/1.0.2": {
+   "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
+   "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/32.1.2-jre": {
+   "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8="
+  },
+  "com/google/guava#guava-parent/32.1.3-android": {
+   "pom": "sha256-QfwmRk+6irC1W0AmdrRTaeCqqbqOClpd7IBFKQisl+E="
+  },
+  "com/google/guava#guava-parent/33.3.1-android": {
+   "pom": "sha256-bhGYbqclC1H4RxV+Lck38yowaATfzgAHpegd25uVxXk="
+  },
+  "com/google/guava#guava/32.1.2-jre": {
+   "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=",
+   "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA="
+  },
+  "com/google/guava#guava/32.1.3-android": {
+   "module": "sha256-+Kh873LA6AJ6b648vfAHKiQc5tjnYPlucIe3QqZgWmE=",
+   "pom": "sha256-SfgFUBXoaHd0z9iTm9aDx08J1rJLzA/CaEC82XoIhms="
+  },
+  "com/google/guava#guava/32.1.3-jre": {
+   "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q="
+  },
+  "com/google/guava#guava/33.3.1-android": {
+   "module": "sha256-aXFhTd7uAD5U0racawyUzopbXrqYDRZFXIHfkImnrLc=",
+   "pom": "sha256-xyjbbycFyj6mo88s8SYNvv86RSQkmhsbkA7c/p1yFC8="
+  },
+  "com/google/guava#guava/33.3.1-jre": {
+   "jar": "sha256-S/Dixa+ORSXJbo/eF6T3MH+X+EePEcTI41oOMpiuTpA="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/j2objc#j2objc-annotations/2.8": {
+   "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
+   "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
+  },
+  "com/google/j2objc#j2objc-annotations/3.0.0": {
+   "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
+   "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+  },
+  "com/google/protobuf#protobuf-bom/3.25.1": {
+   "pom": "sha256-Q3hpcMGst8EZyWH1PqhWpLwL9r8M7/qwrSqE8mLPFlQ="
+  },
+  "com/google/protobuf#protobuf-java/3.25.1": {
+   "jar": "sha256-SKjlihqPgu/xQaejiNON/nfXpI1eV8kGbuN/GRR+IN8=",
+   "pom": "sha256-P/SnjWBeHWmR5RXFUDcmy0gEK4dOpVSkvIqHrp+Rv5U="
+  },
+  "com/google/protobuf#protobuf-parent/3.25.1": {
+   "pom": "sha256-zRvoNznwNkYrEptlN1n6hov61D+5U5xefR3irD2F3Oo="
+  },
+  "com/google/zxing#core/3.4.0": {
+   "jar": "sha256-ZQBIBqZpI0xpj74HVSWBADdfsB/pO1OEVfOQNxPUpQ0=",
+   "pom": "sha256-CzqlUO6bM9qDUwx7POCYVDQyNZew+ZXZrqEkbfeweDI="
+  },
+  "com/google/zxing#javase/3.4.0": {
+   "jar": "sha256-eu73RqVE7/zZ5JkhTZ8xXmnDqDXnyBq/twO+efhZptc=",
+   "pom": "sha256-zAE4wjA1fmStdZpAwONiuog3yf1PSr5kw1uz/VKhCno="
+  },
+  "com/google/zxing#zxing-parent/3.4.0": {
+   "pom": "sha256-6hqNZZr4nC3dRyfettWvEkddEsi4Rd/J11AT0I/xE+8="
+  },
+  "com/googlecode/owasp-java-html-sanitizer#java10-shim/20260101.1": {
+   "jar": "sha256-nCC++8cAOvTe45cP0fnQHyUtK+mDUjVQkDhBn8to2h0=",
+   "pom": "sha256-AkJQ+u/aQWrhRxG64pkHes+SfHIy5JG4SlIjUNebpck="
+  },
+  "com/googlecode/owasp-java-html-sanitizer#java8-shim/20260101.1": {
+   "jar": "sha256-tdWxCv0qsYmb2ahZ0de1m0nkONqxinyV2FrHHBMpkyo=",
+   "pom": "sha256-1DL8KSVzoBYOU/IZAupmBMuST25eGW3J4G+Q5z25uSk="
+  },
+  "com/googlecode/owasp-java-html-sanitizer#owasp-java-html-sanitizer/20260101.1": {
+   "jar": "sha256-8xPx1q6Emhj1Ei2++BJtw3nshs7y3PgZK0eBcMfq8VU=",
+   "pom": "sha256-LzARwOiu+gAb+dsZ+Mx+ts7bcvnoA/7wKGLvWlVa71s="
+  },
+  "com/googlecode/owasp-java-html-sanitizer#parent/20260101.1": {
+   "pom": "sha256-nk08oMDaG75sAV7RenMI6GNFrx2/BGBtZ9hx5CI7vMc="
+  },
+  "com/sun/activation#all/2.0.1": {
+   "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw="
+  },
+  "com/sun/activation#jakarta.activation/2.0.1": {
+   "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=",
+   "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo="
+  },
+  "com/webauthn4j#webauthn4j-core/0.29.3.RELEASE": {
+   "jar": "sha256-KwcixSJzMd6gy6hVyM06C0wu+d1SKN3HP7g9wV4ado4=",
+   "module": "sha256-LvUJKU66sFQfwNJLBbuUReNtMbveczzXFFsUtKujeYg=",
+   "pom": "sha256-mRqiEmv00c88ly/MiIKgb0F2Q17FlC1CT2+Ou6GGp2A="
+  },
+  "commons-codec#commons-codec/1.11": {
+   "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
+   "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
+  },
+  "io/grpc#grpc-api/1.65.0": {
+   "pom": "sha256-JD7d8N/78ktOlxt4m6NO0zUb0X85Y3k8JaiNJv98dDk="
+  },
+  "io/grpc#grpc-api/1.69.1": {
+   "jar": "sha256-qNPW3McfOrYT1miEIoK0iL3ZPT6ZoO9dyn7ub6c0woM=",
+   "pom": "sha256-vq8uR11cRdBjTU0yS/hNsqjWqSkilx5vfcJ+hRxCkH8="
+  },
+  "io/grpc#grpc-context/1.69.1": {
+   "jar": "sha256-Re+VuMFYqLW906y2e55oLvJUFLsUj0iOyEdDirZHFdQ=",
+   "pom": "sha256-beKbzqslob0L4R7qhGjQ4/HAxHbQpTMhW0/eHIKEtXA="
+  },
+  "io/grpc#grpc-core/1.69.1": {
+   "jar": "sha256-UTUsra7L+aSkqkLZP28fxyjx/QGwUWgDg+0J5WMf+9A=",
+   "pom": "sha256-loCY9KhFG7zT17iMaoq1t6dO+A397npgUvNS//eDssU="
+  },
+  "io/grpc#grpc-netty/1.65.0": {
+   "jar": "sha256-zukwf1gJhY/XtLwR1Sxqz/jamJ3yiCItDGir7Qm6SI0=",
+   "pom": "sha256-4WrvLiECuNN5SvCh9eEZmQFohMkR1LFeBJBmcp+u3gs="
+  },
+  "io/grpc#grpc-protobuf-lite/1.65.0": {
+   "jar": "sha256-lEZ52Y6pLvVkx+zOMKtpJRLcL/rllvTpqJQRMq+TcOg=",
+   "pom": "sha256-OslNjEdH7PHig5nrPaapmCJg/eAOV5Y/C6PQ3YdqFbg="
+  },
+  "io/grpc#grpc-protobuf/1.65.0": {
+   "jar": "sha256-r2l19WnK5PBaY2/cFXXi7ufMIJmrvFCvSKrGhJA0hD0=",
+   "pom": "sha256-3M03CJmNVXPgzZAWE0iNloomfnpXVTrrT32Hwh5dF4I="
+  },
+  "io/grpc#grpc-stub/1.65.0": {
+   "jar": "sha256-oZ+kxWQ060tyDt7JrdOJqKRCe/kYGMP0dwVxIS5b7iQ=",
+   "pom": "sha256-lzgLq7iK4WhKL8aUCfgkXn/507Myla47K6WuwOpWdXg="
+  },
+  "io/grpc#grpc-util/1.65.0": {
+   "jar": "sha256-aVtu9QQdECm9RyQHyMvdI11S+zJ0DZq8l64GDKggRxo=",
+   "pom": "sha256-iBzI5CKWjAreK+XJmBLu/82qMein8Sf9cquJgQgpgGE="
+  },
+  "io/netty#netty-bom/4.1.121.Final": {
+   "pom": "sha256-E24RjGngF0Wbor28weVaD9w2dD1X8oqOoWKpjR/LtjM="
+  },
+  "io/netty#netty-bom/4.1.125.Final": {
+   "pom": "sha256-xKF8K1VcdW41xsJQz1dSjD0uyGAeReAOHEXTofHPAhY="
+  },
+  "io/netty#netty-bom/4.1.128.Final": {
+   "pom": "sha256-6EgBU0x4auPRUcKkhzZyrehbCxxlKXM1Y8134bo5XIQ="
+  },
+  "io/netty#netty-buffer/4.1.128.Final": {
+   "jar": "sha256-Jb77ayA7SS6tMqUOc3SiUFBKS4vMYru4lZLv3zP+Pp4=",
+   "pom": "sha256-kTgt1XW9T7AyzRhJTMh+BD4YIIM8NXOsMkcVD5aQgPc="
+  },
+  "io/netty#netty-codec-dns/4.1.128.Final": {
+   "jar": "sha256-u5qW8kV+IacKftui8LiOvF8GyohR9iFTzMacDp3I4gg=",
+   "pom": "sha256-WxwtwXjziq/oavyyerkx/QGdK272ox0Z0/DKKTrMayY="
+  },
+  "io/netty#netty-codec-haproxy/4.1.128.Final": {
+   "jar": "sha256-82SM6nywJ+8KfTCuXEzfVWCVTKfhVkwjvU0B4uZu4vw=",
+   "pom": "sha256-0S/Naoyzjg701bI69Q+QBz0PBI7cBPK4nRJGVn+3FEE="
+  },
+  "io/netty#netty-codec-http/4.1.128.Final": {
+   "jar": "sha256-dkxClm3MnfhUE+IOCn+X08toIhl3L7jcoybgovDl9fM=",
+   "pom": "sha256-IWZQVqRQE/BIOYpXmYA+1Zj4yBjUWsSABlIyG4hYzKc="
+  },
+  "io/netty#netty-codec-http2/4.1.128.Final": {
+   "jar": "sha256-Rnm13lVq5UWHM/hEZX2RLeIf25aXJLbL1bGUKqCUyeY=",
+   "pom": "sha256-/MSa+wuxBCjX6LOlvmUApo2Hfh9sj3syhGNTq5is2KU="
+  },
+  "io/netty#netty-codec-socks/4.1.128.Final": {
+   "jar": "sha256-gxboFZNUQSqv8A+Ozmjqwfd6GXB9H1nav1BFfLdS7Os=",
+   "pom": "sha256-WQy4n/NyKrKoPIa1M/NlEkRWvjKSg3whUEd3Sgb48nM="
+  },
+  "io/netty#netty-codec/4.1.128.Final": {
+   "jar": "sha256-0qrYGYggsdCFb6k/4KxvGTW9lQpIqyuF5bStvfxfp7Q=",
+   "pom": "sha256-Wjb0rUE+qslHS9wKtZBKZMfplniQDofNQPjqb/TVAWo="
+  },
+  "io/netty#netty-common/4.1.128.Final": {
+   "jar": "sha256-V12BA0KyQA+vgIW4/AveCUMtr26LknxNyyRvDuWz6Y8=",
+   "pom": "sha256-8VBjPV5LdwT/Wqdf4jXBXcqNwn+Sei32qMMGwmHhPTo="
+  },
+  "io/netty#netty-handler-proxy/4.1.128.Final": {
+   "jar": "sha256-gIQ08tqZP7DzJ2Y6qO8wdWx+6UsWQiE4jsY/7UqfaqY=",
+   "pom": "sha256-IxkMAx2zJZnCAzvie+9NrCzY2AgdUZ0H9+EjBQG3ic0="
+  },
+  "io/netty#netty-handler/4.1.128.Final": {
+   "jar": "sha256-2eP9m4OcsgcDD/04XVs8CH2/dGpkMFbbVE8WMYVzl18=",
+   "pom": "sha256-Us8llYniP11RyEQGwResnM9zVXf3ozmDomKHwiJzd0w="
+  },
+  "io/netty#netty-parent/4.1.128.Final": {
+   "pom": "sha256-MP+WtQDff6aHKn4uvjY57xc84HQ+FiUX+w50qiC77nQ="
+  },
+  "io/netty#netty-resolver-dns/4.1.128.Final": {
+   "jar": "sha256-JxwndI/K5eaL7nSvgaFQ0cQLTCE9g23LFYQ8CQpFLEo=",
+   "pom": "sha256-4Plrh2cPdoEbY9rr2Uv3hf4QbqykPe90SCWcmUYUzJE="
+  },
+  "io/netty#netty-resolver/4.1.128.Final": {
+   "jar": "sha256-OsK48KAP7HhaBkgXL7uLrGqOj1Tn1aqVh5Dl3nBQS2s=",
+   "pom": "sha256-Ksv4nHRODB31ls68vwy+qbr0JtFbFu81VXSpeMcxhBU="
+  },
+  "io/netty#netty-transport-native-unix-common/4.1.128.Final": {
+   "jar": "sha256-hWPiIpFJ2UKYjUp6DsfAG5oF3vUq0oRGM94lxcCmhp8=",
+   "pom": "sha256-DYZVX0OzfMzjiI4UgkIJYa0KrRxil44dUZifKr3S3xo="
+  },
+  "io/netty#netty-transport/4.1.128.Final": {
+   "jar": "sha256-3JEHqukxy1z1lHGDU1j2i0y5VIyfsKn+Bqzyo9PUIvI=",
+   "pom": "sha256-7hczPyV6AU9abJ92wHCjpfn4tL2ZxInU1ErEkMPFJek="
+  },
+  "io/opentelemetry#opentelemetry-api-incubator/1.44.1-alpha": {
+   "jar": "sha256-jb9FHOWA+gJS7pynczH9IXEHEMqbc1oTWSQerTvo6+U=",
+   "module": "sha256-4xVFUKMLo5DGJMsWRkRzAzGPseeQ2ocO2UGb1TcBvzQ=",
+   "pom": "sha256-hcOLlNH3DV4pzm2VhFaKae4m3X3nMZcCFsp0FHuxNlI="
+  },
+  "io/opentelemetry#opentelemetry-api/1.44.1": {
+   "jar": "sha256-CX4ucci4yBP0oTF2uq+7uxJLElP1yf/9EQvCrddKzpM=",
+   "module": "sha256-RbSspNj7Vc4bw+hkVvSTGQhRnvRJIb9+zLskhezCVeg=",
+   "pom": "sha256-KS4M34NNybob7DZvStv+UzZx9DZ3mlfBgshKTLU/PKQ="
+  },
+  "io/opentelemetry#opentelemetry-context/1.44.1": {
+   "jar": "sha256-AGs/fDiANWqG8CxA7t66Ek8iai8UX+kEzBt97wCIurA=",
+   "module": "sha256-h8s/2z9n8MpQ+C211ma7biS2jngCKKCXZD6JuXFQZGA=",
+   "pom": "sha256-zODnGGvOKSWMYdP68YUjTedaN3g81Lz++gr15YzkCWU="
+  },
+  "io/opentelemetry#opentelemetry-exporter-common/1.44.1": {
+   "jar": "sha256-JZtlrcHolpgEtCMlKb1Sy6qr+GBJxATyW841iYAjaWs=",
+   "module": "sha256-yW92+ff4JJk+mdYynDqOkJULe+ASlBrbPoo0jtK9gJo=",
+   "pom": "sha256-zBc+te2QVHVmGNUJFoMV9UiNn+doBox0QYX/3fBwFVI="
+  },
+  "io/opentelemetry#opentelemetry-exporter-otlp-common/1.44.1": {
+   "jar": "sha256-WJOFzt6Ol0oJJ1PXuvvFr9JujqrZcOl1+1EQZVe9rkE=",
+   "module": "sha256-K1ONCNGjdLY5Pj6Ucmzad+9FwSIDvt+g3HpEBSG5tRU=",
+   "pom": "sha256-/n6L61GdAJnLCzn8YmfP8rXdEgpSF92tJtJbvVI+IDg="
+  },
+  "io/opentelemetry#opentelemetry-exporter-otlp/1.44.1": {
+   "jar": "sha256-k4T6qDHwgt0QyksJ6xkG+izdiooP2/ylbrtPtNbiBew=",
+   "module": "sha256-aK04rzhflHG9FcXFzvj3ZWLTSO55JVXtaAMt9AGWP6I=",
+   "pom": "sha256-xEkzR+8x4M1O7083/BT7LDLOoOZ+kY+c5UZbuZtpKp4="
+  },
+  "io/opentelemetry#opentelemetry-sdk-common/1.44.1": {
+   "jar": "sha256-N3D8R37g+rIeeWu1WfCpltOMdE86Fwho0bO4W2O4J9A=",
+   "module": "sha256-GJDjyaKYoES0Wvc0EfKQ7GN7RLKHJReJ9jbHrWMmbic=",
+   "pom": "sha256-lSuXrrc9sdi6OocSdRPbY15F9Dy3jFqJY10DCmoyG/E="
+  },
+  "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure-spi/1.44.1": {
+   "jar": "sha256-80eK+W5PL1/WAoNSJVPeTOmcA2BqFuRg0HvG7uEvn5U=",
+   "module": "sha256-RR2LypYXHnQYdi+k56TE+NaVsft0p9/2VcEvR1l0ACY=",
+   "pom": "sha256-0VY919SNjat3nNL+nHsvMUuDezLjJlT2yvvfvzQCCkw="
+  },
+  "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure/1.44.1": {
+   "jar": "sha256-IsMSy/77GmqKsJc/P//oLDJpCJgmSqW6eUH77TM/Rrc=",
+   "module": "sha256-8Pp/J/HrRfuGKXzUhTVHWdCdSD4toO5+CM3+rJg8S50=",
+   "pom": "sha256-d8LvW3ZBR/ugGutAqaLHbH5BoVoWB31LRfYqywraQsM="
+  },
+  "io/opentelemetry#opentelemetry-sdk-logs/1.44.1": {
+   "jar": "sha256-ukqXlm3tKSfcqubpG/ChcHhn5EzD3Srkx++CFL342vc=",
+   "module": "sha256-WqzBloLcDuNB5WKaKCnrrdgQ2FlKOddardqk2bSD/Bc=",
+   "pom": "sha256-ZfhfVBB+2/csorRqovDFeVBl4sdD6nAi2WyWJm6PJb0="
+  },
+  "io/opentelemetry#opentelemetry-sdk-metrics/1.44.1": {
+   "jar": "sha256-PAlmipbx6UQ9KJSuRWZ0yMOLIhwJbDkfyBYW2qZyv2g=",
+   "module": "sha256-6rYDVYnMHynQbSW4JEa6175P6OqXdHjg35UhMe4e1Vo=",
+   "pom": "sha256-0aP1lEWdRQUX5k6D+dqjIj5RxSfouDGYLpfsDd7OjN8="
+  },
+  "io/opentelemetry#opentelemetry-sdk-trace/1.44.1": {
+   "jar": "sha256-/wE6uUVWfcy13eY496NmUZ3vvS0TjfE3CTboR+9gjIc=",
+   "module": "sha256-GbZ9F2m+2icA2wziDS5OMg+dGMHX3DW2iy2rq2e99M4=",
+   "pom": "sha256-Yhr6Z+8S2iKViUfNm8JR0vbCfSgzMOu+XKJv6fjscpo="
+  },
+  "io/opentelemetry#opentelemetry-sdk/1.44.1": {
+   "jar": "sha256-fGTzMOwZeh64gFm5fck3b9uYNmlQJ8lqDLTnTvkXzr4=",
+   "module": "sha256-l4xnOlg7C4VWdDijcn/JJ/uxB8zdniLEV27NQ1O8bto=",
+   "pom": "sha256-mSRNwYlhphYEI96Ks0Gg1cd5VcUrFHoFzLxxz75qrXU="
+  },
+  "io/opentelemetry/instrumentation#opentelemetry-instrumentation-annotations-support/2.10.0-alpha": {
+   "jar": "sha256-+M7F7I2nF9sluK0wctA0PmNvW1uHv/2T2wks+/2/SAI=",
+   "module": "sha256-SX5VTcazi7yAtwUGYkv4ZHL7gPsSRhBUX/wVCtyVQPM=",
+   "pom": "sha256-8NVbPyHN3//YXrGy4nd1BuIhLmQEB381sh/GlUJ+/4A="
+  },
+  "io/opentelemetry/instrumentation#opentelemetry-instrumentation-annotations/2.10.0": {
+   "jar": "sha256-kGuirHRxCeRUC9hyN2P8HQxRYAuf6iA7oidqQpWb9tM=",
+   "module": "sha256-W6mFKXlR/zMxayDtgRXkPLgnZc7N74ijq0y9i88sOuY=",
+   "pom": "sha256-6QM+fjTF3BegyTlR1hFKejiSr6JyVICuptsHYcgK4n0="
+  },
+  "io/opentelemetry/instrumentation#opentelemetry-instrumentation-api-incubator/2.10.0-alpha": {
+   "jar": "sha256-5q0LzuRnSZPxX9ZyACCQ97EI/+lf59otiCmJy+txmkw=",
+   "module": "sha256-4KjCBqOkKfT0rs73Fs6KntB0IMLRA51EPsvy88qeYDE=",
+   "pom": "sha256-NqfREgpfdEiRf0BB7HRejvP6aahhCNgmsY3ejoxyskI="
+  },
+  "io/opentelemetry/instrumentation#opentelemetry-instrumentation-api/2.10.0": {
+   "jar": "sha256-qxU1wp+S/Py3Vf35aQTTFxYcauJ9U4Xr6oyOOU0p5vY=",
+   "module": "sha256-1J2QILHe9JzH4Vp9AvoAIGLSd2/RZdyJ8SpL/hCXdGE=",
+   "pom": "sha256-KHIpdPydxrwV+ETuAhYEkhpVtI1aalZdmb7GQkuZ+D0="
+  },
+  "io/opentelemetry/instrumentation#opentelemetry-jdbc/2.10.0-alpha": {
+   "jar": "sha256-nO9Jvc7m0ndyWZUAQXQ2XXT7MV1zdDVbd00j1zvP8Hc=",
+   "module": "sha256-S643TODrEX09xYI5IBRQQf2wPLRz+TuEmrmODGsGuB8=",
+   "pom": "sha256-hchv5iiuk9gYQXQ5oVUtVUj4kMcfTS8KUsBvgq8gDLE="
+  },
+  "io/opentelemetry/instrumentation#opentelemetry-runtime-telemetry-java17/2.10.0-alpha": {
+   "jar": "sha256-eIoK0DsirJr24w+rkQNHCAd0Glqx8lrsAP1HQMSQ8cM=",
+   "module": "sha256-xqxvXJOqGGKNmG7KMw9YcLUPBQ4Wy5u8jt2Af0eoqSc=",
+   "pom": "sha256-1/247cE3DrnctSvBVqFlNRxYdeZZNYhWfzv39MrOues="
+  },
+  "io/opentelemetry/instrumentation#opentelemetry-runtime-telemetry-java8/2.10.0-alpha": {
+   "jar": "sha256-FlgPr5BTL2AXlnesGISpZjrecEf5UEqGcUbQrssyYyY=",
+   "module": "sha256-NoAo0AwQf6M46e3eyYXb284JzyAwkPpxldArDT4U/eM=",
+   "pom": "sha256-1S1lVTYZ50/4xiD9J4wPspBZChhRyVFrumhtKX4nadM="
+  },
+  "io/opentelemetry/semconv#opentelemetry-semconv-incubating/1.29.0-alpha": {
+   "jar": "sha256-KNFmd+YnvROgJJe63cUjX/86TcmJO25xDaXX7n+OkRs=",
+   "module": "sha256-UQnQAW3PUDYkHNqJFISYO+QYwmqPq4c3a6XprAIyxyo=",
+   "pom": "sha256-bGXZkzdvLC9hRrir8BYts2lbnWXteUOYnr1O5nlUHec="
+  },
+  "io/opentelemetry/semconv#opentelemetry-semconv/1.28.0-alpha": {
+   "module": "sha256-a+M8eGFUBbP+AKl/Kq/heNGT8/GXgbsMnS1BDKtMs/0=",
+   "pom": "sha256-WxMz4G1KPsra2LV6BJfZU4gLCL4fTBlKHR5ql2yE5VQ="
+  },
+  "io/opentelemetry/semconv#opentelemetry-semconv/1.29.0-alpha": {
+   "jar": "sha256-qV8a7X4/ZDU+xiXG3vcqDKrwa2xTlw9Xj91RPa/Zlf0=",
+   "module": "sha256-uCvms5s/HXFPu90Te+mLagSeocjD/bPSRP+4YlGYOmg=",
+   "pom": "sha256-ritWG/POdHQlww2QMVMJt1fV/Qn/GVykQE5XSadm8hs="
+  },
+  "io/perfmark#perfmark-api/0.27.0": {
+   "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=",
+   "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=",
+   "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY="
+  },
+  "io/quarkus#quarkus-arc-parent/3.27.1": {
+   "pom": "sha256-r+Hy3BjQ0h4WmNEdMfWvqvH/y2qGBuP/rVWHUOiCzJg="
+  },
+  "io/quarkus#quarkus-arc/3.27.1": {
+   "jar": "sha256-S+KuUy1yMtViIe5+Dl7vDOROCwLFYTlh7f2q+vAl4Uk=",
+   "pom": "sha256-sj5Fn2K/Q4n4CDLsu+S0sndYsatMZjWr9Gc/BIFpC7Q="
+  },
+  "io/quarkus#quarkus-bom/3.27.1": {
+   "pom": "sha256-ic2cgol50N/WCG53Rw+dv2CpvFwC4+I6S4hh6to26vE="
+  },
+  "io/quarkus#quarkus-bootstrap-bom-test/3.27.1": {
+   "pom": "sha256-SuT+6+5SQplL2pTWVuM7oOwm8cl0KD5ivRMAKoDNofA="
+  },
+  "io/quarkus#quarkus-bootstrap-bom/3.27.1": {
+   "pom": "sha256-41TAMHxEga56DfKpfTy/f7E9z1gzQmNvXGHPlHdzhx0="
+  },
+  "io/quarkus#quarkus-bootstrap-parent/3.27.1": {
+   "pom": "sha256-PnAy4WfoK+CG+M/d6cWX4fxMEspy3UgyBuVKwe07Kpk="
+  },
+  "io/quarkus#quarkus-bootstrap-runner/3.27.1": {
+   "jar": "sha256-bkZqKVQOOCGzCHFNhS42nk4pksXmJFu8k/N5aDUf7cc=",
+   "pom": "sha256-LVBxXS6bD71Herqo/X5otezJf5mQ5GWSpdKH5p9nypg="
+  },
+  "io/quarkus#quarkus-build-parent/3.27.1": {
+   "pom": "sha256-i/dMvx3yTW3Na0BPk5gIs5X4LwV9QBi7iN3XCH1QaYw="
+  },
+  "io/quarkus#quarkus-classloader-commons/3.27.1": {
+   "jar": "sha256-tvj6OuYXuPm0drE0RYEaF5DJVyEw4Iwdw+xUCvAN1Tg=",
+   "pom": "sha256-pVhBcPuOEnunyM58orVoFFiqWBi/diaFO5oXmvEDUQY="
+  },
+  "io/quarkus#quarkus-core-parent/3.27.1": {
+   "pom": "sha256-AqCmkFLzkc5pJgJXlnyZSC+GVVtphw9TtG94ArzQC6A="
+  },
+  "io/quarkus#quarkus-core/3.27.1": {
+   "jar": "sha256-vquzQtI6cQY61ffEsJhdX8lZPxkbmmF2dnGmwrPC1AA=",
+   "pom": "sha256-gMiPhJuvoaJk5c3GDSM03kaZuaep37xh8BKEAQcSwhU="
+  },
+  "io/quarkus#quarkus-credentials-parent/3.27.1": {
+   "pom": "sha256-5LqD5xw19ulq6raZ+0Lj9WEeAzAfx6KCRMq/2w1ajDE="
+  },
+  "io/quarkus#quarkus-credentials/3.27.1": {
+   "jar": "sha256-RV2rOiUQwoqxAneuY1Ja8mRqSxBaYxnoQadVlOXWvQw=",
+   "pom": "sha256-Ta/o/0o264J9wgLgnpva8Kw75UG/x5RhjPNWP+4nqSo="
+  },
+  "io/quarkus#quarkus-development-mode-spi/3.27.1": {
+   "jar": "sha256-KYQeqIU8rGPKoDdP70flt4fnLiPLn2kfPcwLaTyaAV0=",
+   "pom": "sha256-08R9mFvm97gLRlOmVcXSpaWCaE6LmdqOrU6DBXhLSjc="
+  },
+  "io/quarkus#quarkus-extensions-parent/3.27.1": {
+   "pom": "sha256-AL/j47l8ooM2I4PqlAqQ6GMJ9wDu0r2nPKa/7sFMNAY="
+  },
+  "io/quarkus#quarkus-fs-util/1.1.0": {
+   "jar": "sha256-UVeS4sJh5wS1wFK+If2qnMQ6pf2FiN9Tzy7dBx/Z7iY=",
+   "pom": "sha256-b3vzqQRLngi5QKZ4aONBjJrTtaUw4L92iMJpTR4jYK4="
+  },
+  "io/quarkus#quarkus-grpc-common-parent/3.27.1": {
+   "pom": "sha256-ATBpJ84MCd1dbs9n8I9+6+TChHoOSoGfd1lEqyMHF1c="
+  },
+  "io/quarkus#quarkus-grpc-common/3.27.1": {
+   "jar": "sha256-tBgyjQj4Dkntr2ElV4n+OSWfdpyBlf4tYc3MCPLQpF8=",
+   "pom": "sha256-t7qidlYUCqTpKQg6m5jbwxWtTdquIMw7jqNghRxGs6U="
+  },
+  "io/quarkus#quarkus-ide-launcher/3.27.1": {
+   "jar": "sha256-WGzMWDNhLILgmNcD8f69E8OJKXsizxw79rui7m2XQCc=",
+   "pom": "sha256-sZonPJXUOMg93h052ulF3mOyienRjJezqgAZLifFgUo="
+  },
+  "io/quarkus#quarkus-mutiny-parent/3.27.1": {
+   "pom": "sha256-4fDk629gp9colHbBpBYXbC29Yg6pparY9rN2p7gM8t0="
+  },
+  "io/quarkus#quarkus-mutiny/3.27.1": {
+   "jar": "sha256-Wa9V7q4wnBRjRtw0opZAWdEw8YDyDtca8fqbXknreEc=",
+   "pom": "sha256-OBw67j40/cj4cwshiLbXJfkWTzU9oJVYKoIQOFa8R80="
+  },
+  "io/quarkus#quarkus-netty-parent/3.27.1": {
+   "pom": "sha256-ZJ3QhMKK1c0ybVhKcD7O8MZoqpEMHh2lPZ1yFNzJ+kI="
+  },
+  "io/quarkus#quarkus-netty/3.27.1": {
+   "jar": "sha256-eOuqYoIrJk0n1WsHH8W/Wej1FRn0gqzMGjsKkOasxXY=",
+   "pom": "sha256-aoNgfiRQ3/ySdDIQz2KHsfVVkykRiXvlfEEjCjdk7n8="
+  },
+  "io/quarkus#quarkus-opentelemetry-parent/3.27.1": {
+   "pom": "sha256-FDRhOYZblfU3H78qu7Kaeg/hrhC1qMRdKZcBJtRjEZc="
+  },
+  "io/quarkus#quarkus-opentelemetry/3.27.1": {
+   "jar": "sha256-TccC56imxwSa79eSZsM1j3D1z8bpAFHXx+Epz1VzUTQ=",
+   "pom": "sha256-EhcHh+DF3S6/FtlXeQ95eImZSedMBG6AzFwr7kWbC6A="
+  },
+  "io/quarkus#quarkus-parent/3.27.1": {
+   "pom": "sha256-aQJC4vk6U1kcqebmETu9x6BuaHcVI2gxVlcHeD09rFE="
+  },
+  "io/quarkus#quarkus-project/3.27.1": {
+   "pom": "sha256-XZ2SuvTsWMF+8kyCuC/Mu1otcV17P6qV8QfrAOVx2fM="
+  },
+  "io/quarkus#quarkus-security-parent/3.27.1": {
+   "pom": "sha256-/rbLSu0vEByzvOoa89+gLoHfQEXM5A3VCDTsrDaJBa0="
+  },
+  "io/quarkus#quarkus-security-runtime-spi/3.27.1": {
+   "jar": "sha256-bahwghgxPVoHqybwm3ARXMf8fan17WviCwQTMHwOTUA=",
+   "pom": "sha256-eDWfYKR6nRue9h/VFOQ6ZSG2nymsfLTcAgtl8kZDbdw="
+  },
+  "io/quarkus#quarkus-smallrye-context-propagation-parent/3.27.1": {
+   "pom": "sha256-bIPmNx+8faZa7GzEk2xgi8hTudJMpcX/7Ku48hBIPSg="
+  },
+  "io/quarkus#quarkus-smallrye-context-propagation/3.27.1": {
+   "jar": "sha256-78RAqAHk8YcLVRxj/87yT2O7TFxtbwHxiP71ddCagv8=",
+   "pom": "sha256-DbWuY2oMAdOI/oXi6Aeh4S/B4NqGAN4nJyMpgy2BYFI="
+  },
+  "io/quarkus#quarkus-tls-registry-parent/3.27.1": {
+   "pom": "sha256-8PmG4m64Xu7/YDJ7nslzA5pVlNibbXk+sw5Hw2Nujtk="
+  },
+  "io/quarkus#quarkus-tls-registry-spi/3.27.1": {
+   "jar": "sha256-AcDTssFYrwsKZRRLj82akg84+LV/9sgTe16NikVOEJY=",
+   "pom": "sha256-4P0BVMC8mvJ5gr3wZHnPhXLK6VxXdJjCFk372ylkqJI="
+  },
+  "io/quarkus#quarkus-tls-registry/3.27.1": {
+   "jar": "sha256-RM8NWfK1aDU9s8xAa9cnF0n4wZ6X3Q1glm8oQ1yfXAQ=",
+   "pom": "sha256-joJAcS7zcwoLie7o/XmPCWjTEoTKrgxbhP9KOXzyqYU="
+  },
+  "io/quarkus#quarkus-vertx-latebound-mdc-provider/3.27.1": {
+   "jar": "sha256-lYG3JcmSE5QU5w0yddTBFteOr5+76NkmbmZCVU48vIw=",
+   "pom": "sha256-7cHLybq1IlWyKODz37U17bnkeEsfA/F2Lk8lCxeeC0E="
+  },
+  "io/quarkus#quarkus-vertx-parent/3.27.1": {
+   "pom": "sha256-vraDDs16B9havTqUhKmBYMyiKwfiHzafHBOs4Rv7Moo="
+  },
+  "io/quarkus#quarkus-vertx/3.27.1": {
+   "jar": "sha256-MXhCvYIKlsoVWeVjPJ/qUGWGOqm4ShZWJa4QzOe+7gU=",
+   "pom": "sha256-ipj01ZM9buhM4iYAkvVTmhJ69Zb9LEp5Sp0HjQTSI1s="
+  },
+  "io/quarkus#quarkus-virtual-threads-parent/3.27.1": {
+   "pom": "sha256-tbV3LVxACcbKSif/FSPxnuwREInFliWTb4eEaEaKCHI="
+  },
+  "io/quarkus#quarkus-virtual-threads/3.27.1": {
+   "jar": "sha256-nFsg/8wBVE6o9Zafk3VrlvcYff/hm9B3n474OMhzchM=",
+   "pom": "sha256-D7dc1AZNuhnkns7sSQC8mkY24aMtdC5K8cYIgkFMUS8="
+  },
+  "io/quarkus#quarkus-websockets-next-parent/3.27.1": {
+   "pom": "sha256-M7QoaUhK3FVN1LL+C9A8eKOK82nHtWM59AJGJylvtHw="
+  },
+  "io/quarkus#quarkus-websockets-next-spi/3.27.1": {
+   "jar": "sha256-ieUFqGTfVK/smA2Sx4GoPUCUWHvlHOBqXUr5RouJYQ8=",
+   "pom": "sha256-ir5mMbxgTbc5CKl+VT8xEbQG0j0YFg7lvuzmSpgc+2I="
+  },
+  "io/quarkus/arc#arc-parent/3.27.1": {
+   "pom": "sha256-RLsMrAX3FOcOWQ7t39YS7AJo0clPMLgp0JS+KGobLf4="
+  },
+  "io/quarkus/arc#arc/3.27.1": {
+   "jar": "sha256-QNVht1tRjvE3aBA7Ees//i6lII4z2xERvQSr+wsE0Zg=",
+   "pom": "sha256-QvLyd1g/azcc1ZtnTZBMI3NC5ksaXcKtHcdwpOVGMsc="
+  },
+  "io/quarkus/platform#quarkus-bom/3.27.1": {
+   "pom": "sha256-HSMAeLG5ZadDG4+U+JqlQfsxKs//zlAppjKh9RbXoIU="
+  },
+  "io/quarkus/security#quarkus-security/2.2.1": {
+   "jar": "sha256-tQIPb8xQbS23HBesaFTMOpB4wLc5UpGASNHyy7Sn2Pg=",
+   "pom": "sha256-61QM6rzfhW8vhd1hzXDVDrIYSPb6mMFcSR/5ngWVZ+o="
+  },
+  "io/reactivex/rxjava3#rxjava/3.1.10": {
+   "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=",
+   "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=",
+   "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60="
+  },
+  "io/setl#rdf-urdna/1.1": {
+   "jar": "sha256-xXoq5VG9MB+E+vEBAlHZZRCkDisA2IPobN0tDfpvAa4=",
+   "pom": "sha256-A9Ntu7P+61HJhioDg6G/JMnvI/3MM+IaPi3iAxE/OF0="
+  },
+  "io/smallrye#smallrye-build-parent/41": {
+   "pom": "sha256-cMa/huHu5E1o5zmJYoghjLU6mtI+GNJHp5FBXKdyfGU="
+  },
+  "io/smallrye#smallrye-build-parent/42": {
+   "pom": "sha256-FBJFawNFSQ+NC00L5SnQSh1Y0Z1a2FvzHDdAwT+Q1t4="
+  },
+  "io/smallrye#smallrye-build-parent/45": {
+   "pom": "sha256-1vPL5JFUM6LZ9bmsEjjul17d+7En3yDbdpRpCKBMXys="
+  },
+  "io/smallrye#smallrye-build-parent/46": {
+   "pom": "sha256-FP8daINJaqcRP89+Fv5Whyr1hL2g2G16nreXQkW4zFE="
+  },
+  "io/smallrye#smallrye-build-parent/47": {
+   "pom": "sha256-1xrwHMwBPiiKiVx5tegErdaADy3r6NWXUSAaYsqt5Bk="
+  },
+  "io/smallrye#smallrye-context-propagation-api/2.2.1": {
+   "jar": "sha256-oTFH8wXUh5B0wHOt/YYdBwdieLGPH4AQrNgf2KIfXLk=",
+   "pom": "sha256-Xv/VEJ3oz9ZYvhkePAgHx9ri8OOcFIZslJzY0JxalWk="
+  },
+  "io/smallrye#smallrye-context-propagation-parent/2.2.1": {
+   "pom": "sha256-5unin/Ow22Q+mTxqico0Edh7FxMlbOd/3yTn6hcIxps="
+  },
+  "io/smallrye#smallrye-context-propagation-storage/2.2.1": {
+   "jar": "sha256-OzR7tXyOyT7SN1rnjySQj6C1QaEQ3oCv22PzJaXIpwU=",
+   "pom": "sha256-Z5IMHn2OUknNWtW2siSG10hnnAYml6unH7a8YHPrRxg="
+  },
+  "io/smallrye#smallrye-context-propagation/2.2.1": {
+   "jar": "sha256-kfolPYvZA2cvMLm80DqX8DpzSZ9aftH9PQPQT1NIVJo=",
+   "pom": "sha256-THy3aKr/jqdJXTUy9VVqP9wjaRas02QbF3745PJs2OY="
+  },
+  "io/smallrye#smallrye-fault-tolerance-implementation-parent/6.9.3": {
+   "pom": "sha256-ZVqovQk90r2ER3clp+IuJFvrUzHhXUpuX9W4rhH66p8="
+  },
+  "io/smallrye#smallrye-fault-tolerance-parent/6.9.3": {
+   "pom": "sha256-r/x2bbL5uacuQnzsKg0tZn0Lq5CohWTmPxv62is8yGA="
+  },
+  "io/smallrye#smallrye-fault-tolerance-vertx/6.9.3": {
+   "jar": "sha256-QQh8osz5wPJY3zY59uT5WbeRFZbQ8XXulCeNWbxIhKA=",
+   "pom": "sha256-hhpJklfkS8MRa9DJANGSPAzHh8JI3RzG7YMm/4EvCXk="
+  },
+  "io/smallrye#smallrye-parent/41": {
+   "pom": "sha256-ioaQNk3oDebPDRAahYPpMb6E4Ej6OHw5i79upl8lrQw="
+  },
+  "io/smallrye#smallrye-parent/42": {
+   "pom": "sha256-EGQjW60r3LUZiEslMIbPyqQ0Ft20fExszkIVadt5ooU="
+  },
+  "io/smallrye#smallrye-parent/46": {
+   "pom": "sha256-SwaHf4gDT1Nv8tl97y0zlQq2ROCZFWOb6lOPasl+je4="
+  },
+  "io/smallrye#smallrye-parent/47": {
+   "pom": "sha256-5kq1jZ4QolJiHzARt1x+dbNHmlvOiBoiuO+msH4EhDI="
+  },
+  "io/smallrye/certs#smallrye-certificate-generator-parent/0.9.2": {
+   "pom": "sha256-8aCsVJaI1GhDzzDhM3F6Gck17ytxXVemI6lfpzyjG2c="
+  },
+  "io/smallrye/certs#smallrye-private-key-pem-parser/0.9.2": {
+   "jar": "sha256-S6mOku0gNZPYfjhKHgn6lsGMkBc6YXD+pxzyOhycUoY=",
+   "pom": "sha256-xGmWD+xR7AjjvWN3l2QsRK3yIAFI0x6DJCLmU6XN/o8="
+  },
+  "io/smallrye/common#smallrye-common-annotation/2.13.9": {
+   "jar": "sha256-rT7/FbRvv4G7yVMVFEZAd0veeBfC51mBIwof4563Qpo=",
+   "pom": "sha256-SFvgX+ekxY65Ejs7GOv0QO5jwAHwaG65RJoQ9cRz6ek="
+  },
+  "io/smallrye/common#smallrye-common-bom/2.12.0": {
+   "pom": "sha256-KO214eRveaA0DEcf1MV3AV7+xXqcDC7wP+lNsuMh+vA="
+  },
+  "io/smallrye/common#smallrye-common-bom/2.13.7": {
+   "pom": "sha256-ONZLzK+YWJ7WHBXQo4w7Z6WQytJS/Hef5SZgk++Da7w="
+  },
+  "io/smallrye/common#smallrye-common-bom/2.13.9": {
+   "pom": "sha256-0HBc+5T145lqWx69/t6T9JGe86VS9nwcccsf0gbleRQ="
+  },
+  "io/smallrye/common#smallrye-common-bom/2.2.0": {
+   "pom": "sha256-qLCcNrWIuSXIMKhUV+75cVVOQk4H6wu+1GnGruoLiAk="
+  },
+  "io/smallrye/common#smallrye-common-bom/2.4.0": {
+   "pom": "sha256-puGY/JfU0KDHsxCSPhkTTjS6+jHmpG6CcmYDwLxeYow="
+  },
+  "io/smallrye/common#smallrye-common-classloader/2.13.7": {
+   "jar": "sha256-UauhPN7KCsXFLwPBgM+ovgm3BSYVM/9wKIxt8BpFeds=",
+   "pom": "sha256-PgSr+3GjSeEcYi8sYv5Ac2Nx7buorTcgLwf9JbnJN4k="
+  },
+  "io/smallrye/common#smallrye-common-constraint/2.13.9": {
+   "jar": "sha256-x11vzsuGdIAQbtFmB/A5MHiIOMT9lZ0R4FqRbl6uOgE=",
+   "pom": "sha256-atuj2SyHn4RCf3M5FqHGSvF4xjirIUVBd/kYMXPj0EI="
+  },
+  "io/smallrye/common#smallrye-common-cpu/2.12.0": {
+   "jar": "sha256-nR3X1CNMWNiRmNd3+hxretVTNm9fY1S4HNwjIE73cJA=",
+   "pom": "sha256-++jCL2Z7E7lT9AFC5AWZmMBunYdM9jxZweAlErHvBoQ="
+  },
+  "io/smallrye/common#smallrye-common-cpu/2.2.0": {
+   "pom": "sha256-0mGDziGlS1zTx9LyEZ18DDFLgs5OLXWsXHze+sQBK4M="
+  },
+  "io/smallrye/common#smallrye-common-expression/2.13.7": {
+   "jar": "sha256-QF4QVDL9FaTbTTzx+Q9bIRfSEohb4p4D5haG5NkZQPQ=",
+   "pom": "sha256-NEoEFG5anaEB6JLhnh4ThyxQvRAkKxudJX3/zkBXQa4="
+  },
+  "io/smallrye/common#smallrye-common-expression/2.2.0": {
+   "pom": "sha256-1uROh7ttspfOvjlga2s3qaLbDTShf2sLmZxAWDsNL1o="
+  },
+  "io/smallrye/common#smallrye-common-expression/2.4.0": {
+   "pom": "sha256-wBzAQOvkRjOSkKdFwFvU4nykStE1TbF/g9VpXEMeErk="
+  },
+  "io/smallrye/common#smallrye-common-function/2.12.0": {
+   "pom": "sha256-dYYLzV8fA29BYMyMqrNw55t2iend1Q0hDHey8gtBpDg="
+  },
+  "io/smallrye/common#smallrye-common-function/2.13.7": {
+   "jar": "sha256-xj4w9o6RJSiMT8DXcrpWHnKSjStsKiJYHM1GbfRaFz8=",
+   "pom": "sha256-8s3BlLdddMAJQzF6Kquv0cpz5w6XmX3qw5NZHRaq7N4="
+  },
+  "io/smallrye/common#smallrye-common-io/2.13.9": {
+   "jar": "sha256-YTJRL6HDLqY7nw2stfuF9dQY8ltwh9iNtu0pRWCoiOs=",
+   "pom": "sha256-qmB8FWWNw3VPNWFw0ChKzMv/Zrk3NxxXiVwVdoCN8EE="
+  },
+  "io/smallrye/common#smallrye-common-net/2.2.0": {
+   "pom": "sha256-Jamu9WCWh9aY0pXM6SMr+10GTXH80kb/I90yHXGFhas="
+  },
+  "io/smallrye/common#smallrye-common-net/2.4.0": {
+   "jar": "sha256-wwPBS2+Nz+u7O/IwwcKU5MP5kOBgtKLHDo/86jyabe4=",
+   "pom": "sha256-oLeuxpBtgIykODX1QIJb9Dr0HkNX3Me6dcvHfuWnqLM="
+  },
+  "io/smallrye/common#smallrye-common-os/2.13.9": {
+   "jar": "sha256-jeGEbKBnSimc1sN/ZpFM5yVpAZtXBiZ6o5Y85o/YezY=",
+   "pom": "sha256-/VEGxFrO4x3T4EHrCDwmAhplmKAwLqy2hnrGWOsiU0E="
+  },
+  "io/smallrye/common#smallrye-common-parent/2.12.0": {
+   "pom": "sha256-Lgu9gF58//pkt4GMZmEetxMSC/EiijO5MUeaFhw3VCs="
+  },
+  "io/smallrye/common#smallrye-common-parent/2.13.7": {
+   "pom": "sha256-HekbICMWPsNipJy1t+4sfdx0n5xJUZuvx9W4RnqWMxQ="
+  },
+  "io/smallrye/common#smallrye-common-parent/2.13.9": {
+   "pom": "sha256-98YjrNoF1DADFDNl04nV4UY8i1KmDv2uTvKzD2TSBfc="
+  },
+  "io/smallrye/common#smallrye-common-parent/2.2.0": {
+   "pom": "sha256-JMv8O0a0/z97onRjG26HpkFt0rKzCLfu7JarZYHeBJc="
+  },
+  "io/smallrye/common#smallrye-common-parent/2.4.0": {
+   "pom": "sha256-snO2sOWvRzileVZ+dA4krJON7RD45EbT26GQ9xhkT+E="
+  },
+  "io/smallrye/common#smallrye-common-ref/2.2.0": {
+   "pom": "sha256-/Ix5ya3YlCcd7MU2ZM+mNevQV/XIZu7kqu9046VKC3o="
+  },
+  "io/smallrye/common#smallrye-common-ref/2.4.0": {
+   "jar": "sha256-uZAtmbUqRjzDhREF3d1Y1A9YBzUGSLmWrhYasUEjQnw=",
+   "pom": "sha256-wMVVPQElarUrmuLe57dismveONfMkHaddTWM8+Cpo4Y="
+  },
+  "io/smallrye/common#smallrye-common-vertx-context/2.13.9": {
+   "jar": "sha256-LwDDSoNFiipQVkJZNJnm4FxQlpTyMIcyr13ZFgrRBU0=",
+   "pom": "sha256-wCsRlq7H/o/kqsXkYgZXvgZXbiq55EjXZMw09N9Hh0w="
+  },
+  "io/smallrye/config#smallrye-config-common/3.13.4": {
+   "jar": "sha256-/T+28GCdLLldJhGZEhZfiQNhIDkv95yr4Lwkzbes2lE=",
+   "pom": "sha256-ri+qhPtc37XPeMq5BL7OtXC+zV6cZrno743VPOq7fL4="
+  },
+  "io/smallrye/config#smallrye-config-core/3.13.4": {
+   "jar": "sha256-sqxThIRLrnmLQMVwV/Ex63J1T7aDZvsJK9pdkT7ko1s=",
+   "pom": "sha256-WM2maEKhpej+6b1VbAsRFu2IOJlbvATOOpwTPiKQdrQ="
+  },
+  "io/smallrye/config#smallrye-config-parent/3.13.4": {
+   "pom": "sha256-O/t/MY3foMxv7MzAXEEYzA86wXVbDQRacvnfYb06AGc="
+  },
+  "io/smallrye/config#smallrye-config/3.13.4": {
+   "jar": "sha256-yo1vsLAg2HS3B/LEoT1kktYup//6lf4DwED1U/d5mPQ=",
+   "pom": "sha256-Ps7R2beSYvTpJIKLdp0T9bBzmDyR56XPLxpMBT66/Nw="
+  },
+  "io/smallrye/reactive#mutiny-bom/2.9.5": {
+   "pom": "sha256-fXWvERRq4a5zlsXsV2GOaue600OsxjqPJ6f26yd7yZA="
+  },
+  "io/smallrye/reactive#mutiny-project/2.9.5": {
+   "pom": "sha256-7d/eBJRqr5SzYVp4D+fNSxg9xAf9NB+fAD2zjxzYfqE="
+  },
+  "io/smallrye/reactive#mutiny-smallrye-context-propagation/2.9.5": {
+   "jar": "sha256-cxHvP49PQO/RuMKr/oecwoeojLahwz66bIGetDLLP+k=",
+   "pom": "sha256-f/QMyqIOqZ2jTbAKmH6RPRnICX2El3WtMeQxOMuMjZc="
+  },
+  "io/smallrye/reactive#mutiny/2.9.5": {
+   "jar": "sha256-fj0axgFs+xUm2OSav0i7cr91IwXmzX9WCfnT914EvZA=",
+   "pom": "sha256-cFbpIIxnrcli7KWljCsj7jk4tHMSHu6ZUbkMyaM0DQs="
+  },
+  "io/smallrye/reactive#smallrye-mutiny-vertx-bindings-projects/3.19.2": {
+   "pom": "sha256-CzmbH+pkPCpnDicjtlehqh10I7oKsj/FSS2Y86yyzow="
+  },
+  "io/smallrye/reactive#smallrye-mutiny-vertx-core/3.19.2": {
+   "jar": "sha256-qcfKgb1b20YNpCzEk9JWBJ3BVEKqKB7z+pZ66IrF5Dk=",
+   "pom": "sha256-PIT7fs/5TJOmACHVYXqDzKS2b4q7X8uS7WVKHDXi6RM="
+  },
+  "io/smallrye/reactive#smallrye-mutiny-vertx-runtime/3.19.2": {
+   "jar": "sha256-tje5sU0FQ20qNhx9uv/lLg7tZoBavJkhwb5Tj8uXX5U=",
+   "pom": "sha256-QiNzICjfVvzW8IWKpJ+gCp2HT8MzpjgsYaS5YKOQjRo="
+  },
+  "io/smallrye/reactive#vertx-mutiny-clients/3.19.2": {
+   "pom": "sha256-e9l/JtUJFNpDZVvmrytUYm/od6HyKd1uoCph+t69EEo="
+  },
+  "io/smallrye/reactive#vertx-mutiny-generator/3.19.2": {
+   "jar": "sha256-WVckM8inxyrm31HfR9Atpo1CyEnf9RMZ2CEOL+gf1lc=",
+   "pom": "sha256-JoZP6CzDJMcnyKZ0NJMSUPKBBDf/7Nf3KPMPS9KuLVc="
+  },
+  "io/smallrye/testing#smallrye-testing-bom/2.3.1": {
+   "pom": "sha256-PXfwZzfjRWwgi9zmKzccfsRYz2+9vJgWQIPkiFC4Mf4="
+  },
+  "io/smallrye/testing#smallrye-testing-parent/2.3.1": {
+   "pom": "sha256-vxksWNysCIzuwC3riPu+eC7iNx4N8hZh6lXPR4kZNdE="
+  },
+  "io/vertx#vertx-codegen/4.5.16": {
+   "jar": "sha256-wudmVKG/xxEBG9dDXEhWWGNdEsC06uxBNoSEmczCn1Q=",
+   "pom": "sha256-/cs+rzdQDBvFRtu1tV8ScKlGlkio6RfV+M1kyAfnLmM="
+  },
+  "io/vertx#vertx-core/4.5.21": {
+   "pom": "sha256-AIylD5wQ4cMOKU0Yv+2Y7/CGiZwLS/n32Ns3RUBKbz0="
+  },
+  "io/vertx#vertx-core/4.5.22": {
+   "jar": "sha256-bB9vFYrSFHY7EV7v7KFS5hl8UJeVN5bj4GCJpfxmx3Y=",
+   "pom": "sha256-wsD6yOTRZH8l6qULgpsrBnuZOuUgBZHbuQLdRdX3ij4="
+  },
+  "io/vertx#vertx-dependencies/4.5.16": {
+   "pom": "sha256-tMhz4Q689VFGlzc5mGbEQl5jxFF49oUIcjZfh+4CaDs="
+  },
+  "io/vertx#vertx-dependencies/4.5.21": {
+   "pom": "sha256-RoNO1Vlj5RBbGeXMUF8j3MIvQpoVPxfpCAxSrIJi34s="
+  },
+  "io/vertx#vertx-dependencies/4.5.22": {
+   "pom": "sha256-U+GlkteyIh9ohiOVtLbaA/DBgAt+tRusu12VKc2UIMw="
+  },
+  "io/vertx#vertx-ext-parent/42": {
+   "pom": "sha256-VPvxEeodETa2f+Y4RC3Eezw7ecBZgtdJbcMSpeYtyQc="
+  },
+  "io/vertx#vertx-ext/42": {
+   "pom": "sha256-MNosN+ZU8G39XLc2XbuXawmGgNc4PtcVnmP5Ysbvoro="
+  },
+  "io/vertx#vertx-grpc-aggregator/4.5.22": {
+   "pom": "sha256-R3D3MtyQl5KPEOsJIdjPXBovmTGzFQkGo6nWGWQeaRk="
+  },
+  "io/vertx#vertx-grpc-client/4.5.22": {
+   "jar": "sha256-nvyN30Badsh/HgJjO+lzUrrPHlk4FKDLJwdkRvMO6Zo=",
+   "pom": "sha256-Ih+tXAnSuv0wB3oRM3J7YkWbzlqROggkJ2TCznixp4o="
+  },
+  "io/vertx#vertx-grpc-common/4.5.22": {
+   "jar": "sha256-zUBB3ryzoL5+4opkYZcImYH2HeIX6q+VZ/O4B+oyqvI=",
+   "pom": "sha256-chScFwdbbWHREqzwqiRPwLtKHVYntJIvFJFO3p+6Nvc="
+  },
+  "io/vertx#vertx-grpc-parent/4.5.22": {
+   "pom": "sha256-xIu0mGuT2E7ar4505VDYd5KNFXrARSr5PkuBa4uUKSY="
+  },
+  "io/vertx#vertx-grpc-server/4.5.22": {
+   "jar": "sha256-GOFss0HeqpRDfvngfGW/qJQ1v279hws/Xso8bm6k+Vo=",
+   "pom": "sha256-0+m3LUk/WvdU8TdqUFaOvqfJqT2w8q4YwWdmfZYX8hw="
+  },
+  "io/vertx#vertx-grpc/4.5.22": {
+   "jar": "sha256-CABnjN9H+ajYOzq7Z3H0d4/Eyn3+qi2LsKkxuy0SOQ0=",
+   "pom": "sha256-nOrng6qgdfJsb+hMkh7f/pZ1CGtI8HeyustVaB6faYc="
+  },
+  "io/vertx#vertx-parent/22": {
+   "pom": "sha256-0RFbFBZdLwS0RoW7RJhQ3l9Yd3EGWjGJWK/Iwvv9hv0="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.1": {
+   "pom": "sha256-aTJZ+O/tqXSHm/MFz3HPELZUjYxvZ6ufNYyWrUfnygA="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.3": {
+   "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=",
+   "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg="
+  },
+  "jakarta/annotation#jakarta.annotation-api/3.0.0": {
+   "jar": "sha256-sB9VVSKEz7FJQR5k6rynXpQtJtLheGsykUJQ5DMK+qI=",
+   "pom": "sha256-n8Zqhzdd+EQ6umvcwdT/B/EmVCWDeFpIKpJioZv+jq4="
+  },
+  "jakarta/el#jakarta.el-api/6.0.0": {
+   "jar": "sha256-8z0L7PLVUWcwulzJmntaKx9imGvwozcCSc3/mi8XFQc=",
+   "pom": "sha256-JsZmqRV0htvE3C6xnzuAhWDdvAukVyVNY/JcjascZtA="
+  },
+  "jakarta/enterprise#jakarta.enterprise.cdi-api/4.1.0": {
+   "jar": "sha256-xCyAjxeSUSmggA9hj+vgUNlm4YGkxzhMil56AoPWhpk=",
+   "pom": "sha256-1GTYSDGOBh0SNkQit1NHz8i8vSlEfbZIDTbx0CWAmFw="
+  },
+  "jakarta/enterprise#jakarta.enterprise.cdi-parent/4.1.0": {
+   "pom": "sha256-4WQl8r2D3YcdpwRKpRQBb74SBdpfsVTl2tFEtrNjgvE="
+  },
+  "jakarta/enterprise#jakarta.enterprise.lang-model/4.1.0": {
+   "jar": "sha256-u1b1cfYNKGKyOH1UaP6PVUD4CUcnKD7ZkfiQgnCAle4=",
+   "pom": "sha256-/2xEh5kCTGlLrItSt97jsfJkoicYpeKvTdTV+0LJiwI="
+  },
+  "jakarta/inject#jakarta.inject-api/2.0.1": {
+   "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=",
+   "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o="
+  },
+  "jakarta/interceptor#jakarta.interceptor-api/2.2.0": {
+   "jar": "sha256-0kDXK03Tii5DHIBAeYEAEMuXkDZ4+l+Yf7dDSHiwQ5g=",
+   "pom": "sha256-jOOOxhmprbgI0qjQay+mLYmkNC5/Fu125+m7uzcypvg="
+  },
+  "jakarta/json#jakarta.json-api/2.1.3": {
+   "jar": "sha256-vJNBQoBeodeU8UQFY5ZaOGGiqft0FOzT/kTyZQBzRBQ=",
+   "pom": "sha256-QWpzlxOFoL5D+dqKR3qmT0gUrFIYfYjz4k8hW3+J394="
+  },
+  "jakarta/mail#jakarta.mail-api/2.1.1": {
+   "pom": "sha256-LApZ7RKeEs7aDkiIohPfsaBthZGa/OzAzBwKPUNqIqA="
+  },
+  "jakarta/mail#jakarta.mail-api/2.1.3": {
+   "jar": "sha256-gFG1jXX5gvmluWOzdlQm6CSypkhl7wrxcgXkVbmNsFw=",
+   "pom": "sha256-/r52PsEKgXMh7LFdqGyx+8mVx+NS4cET8P01fku1eYA="
+  },
+  "jakarta/transaction#jakarta.transaction-api/2.0.1": {
+   "jar": "sha256-UMCnx2DBOubAQqzxgrKPAEdBPblbRjb7iHm8/6tbqHU=",
+   "pom": "sha256-X+NJmBwVb7viY4jVmUn9rBa7jXh57mGzTEnHtc4PLyM="
+  },
+  "jakarta/validation#jakarta.validation-api/3.1.1": {
+   "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=",
+   "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync="
+  },
+  "jakarta/ws/rs#all/3.1.0": {
+   "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw="
+  },
+  "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": {
+   "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=",
+   "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": {
+   "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": {
+   "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=",
+   "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o="
+  },
+  "jakarta/xml/soap#jakarta.xml.soap-api/3.0.0": {
+   "jar": "sha256-MxJOmNcktp4Wc6YWdcIFtYw3JgX0JU1FWxKzc5ghmjc=",
+   "pom": "sha256-L2a6M+MGzpKyLnvPRW0S5klOepfRijqNS+rbt4Gdzdg="
+  },
+  "javax/annotation#javax.annotation-api/1.3.2": {
+   "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=",
+   "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c="
+  },
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+  },
+  "org/apache#apache/18": {
+   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache/commons#commons-collections4/4.4": {
+   "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=",
+   "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0="
+  },
+  "org/apache/commons#commons-parent/42": {
+   "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
+  },
+  "org/apache/commons#commons-parent/48": {
+   "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.14": {
+   "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
+   "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.14": {
+   "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.16": {
+   "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.16": {
+   "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=",
+   "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/checkerframework#checker-qual/3.43.0": {
+   "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=",
+   "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=",
+   "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM="
+  },
+  "org/crac#crac/1.5.0": {
+   "jar": "sha256-9EJuFkHI8PovAlpM18QMKFq68mWTDmcXrfyu8D0DSFA=",
+   "pom": "sha256-mW3NvEpNuqYmZ6d9nSoMlH7SeUpGuX5iG6nZpG4oxQ8="
+  },
+  "org/eclipse/angus#all/2.0.4": {
+   "pom": "sha256-/M1yMQnFQB6VNOZYBCnxNj/1yEa0sWkThqbx9zdcoQw="
+  },
+  "org/eclipse/angus#angus-activation-project/2.0.2": {
+   "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY="
+  },
+  "org/eclipse/angus#angus-activation/2.0.2": {
+   "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=",
+   "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE="
+  },
+  "org/eclipse/angus#angus-mail/2.0.4": {
+   "jar": "sha256-hzAYZVhLrZFwZis+7vA1Cqr+pFIkg+OOVK6H3D3z6Vg=",
+   "pom": "sha256-hQ9aU/bgvIyFxRwmuDzkvVGEsbmC3zTRMfYIRO2T6zg="
+  },
+  "org/eclipse/ee4j#project/1.0.6": {
+   "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
+  },
+  "org/eclipse/ee4j#project/1.0.7": {
+   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+  },
+  "org/eclipse/ee4j#project/1.0.8": {
+   "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s="
+  },
+  "org/eclipse/ee4j#project/1.0.9": {
+   "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
+  },
+  "org/eclipse/microprofile#microprofile-parent/2.11": {
+   "pom": "sha256-Bh21mPB4vltnvh3qVKmYZPqaa6zH1AvPtWrArdpDdVc="
+  },
+  "org/eclipse/microprofile#microprofile-parent/2.8": {
+   "pom": "sha256-Jp6jTEQci09GlvduyeDGaE10K/13dicT+6ix5E2BI6k="
+  },
+  "org/eclipse/microprofile/config#microprofile-config-api/3.1": {
+   "jar": "sha256-3uJ3+B4e3+r9XkNYlEHs30NFAP5KMdA150uObY57/ZE=",
+   "pom": "sha256-GAJTRl9lUPjhlVSHJVZ5ZuUyS6NDkNGShL1V7tl+aWk="
+  },
+  "org/eclipse/microprofile/config#microprofile-config-parent/3.1": {
+   "pom": "sha256-ywzs7U528l0aYMvNPGfM9eOQKPYCTpM17fX6oPL2vhI="
+  },
+  "org/eclipse/microprofile/context-propagation#microprofile-context-propagation-api/1.3": {
+   "jar": "sha256-aczARIfod3nUlwqlDGc8w0qd8IDBwOjY6rLotG+CXPQ=",
+   "pom": "sha256-nvSA7RaoZ9Gux6gEH6/mDcPBdF0G68GN1d1o5sQ/qEQ="
+  },
+  "org/eclipse/microprofile/context-propagation#microprofile-context-propagation-parent/1.3": {
+   "pom": "sha256-tIsfWNtYIsWs6EQcbAymZoHUsETBbbXLDsrxMUtGeLQ="
+  },
+  "org/eclipse/microprofile/openapi#microprofile-openapi-api/4.0.2": {
+   "jar": "sha256-xvypkT1+y964AdXmyTWYghn2Sg64sX4jQ36g4B56EKk=",
+   "pom": "sha256-pHgztxGIuIUZs0nPLC2LTiaKn78OhbwsC0+D7VFpcwo="
+  },
+  "org/eclipse/microprofile/openapi#microprofile-openapi-parent/4.0.2": {
+   "pom": "sha256-xZ/HxL1loTq28ogYDbDT5M1n2+sINSNpqn4wu7dsKus="
+  },
+  "org/eclipse/parsson#parsson/1.1.6": {
+   "jar": "sha256-f4gAdNCe+vG3RDv9n5m1KZgTkuhFrZctu2kXNEuxOBU=",
+   "pom": "sha256-DZz9FQTUuOs3gmXoY4M5nPEJuYMtCQvI0OzOMiOIs9M="
+  },
+  "org/eclipse/parsson#project/1.1.6": {
+   "pom": "sha256-LuAauaenRjgO5vpjnCrxvJixnc/WCmWZZUu7uS/tftA="
+  },
+  "org/hibernate/validator#hibernate-validator/9.0.1.Final": {
+   "jar": "sha256-JfQBGPpMUPhSLQkNJdUtWjiVOwzNElCDXwUue9MWTOA=",
+   "pom": "sha256-5w3BopQp/dTgh1E+tk70V1IMrwpRqxFFw7ilN8hC6gw="
+  },
+  "org/infinispan#infinispan-bom/15.0.19.Final": {
+   "pom": "sha256-EORmwd1rdMnBh9B5ZpN25naQJrlCWTpKu10NQ9W4XY8="
+  },
+  "org/infinispan#infinispan-build-configuration-parent/15.0.19.Final": {
+   "pom": "sha256-3jSEoQYRh1Y+i9Jj4xFRWs3i/Ie4GgrxZJ5s/TCsjJA="
+  },
+  "org/infinispan#infinispan-commons-parent/15.0.19.Final": {
+   "pom": "sha256-luIdP8U1wVS//6cWlsrHprgsUGVAqM3CA3QXqIAc0OI="
+  },
+  "org/infinispan#infinispan-commons/15.0.19.Final": {
+   "jar": "sha256-lnV1+9JTNIcr1J2hIA8sizIwXh68z3EJUhk30PRo920=",
+   "pom": "sha256-sJb5V+rLRJc1umczXOCq+0OvTm2ZNvN3VHPw6sBOlRI="
+  },
+  "org/infinispan#infinispan-parent/15.0.19.Final": {
+   "pom": "sha256-jmzA2m9nq4OgTPxDgVmhqKYYpzrxGAMT894ueE5F2f4="
+  },
+  "org/infinispan/protostream#parent/5.0.14.Final": {
+   "pom": "sha256-dd31FbFXy5YxbUl5TptinotZ9s+rTRpOmXtXRerEpBE="
+  },
+  "org/infinispan/protostream#protostream-processor/5.0.14.Final": {
+   "jar": "sha256-7YnsbRu2iKEmyYr+OmguOw4JVVfWye1iaWvs2rTDX5M=",
+   "pom": "sha256-DfassHZwHm5xRbfsowFX6442zcQK0q2FGflf2ZlQYPU="
+  },
+  "org/infinispan/protostream#protostream-types/5.0.14.Final": {
+   "jar": "sha256-Ff7P3AVs+AMw2yTAUge1e5mpKsiXHx9wmEkfvRXfOd0=",
+   "pom": "sha256-uFRu3De9CldOIkryjf2NtLkAasbheD0zTxBMsmbQGpI="
+  },
+  "org/infinispan/protostream#protostream/5.0.14.Final": {
+   "jar": "sha256-dcDm6an7B8faP85awaUBIqjAqcg8wDnYjHjAfyf9MRg=",
+   "pom": "sha256-Qd4D8E1bo2CzRxCoAWjT3uZnuldNChSG8PO+/bZy6Rk="
+  },
+  "org/jboss#jboss-parent/18": {
+   "pom": "sha256-cHWFSAOI9dIE/KZTz7/KCIVx61HCW70VLoXwfhg3tuQ="
+  },
+  "org/jboss#jboss-parent/39": {
+   "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ="
+  },
+  "org/jboss#jboss-parent/42": {
+   "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs="
+  },
+  "org/jboss#jboss-parent/43": {
+   "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc="
+  },
+  "org/jboss#jboss-parent/44": {
+   "pom": "sha256-zsr9kUYWSkIoy76TFkCzmGAmwC2D+U7fFrZJNPe2rcc="
+  },
+  "org/jboss#jboss-parent/47": {
+   "pom": "sha256-B0S14LJQm3uhe4W1r1RoCOovH4Oydl/R2MMztyzQW+Y="
+  },
+  "org/jboss#jboss-parent/48": {
+   "pom": "sha256-CO+EDZkz+WMjFsnLGysaql2oZynZSE5ZdQnRh43iv5s="
+  },
+  "org/jboss#jboss-parent/49": {
+   "pom": "sha256-LomePziWPgSk3fGSpaQFY6cAnEjYVjBAaHTMwVzbBpg="
+  },
+  "org/jboss/logging#commons-logging-jboss-logging/1.0.0.Final": {
+   "jar": "sha256-8SF2Jj6iX054u0+ks20zWilzjd5qgSPhttqJplXRUP8=",
+   "pom": "sha256-WNsZt6ci9K+a5CHQh0xaCkpCt/0VqO0m2FmnM1du5cw="
+  },
+  "org/jboss/logging#jboss-logging/3.6.1.Final": {
+   "jar": "sha256-XgiksJLchbM38JEKdAVx2HIM+lZfq9iAqMr5SmV8pBY=",
+   "pom": "sha256-J82Iq45ZRrinqpJkTrNzLjW+KBQ5qwevcfiYRT7nVA0="
+  },
+  "org/jboss/logging#logging-parent/1.0.0.Final": {
+   "pom": "sha256-42K+6+hUVCL6KGhAVGvIRqaeyo7NY+VKMkywhPqvyNY="
+  },
+  "org/jboss/logging#logging-parent/1.0.3.Final": {
+   "pom": "sha256-mXLIlHSc2jVXZiF9Q97XAJse6ybgMBwwkUotslPdaFs="
+  },
+  "org/jboss/logmanager#jboss-logmanager/3.1.2.Final": {
+   "jar": "sha256-wefeaCpIcajk7vsmra8PzGPNCRNUPFCqa39G+l7BUf4=",
+   "pom": "sha256-W8Fhlm6f+EcDJamlXR0bT3zhyp9b6CsrfG90toW+mxI="
+  },
+  "org/jboss/shrinkwrap#shrinkwrap-bom/1.2.6": {
+   "pom": "sha256-HArIAaoxJb3l6IFrqHijJDJZw5bS845nbihSqcxVADY="
+  },
+  "org/jboss/slf4j#slf4j-jboss-logmanager/2.0.0.Final": {
+   "jar": "sha256-J3iFEEtyeiE+94S6sxSZ0jIhB03tKLBIJ+gJ0vVIlpM=",
+   "pom": "sha256-U01FZKb8jAJlTHQ3X9lK7G4rg5C1mlTHfyKC5EjpOFo="
+  },
+  "org/jboss/threads#jboss-threads/3.9.1": {
+   "jar": "sha256-068va5Qurmg/8t59/mhGf41XDLuo2zf+hYl3NJw78qo=",
+   "pom": "sha256-1c6ELJiUVKWGeA4ONoidMglfFdMneG72yIRJ+d743AI="
+  },
+  "org/jctools#jctools-core/4.0.5": {
+   "jar": "sha256-1l5fOLzQmE4m+HGHaH8fcN1SdAxNXgRvjRBOAatduV8=",
+   "pom": "sha256-ppiXuP8MIZi0uM19T5P95tQrjp2/yVVTWF4nWHsk4hE="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": {
+   "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY="
+  },
+  "org/junit#junit-bom/5.10.0": {
+   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+  },
+  "org/junit#junit-bom/5.10.2": {
+   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+  },
+  "org/junit#junit-bom/5.10.3": {
+   "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+   "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+  },
+  "org/junit#junit-bom/5.11.0": {
+   "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+   "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+  },
+  "org/junit#junit-bom/5.11.3": {
+   "module": "sha256-S/D1PO6nx5D9+9JNujyeBM3FGGQnnuv8V6qkc+vKA4A=",
+   "pom": "sha256-8T3y5Mrx/rzlZ2Z+fDeBAaAzHVPRMk1uLf467Psfd3Q="
+  },
+  "org/junit#junit-bom/5.11.4": {
+   "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
+   "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
+  },
+  "org/junit#junit-bom/5.13.4": {
+   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
+   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
+  },
+  "org/junit#junit-bom/5.9.0": {
+   "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
+   "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
+  },
+  "org/junit#junit-bom/5.9.2": {
+   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
+   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.9.0": {
+   "jar": "sha256-PjcLy7HoV/2l8LIDckEW0CsF54j6oeslGIFKzPnPtbE=",
+   "module": "sha256-n5LPF5V1xN9pgpRwTRDxLozHFdaC+yDtzYrbxB/H8PQ=",
+   "pom": "sha256-ap2MRpjcjGkE1qwfXRMBiqf4KESbxbjO94/BQxzgghc="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.9.0": {
+   "jar": "sha256-24bLszUnGfoKl4AO39CcIEY8fyq0oEaZJEQwvYlUWDs=",
+   "module": "sha256-sVnltbYmIiOP1v0oZPigEsHfbbK7JvEMqA4dIqzOLx0=",
+   "pom": "sha256-qLfR7QMvuStDJY140jmwGcX1g02swIT5l4PjTD7hLL8="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.9.0": {
+   "jar": "sha256-uM73mC3VPfhMlXpumsie3pZ88ubZNA70xReG4gVIxBs=",
+   "module": "sha256-QUkSewrR3JKJdqY4WIer3wpD9oNlRLK614OUh2kJenE=",
+   "pom": "sha256-DDOljPiR2vvGIfPG2cyCMnCDHrOxib3juIbMMDmQ/Ww="
+  },
+  "org/junit/jupiter#junit-jupiter/5.9.0": {
+   "jar": "sha256-LbLkqitegv78vxjQryDICVpD6UrZq50WvYdVfNqjl90=",
+   "module": "sha256-a1AJDfWdSZ4ycr41ULiBJdXJGojhzbSaEsLwi+p6hds=",
+   "pom": "sha256-Imsy40Pt4WvSls+36xXhmaFOQBxUJulUOsUDrM1E3JI="
+  },
+  "org/junit/platform#junit-platform-commons/1.9.0": {
+   "jar": "sha256-5YlLcQCUtMqvxigLiCmkOft2SQHqCuGNBu2AOIswm3o=",
+   "module": "sha256-SyAzP4ruVOgwRY2B0EXrjRfcBCTTEzKNtQmpzCSZsXo=",
+   "pom": "sha256-MJp9efG/577WChoXCKqovXGGHBKdIWhNaO305NnILCA="
+  },
+  "org/junit/platform#junit-platform-engine/1.9.0": {
+   "jar": "sha256-quxzX3REqfwFXiBlmN49gpwk6ceo7qbv3usZYgh/6BE=",
+   "module": "sha256-/3Xx1hE/RdWyXyUpUE3tiDmGoBLJtD0hrUI5jknXEGM=",
+   "pom": "sha256-G2rN+hUNaWYlIHYAAcaONlhl1o7xMNGZblK5SD7IYWE="
+  },
+  "org/keycloak#keycloak-common/26.5.0": {
+   "jar": "sha256-2PK11SgJzuZvI+s03v9MhAU8PZMa8DmLaoldGeeybWA=",
+   "pom": "sha256-4vFpvHt9yXBC2UzAi6lkXABKch6kJGM5qAY+mrI/+YY="
+  },
+  "org/keycloak#keycloak-config-api/26.5.0": {
+   "jar": "sha256-oRDkNFwYkuUix1MJzdB0Y+jvXyRB/lPN+4AfDl5Ae6U=",
+   "pom": "sha256-morv3k+SZkVsBR2iwFVm31DUtAhUunCvjMVDy2VAqWg="
+  },
+  "org/keycloak#keycloak-core/26.5.0": {
+   "jar": "sha256-1yA3b1qqEu/i24uRbLchwOK51yflDoVeI7cBXdaBwbY=",
+   "pom": "sha256-xmppjrEpuyQI0bTJjsw9wTi9PZN0Yn8v1XSwNtCHXqI="
+  },
+  "org/keycloak#keycloak-model-pom/26.5.0": {
+   "pom": "sha256-DM/HtbmHsna/rnG1Dce8ZWb4atZ/RzMmcqY8GWor7Sc="
+  },
+  "org/keycloak#keycloak-model-storage-private/26.5.0": {
+   "jar": "sha256-3Wk68aMVEo85/pqRReLyJKSRyMhltmTNtfB+/1qaz+g=",
+   "pom": "sha256-1sFZtmjRNs8kOeJj/empnp2PYJzrunHetaRUxYTzdJU="
+  },
+  "org/keycloak#keycloak-model-storage/26.5.0": {
+   "jar": "sha256-HZ05Oog0lfyvAjQwbndB3g2ziytXqb4DSWK8WwwfbwQ=",
+   "pom": "sha256-iTC+gd270T75QEHzHTUNpfSBJV+VnvACYEguTUsipio="
+  },
+  "org/keycloak#keycloak-parent/26.5.0": {
+   "pom": "sha256-uUAV2DPIwxPbc6dW2EvXFhSdrRdQtYA1Zq1t4Rovwjw="
+  },
+  "org/keycloak#keycloak-quarkus-parent/26.5.0": {
+   "pom": "sha256-Ho5I8IjxJHJFmET7rE1Hhtv79KcilbaJLPA+DL2Vwrw="
+  },
+  "org/keycloak#keycloak-server-spi-private/26.5.0": {
+   "jar": "sha256-gjQHk70/k84MOYF6Fof9uMuGoispAKdK+j0LKUV0zGc=",
+   "pom": "sha256-ebNAq+2oFRzpgm4mvRLCfacycX1LTSNOWAxIrAme/zo="
+  },
+  "org/keycloak#keycloak-server-spi/26.5.0": {
+   "jar": "sha256-TTuIUF2kSgU270lW3Efk8kut4UK8m2/BpjBCzzeEYLk=",
+   "pom": "sha256-mxto4VbiUf9d1KK5kUSF3VzEn8cCrMCPGhKDDVyJZXs="
+  },
+  "org/keycloak#keycloak-services/26.5.0": {
+   "jar": "sha256-klKTfqrMeC/ZoH4+HvWmng6Dxf5zml4zlEU4zpC3Qaw=",
+   "pom": "sha256-Qu6DIJIxfY/tWp5pG7/ytqxzuKZ7Gz3gAVgkjov2NQ0="
+  },
+  "org/mockito#mockito-bom/5.18.0": {
+   "pom": "sha256-BhfEyedxfwt421BQgYuxvvLYvEuzmDQiQfKwoaKruZg="
+  },
+  "org/opentest4j#opentest4j/1.2.0": {
+   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
+   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  },
+  "org/reactivestreams#reactive-streams/1.0.4": {
+   "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=",
+   "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag="
+  },
+  "org/slf4j#slf4j-api/2.0.17": {
+   "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
+   "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
+  },
+  "org/slf4j#slf4j-bom/2.0.17": {
+   "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
+  },
+  "org/slf4j#slf4j-parent/2.0.17": {
+   "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/testcontainers#testcontainers-bom/1.21.3": {
+   "pom": "sha256-LOcXIm0dZ7Wx35cH7ZgCKjZqyJLZ5JbF8Bc/GreKCWU="
+  },
+  "org/twitter4j#twitter4j-core/4.1.2": {
+   "jar": "sha256-cmAigcBtl+ksY86EvZPQB2QvoL/4UvY98S/RI7mQsfI=",
+   "module": "sha256-AQDT1GTl6gAdKXq4e4JQsslz2b9a2VFnltfHvnVrOCY=",
+   "pom": "sha256-VhhBMpQ6873BFPIRc7ieacjMqlj2GBo/vR1g9xJro0Y="
+  },
+  "org/wildfly/common#wildfly-common/2.0.1": {
+   "jar": "sha256-+kpxDbeuPlmKX0FjnrVOn3sJ3l/Q9Y9WvWBw8h2VY3Q=",
+   "pom": "sha256-yWySJJfCjJxm7brae4odGYJJJr1B/h1LEMJ7psZsZfM="
+  },
+  "org/yaml#snakeyaml/2.0": {
+   "pom": "sha256-Q8dh+StUnIsI+5kggCU+SfCpg+VE7wZjwfT51o61JhY="
+  },
+  "org/yaml#snakeyaml/2.4": {
+   "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=",
+   "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY="
+  }
+ }
+}

From c58fdcb9f8b496aff6404d78e07138e9c51d6b84 Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:00:05 +0800
Subject: [PATCH 0452/1386] bruno: 3.5.1 -> 3.5.2

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

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 11c53a98a0a0..f847d768e712 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -21,13 +21,13 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-ud1zdA38k5RW6qlmPQGnkYUIHOhiHNYWmlXbEzJsIUk=";
+    hash = "sha256-Lll/ywDkHv0xvLk8iiBEySek7A3dBmfO4V/q2xaNtBQ=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json

From f361a82ad8e4170a3bcdcfa7816206d8f5fd066e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 09:13:16 +0000
Subject: [PATCH 0453/1386] codex: 0.144.1 -> 0.144.4

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

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 6fa2aff8ea20..ad87fcd174e5 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -26,13 +26,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.144.1";
+  version = "0.144.4";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-KHgrqIZyAmLhTZSRYbb7huBO8neOib/B1Vx/oPW2nEU=";
+    hash = "sha256-NmYZxjNFPkRWN4rw+eeka10pJt6/oU3ZoLXBxj3dPRU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";

From dcf185ea294b119c2a3cf2769ffc9c692a0ee61b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 09:18:25 +0000
Subject: [PATCH 0454/1386] python3Packages.azure-mgmt-recoveryservices: 4.0.1
 -> 4.1.0

---
 .../python-modules/azure-mgmt-recoveryservices/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index ff6a6490b68d..3bb430f32d7c 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservices";
-  version = "4.0.1";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_mgmt_recoveryservices";
     inherit version;
-    hash = "sha256-/9/yZ9sqYC6wMMCC9Tpd8YXIbqU8RG6meaEzYAJ4YGs=";
+    hash = "sha256-Y81Zbm/xuAHgYoPRU84Mfx1E9+3wUtMhwTJ0bDyMhx4=";
   };
 
   build-system = [ setuptools ];

From 9d935210773f4fc9c266b331f2587d663af2f0c5 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 14 Jul 2026 21:20:49 +1200
Subject: [PATCH 0455/1386] nix-unit: 2.34.1 -> 2.34.2

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

diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix
index c79e4d10f2ee..a958b1ebcd78 100644
--- a/pkgs/by-name/ni/nix-unit/package.nix
+++ b/pkgs/by-name/ni/nix-unit/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nix-unit";
-  version = "2.34.1";
+  version = "2.34.2";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-unit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XUgPlbtvuqxJHqaiVtwwxPxGa4seC/7XqZP2k0m3RXo=";
+    hash = "sha256-eG+ETC+lvHDLhlKgQB6/lGfpqr56Lt3+j1pHOeb4tK4=";
   };
 
   buildInputs = [

From 963c03f40c7d945fa88ae0862fef0a490e21083c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Santos=20Reis?= <joao.reis@tweag.io>
Date: Wed, 6 May 2026 10:08:45 +0100
Subject: [PATCH 0456/1386] shadow: move test configuration to a directory

---
 nixos/tests/all-tests.nix                    | 2 +-
 nixos/tests/shadow/default.nix               | 4 ++++
 nixos/tests/{shadow.nix => shadow/login.nix} | 0
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/shadow/default.nix
 rename nixos/tests/{shadow.nix => shadow/login.nix} (100%)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 029a2543ec93..ad8915c8b25b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1539,7 +1539,7 @@ in
   sftpgo = runTest ./sftpgo.nix;
   sfxr-qt = runTest ./sfxr-qt.nix;
   sgt-puzzles = runTest ./sgt-puzzles.nix;
-  shadow = runTest ./shadow.nix;
+  shadow = import ./shadow { inherit runTest; };
   shadowsocks = handleTest ./shadowsocks { };
   shadps4 = runTest ./shadps4.nix;
   sharkey = runTest ./web-apps/sharkey.nix;
diff --git a/nixos/tests/shadow/default.nix b/nixos/tests/shadow/default.nix
new file mode 100644
index 000000000000..703f1119d824
--- /dev/null
+++ b/nixos/tests/shadow/default.nix
@@ -0,0 +1,4 @@
+{ runTest }:
+{
+  login = runTest ./login.nix;
+}
diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow/login.nix
similarity index 100%
rename from nixos/tests/shadow.nix
rename to nixos/tests/shadow/login.nix

From 6d97e51b7c90cd43d4ee7cb5ced48b0f54da9f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Santos=20Reis?= <joao.reis@tweag.io>
Date: Wed, 6 May 2026 10:09:37 +0100
Subject: [PATCH 0457/1386] shadow: enable running upstream system test suite

---
 nixos/tests/shadow/default.nix     |   1 +
 nixos/tests/shadow/system.nix      | 147 +++++++++++++++++++++++++++++
 pkgs/by-name/sh/shadow/package.nix |  54 ++++++++++-
 3 files changed, 201 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/shadow/system.nix

diff --git a/nixos/tests/shadow/default.nix b/nixos/tests/shadow/default.nix
index 703f1119d824..ba773f93f073 100644
--- a/nixos/tests/shadow/default.nix
+++ b/nixos/tests/shadow/default.nix
@@ -1,4 +1,5 @@
 { runTest }:
 {
   login = runTest ./login.nix;
+  system = runTest ./system.nix;
 }
diff --git a/nixos/tests/shadow/system.nix b/nixos/tests/shadow/system.nix
new file mode 100644
index 000000000000..fbed9be8beba
--- /dev/null
+++ b/nixos/tests/shadow/system.nix
@@ -0,0 +1,147 @@
+{ pkgs, ... }:
+let
+  # Create a Python environment for the controller with all necessary test framework dependencies
+  controllerPython = pkgs.python3.withPackages (ps: [
+    ps.flaky
+    ps.jc
+    ps.pytest
+    ps.pytest-mh
+    ps.pytest-ticket
+  ]);
+
+  shadowHostName = "shadowhost";
+in
+{
+  name = "shadow-system-tests";
+
+  meta.maintainers = with pkgs.lib.maintainers; [ joaosreis ];
+
+  nodes = {
+    # The target host: runs sshd, has shadow and other test dependencies installed, mutable users, and some specific settings to match the expectations of the test suite
+    shadowhost =
+      { pkgs, ... }:
+      {
+        networking.hostName = shadowHostName;
+        services.openssh = {
+          enable = true;
+          settings = {
+            PermitRootLogin = "yes";
+            PasswordAuthentication = false;
+          };
+        };
+
+        users.mutableUsers = true;
+
+        environment.systemPackages = with pkgs; [
+          shadow
+          expect
+        ];
+
+        users.defaultUserShell = "/bin/sh";
+
+        security.loginDefs.settings = {
+          PASS_MAX_DAYS = 99999;
+          PASS_MIN_DAYS = 0;
+          PASS_WARN_AGE = 7;
+          USERGROUPS_ENAB = "yes";
+          CREATE_HOME = "yes";
+          UID_MIN = 1001;
+          GID_MIN = 1001;
+        };
+
+        security.pam.services = {
+          newusers.text = ''
+            auth    required    pam_permit.so
+            account required    pam_permit.so
+            password required   pam_permit.so
+            session required    pam_permit.so
+          '';
+        };
+
+        services.envfs.enable = true;
+      };
+
+    # The controller: runs pytest-mh against the shadow host
+    controller =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = [
+          controllerPython
+          pkgs.openssh
+        ];
+      };
+
+  };
+
+  testScript = ''
+    import textwrap
+
+    start_all()
+
+    # ------------------------------------------------------------------
+    # 1. Generate an SSH keypair on the controller and authorise it
+    #    on the shadow host
+    # ------------------------------------------------------------------
+    controller.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh")
+    controller.succeed(
+        "ssh-keygen -t ed25519 -N \'\' -f /root/.ssh/id_ed25519 2>&1"
+    )
+    pub_key = controller.succeed("cat /root/.ssh/id_ed25519.pub").strip()
+
+    # Inject the generated public key into the shadow host at runtime
+    shadowhost.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh")
+    shadowhost.succeed(
+        f"echo '{pub_key}' >> /root/.ssh/authorized_keys && "
+        "chmod 600 /root/.ssh/authorized_keys"
+    )
+
+    # ------------------------------------------------------------------
+    # 2. Make sure the shadow host has a writable /etc/login.defs,
+    #    since the test framework expects to be able to write to it.
+    # ------------------------------------------------------------------
+    shadowhost.succeed(
+        "cp --remove-destination $(readlink -f /etc/login.defs) /etc/login.defs && "
+        "chmod 644 /etc/login.defs"
+    )
+
+    # ------------------------------------------------------------------
+    # 3. Copy the upstream test suite onto the controller
+    # ------------------------------------------------------------------
+    controller.succeed(
+        "cp -r ${pkgs.shadow.passthru.testFramework} /root/shadow-tests && "
+        "chmod -R u+w /root/shadow-tests"
+    )
+
+    # ------------------------------------------------------------------
+    # 4. Write the mhc.yaml topology config
+    #    This tells pytest-mh where the shadow host is and which role
+    #    it plays. The hostname must match the NixOS node name.
+    # ------------------------------------------------------------------
+    controller.succeed(textwrap.dedent("""
+        cat > /root/shadow-tests/mhc.yaml << 'EOF'
+        domains:
+          - id: shadow
+            hosts:
+              - hostname: ${shadowHostName}
+                role: shadow
+                ssh:
+                  user: root
+                  private_key: /root/.ssh/id_ed25519
+        EOF
+    """))
+
+
+    # ------------------------------------------------------------------
+    # 5. Run the upstream pytest-mh test suite from the controller
+    # ------------------------------------------------------------------
+    shadowhost.wait_for_unit("sshd.service")
+    # gpasswd tests are disabled, since they rely on specific behavior of the gpasswd command that is not applicable to NixOS
+    controller.succeed(
+        "cd /root/shadow-tests && "
+        "${controllerPython}/bin/pytest "
+        "--mh-config=mhc.yaml "
+        "--deselect=tests/test_gpasswd.py "
+        "-v tests/"
+    )
+  '';
+}
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 4c5f050b911f..51a216b27684 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -20,6 +20,7 @@
   withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb,
   tcb,
   cmocka,
+  fetchpatch,
 }:
 let
   glibc' =
@@ -139,7 +140,58 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     shellPath = "/bin/nologin";
-    # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests
     tests = { inherit (nixosTests) shadow; };
+    # Package the upstream system test framework for use in nixosTests
+    testFramework = stdenv.mkDerivation {
+      name = "shadow-test-framework";
+      inherit (finalAttrs) version;
+      src = "${finalAttrs.src}/tests/system";
+      installPhase = ''
+        cp -r . $out/
+      '';
+      dontBuild = true;
+      patches = [
+        # tests: update useradd tests to expect ID 1001
+        (fetchpatch {
+          name = "update-useradd-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/59fbe8415dab17f1e702fbdee96956886c86c737.patch";
+          hash = "sha256-U0+NSCd4AfTuHMddTx9+wNtpdJt9t8+D5ApW0OCNgsY=";
+          stripLen = 2;
+        })
+        # tests: update usermod tests to expect ID 1001
+        (fetchpatch {
+          name = "update-usermod-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/91c2ad44ababca2e32cdb71152b0f7f2a7c546be.patch";
+          hash = "sha256-v1EEvMfUYoE/ZnBM0k/+kUBK3W1dXr588OQzvFmnXLI=";
+          stripLen = 2;
+        })
+        # tests: update groupadd tests to expect GID 1001
+        (fetchpatch {
+          name = "update-groupadd-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/60568eaec13d1e417f56f0e59ac9573c0e3b9a83.patch";
+          hash = "sha256-tLmGeW4Y7UcZqMhW3IXgygKPhCmbZkkW5XTJ7CFz9vg=";
+          stripLen = 2;
+        })
+        # tests: update newgrp tests to expect GID 1002
+        (fetchpatch {
+          name = "update-newgrp-tests.patch";
+          url = "https://github.com/shadow-maint/shadow/commit/49ff9bf33a7b6af57cb26688c3139f014302c9d9.patch";
+          hash = "sha256-1760t4Ezd5Ke4PFZ70Njb+k+1kp17aT/7uqu1PswVss=";
+          stripLen = 2;
+        })
+      ];
+      postPatch = ''
+        # Replace the gshadow existence check in the test framework with a more NixOS-friendly one, since NixOS does not have /etc/gshadow as a regular file
+        substituteInPlace framework/hosts/shadow.py \
+          --replace-fail 'getent gshadow > /dev/null 2>&1' 'test -f /etc/gshadow'
+
+        # Remove the backup entry for gshadow, since it's not being used in the tests running on NixOS
+        sed -i '/{"origin": "\/etc\/gshadow", "backup": "gshadow"}/d' framework/hosts/shadow.py
+
+        # Replace the Debian-specific check in the useradd test with a NixOS-specific one
+        substituteInPlace tests/test_useradd.py \
+          --replace-fail 'if "Debian" in shadow.host.distro_name:' 'if "NixOS" in shadow.host.distro_name:'
+      '';
+    };
   };
 })

From f50325059adf7251e8dce7f906a7ebac1e61c6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.dev>
Date: Tue, 14 Jul 2026 11:29:59 +0200
Subject: [PATCH 0458/1386] python3Packages.nvidia-dlprofviewer: init at 1.8.0

---
 .../nvidia-dlprofviewer/default.nix           | 58 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/nvidia-dlprofviewer/default.nix

diff --git a/pkgs/development/python-modules/nvidia-dlprofviewer/default.nix b/pkgs/development/python-modules/nvidia-dlprofviewer/default.nix
new file mode 100644
index 000000000000..1ba2c9c8691c
--- /dev/null
+++ b/pkgs/development/python-modules/nvidia-dlprofviewer/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchurl,
+  autoAddDriverRunpath,
+  autoPatchelfHook,
+  django,
+  gunicorn,
+  setuptools,
+  sqlite,
+  uvicorn,
+  whitenoise,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "nvidia-dlprofviewer";
+  version = "1.8.0";
+  __structuredAttrs = true;
+  format = "wheel";
+
+  src = fetchurl {
+    url = "https://pypi.nvidia.com/nvidia-dlprofviewer/nvidia_dlprofviewer-${finalAttrs.version}-py3-none-any.whl";
+    hash = "sha256-KrfLZ6NdP31qfSfOBl8944ZE2xZ+kgjkyt+QPUblYVA=";
+  };
+
+  pythonImportsCheck = [
+    "dlprofviewer"
+  ];
+
+  nativeBuildInputs = [
+    autoAddDriverRunpath
+    autoPatchelfHook
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvidia-ml.so.1"
+  ];
+
+  propagatedBuildInputs = [
+    django
+    gunicorn
+    setuptools
+    sqlite
+    uvicorn
+    whitenoise
+  ];
+
+  pythonRelaxDeps = [
+    "django"
+  ];
+
+  meta = {
+    description = "NVIDIA DLProf Viewer";
+    homepage = "https://docs.nvidia.com/deeplearning/frameworks/dlprof-user-guide/index.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ jlesquembre ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ebecb4e6a12..a5e3498b76ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11919,6 +11919,8 @@ self: super: with self; {
     callPackage ../development/python-modules/nvidia-dlprof-pytorch-nvtx
       { };
 
+  nvidia-dlprofviewer = callPackage ../development/python-modules/nvidia-dlprofviewer { };
+
   nvidia-ml-py = callPackage ../development/python-modules/nvidia-ml-py { };
 
   nwdiag = callPackage ../development/python-modules/nwdiag { };

From 955995bbdc09229be959e6a80e859837a6882c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Jul 2026 18:16:26 +0200
Subject: [PATCH 0459/1386] python3Packages.dogpile-cache: update disabled
 tests for darwin

---
 .../python-modules/dogpile-cache/default.nix  | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix
index ebea5ee74068..42bfe3fae843 100644
--- a/pkgs/development/python-modules/dogpile-cache/default.nix
+++ b/pkgs/development/python-modules/dogpile-cache/default.nix
@@ -7,9 +7,7 @@
   pytestCheckHook,
   mako,
   decorator,
-  stdenv,
   stevedore,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -28,7 +26,6 @@ buildPythonPackage rec {
   dependencies = [
     decorator
     stevedore
-    typing-extensions
   ];
 
   nativeCheckInputs = [
@@ -37,24 +34,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths = lib.optionals stdenv.hostPlatform.isLinux [
+  disabledTestPaths = [
     # flaky
     "tests/cache/test_dbm_backend.py"
-  ];
-
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    # AssertionError: <dogpile.cache.api.NoValue object> != 'some value 1'
-    "test_expire_override"
-    # flaky
-    "test_get_value_plus_created_long_create"
-    "test_get_value_plus_created_registry_safe_cache_quick"
-    "test_get_value_plus_created_registry_safe_cache_slow"
-    "test_get_value_plus_created_registry_unsafe_cache"
-    "test_quick"
-    "test_region_set_get_value"
-    "test_region_set_multiple_values"
-    "test_return_while_in_progress"
-    "test_slow"
+    # timing sensitive
+    "tests/test_lock.py::ConcurrencyTest"
   ];
 
   meta = {

From 20806e0226232e580beae3078efbc8dec01a2723 Mon Sep 17 00:00:00 2001
From: Ushitora Anqou <ushitora@anqou.net>
Date: Wed, 29 Apr 2026 14:51:39 +0900
Subject: [PATCH 0460/1386] minikube: set libvirt to LD_LIBRARY_PATH to avoid
 'Failed to open libvirt.so.0' error

Currently `minikube start --driver=kvm2` fails with the following
message:

  Exiting due to GUEST_PROVISION: error provisioning guest: Failed to start host: recreate: creating host: create: creating: creating network: failed opening libvirt connection: failed connecting to libvirt socket: virError(Code=1, Domain=0, Message='Failed to open libvirt.so.0')

This commit fixes this problem by adding libvirt to LD_LIBRARY_PATH.
---
 pkgs/by-name/mi/minikube/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix
index 9fc1a2e0a432..f1f2064bea3d 100644
--- a/pkgs/by-name/mi/minikube/package.nix
+++ b/pkgs/by-name/mi/minikube/package.nix
@@ -71,7 +71,10 @@ buildGoModule (finalAttrs: {
 
     installBin out/minikube
 
-    wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false
+    wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ])
+      }
     ln -sv $out/bin/minikube $out/bin/kubectl
 
     for shell in bash zsh fish; do

From 101865f667ddbf595956d09b8a5670ac6a7b36bc Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 20 Jan 2025 11:28:15 +0100
Subject: [PATCH 0461/1386] stamp: init at 0-unstable-2026-07-14

---
 pkgs/by-name/st/stamp/package.nix | 66 +++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 pkgs/by-name/st/stamp/package.nix

diff --git a/pkgs/by-name/st/stamp/package.nix b/pkgs/by-name/st/stamp/package.nix
new file mode 100644
index 000000000000..fd889cef2035
--- /dev/null
+++ b/pkgs/by-name/st/stamp/package.nix
@@ -0,0 +1,66 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  desktop-file-utils,
+  libadwaita,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  webkitgtk_6_0,
+  blueprint-compiler,
+  evolution-data-server-gtk4,
+  gst_all_1,
+  libportal-gtk4,
+  libpsl,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation {
+  pname = "stamp";
+  version = "0-unstable-2026-07-13";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "jbrummer";
+    repo = "stamp";
+    rev = "9bce220c9e094c4d616009ebc87499a68ffc14aa";
+    hash = "sha256-mplowqsBTT9ibLxD8pbaIeLSd1pindgXLSPKBjseul8=";
+  };
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    evolution-data-server-gtk4
+    gst_all_1.gstreamer
+    libadwaita
+    libportal-gtk4
+    libpsl
+    webkitgtk_6_0
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch=main" ];
+  };
+
+  meta = {
+    description = "Modern GTK4 email client for the GNOME ecosystem";
+    homepage = "https://gitlab.gnome.org/jbrummer/stamp";
+    maintainers = with lib.maintainers; [ onny ];
+    license = with lib.licenses; [ gpl3Plus ];
+    platforms = lib.platforms.linux;
+    mainProgram = "stamp";
+  };
+}

From d846912fb0b533478ce337c08bd303c8635015cd Mon Sep 17 00:00:00 2001
From: Samiser <github@me.samiser.xyz>
Date: Tue, 14 Jul 2026 10:55:40 +0100
Subject: [PATCH 0462/1386] gtk4: fix build on darwin by linking with lld

---
 pkgs/by-name/gt/gtk4/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix
index 9b7807508a35..c92464ba6e3d 100644
--- a/pkgs/by-name/gt/gtk4/package.nix
+++ b/pkgs/by-name/gt/gtk4/package.nix
@@ -60,6 +60,7 @@
   compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages,
   cups,
   libexecinfo,
+  llvmPackages,
   broadwaySupport ? true,
   testers,
   darwinMinVersionHook,
@@ -130,6 +131,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals vulkanSupport [
     shaderc # for glslc
   ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+    llvmPackages.lld
+  ]
   ++ finalAttrs.setupHooks;
 
   buildInputs = [
@@ -221,6 +226,10 @@ stdenv.mkDerivation (finalAttrs: {
   }
   // lib.optionalAttrs stdenv.hostPlatform.isMusl {
     NIX_LDFLAGS = "-lexecinfo";
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+    NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
   };
 
   postPatch = ''

From 8f167ce6ca9b309849ce3f52b149c5bec525182e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 09:57:30 +0000
Subject: [PATCH 0463/1386] terraform-providers.ovh_ovh: 2.15.0 -> 2.16.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 019b0716544b..a79d0db56d6c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1067,11 +1067,11 @@
     "vendorHash": null
   },
   "ovh_ovh": {
-    "hash": "sha256-JaZdCten+5mV8aKCRhkoifqP4EwNrytK25TLJl1eQjQ=",
+    "hash": "sha256-01xbvlVgdpRXPw7S1J067cj92ogfcBOzC6y+/PTWtRM=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.15.0",
+    "rev": "v2.16.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 4d01e35160da4ded729e0bcad0655bc4c3c525be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 10:04:54 +0000
Subject: [PATCH 0464/1386] ollama: 0.31.2 -> 0.32.0

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 056b977b741b..16508c4919eb 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -152,13 +152,13 @@ let
 in
 goBuild (finalAttrs: {
   pname = "ollama";
-  version = "0.31.2";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/ySx6vfOGPo5twwKiNtkuROaTV7SvCeHX2fQiilmTkA=";
+    hash = "sha256-NyZ3H1gsC692IcmdTXjIA9jDtTobUEfJladGW72aNGw=";
   };
 
   vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs=";

From 17a968aca67a2ae0b5c180f09f76d4f38f21876d Mon Sep 17 00:00:00 2001
From: Romain Delhommais <romain@delhommais.com>
Date: Tue, 14 Jul 2026 12:35:52 +0200
Subject: [PATCH 0465/1386] wealthfolio-server: 3.5.3 -> 3.6.2

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

diff --git a/pkgs/by-name/we/wealthfolio-server/package.nix b/pkgs/by-name/we/wealthfolio-server/package.nix
index 8211d696ea73..74b2ffd0867e 100644
--- a/pkgs/by-name/we/wealthfolio-server/package.nix
+++ b/pkgs/by-name/we/wealthfolio-server/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (
 
         pnpm = pnpm_10;
         fetcherVersion = 3;
-        hash = "sha256-9pINtZToPqAA5VRTO8lRIBzNxO9481WvMkE2kk/iyUM=";
+        hash = "sha256-fryLXUVzyDT1jOuS5sIf9kpCJ40oHaxFRJFKMrn7EGs=";
       };
 
       nativeBuildInputs = [
@@ -54,18 +54,18 @@ rustPlatform.buildRustPackage (
     __structuredAttrs = true;
 
     pname = "wealthfolio-server";
-    version = "3.5.3";
+    version = "3.6.2";
 
     src = fetchFromGitHub {
       owner = "wealthfolio";
       repo = "wealthfolio";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-9dE0IQtDUcveZk2eWu9+UDpAYPgk/LbY+jsTNH3N9hg=";
+      hash = "sha256-2Chwr7OifQ5PgRAnxDEeAxyYaxVQqS32mezqzUBKKyU=";
     };
 
     cargoRoot = ".";
     buildAndTestSubdir = "apps/server";
-    cargoHash = "sha256-P93AAivBXWBLik8M/DNUWyKXVsq7ttvX3DpiXwaDL2I=";
+    cargoHash = "sha256-pfUrfIZmuibjFYzcuh57WU/pTlXFZNWYgurNYn+Wvus=";
 
     nativeBuildInputs = [ makeWrapper ];
 

From d823df4fb02d2a839617d69396e8ca75fbc2a264 Mon Sep 17 00:00:00 2001
From: DarshanCode2005 <darshanthakaregsoc2023@gmail.com>
Date: Tue, 14 Jul 2026 16:17:36 +0530
Subject: [PATCH 0466/1386] maintainers: add darshancode2005

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7667360d7624..e17d8e122520 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6252,6 +6252,12 @@
     github = "darkyzhou";
     githubId = 7220778;
   };
+  darshancode2005 = {
+    name = "Darshan Thakare";
+    email = "darshanthakaregsoc2023@gmail.com";
+    github = "DarshanCode2005";
+    githubId = 143271270;
+  };
   daru-san = {
     name = "Daru";
     email = "zadarumaka@proton.me";

From 9b9c984417a6385f75247b646cee145103b7cf2a Mon Sep 17 00:00:00 2001
From: DarshanCode2005 <darshanthakaregsoc2023@gmail.com>
Date: Tue, 14 Jul 2026 16:19:44 +0530
Subject: [PATCH 0467/1386] python3packages/django-rest-knox: init at 5.1.0

---
 .../django-rest-knox/default.nix              | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-rest-knox/default.nix

diff --git a/pkgs/development/python-modules/django-rest-knox/default.nix b/pkgs/development/python-modules/django-rest-knox/default.nix
new file mode 100644
index 000000000000..3c2caa0a1f30
--- /dev/null
+++ b/pkgs/development/python-modules/django-rest-knox/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  django,
+  djangorestframework,
+  freezegun,
+  pytest-django,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "django-rest-knox";
+  version = "5.1.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "django-rest-knox";
+    tag = finalAttrs.version;
+    hash = "sha256-YK2dD2QAnrgDqWy506afRnEbnla4VT8RFV4Rg0BRjEY=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    djangorestframework
+  ];
+
+  nativeCheckInputs = [
+    freezegun
+    pytest-django
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=knox_project.settings
+  '';
+
+  pythonImportsCheck = [ "knox" ];
+
+  meta = {
+    description = "Authentication module for Django REST Framework";
+    homepage = "https://github.com/jazzband/django-rest-knox";
+    changelog = "https://github.com/jazzband/django-rest-knox/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ darshancode2005 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9226a4d81e9..a1ad7c034301 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4756,6 +4756,8 @@ self: super: with self; {
 
   django-rest-auth = callPackage ../development/python-modules/django-rest-auth { };
 
+  django-rest-knox = callPackage ../development/python-modules/django-rest-knox { };
+
   django-rest-polymorphic = callPackage ../development/python-modules/django-rest-polymorphic { };
 
   django-rest-registration = callPackage ../development/python-modules/django-rest-registration { };

From 2985ed912bba646a5446788c97fbb3fba1b8ea20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.dev>
Date: Fri, 12 Jun 2026 23:00:50 +0200
Subject: [PATCH 0468/1386] cloudquery: init at 6.36.1

---
 pkgs/by-name/cl/cloudquery/package.nix | 62 ++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/cl/cloudquery/package.nix

diff --git a/pkgs/by-name/cl/cloudquery/package.nix b/pkgs/by-name/cl/cloudquery/package.nix
new file mode 100644
index 000000000000..08f046705476
--- /dev/null
+++ b/pkgs/by-name/cl/cloudquery/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  installShellFiles,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "cloudquery";
+  version = "6.36.1";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "cloudquery";
+    repo = "cloudquery";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-D0gciTH5OwYXBPabOmn6bMHyWZwS6y5uAQIdNS+WugE=";
+  };
+
+  modRoot = "cli";
+
+  vendorHash = "sha256-gY/FQ71Nwk9i7QXgMmOVlJe9lEW9ViPZ3Eh1NusIizE=";
+
+  subPackages = [
+    "."
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/cloudquery/cloudquery/cli/v${lib.versions.major finalAttrs.version}/cmd.Version=${finalAttrs.version}"
+  ];
+
+  doInstallCheck = true;
+
+  nativeBuildInputs = [
+    installShellFiles
+    versionCheckHook
+  ];
+
+  postInstall = ''
+    mv $out/bin/cli $out/bin/cloudquery
+
+    installShellCompletion --cmd cloudquery \
+       --bash <($out/bin/cloudquery completion bash) \
+       --fish <($out/bin/cloudquery completion fish) \
+       --zsh <($out/bin/cloudquery completion zsh)
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Data pipelines for cloud config and security data";
+    homepage = "https://github.com/cloudquery/cloudquery";
+    changelog = "https://github.com/cloudquery/cloudquery/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ jlesquembre ];
+    mainProgram = "cloudquery";
+  };
+})

From 723d5e1abe9ddf8b70a25d654e3e39db7f645f96 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 14 Jul 2026 00:15:41 +0200
Subject: [PATCH 0469/1386] apparmor-init: init at 5.0.0

This package was split from apparmor-parser and contains init files such
as a systemd service, as well as the `rc.apparmor.functions` utility
script, useful to remove old apparmor profiles.
---
 .../fix-rc-apparmor-functions-FHS.patch       | 34 +++++++
 pkgs/by-name/ap/apparmor-init/package.nix     | 94 +++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch
 create mode 100644 pkgs/by-name/ap/apparmor-init/package.nix

diff --git a/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch b/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch
new file mode 100644
index 000000000000..0e43f12bcecb
--- /dev/null
+++ b/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch
@@ -0,0 +1,34 @@
+diff --git a/rc.apparmor.functions b/rc.apparmor.functions
+index 96cb23d33..4401fc420 100644
+--- a/rc.apparmor.functions
++++ b/rc.apparmor.functions
+@@ -31,7 +31,10 @@
+ 
+ # Some nice defines that we use
+ 
+-PARSER=/sbin/apparmor_parser
++PATH="@PATH@${PATH:+:$PATH}"
++export PATH
++
++PARSER=$(command -v apparmor_parser)
+ PARSER_OPTS=
+ # Suppress warnings when booting in quiet mode
+ if [ "${QUIET:-no}" = yes ] || [ "${quiet:-n}" = y ]; then
+@@ -50,7 +53,7 @@ ADDITIONAL_PROFILE_DIR=
+ if [ -n "$ADDITIONAL_PROFILE_DIR" ] && [ -d "$ADDITIONAL_PROFILE_DIR" ]; then
+ 	PROFILE_DIRS="$PROFILE_DIRS $ADDITIONAL_PROFILE_DIR"
+ fi
+-AA_STATUS=/usr/sbin/aa-status
++AA_STATUS=$(command -v aa-status)
+ SECURITYFS=/sys/kernel/security
+ SFS_MOUNTPOINT="${SECURITYFS}/apparmor"
+ 
+@@ -91,7 +94,7 @@ is_container_with_internal_policy() {
+ 	local ns_name
+ 
+ 	# WSL needs to be detected explicitly
+-	if [ -x /usr/bin/systemd-detect-virt ] && \
++	if command -v systemd-detect-virt >/dev/null 2>&1 && \
+ 	   [ "$(systemd-detect-virt --container)" = "wsl" ]; then
+ 		return 0
+ 	fi
diff --git a/pkgs/by-name/ap/apparmor-init/package.nix b/pkgs/by-name/ap/apparmor-init/package.nix
new file mode 100644
index 000000000000..0e95a3f13b47
--- /dev/null
+++ b/pkgs/by-name/ap/apparmor-init/package.nix
@@ -0,0 +1,94 @@
+{
+  lib,
+  stdenv,
+  which,
+  replaceVars,
+  perl,
+  buildPackages,
+  runtimeShellPackage,
+
+  # apparmor deps
+  libapparmor,
+  apparmor-bin-utils,
+  apparmor-parser,
+
+  # runtime deps
+  gnused,
+  gnugrep,
+  systemd,
+  coreutils,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "apparmor-init";
+  inherit (libapparmor) version src;
+
+  sourceRoot = "${finalAttrs.src.name}/init";
+
+  patches = [
+    (replaceVars ./fix-rc-apparmor-functions-FHS.patch {
+      PATH = lib.makeBinPath [
+        # bash script needs a bunch of binaries, but we can't wrapProgram because it is more a library that will be used with `source`
+        apparmor-bin-utils
+        apparmor-parser
+        coreutils
+        gnused
+        gnugrep
+        systemd
+      ];
+    })
+  ];
+
+  postPatch = ''
+    patchShebangs .
+
+    substituteInPlace apparmor.service \
+      --replace-fail "/bin/true" "${lib.getExe' coreutils "true"}"
+
+    # the various provided scripts hardcode /lib/apparmor
+    for FILE in aa-teardown apparmor.service apparmor.systemd profile-load
+    do
+      substituteInPlace "$FILE" \
+        --replace-fail "/lib/apparmor" "$out/lib/apparmor"
+    done
+  '';
+
+  nativeBuildInputs = [
+    which
+    perl
+  ];
+
+  buildInputs = [
+    runtimeShellPackage
+  ];
+
+  makeFlags = [
+    "POD2MAN=${lib.getExe' buildPackages.perl "pod2man"}"
+    "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}"
+    "MANDIR=share/man"
+  ];
+
+  installFlags = [
+    "DESTDIR=${placeholder "out"}"
+    "DISTRO=unknown"
+    "USR_SBINDIR=${placeholder "out"}/bin"
+    "SBINDIR=${placeholder "out"}/bin"
+    "LOCALEDIR=${placeholder "out"}/share/locale"
+    "SYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
+  ];
+
+  doCheck = true;
+
+  installTargets = [
+    "install"
+    # Likely not very useful for NixOS, as this is missing some NixOS awareness such as loading declarative profiles from the store
+    # However, the cost is low, it may be useful in the future or on non-NixOS systems, so install the systemd service too.
+    "install-systemd"
+  ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  meta = libapparmor.meta // {
+    description = "Mandatory access control system - init files";
+  };
+})

From 7000a4f71f26cc608e3650c59a40d2a162c6b312 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 14 Jul 2026 00:17:26 +0200
Subject: [PATCH 0470/1386] nixos/apparmor: use upstream aa-teardown

---
 nixos/modules/security/apparmor.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 12e634c5e2d9..341c343adb44 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -241,7 +241,7 @@ in
         {
           Type = "oneshot";
           RemainAfterExit = "yes";
-          ExecStartPre = "${pkgs.apparmor-utils}/bin/aa-teardown";
+          ExecStartPre = lib.getExe' pkgs.apparmor-init "aa-teardown";
           ExecStart = lib.mapAttrsToList (
             n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --add ${commonOpts n p}"
           ) enabledPolicies;
@@ -262,7 +262,7 @@ in
               # Optionally kill the processes which are unconfined but now have a profile loaded
               # (because AppArmor can only start to confine new processes).
               lib.optional cfg.killUnconfinedConfinables killUnconfinedConfinables;
-          ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown";
+          ExecStop = lib.getExe' pkgs.apparmor-init "aa-teardown";
           CacheDirectory = [
             "apparmor"
             "apparmor/logprof"

From 9b66f27082e545a4a3bdb33fdb4527143a975762 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 14 Jul 2026 00:18:59 +0200
Subject: [PATCH 0471/1386] apparmor-parser: remove rc.apparmor.functions
 references

---
 .../fix-rc.apparmor.functions.sh              | 32 -------------------
 pkgs/by-name/ap/apparmor-parser/package.nix   |  7 ----
 2 files changed, 39 deletions(-)
 delete mode 100644 pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh

diff --git a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh b/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh
deleted file mode 100644
index ebc1baaa92d4..000000000000
--- a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-aa_action() {
-  STRING=$1
-  shift
-  $*
-  rc=$?
-  if [ $rc -eq 0 ] ; then
-    aa_log_success_msg $"$STRING "
-  else
-    aa_log_failure_msg $"$STRING "
-  fi
-  return $rc
-}
-
-aa_log_success_msg() {
-   [ -n "$1" ] && echo -n $1
-   echo ": done."
-}
-
-aa_log_warning_msg() {
-   [ -n "$1" ] && echo -n $1
-   echo ": Warning."
-}
-
-aa_log_failure_msg() {
-   [ -n "$1" ] && echo -n $1
-   echo ": Failed."
-}
-
-aa_log_skipped_msg() {
-   [ -n "$1" ] && echo -n $1
-   echo ": Skipped."
-}
diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix
index de39713f0c10..8844ca83b316 100644
--- a/pkgs/by-name/ap/apparmor-parser/package.nix
+++ b/pkgs/by-name/ap/apparmor-parser/package.nix
@@ -11,7 +11,6 @@
 
   # apparmor deps
   libapparmor,
-  apparmor-bin-utils,
   runtimeShellPackage,
 
   # testing
@@ -25,12 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs .
-
-    substituteInPlace init/rc.apparmor.functions \
-      --replace-fail "/sbin/apparmor_parser" "$out/bin/apparmor_parser" \
-      --replace-fail "/usr/sbin/aa-status" "${lib.getExe' apparmor-bin-utils "aa-status"}"
-    sed -i init/rc.apparmor.functions -e '2i . ${./fix-rc.apparmor.functions.sh}'
-
     cd parser
 
     substituteInPlace Makefile \

From a95d5fd7bbe108deaee184477872015b1bb16d2e Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 14 Jul 2026 00:20:01 +0200
Subject: [PATCH 0472/1386] apparmor-utils: remove aa-teardown symlink

---
 pkgs/by-name/ap/apparmor-utils/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix
index ea1c275bdeb3..ac360b87646a 100644
--- a/pkgs/by-name/ap/apparmor-utils/package.nix
+++ b/pkgs/by-name/ap/apparmor-utils/package.nix
@@ -12,7 +12,6 @@
 
   # apparmor deps
   apparmor-parser,
-  apparmor-teardown,
 }:
 let
   inherit (python3Packages) libapparmor;
@@ -75,8 +74,6 @@ python3Packages.buildPythonApplication {
   postInstall = ''
     wrapProgram $out/bin/aa-remove-unknown \
      --prefix PATH : ${lib.makeBinPath [ gawk ]}
-
-    ln -s ${lib.getExe apparmor-teardown} $out/bin/aa-teardown
   '';
 
   meta = libapparmor.meta // {

From 0a8bca838c898d315f338a250d29da513d2f4d7b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 14 Jul 2026 00:22:36 +0200
Subject: [PATCH 0473/1386] apparmor-teardown: drop

---
 pkgs/by-name/ap/apparmor-teardown/package.nix | 33 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/ap/apparmor-teardown/package.nix

diff --git a/pkgs/by-name/ap/apparmor-teardown/package.nix b/pkgs/by-name/ap/apparmor-teardown/package.nix
deleted file mode 100644
index f5c299b24d76..000000000000
--- a/pkgs/by-name/ap/apparmor-teardown/package.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  writeShellApplication,
-  coreutils,
-  gnused,
-  gnugrep,
-  which,
-
-  # apparmor deps
-  apparmor-parser,
-  apparmor-bin-utils,
-  libapparmor,
-}:
-writeShellApplication {
-  name = "apparmor-teardown";
-  runtimeInputs = [
-    apparmor-parser
-    apparmor-bin-utils
-    coreutils
-    gnused
-    gnugrep
-    which
-  ];
-
-  text = ''
-    set +e # the imported script tries to `read` an empty line
-    # shellcheck source=/dev/null
-    . ${apparmor-parser}/lib/apparmor/rc.apparmor.functions
-    remove_profiles
-    exit 0
-  '';
-
-  inherit (libapparmor) meta;
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 17f35a1a3d5a..304775b98a97 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -313,6 +313,7 @@ mapAliases {
   apacheKafka_3_9 = throw "apacheKafka_2_8 through _4_0 have been removed from nixpkgs as outdated"; # Added 2026-07-07
   apacheKafka_4_0 = throw "apacheKafka_2_8 through _4_0 have been removed from nixpkgs as outdated"; # Added 2026-07-07
   apmplanner2 = throw "'apmplanner2' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26
+  apparmor-teardown = warnAlias "'apparmor-teardown' has been replaced by 'apparmor-init', which more closely follows intended teardown procedures." apparmor-init; # Added 2026-07-14
   apple-sdk_11 = throw "apple-sdk_11 was removed as Nixpkgs no longer supports macOS 11; see the 25.11 release notes"; # Added 2025-05-10
   apple-sdk_12 = throw "apple-sdk_12 was removed as Nixpkgs no longer supports macOS 12; see the 25.11 release notes"; # Added 2025-05-10
   apple-sdk_13 = throw "apple-sdk_13 was removed as Nixpkgs no longer supports macOS 13; see the 25.11 release notes"; # Added 2025-05-10

From 4ef20773d3ca9b9c0a87a6bc218277ed2329f78d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 14 Jul 2026 00:23:24 +0200
Subject: [PATCH 0474/1386] nixos/incus: Don't give up on missing apparmor
 rules directory

---
 nixos/modules/virtualisation/incus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 52f34ccd8378..ce414b8896f7 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -396,7 +396,7 @@ in
           abi <abi/4.0>,
           include <tunables/global>
 
-          include "/var/lib/incus/security/apparmor/profiles"
+          include if exists "/var/lib/incus/security/apparmor/profiles"
         '';
       };
       includes."abstractions/base" = ''

From 783a09be09b998926090b5a4f05d51c27c6519da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 10:56:11 +0000
Subject: [PATCH 0475/1386] qsv: 20.1.0 -> 21.1.0

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

diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index 64be3c4f433a..f449260a4b37 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -33,7 +33,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qsv";
-  version = "20.1.0";
+  version = "21.1.0";
 
   inherit buildFeatures;
 
@@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dathere";
     repo = "qsv";
     rev = finalAttrs.version;
-    hash = "sha256-dYUZ2IwvXTFwpv1cDQjmq+iq2g/vQQovpR0++/ZtSy8=";
+    hash = "sha256-Qfrt0HA9VqHE7RpqOZ1XZ7MZ9xoLaTccAgfxOOezSMs=";
   };
 
-  cargoHash = "sha256-7jZR5u32Hy0XQEeX+tWDbpkj7jM804LBUL93wgnA5bM=";
+  cargoHash = "sha256-yPDfOq8JTDMI0g/ao5SLnCA5hw6SJaA/LekI7uPVdDk=";
 
   buildInputs = [
     file

From a881b86c471b743c33f6c4287da501c07135580b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:08:38 +0000
Subject: [PATCH 0476/1386] opencode: 1.17.18 -> 1.17.20

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

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 4704804e5ae8..368b43a575f9 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,7 +16,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.17.18";
+  version = "1.17.20";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y0rcO6r9yqhYux8IS5oAtgzcMXfJE8I1Lre4HdJ5nBg=";
+    hash = "sha256-gHfkwCi6Kjn5ppsuyhyM2vyaLmAoNdWth6Xz4LaV7Hk=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-kXdXw264JQdlNoZPv5GUyWZvb/A8h2CTRdiX79jyvys=";
+    outputHash = "sha256-3NAzmlzVBcLSRXxpNOyW5DKfD1i2HReST2jlKgrtOKc=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From 64b51072f1d94b6b8299feec483404f746a5e1b9 Mon Sep 17 00:00:00 2001
From: Yisrael Dov Lebow <lebow@lebowtech.com>
Date: Tue, 14 Jul 2026 14:14:41 +0300
Subject: [PATCH 0477/1386] tiny-wii-backup-manager: 6.0.7 -> 6.0.8

https://github.com/mq1/TinyWiiBackupManager/blob/v6.0.8/CHANGELOG.md
---
 pkgs/by-name/ti/tiny-wii-backup-manager/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix b/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
index eed8d1b1793a..c2f7d76ab0d3 100644
--- a/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
+++ b/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
@@ -27,16 +27,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tiny-wii-backup-manager";
-  version = "6.0.7";
+  version = "6.0.8";
 
   src = fetchFromGitHub {
     owner = "mq1";
     repo = "TinyWiiBackupManager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yvmLI8T+ut0QwnHPw+0+XKvd+wWo0cJLcxSkz3oj/vE=";
+    hash = "sha256-zY/vLzsj256uKMkr+uxXj5SLQPKxfkS3IB0mXePlGiA=";
   };
 
-  cargoHash = "sha256-/Q0P3re8w9O4a8MTZXmEiaJNURo1XeZhHk8adcUCNeQ=";
+  cargoHash = "sha256-unv/9LoCpRcfGRq8mo6Y1b5PEf0+5UONi2eked8gfSg=";
 
   cargoBuildFlags = [
     "--bin"

From 4080106f0b76519a2f5d8145964948efcdfd09ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 12 Jul 2026 01:33:50 +0200
Subject: [PATCH 0478/1386] nixos/nginx: do not match pkgs.openresty as some
 modules like brotli add buildInputs

--- /dev/fd/63	2026-07-12 01:29:24.447317728 +0200
+++ /dev/fd/62	2026-07-12 01:29:24.448317734 +0200
@@ -4,7 +4,7 @@
         [ ( "doc"
           , DerivationOutput
               { path =
-                  "/nix/store/r2jdcgwxp2a4pa1cxa6yvf9p0f7wi1ih-openresty-1.31.1.1-doc"
+                  "/nix/store/syrb1ccks4vqgg25ygrylahxglknrc5j-openresty-1.31.1.1-doc"
               , hashAlgo = ""
               , hash = ""
               }
@@ -12,7 +12,7 @@
         , ( "out"
           , DerivationOutput
               { path =
-                  "/nix/store/2saawkswxnxs4ffb98r7bidy4vj6259c-openresty-1.31.1.1"
+                  "/nix/store/n48gwmah2pxfc8vg7dc3ki0c4xmszr1d-openresty-1.31.1.1"
               , hashAlgo = ""
               , hash = ""
               }
@@ -62,12 +62,18 @@
         , ( "/nix/store/v2k6k32vbrfsl2cciclgl1k8v8c3jxv8-nginx-doc-unstable-0-unstable-2026-05-15.drv"
           , fromList [ "out" ]
           )
+        , ( "/nix/store/wkgfkcxnpk1dy9qdd7m22ifkhyxn1hd5-brotli-1.2.0.drv"
+          , fromList [ "dev" ]
+          )
         , ( "/nix/store/wx2j9jzk90dlsz9wvbrjdxlm4q1vf8aq-openresty-nix-etag-1.15.4.patch.drv"
           , fromList [ "out" ]
           )
         , ( "/nix/store/xk8m6ai5q00gr0h3vm8afc5dk1plpw9i-install-shell-files.drv"
           , fromList [ "out" ]
           )
+        , ( "/nix/store/xy1vwc4173xz5hz2yjv7z83gz3ss6h72-brotli.drv"
+          , fromList [ "out" ]
+          )
         , ( "/nix/store/zhhm8h70q64qgwg3bccc7ygwy48jn5c3-libxml2-2.15.3.drv"
           , fromList [ "dev" ]
           )
@@ -95,14 +101,14 @@
           )
         , ( "__structuredAttrs" , "" )
         , ( "buildInputs"
-          , "/nix/store/i0jqva96qfgc76g8w7jbyiv6h3si07b9-openssl-3.6.2-dev /nix/store/a9psmsc93llkravrd50rrv8k3dwdw60x-zlib-1.3.2-dev /nix/store/y5yv1kzvmppzdp0jkq3yf3apx563canv-pcre2-10.46-dev /nix/store/35wfzwiy77ab9dhzjblb4kmdnckss40i-libxml2-2.15.3-dev /nix/store/9vgz8w91lcw9f43glyqmfj50v1hvgkmp-libxslt-1.1.45-dev /nix/store/k7kxg101ikkm0cyf8jcqhg948vy542af-perl-5.42.0 /nix/store/hzdwjd2s60585lygfj81qdhm2825frsm-libpq-18.4-dev"
+          , "/nix/store/i0jqva96qfgc76g8w7jbyiv6h3si07b9-openssl-3.6.2-dev /nix/store/a9psmsc93llkravrd50rrv8k3dwdw60x-zlib-1.3.2-dev /nix/store/y5yv1kzvmppzdp0jkq3yf3apx563canv-pcre2-10.46-dev /nix/store/35wfzwiy77ab9dhzjblb4kmdnckss40i-libxml2-2.15.3-dev /nix/store/9vgz8w91lcw9f43glyqmfj50v1hvgkmp-libxslt-1.1.45-dev /nix/store/k7kxg101ikkm0cyf8jcqhg948vy542af-perl-5.42.0 /nix/store/hzdwjd2s60585lygfj81qdhm2825frsm-libpq-18.4-dev /nix/store/pcq77h5mhc5nfvf1rs92a5l5g0kaapdg-brotli-1.2.0-dev"
           )
         , ( "builder"
           , "/nix/store/zh1ijdhb6gng1509b1zrilb6xlzx60j6-bash-5.3p9/bin/bash"
           )
         , ( "cmakeFlags" , "" )
         , ( "configureFlags"
-          , "--sbin-path=bin/nginx --with-http_ssl_module --with-http_v2_module --with-http_v3_module --with-http_realip_module --with-http_addition_module --with-http_xslt_module --with-http_sub_module --with-http_dav_module --with-http_flv_module --with-http_mp4_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_degradation_module --with-http_stub_status_module --with-threads --with-pcre-jit --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/log/nginx/nginx.pid --http-client-body-temp-path=/tmp/nginx_client_body --http-proxy-temp-path=/tmp/nginx_proxy --http-fastcgi-temp-path=/tmp/nginx_fastcgi --http-uwsgi-temp-path=/tmp/nginx_uwsgi --http-scgi-temp-path=/tmp/nginx_scgi --with-openssl-opt=enable-ktls --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-file-aio --with-http_postgres_module"
+          , "--sbin-path=bin/nginx --with-http_ssl_module --with-http_v2_module --with-http_v3_module --with-http_realip_module --with-http_addition_module --with-http_xslt_module --with-http_sub_module --with-http_dav_module --with-http_flv_module --with-http_mp4_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_degradation_module --with-http_stub_status_module --with-threads --with-pcre-jit --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/log/nginx/nginx.pid --http-client-body-temp-path=/tmp/nginx_client_body --http-proxy-temp-path=/tmp/nginx_proxy --http-fastcgi-temp-path=/tmp/nginx_fastcgi --http-uwsgi-temp-path=/tmp/nginx_uwsgi --http-scgi-temp-path=/tmp/nginx_scgi --with-openssl-opt=enable-ktls --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-file-aio --with-http_postgres_module --add-module=/nix/store/sw63grm2cbi76pcq44izm8f8fdvzjafn-brotli"
           )
         , ( "configurePlatforms" , "" )
         , ( "depsBuildBuild" , "" )
@@ -113,11 +119,13 @@
         , ( "depsHostHostPropagated" , "" )
         , ( "depsTargetTarget" , "" )
         , ( "depsTargetTargetPropagated" , "" )
-        , ( "disallowedReferences" , "" )
+        , ( "disallowedReferences"
+          , "/nix/store/sw63grm2cbi76pcq44izm8f8fdvzjafn-brotli"
+          )
         , ( "doCheck" , "" )
         , ( "doInstallCheck" , "" )
         , ( "doc"
-          , "/nix/store/r2jdcgwxp2a4pa1cxa6yvf9p0f7wi1ih-openresty-1.31.1.1-doc"
+          , "/nix/store/syrb1ccks4vqgg25ygrylahxglknrc5j-openresty-1.31.1.1-doc"
           )
         , ( "enableParallelBuilding" , "1" )
         , ( "enableParallelChecking" , "1" )
@@ -129,7 +137,7 @@
           )
         , ( "nginxVersion" , "1.31.1" )
         , ( "out"
-          , "/nix/store/2saawkswxnxs4ffb98r7bidy4vj6259c-openresty-1.31.1.1"
+          , "/nix/store/n48gwmah2pxfc8vg7dc3ki0c4xmszr1d-openresty-1.31.1.1"
           )
         , ( "outputs" , "out doc" )
         , ( "patches"
@@ -137,7 +145,7 @@
           )
         , ( "pname" , "openresty" )
         , ( "postInstall"
-          , "ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty\nln -sf $out/nginx/bin/nginx $out/bin/openresty\nln -s $out/nginx/bin/nginx $out/bin/nginx\nln -s $out/nginx/conf $out/conf\nln -s $out/nginx/html $out/html\n\nwrapProgram $out/bin/restydoc \\\n  --prefix PATH : /nix/store/i6jrv1f3mygdh2gv5r2yn1lm77d3qals-groff-1.24.1/bin\n\nsubstituteInPlace $out/bin/resty \\\n  --replace-fail \"'bin/nginx'\" \"'$out/bin/nginx'\"\n"
+          , "ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty\nln -sf $out/nginx/bin/nginx $out/bin/openresty\nln -s $out/nginx/bin/nginx $out/bin/nginx\nln -s $out/nginx/conf $out/conf\nln -s $out/nginx/html $out/html\n\nwrapProgram $out/bin/restydoc \\\n  --prefix PATH : /nix/store/i6jrv1f3mygdh2gv5r2yn1lm77d3qals-groff-1.24.1/bin\n\nsubstituteInPlace $out/bin/resty \\\n  --replace-fail \"'bin/nginx'\" \"'$out/bin/nginx'\"\nremove-references-to -t /nix/store/sw63grm2cbi76pcq44izm8f8fdvzjafn-brotli $(readlink -fn $out/bin/nginx)\n"
           )
         , ( "postPatch"
           , "substituteInPlace bundle/nginx-1.31.1/src/http/ngx_http_core_module.c \\\n  --replace-fail '@nixStoreDir@' \"$NIX_STORE\" \\\n  --replace-fail '@nixStoreDirLen@' \"${#NIX_STORE}\"\n\npatchShebangs configure bundle/\n"
---
 nixos/modules/services/web-servers/nginx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index eb344d92377a..9553090e8c85 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -1617,7 +1617,7 @@ in
           MemoryDenyWriteExecute =
             !(
               (builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules)
-              || (cfg.package == pkgs.openresty)
+              || (lib.getName cfg.package == "openresty")
             );
           RestrictRealtime = true;
           RestrictSUIDSGID = true;

From 9bcc4613e0db85a4e556093286e48a52be550b76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:16:27 +0000
Subject: [PATCH 0479/1386] python3Packages.pyfaup-rs: 0.4.13 -> 0.4.14

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

diff --git a/pkgs/development/python-modules/pyfaup-rs/default.nix b/pkgs/development/python-modules/pyfaup-rs/default.nix
index 4a2bbd4ba541..86a2a408fe26 100644
--- a/pkgs/development/python-modules/pyfaup-rs/default.nix
+++ b/pkgs/development/python-modules/pyfaup-rs/default.nix
@@ -8,19 +8,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyfaup-rs";
-  version = "0.4.13";
+  version = "0.4.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "faup-rs";
     tag = "pyfaup-rs-v${finalAttrs.version}";
-    hash = "sha256-xO3PVMtFcfz2LDoBK31VGiN8LtHSdMSMWyNDylRp1dE=";
+    hash = "sha256-rECfx7um1Rk9Fd65y3377StGru68QE13xwqDOmXQ140=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-H6lV1Vnm0ZL5awl3xoMtJ+WUW9ndj+uj8qVSKJw6vXw=";
+    hash = "sha256-F41gKLhly8V6dw8qE5lFLuQpSmGGfWg9EcAUMD29dsA=";
   };
 
   buildAndTestSubdir = "python";

From 461cf9b9c3e4e150f1148d8ae452cc900540bd75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:16:33 +0000
Subject: [PATCH 0480/1386] matterjs-server: 1.1.7 -> 1.2.5

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

diff --git a/pkgs/by-name/ma/matterjs-server/package.nix b/pkgs/by-name/ma/matterjs-server/package.nix
index a783efe28a6d..428e73568b38 100644
--- a/pkgs/by-name/ma/matterjs-server/package.nix
+++ b/pkgs/by-name/ma/matterjs-server/package.nix
@@ -12,7 +12,7 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "matterjs-server";
-  version = "1.1.7";
+  version = "1.2.5";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: {
     owner = "matter-js";
     repo = "matterjs-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8b4bLDVHTFcOHj3h/VuIxwdHJBleibZe9gUQvUD+aPA=";
+    hash = "sha256-IXYq4Ppz61+8PeGUgmBcENkL3o6JFrJaIwFjr77uOhg=";
   };
 
-  npmDepsHash = "sha256-wkxYJtHwwpP87PDuE2HWA/2GDEUWfcSN2sEvjWz27a8=";
+  npmDepsHash = "sha256-HrBtwT61RnHSuUCGH9I6vcigzpZdwp6HS5dc0v3EVnQ=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From b46aaf85f332c70aea298c2546bc98475b6d997a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:18:45 +0000
Subject: [PATCH 0481/1386] rura: 1.7.0 -> 1.9.0

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

diff --git a/pkgs/by-name/ru/rura/package.nix b/pkgs/by-name/ru/rura/package.nix
index 8d7752479584..9cbf3d462f21 100644
--- a/pkgs/by-name/ru/rura/package.nix
+++ b/pkgs/by-name/ru/rura/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rura";
-  version = "1.7.0";
+  version = "1.9.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "tlipinski";
     repo = "rura";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rz8Hmxse1THGH3inGP3K+7JY3Lh9qaGUdESSHkai82c=";
+    hash = "sha256-+XfJc9FH9El36AL7s7wMy9TNILKvtYflRDZjeW9J3fg=";
   };
 
-  cargoHash = "sha256-Ytbo8fVf6oAHGQvicU3TFGQxoYh36CISuRaMwd1Ysf4=";
+  cargoHash = "sha256-HBcKuQjRqVBItgIVUyNQiqfZxNVtyQgwr+5mTrlV3eM=";
 
   passthru = {
     updateScript = nix-update-script { };

From 1476ccd542dbd0ff0771ed1ea72c792514344820 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:19:26 +0000
Subject: [PATCH 0482/1386] python3Packages.pylookyloo: 1.39.1 -> 1.40.0

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

diff --git a/pkgs/development/python-modules/pylookyloo/default.nix b/pkgs/development/python-modules/pylookyloo/default.nix
index f3f2a37b478d..351faa61db91 100644
--- a/pkgs/development/python-modules/pylookyloo/default.nix
+++ b/pkgs/development/python-modules/pylookyloo/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylookyloo";
-  version = "1.39.1";
+  version = "1.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lookyloo";
     repo = "PyLookyloo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3bdVc2OvYJ9gH44PuTKPLg9e3psyBKqRs0jzrBYwRas=";
+    hash = "sha256-2SeEAzVMS4tyOU2WZw7wx+fOgyKnrQxMb6dJRjbSplU=";
   };
 
   build-system = [ poetry-core ];

From 5c43e94eeb87ecdf60b6c667c6123adebbe5fab3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:21:57 +0000
Subject: [PATCH 0483/1386] python3Packages.python-benedict: 0.37.0 -> 0.38.0

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

diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix
index 4a6278f176a1..5159c7b5d0f4 100644
--- a/pkgs/development/python-modules/python-benedict/default.nix
+++ b/pkgs/development/python-modules/python-benedict/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-benedict";
-  version = "0.37.0";
+  version = "0.38.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fabiocaccamo";
     repo = "python-benedict";
     tag = finalAttrs.version;
-    hash = "sha256-iYCc8e7+7OXpHW2gGxR6ckiTi/Wi5ByqcOFx9e2Eme0=";
+    hash = "sha256-1YZqc0Ytqx4a1WGaqz5y0r2hw3okvax0/r267YTTGCE=";
   };
 
   pythonRelaxDeps = [ "boto3" ];

From ed6162d82382033e09b344495e0317f1aa8ea767 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:33:20 +0000
Subject: [PATCH 0484/1386] github-backup: 0.63.0 -> 0.64.0

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

diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix
index f6594a73161a..6cccde5e58e8 100644
--- a/pkgs/by-name/gi/github-backup/package.nix
+++ b/pkgs/by-name/gi/github-backup/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "github-backup";
-  version = "0.63.0";
+  version = "0.64.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "josegonzalez";
     repo = "python-github-backup";
     tag = finalAttrs.version;
-    hash = "sha256-B7psPUxkhPCzxPJZiZu9IXsNUVvMu1mOdOIu+KlPjag=";
+    hash = "sha256-UPHwohx2qN/vT5a1Km0UqW2SB7br6yAZJ1xKYKX4H70=";
   };
 
   build-system = with python3Packages; [

From fa23725d3b96940e029acb0e5f4a53f424bd1eb2 Mon Sep 17 00:00:00 2001
From: Malix - Alix Brunet <alixbrunetcontact@gmail.com>
Date: Tue, 14 Jul 2026 13:36:34 +0200
Subject: [PATCH 0485/1386] options: mkOption docs update

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

diff --git a/lib/options.nix b/lib/options.nix
index accbb56ff34a..6e5383fab455 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -90,12 +90,12 @@ rec {
       `defaultText`
       : Substitute for documenting the `default`, if evaluating the default value during documentation rendering is not possible.
       : Can be any nix value that evaluates.
-      : Usage with `lib.literalMD` or `lib.literalExpression` is supported
+      : Usage with `lib.literalMD`, `lib.literalExpression`, or `lib.literalCode` is supported
 
       `example`
       : Optional example value used in the manual.
       : Can be any nix value that evaluates.
-      : Usage with `lib.literalMD` or `lib.literalExpression` is supported
+      : Usage with `lib.literalMD`, `lib.literalExpression`, or `lib.literalCode` is supported
 
       `description`
       : Optional string describing the option. This is required if option documentation is generated.

From 7bf57336e35ef6b1c654ccba110e6f3c35dc1ca9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 11:48:08 +0000
Subject: [PATCH 0486/1386] tree-sitter-grammars.tree-sitter-rescript:
 0-unstable-2026-05-02 -> 6.0.0-unstable-2026-07-13

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..464b8d33c865 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2294,10 +2294,10 @@
   };
 
   rescript = {
-    version = "0-unstable-2026-05-02";
+    version = "6.0.0-unstable-2026-07-13";
     url = "github:rescript-lang/tree-sitter-rescript";
-    rev = "5c71bebe716dc89ca84b816f9646456dd85666cc";
-    hash = "sha256-45wPsR0ipBrd6R6SbL65EpIadAG0alQHzIXZhKJ9BkA=";
+    rev = "19ed8a8e6bcc844b71c37e9edaffc60c77f74d7c";
+    hash = "sha256-mQJSmb9Qy5pFS+nNz4+C7RPs1mpAoxxqbx7seYo8+JI=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 483e8cbbd1c7a3ba60764426d3f29b6bf57e4a3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 12:00:40 +0000
Subject: [PATCH 0487/1386] python3Packages.bx-py-utils: 119 -> 120

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

diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix
index 88bd732856cd..dd45ac8c5f13 100644
--- a/pkgs/development/python-modules/bx-py-utils/default.nix
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "bx-py-utils";
-  version = "119";
+  version = "120";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "boxine";
     repo = "bx_py_utils";
     tag = "v${version}";
-    hash = "sha256-izKBOsp0YPatng4JwvjioUUHptojGc924MIEP+zEYfI=";
+    hash = "sha256-/J2neHRfyplsdEBp8ziNiOT5mLBKYobxJ0/oeSRw4g0=";
   };
 
   postPatch = ''

From 91c101cb8b71e1d59f568d79564d5539c77725d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 12:07:42 +0000
Subject: [PATCH 0488/1386] flexget: 3.19.26 -> 3.19.28

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

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index f9ef4f9cfdf0..fdbd7777d799 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "flexget";
-  version = "3.19.26";
+  version = "3.19.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QWVCCV8R1gBw647slTtOYX7IQZNC2EmQQiloQNlgcUQ=";
+    hash = "sha256-NEBE39rqYegFO7f1fd0rTIZzkamuQM+5d3dD/zYHCoU=";
   };
 
   pythonRelaxDeps = true;

From a46a9f400be3e2e674a410e2fcb8a6d4a453f63f Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Tue, 14 Jul 2026 19:55:07 +0800
Subject: [PATCH 0489/1386] bilibili-tui: 1.0.9 -> 1.0.12

---
 pkgs/by-name/bi/bilibili-tui/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix
index c582a809336d..258f6f9a9549 100644
--- a/pkgs/by-name/bi/bilibili-tui/package.nix
+++ b/pkgs/by-name/bi/bilibili-tui/package.nix
@@ -5,8 +5,9 @@
   nix-update-script,
   stdenv,
   pkg-config,
-  makeWrapper,
+  makeBinaryWrapper,
   openssl,
+  cacert,
   mpv-unwrapped,
   yt-dlp-light,
 
@@ -14,23 +15,28 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bilibili-tui";
-  version = "1.0.9";
+  version = "1.0.12";
 
   src = fetchFromGitHub {
     owner = "MareDevi";
     repo = "bilibili-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LACNDpVhlYEgT3fN+Ff2MVipblUqPlqwOUpTLaXSCbk=";
+    hash = "sha256-G2aoPw8SMu3ytHbxcQrf1iH6i+b9viM+/EYorv6j5bg=";
   };
 
-  cargoHash = "sha256-q3jRjmzQA64sZjVShoEmu1x2CFOAgBGgZYyTq7Lg4is=";
+  cargoHash = "sha256-ojAN98of7vZp/F1n0a/88e6k4nBPG9HPKyTO1xc8o4Q=";
 
-  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;
 
-  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
+  buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl;
 
   env.OPENSSL_NO_VENDOR = true;
 
+  nativeCheckInputs = [ cacert ];
+
   # Wrap mpv as fallback; users should prefer their system's mpv in PATH
   postInstall = lib.optionalString withMpv ''
     wrapProgram $out/bin/bilibili-tui \

From 59a2edfdbf39f8387807eac55085cfbe647bf577 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 12:12:05 +0000
Subject: [PATCH 0490/1386] foxglove-cli: 1.0.31 -> 1.0.32

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

diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix
index 659e167c9c2c..c90023a5e8c4 100644
--- a/pkgs/by-name/fo/foxglove-cli/package.nix
+++ b/pkgs/by-name/fo/foxglove-cli/package.nix
@@ -11,16 +11,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "foxglove-cli";
-  version = "1.0.31";
+  version = "1.0.32";
 
   src = fetchFromGitHub {
     owner = "foxglove";
     repo = "foxglove-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BBvkvh1OZ+HJHJzSxCf8aCQklpZ536bkLNVlbKX9obY=";
+    hash = "sha256-bc2YNCkTbO6qO2PyBI4UH7O48GNMgDfKKXWXjYaznBI=";
   };
 
-  vendorHash = "sha256-nRd9d3LJIrWoO+CQdbWLs249rOYmzfIf4u6x5dBDA2Y=";
+  vendorHash = "sha256-IXmkO7WIvy4ETMMHHJF6hS8ACRat/vnoiqaXyhw8u+M=";
 
   env.CGO_ENABLED = 0;
   tags = [ "netgo" ];

From c46b1a84a79bab2b00edfea9f2e67af855494e8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 12:26:24 +0000
Subject: [PATCH 0491/1386] otf2: 3.1.1 -> 3.2

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

diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix
index 432647edf929..e06f0f183349 100644
--- a/pkgs/by-name/ot/otf2/package.nix
+++ b/pkgs/by-name/ot/otf2/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "otf2";
-  version = "3.1.1";
+  version = "3.2";
 
   outputs = [
     "out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4=";
+    hash = "sha256-grOoilUMuMPOyP1F7Kgs3Lr5RSCZd0gkcbS15DDWSo0=";
   };
 
   postPatch = ''

From 92a536dcfe1c4a5f4a35ff60cf43f3a528584e4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 12:30:47 +0000
Subject: [PATCH 0492/1386] xbyak: 7.37.4 -> 7.37.5

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

diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix
index 24945d78ae0f..bf4e8c415692 100644
--- a/pkgs/by-name/xb/xbyak/package.nix
+++ b/pkgs/by-name/xb/xbyak/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xbyak";
-  version = "7.37.4";
+  version = "7.37.5";
 
   src = fetchFromGitHub {
     owner = "herumi";
     repo = "xbyak";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JK4r2Fh083JJm9gm7GpdjMJ4G8wZGw5eGLCgtZh5HrE=";
+    hash = "sha256-a4DR7hoPwJa105Ry8Znm+4a2Ob7210Xb/nVcZ7TgH8I=";
   };
 
   nativeBuildInputs = [ cmake ];

From 490db099aa4330d875b6f6c0d02f57d3b7a29d98 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Tue, 14 Jul 2026 20:42:06 +0800
Subject: [PATCH 0493/1386] stats: fix darwin build

---
 pkgs/by-name/st/stats/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 5168a4051808..00ef020ed709 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -3,6 +3,8 @@
   swiftPackages,
   fetchFromGitHub,
   leveldb,
+  # TODO: Clean up on `staging`.
+  llvmPackages,
   perl,
   actool,
   makeWrapper,
@@ -88,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
     actool
     makeWrapper
     rcodesign
+    # TODO: Clean up on `staging`.
+    llvmPackages.lld
   ];
 
   buildInputs = [ leveldb ];
@@ -126,6 +130,8 @@ stdenv.mkDerivation (finalAttrs: {
       # The Swift compiler in nixpkgs uses SDK 14 headers (which compile fine), but without
       # this flag the linker records SDK 14 and macOS withholds it (Liquid Glass)
       -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0
+      # TODO: Clean up on `staging`
+      -use-ld=lld
     )
 
     buildFramework() {

From f115284c614ad770cb9bdc2b46b8eaca2a2b18c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 12:43:10 +0000
Subject: [PATCH 0494/1386] ggmorse: 0.1.0-unstable-2024-05-31 ->
 0-unstable-2024-05-31

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

diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix
index 51a4ce819e28..e11f6879e877 100644
--- a/pkgs/by-name/gg/ggmorse/package.nix
+++ b/pkgs/by-name/gg/ggmorse/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation {
   pname = "ggmorse";
-  version = "0.1.0-unstable-2024-05-31";
+  version = "0-unstable-2024-05-31";
 
   src = fetchFromGitHub {
     owner = "ggerganov";

From 4bd4a3c25159db11e04faab94606579e3c3e1140 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 14 Jul 2026 15:49:46 +0300
Subject: [PATCH 0495/1386] kdePackages: Plasma 6.7.2 -> 6.7.3

---
 pkgs/kde/generated/sources/plasma.json | 450 ++++++++++++-------------
 1 file changed, 225 insertions(+), 225 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 741230141b2f..9865bb76459d 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,377 +1,377 @@
 {
   "aurorae": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/aurorae-6.7.2.tar.xz",
-    "hash": "sha256-bWSLX7IJirP+62T6VGe6AgXvQXMMCIfjc831vnDzzpY="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/aurorae-6.7.3.tar.xz",
+    "hash": "sha256-p5U+jGXKZToBAl92qgbOwTxAmZZl95JR8Ab28BJI7Ow="
   },
   "bluedevil": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/bluedevil-6.7.2.tar.xz",
-    "hash": "sha256-hwPFard5Qz8S082+ZMkeo2UZSqQT3J7wrwihpQ/zbsY="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/bluedevil-6.7.3.tar.xz",
+    "hash": "sha256-8ciQQrUTmixvXGjFdMiD/T+0JZr4wH2slmz8ZeGT3NE="
   },
   "breeze": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/breeze-6.7.2.tar.xz",
-    "hash": "sha256-gIGL9jgqluGkXHVfmD2YNXxPcWP4DLgheJffFfigJ4U="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/breeze-6.7.3.tar.xz",
+    "hash": "sha256-2FP8RaQ+ZO5tkBhgsZ54pQyKA8/pEn8qV4HVDxP/6Dg="
   },
   "breeze-grub": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/breeze-grub-6.7.2.tar.xz",
-    "hash": "sha256-uQ/zP2KhWHD5rbo8Us1lqwe8GqOWrn9nIEAVfx6ueF4="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/breeze-grub-6.7.3.tar.xz",
+    "hash": "sha256-sVmO8iHflWn0jpUVwoOebI/ePEZjU+kTNEqQGFZ/z0c="
   },
   "breeze-gtk": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/breeze-gtk-6.7.2.tar.xz",
-    "hash": "sha256-tfFUiczTFZOV8oKAQ8iTA12MC0oYsFDRiLvqi2pamcU="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/breeze-gtk-6.7.3.tar.xz",
+    "hash": "sha256-+pO2gZ3F5Ky26W7A27PU3n7r/y8d5IC+AXdqgBB6CHs="
   },
   "breeze-plymouth": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/breeze-plymouth-6.7.2.tar.xz",
-    "hash": "sha256-BqHZnJL0tSAsDdldrwN2TIwMnDO6cjd/bUPQwpqwdHs="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/breeze-plymouth-6.7.3.tar.xz",
+    "hash": "sha256-T6UQTxqQG+wHFBJevKg4HQP1K5ecHP3MRFUJDRoR7yc="
   },
   "discover": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/discover-6.7.2.tar.xz",
-    "hash": "sha256-+st8/OPJSN34+P8KcoH4IeDjrOUN7pD7ue/khoNrlI4="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/discover-6.7.3.tar.xz",
+    "hash": "sha256-8oxHVp3f/ZXBCV6mxzz+AaaUO7s75dgVjVQxxENDnxw="
   },
   "drkonqi": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/drkonqi-6.7.2.tar.xz",
-    "hash": "sha256-ZXLY/Tq4v7071zqGa+UqlOJFWwCTaVtF1wmcUGgac70="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/drkonqi-6.7.3.tar.xz",
+    "hash": "sha256-0uLBWMDj9+R/GiUpwwyv/Dv/Gqg5jdbf+MlkUkT5ziY="
   },
   "flatpak-kcm": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/flatpak-kcm-6.7.2.tar.xz",
-    "hash": "sha256-C8qz1RTRXgYPj1sPl0Nh0wN728cv6awHdOKTlEkMIRk="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/flatpak-kcm-6.7.3.tar.xz",
+    "hash": "sha256-ADdm/seYB/htw9UEv4iNqdNx67jdCukoDfmzjtBT/tI="
   },
   "kactivitymanagerd": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kactivitymanagerd-6.7.2.tar.xz",
-    "hash": "sha256-mNmUNvB+5Prohz0YfOSp9Byp/cfZrcyUI+wViZa0LHM="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kactivitymanagerd-6.7.3.tar.xz",
+    "hash": "sha256-UzbZrd68iehdO2E/8RNsfIQvdMqYbdHUbAovdzPcCVo="
   },
   "kde-cli-tools": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kde-cli-tools-6.7.2.tar.xz",
-    "hash": "sha256-92pSC7L4mmnPF4WIXdWBhf+VL0hIk0MJKIla8nfMw3s="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kde-cli-tools-6.7.3.tar.xz",
+    "hash": "sha256-8u8t+Cm1Y2XoZO7MjVBA2bJYOtuP5nMjT4P1gdiQifE="
   },
   "kde-gtk-config": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kde-gtk-config-6.7.2.tar.xz",
-    "hash": "sha256-TvngfMJiJiz0/R/T5DSUviCiSHxrSHWE8N6mvFZfmPk="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kde-gtk-config-6.7.3.tar.xz",
+    "hash": "sha256-wHZx76h5iI6BvdrkEbyyWoHuOEU7TuLGheWGT6Mp1hQ="
   },
   "kdecoration": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kdecoration-6.7.2.tar.xz",
-    "hash": "sha256-yC4o5Z0swuMa4447xIV5UoIUuj2i0TorcaZb3A3Ed3E="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kdecoration-6.7.3.tar.xz",
+    "hash": "sha256-aWkHE9IhYyPa6W1h104Ie9nl5bPv/PHFT3o+gjZy0Oc="
   },
   "kdeplasma-addons": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kdeplasma-addons-6.7.2.tar.xz",
-    "hash": "sha256-b3d4y+q9NOSBm7ijvFtBCqQ8If5eMyLjtJ0A8hYIqgc="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kdeplasma-addons-6.7.3.tar.xz",
+    "hash": "sha256-eoaZSv6R9U/FYkzF8+kgZMK015AEfmV8kwO/AbSWbKg="
   },
   "kgamma": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kgamma-6.7.2.tar.xz",
-    "hash": "sha256-0lSFWUDZO0gJ2NWp3uqPJc3HwAe+8lMqqTHaJlCtnhk="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kgamma-6.7.3.tar.xz",
+    "hash": "sha256-HN9bYzQ+oFJacmQt2ISXhiiQYVUkJJUglgO9bXayA6A="
   },
   "kglobalacceld": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kglobalacceld-6.7.2.tar.xz",
-    "hash": "sha256-QM1rQXZ4+rpphH4fpNnvyPUAzfldsX4xfW2GjRjJUzk="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kglobalacceld-6.7.3.tar.xz",
+    "hash": "sha256-zZQNIbsFDW7midWWLTEpLFLzHPqSEep4nb7U/wUCLx0="
   },
   "kinfocenter": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kinfocenter-6.7.2.tar.xz",
-    "hash": "sha256-oo9C0fb4s2/x9VHVk+IRZQmKl2r5H+cYw37d4BE6QH0="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kinfocenter-6.7.3.tar.xz",
+    "hash": "sha256-Q2636V4GHr3bhNDlG1q/R3paOyaYRi6iR+prpjOohlU="
   },
   "kmenuedit": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kmenuedit-6.7.2.tar.xz",
-    "hash": "sha256-FHO3gC1DzOEFEmy3nK5xy9ij486VB9GCWlxknEUELyE="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kmenuedit-6.7.3.tar.xz",
+    "hash": "sha256-3ZLunDvz/ebXvEmQRTucciOLUbhtUQ2UPWi7HRYC4uw="
   },
   "knighttime": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/knighttime-6.7.2.tar.xz",
-    "hash": "sha256-PSbH/gRRKrY2e/srCS8pbb/YMx3t1XarLPMNhAvmgw4="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/knighttime-6.7.3.tar.xz",
+    "hash": "sha256-Iilc82QOFesE0oNQk0odRXpOxXgDOvjCiUi9EKjHU4c="
   },
   "kpipewire": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kpipewire-6.7.2.tar.xz",
-    "hash": "sha256-aL0kb01APT1/Sb0v/NTg0SvFX6gVVFM/dQrC5Ltaph4="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kpipewire-6.7.3.tar.xz",
+    "hash": "sha256-tiLz0tjUOvF5UQPse0a5DxGvVZJFyfE3H71WY9DY7jM="
   },
   "krdp": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/krdp-6.7.2.tar.xz",
-    "hash": "sha256-WMDNavYBo3EYmZw+DKveJXFVIcvdkVJEv4BrhDk5Jlk="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/krdp-6.7.3.tar.xz",
+    "hash": "sha256-TYAZsAsg6R6E802g1Ty8wrGuWleh9DekJsZzX8+kFNA="
   },
   "kscreen": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kscreen-6.7.2.tar.xz",
-    "hash": "sha256-pn+7uML6KodfKdBW1yRT00AUMhmwgGKpMsex8VAa3Ug="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kscreen-6.7.3.tar.xz",
+    "hash": "sha256-3+anJN11jV2VElYvWVWZRMXJTh0qJZ0P1h2Ot0Q580w="
   },
   "kscreenlocker": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kscreenlocker-6.7.2.tar.xz",
-    "hash": "sha256-d/AkGLYaYnJ8tDwDx+13csZ7HCy8NpHk82cmpHIKHLo="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kscreenlocker-6.7.3.tar.xz",
+    "hash": "sha256-dtS7sSARAuG13TQULFUAa/J/PO05+mTJen9Eux5TTf4="
   },
   "ksshaskpass": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/ksshaskpass-6.7.2.tar.xz",
-    "hash": "sha256-EMOJ2ekle/tQRhvZm0Zj9R0uy4+jt0yjtYKc9WPMdFw="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/ksshaskpass-6.7.3.tar.xz",
+    "hash": "sha256-0nXms0J+bxIMl/em5k2dFXgpl2oSQSd/E83vHH4rGTo="
   },
   "ksystemstats": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/ksystemstats-6.7.2.tar.xz",
-    "hash": "sha256-tPbe3Q22nOWy5KVlAGZMZAmAK2mGCW/r7TzrikngTy8="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/ksystemstats-6.7.3.tar.xz",
+    "hash": "sha256-OUptNCofiiw9YnP7hgTBgiD5E10jS9LmUe92+Z0Zwlk="
   },
   "kwallet-pam": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kwallet-pam-6.7.2.tar.xz",
-    "hash": "sha256-BX8zyrWFetWWzjZGDN9XKQBdR47vgK/uhws2bRucNnM="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kwallet-pam-6.7.3.tar.xz",
+    "hash": "sha256-pyChRA7fhzTkuNTU1eqW/BSUbCHzj2pcobc42KjcWDs="
   },
   "kwayland": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kwayland-6.7.2.tar.xz",
-    "hash": "sha256-PTynRdT3pTvoszH8zegl2cxUqHYdejMxj0+y1gK4V/Q="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kwayland-6.7.3.tar.xz",
+    "hash": "sha256-DjMdyhKKni8LQI4QIOW2E+JNdCzBv9i7X4lFn+4Rwhc="
   },
   "kwayland-integration": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kwayland-integration-6.7.2.tar.xz",
-    "hash": "sha256-R801GZqWBKFcncibfTjnNcT3vrp6sP56/FLzlhN/VAs="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kwayland-integration-6.7.3.tar.xz",
+    "hash": "sha256-guCscD7uZbPoO0xpcwIM7gMrecLdQeQ8tl9yhtB2WWI="
   },
   "kwin": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kwin-6.7.2.tar.xz",
-    "hash": "sha256-YWGhiPZv+sCjMNz4LeyezD5TRRt73dXRj6ALHpqtpzs="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kwin-6.7.3.tar.xz",
+    "hash": "sha256-NFtF1ACITMawD0s1hcwFaqJ4DzKv4t85TSDFqYJzxVk="
   },
   "kwin-x11": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kwin-x11-6.7.2.tar.xz",
-    "hash": "sha256-z44uABwfn/aXkDPp/pWM5zlMz1+1PcJDzOKdIn7DWz0="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kwin-x11-6.7.3.tar.xz",
+    "hash": "sha256-pEATYMGrgytEizYsMwnwIrMi2kxCuvzslwgSjdIprHE="
   },
   "kwrited": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/kwrited-6.7.2.tar.xz",
-    "hash": "sha256-8D6GehrOd+XZKFlXAjxbudt/2S5Gan4C1dQZ+Ngn5rM="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/kwrited-6.7.3.tar.xz",
+    "hash": "sha256-DiBpY1OpnGzE8YgkCxqbUf0Hewy7IMnVEjuaKo+3/C0="
   },
   "layer-shell-qt": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/layer-shell-qt-6.7.2.tar.xz",
-    "hash": "sha256-OSzYJ0LxCUUvh00U9dORqCPHsCG9wkRsD0dLPR53sSk="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/layer-shell-qt-6.7.3.tar.xz",
+    "hash": "sha256-UZJPoU0FMg6s743v6lGJXJYRe8id1wnnRTbdjs37RYE="
   },
   "libkscreen": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/libkscreen-6.7.2.tar.xz",
-    "hash": "sha256-QI3CdTABponK38d73MSpaLqjhcro3Yq85sPOQiKE0Hg="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/libkscreen-6.7.3.tar.xz",
+    "hash": "sha256-Jt/iPyDq+VtdT6JZXVWpx0DRNW1eMXtI7esQl16mNZ4="
   },
   "libksysguard": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/libksysguard-6.7.2.tar.xz",
-    "hash": "sha256-b32/BY5FPG0tZDz1zyUFGqA5j6PI88t1S/LkZDTZTNc="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/libksysguard-6.7.3.tar.xz",
+    "hash": "sha256-IFnzDWhAeHBEk4cKf116oxv5WMg0dneMCL7IYw5bv80="
   },
   "libplasma": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/libplasma-6.7.2.tar.xz",
-    "hash": "sha256-Ez2N5fAK0NFbUV6p8TvGT6x/f1LQdyQ9yN/uFjI/n4w="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/libplasma-6.7.3.tar.xz",
+    "hash": "sha256-ljTqdDLQX8dCmlEtPOVnPYv/9Z+WGKoEAT6k8Jq4sBA="
   },
   "milou": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/milou-6.7.2.tar.xz",
-    "hash": "sha256-dRYkAhaAgszlrYvkEzH8n1XLdPXicya2Iz7q9carptE="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/milou-6.7.3.tar.xz",
+    "hash": "sha256-ILjZ4ED/vu6+BbJ9iXWcjoyJCBq6Rj464NOEfmCtTVI="
   },
   "ocean-sound-theme": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/ocean-sound-theme-6.7.2.tar.xz",
-    "hash": "sha256-eRyzXUvXyMxq3KzKkr2E1lkhgAig4ysLsKW3Z0F2+xo="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/ocean-sound-theme-6.7.3.tar.xz",
+    "hash": "sha256-mtEv2thR5p9P99lm6Lhbk8I8/HsB+QQ0kUMAxgFA6XE="
   },
   "oxygen": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/oxygen-6.7.2.tar.xz",
-    "hash": "sha256-0zV8Lgxp22ztU2UAa5Z3DbC6rbCJmk5XKuUBY3dxKt4="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/oxygen-6.7.3.tar.xz",
+    "hash": "sha256-1FN9x9WvoqdUJ4q+8yzurYLaQajIyhnmy9b2ePSa6pw="
   },
   "oxygen-sounds": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/oxygen-sounds-6.7.2.tar.xz",
-    "hash": "sha256-RBzM0oMenhUsUW7Dy0aHjIcni+zhtoqHVHkVHoHtmNc="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/oxygen-sounds-6.7.3.tar.xz",
+    "hash": "sha256-eZoSvDe2MMoP1lCC4ufYka/3bP34FAb/jHbOtIe81lc="
   },
   "plasma-activities": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-activities-6.7.2.tar.xz",
-    "hash": "sha256-GDeTSesFOCoWXTtZwTt1b9t+aBsR1Xyp4vuuP/7ko0o="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-activities-6.7.3.tar.xz",
+    "hash": "sha256-Op+/ADlGQnAji4Q0SxBkxX+xGmql15APCKCoaAY6Yuo="
   },
   "plasma-activities-stats": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-activities-stats-6.7.2.tar.xz",
-    "hash": "sha256-GSg1WDg1a81ZeQcBy41HCEmw3EvsGD4+ribRL3iUWbQ="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-activities-stats-6.7.3.tar.xz",
+    "hash": "sha256-RIuF1WnzkS+Mk8HEEuNlUbq33+iZG6oMYgbGAiPpigg="
   },
   "plasma-bigscreen": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-bigscreen-6.7.2.tar.xz",
-    "hash": "sha256-8IGMmvIlqYBuRvPXsNsSYIDSJ9zqqRBl6/c5Xj8i6H0="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-bigscreen-6.7.3.tar.xz",
+    "hash": "sha256-2yE976OjqCcaVNowdgwt8BL6bukUO5D7KvBgrR+hrg4="
   },
   "plasma-browser-integration": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-browser-integration-6.7.2.tar.xz",
-    "hash": "sha256-tpClVeh9iNglvOsUiQ1CX6BAQiBN1uaId67p1hq1V6o="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-browser-integration-6.7.3.tar.xz",
+    "hash": "sha256-mpfsZsKbmBflCBJZt6LIl0rr9g8KoTI/P38/uyR2dNI="
   },
   "plasma-desktop": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-desktop-6.7.2.tar.xz",
-    "hash": "sha256-bRoNWXC1UzKdJiaPnrPISqgzWCOK/PwvhpEUcEZWmDE="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-desktop-6.7.3.tar.xz",
+    "hash": "sha256-jBu3JbQjdejOIX+wQyytMPzKDLMV2GSzGLdrOLXwdMY="
   },
   "plasma-dialer": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-dialer-6.7.2.tar.xz",
-    "hash": "sha256-LFpvjArdLBuyUJdCzoCA0Rb312Z3lGArMNM2+OLjeZE="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-dialer-6.7.3.tar.xz",
+    "hash": "sha256-+e+WIOQv2eBjlFV0pZtcRz5ASsGtVhNcETnNLnyoAvI="
   },
   "plasma-disks": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-disks-6.7.2.tar.xz",
-    "hash": "sha256-sAzsAxCP0un0FC85xi+opqtWbGDJoodV9B46j9HDp5E="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-disks-6.7.3.tar.xz",
+    "hash": "sha256-x6dgRYHWRrBOKqTizg4w993iBKhT3JWMyzkqz4nM4lk="
   },
   "plasma-firewall": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-firewall-6.7.2.tar.xz",
-    "hash": "sha256-TPPBrE8fCOI2BPSdYbth/B4Eu4KVaAaAttdCV8Mni8o="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-firewall-6.7.3.tar.xz",
+    "hash": "sha256-bDIutWbTbSjCN5XVdghl+tjUFB2+ODqNXt8keugw+ao="
   },
   "plasma-integration": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-integration-6.7.2.tar.xz",
-    "hash": "sha256-8c4sP7Dgek4M1ePVVm+2fmBjqvQ16O+zQC99ZeHalaQ="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-integration-6.7.3.tar.xz",
+    "hash": "sha256-q2Bt+HzDT7ioXOLFScxh4SbN8hCsFqHoWU+jYxc+idw="
   },
   "plasma-keyboard": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-keyboard-6.7.2.tar.xz",
-    "hash": "sha256-ykbkEudTBIGQTUzT9iLFui0DUEvXvOd+o+EiHAHAHAc="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-keyboard-6.7.3.tar.xz",
+    "hash": "sha256-w3HZjEWI22ZyqTqhO1PRePLcODvbWAyL7WXRhJvnyX4="
   },
   "plasma-login-manager": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-login-manager-6.7.2.tar.xz",
-    "hash": "sha256-hJoH+GpdMJ21CYqpn5xDCevvTsGGXZ70UCT+dbQYddc="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-login-manager-6.7.3.tar.xz",
+    "hash": "sha256-GZzASx78/PTUzv0CeGGQIBPQw0K7x1TQIxhZ+hdWf9k="
   },
   "plasma-mobile": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-mobile-6.7.2.tar.xz",
-    "hash": "sha256-WESxSP/DrPf/w48Tpwb1Q2VZwJUobvXNApG0JE8vvgg="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-mobile-6.7.3.tar.xz",
+    "hash": "sha256-RASTkicy0CMFsqniDFMN/MWwPfKJH5RQkKVmVhH0kCc="
   },
   "plasma-nano": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-nano-6.7.2.tar.xz",
-    "hash": "sha256-6GKu7ncjYWOVTpLbDF7cM8XpkkSt+2gMATjPcrIKXi8="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-nano-6.7.3.tar.xz",
+    "hash": "sha256-y1hXOPO/9I4kvGAluzLj/Bdx67/OlUWdQwj0RTAuIgE="
   },
   "plasma-nm": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-nm-6.7.2.tar.xz",
-    "hash": "sha256-vE6vYpAQItdvzjvENK+QXkZrY1aABbZ4QHhL19696M0="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-nm-6.7.3.tar.xz",
+    "hash": "sha256-tDi/EegrIWn83bcV8yTqLgFpM0LGysbDkiQPnGewm+Q="
   },
   "plasma-pa": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-pa-6.7.2.tar.xz",
-    "hash": "sha256-5Y2D7Y8UkZrHgjNsM1cE4kTyEoxj/XUIQB4suZyNa0M="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-pa-6.7.3.tar.xz",
+    "hash": "sha256-yX6YXTdJTDYXr8vh1D4DneAGjtU+I3CD8n3ARuINFmU="
   },
   "plasma-sdk": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-sdk-6.7.2.tar.xz",
-    "hash": "sha256-mXQ74mektVpmTtSEf4735ukoKQWZRs6eFePumhTbfSg="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-sdk-6.7.3.tar.xz",
+    "hash": "sha256-sC2rfCIFGwHv9T4AOO9EVkcWF2l2YmXDtD+NpMrA3mE="
   },
   "plasma-setup": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-setup-6.7.2.tar.xz",
-    "hash": "sha256-eHGoxfDsImIJ44MW41ljZs6aALWalEdKJoU84+5VMvQ="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-setup-6.7.3.tar.xz",
+    "hash": "sha256-uAvesgJk/HEQ8XFnDX5oQEjLWMBhMU26HlUbAuOvvCY="
   },
   "plasma-systemmonitor": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-systemmonitor-6.7.2.tar.xz",
-    "hash": "sha256-+ZZWlyEUW5TTNawuG+2LrDqwq0bKDZNftOic4eURLcw="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-systemmonitor-6.7.3.tar.xz",
+    "hash": "sha256-XBGQxh0golTOjzad5VqDffLuMzZueBJLAVy7PWLRSQw="
   },
   "plasma-thunderbolt": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-thunderbolt-6.7.2.tar.xz",
-    "hash": "sha256-JjdZEV1iOJmc0qHG1qbGOrLieN/Py/G2C+3iBU0e3Yc="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-thunderbolt-6.7.3.tar.xz",
+    "hash": "sha256-TOhi0C0wqZizYvcNbdg0wH8Oz8BA0zS5C/uaN2dDJvI="
   },
   "plasma-vault": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-vault-6.7.2.tar.xz",
-    "hash": "sha256-IfXVWr0GKcSl55u3dhtkUa6zs0hkbYyx2kDtnR3wmNU="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-vault-6.7.3.tar.xz",
+    "hash": "sha256-jF2RrXds7h7x7KL7ObXagtEpVntG0klMMXHhej6SOic="
   },
   "plasma-welcome": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-welcome-6.7.2.tar.xz",
-    "hash": "sha256-/ReLhsbCizoNhU865x43gMz33N2dYU6r8Mk1frl4pjk="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-welcome-6.7.3.tar.xz",
+    "hash": "sha256-/x198bN75SospvTRsCrrWsfqKkrzO9a2KF1ejQtzhBA="
   },
   "plasma-workspace": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-workspace-6.7.2.tar.xz",
-    "hash": "sha256-iUGeBTKosz/ach51DI9IDDiCjVwUUjlSQw3/zOCtxgY="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-workspace-6.7.3.tar.xz",
+    "hash": "sha256-Q4hRcIpweB7POvoKCEiP3Gdotu1avKXyAqh+OVqmN28="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma-workspace-wallpapers-6.7.2.tar.xz",
-    "hash": "sha256-nZyVgyrAtHjulMtJ/K37v41YG/DUT01scuEuOagEi5g="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma-workspace-wallpapers-6.7.3.tar.xz",
+    "hash": "sha256-uPXbayVP3XX58o0Mb/Cvh9y8PsacGjiB1b23ADUHFVE="
   },
   "plasma5support": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plasma5support-6.7.2.tar.xz",
-    "hash": "sha256-ApFz973GxLa4juv1zrQX9C/9QF+KMRFcKd8a8e5yi60="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plasma5support-6.7.3.tar.xz",
+    "hash": "sha256-+nrWak0yFF7mqR7NafGUQMVU0GKvqTDiyFl+Ms/FD3w="
   },
   "plymouth-kcm": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/plymouth-kcm-6.7.2.tar.xz",
-    "hash": "sha256-MtkC0S86Cc21dkMzWsDgRJ21XGUhvcohQZXuKrkpLTw="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/plymouth-kcm-6.7.3.tar.xz",
+    "hash": "sha256-NUvGwFg/MbAICnNLFsJvYQPrVi5axqYF7xGcNxCleEQ="
   },
   "polkit-kde-agent-1": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/polkit-kde-agent-1-6.7.2.tar.xz",
-    "hash": "sha256-dR3sDc1dLFL5emE5FhhUk+VYYa/M756TmgXplQ6mmBg="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/polkit-kde-agent-1-6.7.3.tar.xz",
+    "hash": "sha256-i3jeIBZogRWZVTWs03J+gnPkWCwbXNyIP0NoMiOXCyo="
   },
   "powerdevil": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/powerdevil-6.7.2.tar.xz",
-    "hash": "sha256-AHPT3E4HNeqyIS4sOVx+n+ZoAUaFZCG7cO/0Lr+IzAQ="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/powerdevil-6.7.3.tar.xz",
+    "hash": "sha256-cuNilj1nSIy1W51sVjpmu+BDVTmAJp8uLCtpHwI+LzU="
   },
   "print-manager": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/print-manager-6.7.2.tar.xz",
-    "hash": "sha256-pMVQAfEEY0ASyBB/qj4SEyrkyOMKsAtGtBnvCwFE6tE="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/print-manager-6.7.3.tar.xz",
+    "hash": "sha256-neMdnhIyRDHc0u+5gwFvlehXSoqnnmv3YXd9ZmrOF7I="
   },
   "qqc2-breeze-style": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/qqc2-breeze-style-6.7.2.tar.xz",
-    "hash": "sha256-lOHa2bEQxD1I2L6nwS5/onVOVtGgWnuySaAwNed/W0k="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/qqc2-breeze-style-6.7.3.tar.xz",
+    "hash": "sha256-45na9M7iQeS8r3e2lUj3ufaxVQzA99xc5vLsT5nYKJk="
   },
   "sddm-kcm": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/sddm-kcm-6.7.2.tar.xz",
-    "hash": "sha256-ecTXDiTN5px8PxqizX5TANspeYMH9gcdTJgAovRR1Iw="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/sddm-kcm-6.7.3.tar.xz",
+    "hash": "sha256-NFrPXPPPK1/rLuCzFHFSHnkmhJEBmmuu+zGyNpD2Lg8="
   },
   "spacebar": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/spacebar-6.7.2.tar.xz",
-    "hash": "sha256-6GAvXWm/a7qODIQTnbsZCMxpbnhit1tTn1OSduzGuQI="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/spacebar-6.7.3.tar.xz",
+    "hash": "sha256-enyu7rn2urzUn9u5+U/oL/v9UMkUQohnOfi3y3mQPC0="
   },
   "spectacle": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/spectacle-6.7.2.tar.xz",
-    "hash": "sha256-JNLNAilkAVOPCsdzaASwcbnp9RaorVikuCFBG8FWQqM="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/spectacle-6.7.3.tar.xz",
+    "hash": "sha256-T1yHWS81uxvVj6jnKCnDkElkasw9L3lFHao0DA27EVQ="
   },
   "systemsettings": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/systemsettings-6.7.2.tar.xz",
-    "hash": "sha256-a3J4eiFDxcsXzFB+8ul83jptHFzYFX9ZzGgbZVLXzkU="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/systemsettings-6.7.3.tar.xz",
+    "hash": "sha256-lynNSHqDjIDIpa3Ji1DYS6QjHLR/VbXvqJciE7iOFkA="
   },
   "union": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/union-6.7.2.tar.xz",
-    "hash": "sha256-1nQ2xXkHetWsL6xKMzhzxZg2ZnRtRcfngNY4TZoPjeY="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/union-6.7.3.tar.xz",
+    "hash": "sha256-7pHo7PBm1bxy1lPlMnzvBYDYKqYOD86bR/lFgE05kZk="
   },
   "wacomtablet": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/wacomtablet-6.7.2.tar.xz",
-    "hash": "sha256-ieLbsMAYiWFrIbzTNxueumSVishL/W98L1QqPqtykzw="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/wacomtablet-6.7.3.tar.xz",
+    "hash": "sha256-yPrxfXYqVUHt8fKqoY9xIXBQvXDza5+nEN8FGS7hXvI="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.7.2",
-    "url": "mirror://kde/stable/plasma/6.7.2/xdg-desktop-portal-kde-6.7.2.tar.xz",
-    "hash": "sha256-0Jl03aQX36UZ3WTZzRkGHHwJEwiqIqetitMmAVhN2tA="
+    "version": "6.7.3",
+    "url": "mirror://kde/stable/plasma/6.7.3/xdg-desktop-portal-kde-6.7.3.tar.xz",
+    "hash": "sha256-3pznR182cOVmLeijrZAC35GKte6UtEAePMsdZ/RtSRk="
   }
 }
\ No newline at end of file

From 25475c7ec19158c94aa40be5caf9308899bb57a7 Mon Sep 17 00:00:00 2001
From: Stephen Checkoway <s@pahtak.org>
Date: Tue, 14 Jul 2026 08:51:05 -0400
Subject: [PATCH 0496/1386] rbenv: use installManPage to install the man page

Use installManPage rather than creating the directory and compressing
the file explicitly.
---
 pkgs/by-name/rb/rbenv/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/rb/rbenv/package.nix b/pkgs/by-name/rb/rbenv/package.nix
index e5994e79f861..1e59610fadb5 100644
--- a/pkgs/by-name/rb/rbenv/package.nix
+++ b/pkgs/by-name/rb/rbenv/package.nix
@@ -28,8 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/bin
     mv libexec $out
     ln -s $out/libexec/rbenv $out/bin/rbenv
-    mkdir -p $out/share/man/man1
-    gzip -c share/man/man1/rbenv.1 >$out/share/man/man1/rbenv.1.gz
+    installManPage share/man/man1/rbenv.1
 
     installShellCompletion --zsh completions/_rbenv
     installShellCompletion --bash completions/rbenv.bash

From 0a930dd847a2a0d3e25ea733537138fbd64687db Mon Sep 17 00:00:00 2001
From: Samiser <github@me.samiser.xyz>
Date: Tue, 14 Jul 2026 14:06:32 +0100
Subject: [PATCH 0497/1386] godot: fix build on darwin by linking with lld

---
 pkgs/development/tools/godot/common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index 1ff39286d4bf..ac25ea3cfde6 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -38,6 +38,7 @@
   libxkbcommon,
   libxrandr,
   libxrender,
+  llvmPackages,
   makeWrapper,
   mbedtls,
   miniupnpc,
@@ -398,6 +399,8 @@ let
             "-I${lib.getDev harfbuzz-icu}/include/harfbuzz"
             "-I${lib.getDev recastnavigation}/include/recastnavigation"
           ];
+          # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+          NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
         };
 
         preConfigure = lib.optionalString (editor && withMono) ''
@@ -643,6 +646,8 @@ let
         ++ lib.optionals stdenv.hostPlatform.isDarwin (
           [
             darwin.sigtool
+            # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+            llvmPackages.lld
           ]
           ++ lib.optionals (!editor) [
             strip-nondeterminism

From c57f76fad5c8f52ca83399b2c62b91650abe48b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@telecom-paris.fr>
Date: Mon, 13 Jul 2026 17:12:39 +0200
Subject: [PATCH 0498/1386] rocqPackages.mkRocqDerivation: change prefix for
 coq

Make the default prefix be set to `[ "coq" ]` if `useCoq` is `true`.

This ensures that `mkRocqDerivation` can be called directly to build
Coq derivations without changing the derivation name / `opam-name`.
---
 pkgs/build-support/rocq/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/rocq/default.nix b/pkgs/build-support/rocq/default.nix
index 68181efcfb44..5f6a1c535e0f 100644
--- a/pkgs/build-support/rocq/default.nix
+++ b/pkgs/build-support/rocq/default.nix
@@ -55,7 +55,7 @@ in
   extraNativeBuildInputs ? [ ],
   overrideBuildInputs ? [ ],
   overrideNativeBuildInputs ? [ ],
-  namePrefix ? [ "rocq-core" ],
+  namePrefix ? null,
   enableParallelBuilding ? true,
   extraInstallFlags ? [ ],
   setROCQBIN ? true,
@@ -66,7 +66,7 @@ in
   dropDerivationAttrs ? [ ],
   useDuneifVersion ? (x: false),
   useDune ? false,
-  opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])),
+  opam-name ? null,
   useCoq ? false,
   useCoqifVersion ? (x: false),
   ...
@@ -160,10 +160,12 @@ let
       ] ""
     )
     + optionalString (v == null) "-broken";
-  append-version = p: n: p + display-pkg n "" rocqPackages.${n}.version + "-";
-  prefix-name = foldl append-version "" namePrefix;
   useDune = args.useDune or (useDuneifVersion fetched.version);
   useCoq = args.useCoq or (useCoqifVersion fetched.version);
+  namePrefix = args.namePrefix or [ (if useCoq then "coq" else "rocq-core") ];
+  append-version = p: n: p + display-pkg n "" rocqPackages.${n}.version + "-";
+  prefix-name = foldl append-version "" namePrefix;
+  opam-name = args.opam-name or (concatStringsSep "-" (namePrefix ++ [ pname ]));
   rocq-core = if useCoq then coq // { rocq-version = coq.coq-version; } else args0.rocq-core;
   rocqlib-flags = [
     "COQLIBINSTALL=$(out)/lib/coq/${rocq-core.rocq-version}/user-contrib"

From 2b09eabd3503602e10a408dde9419c2b14fd882b Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 14 Jul 2026 09:30:42 -0400
Subject: [PATCH 0499/1386] navidrome: 0.63.1 -> 0.63.2

changelog: https://github.com/navidrome/navidrome/releases/tag/v0.63.2
---
 pkgs/by-name/na/navidrome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index 8e45a98dc3ff..21c404124953 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -21,13 +21,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "navidrome";
-  version = "0.63.1";
+  version = "0.63.2";
 
   src = fetchFromGitHub {
     owner = "navidrome";
     repo = "navidrome";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sqPqcvi1XIjPuo02qxygM3a3/ih5w5vqfz6D8XRTxiA=";
+    hash = "sha256-s0Pd6yT9NX2VFSPbLPX6Zqon8Y3qyDPGCKvqHPxcZ88=";
   };
 
   vendorHash = "sha256-lNjOVrlRD6ptDBpmfGYCN3Vkal9ACciOyS1RANzKYK4=";

From bcfc305c8723f270fa3c816cd4308b41ec92b8a8 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Tue, 14 Jul 2026 09:22:05 -0400
Subject: [PATCH 0500/1386] mullvad-browser: 15.0.16 -> 15.0.18

changelog: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/mb-15.0.18-build1/projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
diff: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/mullvad-browser-140.12.0esr-15.0-1-build2...mullvad-browser-140.12.0esr-15.0-1-build3
firefox security advisories: https://www.mozilla.org/en-US/security/advisories/mfsa2026-67/

Fixes: CVE-2026-15718, CVE-2026-15719
---
 pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index f718e178f988..241cfe2420bd 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -97,7 +97,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg_7 ]
   );
 
-  version = "15.0.16";
+  version = "15.0.18";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-mlQUAdGcOUbqReROqhs4fwSUmTZqQAEhwsg6ulM2hx4=";
+      hash = "sha256-hvLft1HDj/5NgAfQb1igYdhJN5H/jZ2+7s/JKKLf4Gs=";
     };
   };
 

From 105d54a0469e0c9eedf87f845acc21479d74a19f Mon Sep 17 00:00:00 2001
From: lavecat <lirus12345.lave@gmail.com>
Date: Tue, 14 Jul 2026 16:00:06 +0200
Subject: [PATCH 0501/1386] element-desktop: 1.12.22 -> 1.12.23

---
 pkgs/by-name/el/element-desktop/package.nix       | 6 +++---
 pkgs/by-name/el/element-web-unwrapped/package.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 327c5e1029f3..344d7db401f6 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "element-desktop";
-  version = "1.12.22";
+  version = "1.12.23";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "element-web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g=";
+    hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-wTOdipfWUH0gjTTHJTP8np2D77bNoFCThCg5eRMJXS8=";
+    hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index fda412a8495c..45dd152435f0 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "element-web";
-  version = "1.12.22";
+  version = "1.12.23";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "element-web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g=";
+    hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version src;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-wTOdipfWUH0gjTTHJTP8np2D77bNoFCThCg5eRMJXS8=";
+    hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0=";
   };
 
   nativeBuildInputs = [

From f3239037f143c0af320882f4dff981aaf04fd66a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 14 Jul 2026 10:00:59 -0400
Subject: [PATCH 0502/1386] rage: 0.12.0 -> 0.12.1

Diff: https://github.com/str4d/rage/compare/v0.12.0...v0.12.1

Changelog: https://github.com/str4d/rage/blob/v0.12.1/rage/CHANGELOG.md
---
 pkgs/by-name/ra/rage/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index ad23d7eb796a..6808cd5305ad 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rage";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "str4d";
     repo = "rage";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-T295mhtn1sznTRV1ovAyK9Y+8A+d0NsXUOZO7248j9Y=";
+    hash = "sha256-ZOY0cr0uO5ls3tj80PZqzbdjhcw9jKRJvHC60JaBOm0=";
   };
 
-  cargoHash = "sha256-Dy8TAdOI9Y/w3kdfq3YY153V6ikRDtnyoOd5SybQids=";
+  cargoHash = "sha256-0PfePGkMOSbHemc8gWnQR7W4/R5EMuXBKaFntL6dSPI=";
 
   nativeBuildInputs = [
     installShellFiles

From 300c8299e1b4892abdfa78680613c58667fc3e45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:05:17 +0000
Subject: [PATCH 0503/1386] mmdoc: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix
index dd09c19978ec..c9e678bdb646 100644
--- a/pkgs/by-name/mm/mmdoc/package.nix
+++ b/pkgs/by-name/mm/mmdoc/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mmdoc";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "ryantm";
     repo = "mmdoc";
     rev = finalAttrs.version;
-    hash = "sha256-NS8i5xvCwq0pSdfxnaxnpuwmDAkfH6Tkc4N2F6aGvWY=";
+    hash = "sha256-GxGYW10GZvDzeeKy9U9iyGvfN3IM/A/pnQivx8xXhHI=";
   };
 
   nativeBuildInputs = [

From c35837d7f78b1e22100502d99c1543f29b8562dd Mon Sep 17 00:00:00 2001
From: soyouzpanda <soyouzpanda@soyouzpanda.fr>
Date: Tue, 14 Jul 2026 16:03:06 +0200
Subject: [PATCH 0504/1386] lasuite-drive: 0.18.0 -> 0.19.0

https://github.com/suitenumerique/drive/releases/tag/v0.19.0
https://github.com/suitenumerique/drive/compare/v0.18.0...v0.19.0
---
 pkgs/by-name/la/lasuite-drive/frontend.nix | 2 +-
 pkgs/by-name/la/lasuite-drive/package.nix  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-drive/frontend.nix b/pkgs/by-name/la/lasuite-drive/frontend.nix
index 5ed9033ec82e..1387b44b7b62 100644
--- a/pkgs/by-name/la/lasuite-drive/frontend.nix
+++ b/pkgs/by-name/la/lasuite-drive/frontend.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
-    hash = "sha256-yUKJp6yUTxpvkaA+YuQC3r1t4LBvuYMv1xesLewbK/U=";
+    hash = "sha256-W0Sp8G7Lt9UMND8+ZLD8oxrNCgGpQph23AvQpynYWYI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/la/lasuite-drive/package.nix b/pkgs/by-name/la/lasuite-drive/package.nix
index 61d77e62b6a8..9023f462b61f 100644
--- a/pkgs/by-name/la/lasuite-drive/package.nix
+++ b/pkgs/by-name/la/lasuite-drive/package.nix
@@ -7,13 +7,13 @@
   nixosTests,
 }:
 let
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "drive";
     tag = "v${version}";
-    hash = "sha256-JoOHbwZR4salfLB9Gg7kfRMDcDA/Srn8qwUqLAZtsz8=";
+    hash = "sha256-y9lvGYTIxpuTA0mFDl616JxX+RF5+5Ea8k/NWlLjrZk=";
   };
 
   meta = {

From b3ee0ca8671ea9764564b20b67954ab1421e79c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:15:16 +0000
Subject: [PATCH 0505/1386] lokalise2-cli: 3.1.4 -> 3.1.5

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

diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix
index 433f66a74cd6..c352b3c3e932 100644
--- a/pkgs/by-name/lo/lokalise2-cli/package.nix
+++ b/pkgs/by-name/lo/lokalise2-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lokalise2-cli";
-  version = "3.1.4";
+  version = "3.1.5";
 
   src = fetchFromGitHub {
     owner = "lokalise";
     repo = "lokalise-cli-2-go";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-weqYHKxu6HvdrFduzKtHtCVnJ0GVRGIPABLrsW4f0VA=";
+    sha256 = "sha256-vMredBTXwlpRK3Y90CRV00mdpJu6SoqfPNH1AMUOsPA=";
   };
 
-  vendorHash = "sha256-thD8NtG9uVI4KwNQiNsVCUdyUcgAmnr+szsUQ2Ika1c=";
+  vendorHash = "sha256-NS4nKoZSJ8M/n18Y2vQb5MuKBBjS6SGRoKJi5B2J68g=";
 
   doCheck = false;
 

From 078350ca8252f9232005ed60eaba9cb4ad443b00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:20:29 +0000
Subject: [PATCH 0506/1386] libprojectm: 4.1.6 -> 4.1.7

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

diff --git a/pkgs/by-name/li/libprojectm/package.nix b/pkgs/by-name/li/libprojectm/package.nix
index ee3e8c451541..9c5414cc5e64 100644
--- a/pkgs/by-name/li/libprojectm/package.nix
+++ b/pkgs/by-name/li/libprojectm/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libprojectm";
-  version = "4.1.6";
+  version = "4.1.7";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IUVll+nRvIAOxrb16gWb9OpKzMRRuj28j/v+LvaLY5Y=";
+    hash = "sha256-g7a5Ce7dEfOBGn6wMgdwujkWSi+vLeayWHClvH5W1wY=";
     fetchSubmodules = true;
   };
 

From aa433c9d22ab2d7a4fd0160647be0380be48265b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:26:13 +0000
Subject: [PATCH 0507/1386] kotlin: 2.4.0 -> 2.4.10

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 85fe47b09a88..9f7a4d441768 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.4.0";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-uhuebrbdwydQeSJPLp6korAu731Zzi04QE8EsiYTwgo=";
+    sha256 = "sha256-Rz3WbHo+9LGCBls9pnBGbBvydzqduw7Yszo5/p1Ph20=";
   };
 
   propagatedBuildInputs = [ jre ];

From a622147fcb4ac65966f3b446268c04feb79735ea Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 14 Jul 2026 16:30:58 +0200
Subject: [PATCH 0508/1386] mpv.tests.mpv-scripts-should-not-collide: handle
 "throw" aliases in mpvScripts

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

diff --git a/pkgs/by-name/mp/mpv/package.nix b/pkgs/by-name/mp/mpv/package.nix
index d08eaaae4562..d93e4cb5bdd6 100644
--- a/pkgs/by-name/mp/mpv/package.nix
+++ b/pkgs/by-name/mp/mpv/package.nix
@@ -117,6 +117,8 @@ symlinkJoin {
   passthru.tests.mpv-scripts-should-not-collide = buildEnv {
     name = "mpv-scripts-env";
     paths = lib.pipe mpvScripts [
+      # filters "throw" aliases
+      (lib.filterAttrs (key: script: (builtins.tryEval (lib.isDerivation script)).success))
       # filters "override" "overrideDerivation" "recurseForDerivations"
       (lib.filterAttrs (key: script: lib.isDerivation script))
       # replaces unfree and meta.broken scripts with decent placeholders

From 79806477f882fabea086337bc578f0885311bc1f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 14 Jul 2026 16:31:23 +0200
Subject: [PATCH 0509/1386] mpv.tests.mpv-scripts-should-not-collide: add
 opt-out mechanism, use on modernx-zydezu

---
 pkgs/by-name/mp/mpv/package.nix                | 2 ++
 pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/by-name/mp/mpv/package.nix b/pkgs/by-name/mp/mpv/package.nix
index d93e4cb5bdd6..7d709571efb3 100644
--- a/pkgs/by-name/mp/mpv/package.nix
+++ b/pkgs/by-name/mp/mpv/package.nix
@@ -121,6 +121,8 @@ symlinkJoin {
       (lib.filterAttrs (key: script: (builtins.tryEval (lib.isDerivation script)).success))
       # filters "override" "overrideDerivation" "recurseForDerivations"
       (lib.filterAttrs (key: script: lib.isDerivation script))
+      # filters mpv scripts that opt out of this check
+      (lib.filterAttrs (key: script: !(script.passthru.dontCollideCheck or false)))
       # replaces unfree and meta.broken scripts with decent placeholders
       (lib.mapAttrsToList (
         key: script:
diff --git a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix
index 1e7e4b731c39..362031f19db3 100644
--- a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix
+++ b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   installFonts,
   makeFontsConf,
+  mpvScripts,
   nix-update-script,
 }:
 buildLua (finalAttrs: {
@@ -30,6 +31,9 @@ buildLua (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  # FIXME?: collides with mpvScripts.modernx
+  passthru.dontCollideCheck = lib.hasAttr "modernx" mpvScripts;
+
   meta = {
     description = "Modern OSC UI replacement for MPV that retains the functionality of the default OSC";
     changelog = "https://github.com/zydezu/ModernX/releases/tag/${finalAttrs.version}";

From 8863c358ab0ae57f4ecf85f3def8d30b7de01554 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:37:58 +0000
Subject: [PATCH 0510/1386] lxgw-neoxihei: 1.303 -> 1.304

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

diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index fb1543bace5d..02f90de7c175 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.303";
+  version = "1.304";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-uksTXdA6UPJfaQxyqzjurDfMy7ecEzzSIpkCqG4DA3Y=";
+    hash = "sha256-WWXdmSKQhhxtYihQmNxcp/bGaZMHZf0R1dD9SRLYFuc=";
   };
 
   dontUnpack = true;

From e09e9785e847443677922269accf0157a867cc60 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 14 Jul 2026 16:41:33 +0200
Subject: [PATCH 0511/1386] mpvScripts.mpv-osc-tethys: set
 passthru.dontCollideCheck

fixes mpv.tests.mpv-scripts-should-not-collide when allowUnfree=true
---
 pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix b/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix
index fe8908ba09d3..974a1a7125ad 100644
--- a/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix
+++ b/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix
@@ -2,6 +2,7 @@
   lib,
   buildLua,
   fetchFromGitHub,
+  mpvScripts,
 }:
 buildLua (finalAttrs: {
   pname = "mpv-osc-tethys";
@@ -11,6 +12,9 @@ buildLua (finalAttrs: {
   extraScriptsToCopy = [ "mpv_thumbnail_script_server.lua" ];
   extraScriptsToLoad = [ "mpv_thumbnail_script_server.lua" ];
 
+  # FIXME?: collides with mpvScripts.thumbnail, this one yields since it is unfree
+  passthru.dontCollideCheck = lib.hasAttr "thumbnail" mpvScripts;
+
   src = fetchFromGitHub {
     owner = "Zren";
     repo = "mpv-osc-tethys";

From c9797d652900c9f9826c3145e7cac5a0a3a77c61 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 14 Jul 2026 14:44:34 +0000
Subject: [PATCH 0512/1386] bacon: 3.23.0 -> 3.24.0

Diff: https://github.com/Canop/bacon/compare/v3.23.0...v3.24.0

Changelog: https://github.com/Canop/bacon/blob/v3.24.0/CHANGELOG.md
---
 pkgs/by-name/ba/bacon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 13dfbfbebd45..196e4c34e011 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -27,17 +27,17 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bacon";
-  version = "3.23.0";
+  version = "3.24.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "bacon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HMHZQP9GY9iMm+vDeIhavv4akmM0IUbpDtWHyzHG7KE=";
+    hash = "sha256-rfbK5MrCytBVISXVkazBDnZZxjZQ3ze348mlTyanTWM=";
   };
 
-  cargoHash = "sha256-zlxhlgcTtSYvvGqSpQIg6f10cQZhF6s4UNrCZr8RIdY=";
+  cargoHash = "sha256-s49qZMD922l6KKSFRhVIGp6+7E0S+q7McV9PT2F0RQc=";
 
   buildFeatures = lib.optionals withSound [
     "sound"

From 685fa8e70edf2090d519c0c4f4fd1b62914afbf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:46:55 +0000
Subject: [PATCH 0513/1386] gosec: 2.27.1 -> 2.28.0

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

diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix
index 296ed052b101..6aeb24a0b7ba 100644
--- a/pkgs/by-name/go/gosec/package.nix
+++ b/pkgs/by-name/go/gosec/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gosec";
-  version = "2.27.1";
+  version = "2.28.0";
 
   src = fetchFromGitHub {
     owner = "securego";
     repo = "gosec";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-k4zroP/kqOJe8xdbOSC26cfHGqUoXlJY66MP5s/Saq0=";
+    hash = "sha256-kj6G8aDTLgAXOzlZGgHPiDGjpczDSwYog5G7Cw0/VNE=";
   };
 
-  vendorHash = "sha256-lkaIDS7jrRIXxIvE2/EfM3tTP0cAb58AnzCsrBO955A=";
+  vendorHash = "sha256-jd6nUvuWKygyKxyGCesQQj5OyYp+SD51ZDFXbyaJckc=";
 
   subPackages = [
     "cmd/gosec"

From fdfaaa258d5e96fd9cc231c21929dd12ccc0913b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:47:02 +0000
Subject: [PATCH 0514/1386] mark: 16.5.0 -> 16.5.1

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

diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix
index 9c0c9feb446d..8506cc5d33e7 100644
--- a/pkgs/by-name/ma/mark/package.nix
+++ b/pkgs/by-name/ma/mark/package.nix
@@ -8,16 +8,16 @@
 # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996
 buildGoModule (finalAttrs: {
   pname = "mark";
-  version = "16.5.0";
+  version = "16.5.1";
 
   src = fetchFromGitHub {
     owner = "kovetskiy";
     repo = "mark";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-lgqS9SDI8UIkcucVdKyrPxIn7DIpQyRUknuy1nmoKM0=";
+    sha256 = "sha256-k1VDB/wV8zFtMr8KcgTsw1/+7/PElD62zn5UQ1IuJLU=";
   };
 
-  vendorHash = "sha256-Tw6tk7ZF4H+5/AJCFfMFy2zB4OCQB9S3mFA4Ky49pz4=";
+  vendorHash = "sha256-dCELGpByfx4sEV6/bZ7O+xU5b15Ptbq+wPcbjMXzGZc=";
 
   ldflags = [
     "-s"

From f9957343408c3c89f0c5812da4442a39bafcc5e0 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 2 Jul 2026 17:44:58 +0200
Subject: [PATCH 0515/1386] electron-source.electron_40: remove

electron 40 is EOL.
---
 .../tools/electron/40-angle-patchdir.patch    |   13 -
 pkgs/development/tools/electron/common.nix    |    6 -
 pkgs/development/tools/electron/info.json     | 1390 -----------------
 pkgs/top-level/all-packages.nix               |    5 +-
 4 files changed, 1 insertion(+), 1413 deletions(-)
 delete mode 100644 pkgs/development/tools/electron/40-angle-patchdir.patch

diff --git a/pkgs/development/tools/electron/40-angle-patchdir.patch b/pkgs/development/tools/electron/40-angle-patchdir.patch
deleted file mode 100644
index 82a3b7f40eca..000000000000
--- a/pkgs/development/tools/electron/40-angle-patchdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/electron/patches/config.json b/electron/patches/config.json
-index f5dbe8600f..9e1e5e0704 100644
---- a/electron/patches/config.json
-+++ b/electron/patches/config.json
-@@ -15,5 +15,5 @@
-   { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
-   { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
-   { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
--  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
-+  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
-   { "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
-   { "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
- ]
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index 33b98017767b..73ed0218786b 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -106,12 +106,6 @@ in
 
   src = null;
 
-  patches =
-    base.patches
-    ++ lib.optionals (lib.versions.major info.version == "40") [
-      ./40-angle-patchdir.patch
-    ];
-
   postPatch = ''
     mkdir -p third_party/jdk/current/bin
 
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 275cd4b88df1..b938abbc9179 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1,1394 +1,4 @@
 {
-    "40": {
-        "chrome": "144.0.7559.236",
-        "chromium": {
-            "deps": {
-                "gn": {
-                    "hash": "sha256-04h38X/hqWwMiAOVsVu4OUrt8N+S7yS/JXc5yvRGo1I=",
-                    "rev": "6e0b557db44b3c164094e57687d20ba036a80667",
-                    "version": "0-unstable-2025-12-01"
-                }
-            },
-            "version": "144.0.7559.236"
-        },
-        "chromium_npm_hash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc=",
-        "deps": {
-            "src": {
-                "args": {
-                    "hash": "sha256-Kf7BLOb0w8K3nDez7Q3gMWRc9bexBRY/vBSzSDOXt/Y=",
-                    "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "144.0.7559.236",
-                    "url": "https://chromium.googlesource.com/chromium/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/canvas_bench": {
-                "args": {
-                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/frame_rate/content": {
-                "args": {
-                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
-                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
-                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/xr/webvr_info": {
-                "args": {
-                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
-                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
-                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/docs/website": {
-                "args": {
-                    "hash": "sha256-LnLvIl4L3IFim5LA5ZFYSE6kpBMF8cL1dC/os7QmhHI=",
-                    "rev": "d9a0c174b535ee5165fb8ef278324be9efa49352",
-                    "url": "https://chromium.googlesource.com/website.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/electron": {
-                "args": {
-                    "hash": "sha256-egb/uS76XrADbEtnzEVzym47qrNYwIOby1/3J537Vuw=",
-                    "owner": "electron",
-                    "repo": "electron",
-                    "tag": "v40.10.5"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/media/cdm/api": {
-                "args": {
-                    "hash": "sha256-voZaq/OiP5/QSSZmBx1ifriBc6HQ9+m4pUz0o9+O9x8=",
-                    "rev": "a4cbc4325e6de42ead733f2af43c08292d0e65a8",
-                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/net/third_party/quiche/src": {
-                "args": {
-                    "hash": "sha256-yjHB2BYtSJiK34zIda1t2kcY+netDUIiaQ0vVtglYfw=",
-                    "rev": "901d0a7b4dbb141f2ad4eb8e1f00eb87f945044e",
-                    "url": "https://quiche.googlesource.com/quiche.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
-                "args": {
-                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
-                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
-                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle": {
-                "args": {
-                    "hash": "sha256-7huvYFE/HG2/iojEhn4VfOSdaMNHDOR9NUmjK25QpXQ=",
-                    "rev": "a4490148bd3d1b0cb235d9978a52878bd626280f",
-                    "url": "https://chromium.googlesource.com/angle/angle.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/VK-GL-CTS/src": {
-                "args": {
-                    "hash": "sha256-nOsbMbfBKzyRN+QzOb09LKYIRIoTjTDdsSaR78g3Puk=",
-                    "rev": "4a7c2fcd1b1a3701295f7d3fe42719e867c1b793",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/glmark2/src": {
-                "args": {
-                    "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=",
-                    "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
-                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/rapidjson/src": {
-                "args": {
-                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
-                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
-                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/anonymous_tokens/src": {
-                "args": {
-                    "hash": "sha256-jwfszvnWRtTmzPm5x/lyceX1Y0G0hyIATcKlYkKj/SY=",
-                    "rev": "50e04fb27eacd49a5e2bfde5977ac689e13ebeeb",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/boringssl/src": {
-                "args": {
-                    "hash": "sha256-i+HP5Q1UmBCLmDdGvSKPts6nwo/9vGUh5wMdmmQ7qLU=",
-                    "rev": "b94d71f87ff943a617d77f3ff029f9a01a1ec6bc",
-                    "url": "https://boringssl.googlesource.com/boringssl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/breakpad/breakpad": {
-                "args": {
-                    "hash": "sha256-CQ1doQRsX0zvfgYKJalz0i35mPJfk5o6m2sdGYqS4co=",
-                    "rev": "d0b41ca2a38c7b14c4b7853254eb5bf3b4039691",
-                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cast_core/public/src": {
-                "args": {
-                    "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=",
-                    "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942",
-                    "url": "https://chromium.googlesource.com/cast_core/public"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/catapult": {
-                "args": {
-                    "hash": "sha256-FumPjVoqe6OLULHlduuMZgJTn2cau7QMAQz6gv1gAnU=",
-                    "rev": "a202c86635d505fa893d73bad1e220a66bb644e6",
-                    "url": "https://chromium.googlesource.com/catapult.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ced/src": {
-                "args": {
-                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
-                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/clang-format/script": {
-                "args": {
-                    "hash": "sha256-f+BbQ6xIubloSzx/MhPSZ8ymCskmS+9+epDGtPjZqXc=",
-                    "rev": "c2725e0622e1a86d55f14514f2177a39efea4a0e",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cld_3/src": {
-                "args": {
-                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
-                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/colorama/src": {
-                "args": {
-                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                    "url": "https://chromium.googlesource.com/external/colorama.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/compiler-rt/src": {
-                "args": {
-                    "hash": "sha256-Wl18dFoXfwe266yCKDYviOI46OimFLfstke/+baPzgM=",
-                    "rev": "cb2de163a470f2e9d56ec8a4f912f644378b7191",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/content_analysis_sdk/src": {
-                "args": {
-                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
-                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
-                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpu_features/src": {
-                "args": {
-                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
-                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpuinfo/src": {
-                "args": {
-                    "hash": "sha256-uzo6QpNfzTcqOpDse14e2OoxNyKDU8jSx+/wPLxmpJg=",
-                    "rev": "161a9ec374884f4b3e85725cb22e05f9458fdc93",
-                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crabbyavif/src": {
-                "args": {
-                    "hash": "sha256-5nU1QDY6irjmufd7nO70dTS74EchC7NXX2MBNz3LNPw=",
-                    "rev": "640d2758f8d2e59d1a55ae0933673f0f65de68c4",
-                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crc32c/src": {
-                "args": {
-                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
-                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros-components/src": {
-                "args": {
-                    "hash": "sha256-g7LzBd2V21AaLdSdCw65WGYvKfrbtpRXsYc+3ILdiKs=",
-                    "rev": "7ccdbf60606671c2c057628125908fbfef9bd0c8",
-                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros_system_api": {
-                "args": {
-                    "hash": "sha256-dWWNvPtZ90quSvu/ZfOHd40UosOG9EwPCF3QklHUvA0=",
-                    "rev": "5f1ffac5e855229e27c6e4356ffb189f3010283f",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crossbench": {
-                "args": {
-                    "hash": "sha256-PHP2En509QS+LAvb7zt4l+34VGy7kik0X87n1fKH5tw=",
-                    "rev": "77240be1ccd1dc99b73be332223a8856641a2073",
-                    "url": "https://chromium.googlesource.com/crossbench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crossbench-web-tests": {
-                "args": {
-                    "hash": "sha256-yJmi1IpUiKhdoHAXyazkpm+Ezuc4Hp8pOIBntG5hN+U=",
-                    "rev": "3c76c8201f0732fe9781742229ab8ac43bf90cbf",
-                    "url": "https://chromium.googlesource.com/chromium/web-tests.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dav1d/libdav1d": {
-                "args": {
-                    "hash": "sha256-Lux+OGbeWnQJhIYDczH6jP/+lO+ZLlwpuUcLbO4Jvuo=",
-                    "rev": "fcbc3d1b93f91c709293ed9faea8b7cbcac9030b",
-                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn": {
-                "args": {
-                    "hash": "sha256-S2TPH0CvdK6XEqWRiGqO8dTZA39clhls0I9CRQ6quao=",
-                    "rev": "67bcc781bd5f9f8275a4fc954ddd0e8418ed3f1d",
-                    "url": "https://dawn.googlesource.com/dawn.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxc": {
-                "args": {
-                    "hash": "sha256-LS4+U+GdWXDSkEXMIibeSvjA1079kvQyrASq+5N8gYw=",
-                    "rev": "3f85295cfc982e5447f9faaa36f345366faca11d",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxheaders": {
-                "args": {
-                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
-                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/glfw": {
-                "args": {
-                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
-                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
-                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
-                "args": {
-                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
-                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
-                "args": {
-                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
-                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/webgpu-cts": {
-                "args": {
-                    "hash": "sha256-bMo94M5Io0S76REatQvA/nC9QRvxy5rpKjeItFvZr4k=",
-                    "rev": "3314e4108692d0c201f0d381bf10ddc8dbbc7b69",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/webgpu-headers/src": {
-                "args": {
-                    "hash": "sha256-4ARtN5+4yxMoFGKvPvQgJGYqAqQLjHlrrxlTmka/UhE=",
-                    "rev": "079d4e5153eaabc4033584cc399c27f1acbb2548",
-                    "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/depot_tools": {
-                "args": {
-                    "hash": "sha256-UhEzt9TBZiyuEjPVyHyTEg/idVj9EaAfrHHw2iRuIro=",
-                    "rev": "2e88a3f08bd8c4a0014eae82729beca935f7f188",
-                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/devtools-frontend/src": {
-                "args": {
-                    "hash": "sha256-6osYh+ijcH7LEg1v7xGEf0zC36HZGMfqXP9Eq6g5WdU=",
-                    "rev": "f130475580017f9f87502343dbcfc0c76dccefe8",
-                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dom_distiller_js/dist": {
-                "args": {
-                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
-                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
-                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/domato/src": {
-                "args": {
-                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
-                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
-                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dragonbox/src": {
-                "args": {
-                    "hash": "sha256-AOniXMPgwKpkJqivRd+GazEnhdw53FzhxKqG+GdU+cc=",
-                    "rev": "6c7c925b571d54486b9ffae8d9d18a822801cbda",
-                    "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/eigen3/src": {
-                "args": {
-                    "hash": "sha256-6K6CqifDPVYSs6g6AbG38sP3w7W7/q6bhLgm873Z9bk=",
-                    "rev": "49623d0c4e1af3c680845191948d10f6d3e92f8a",
-                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/electron_node": {
-                "args": {
-                    "hash": "sha256-Y4FP+AstENp1uTYBo8HeTRDwvKClTdrZ4RztLeHNP3k=",
-                    "owner": "nodejs",
-                    "repo": "node",
-                    "tag": "v24.15.0"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/emoji-segmenter/src": {
-                "args": {
-                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
-                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/engflow-reclient-configs": {
-                "args": {
-                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                    "owner": "EngFlow",
-                    "repo": "reclient-configs",
-                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/expat/src": {
-                "args": {
-                    "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk=",
-                    "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2",
-                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/farmhash/src": {
-                "args": {
-                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
-                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fast_float/src": {
-                "args": {
-                    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
-                    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
-                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/federated_compute/src": {
-                "args": {
-                    "hash": "sha256-5kuTp0TXOUCQQ7XcnwBRsQRxugl869hZhx8MbxDLwYk=",
-                    "rev": "e51058dfe7888094ecc09cda38bfceffd4d4664b",
-                    "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ffmpeg": {
-                "args": {
-                    "hash": "sha256-ecfRGFHkLcly874w6m5/oIO99MRgXftOJAb8KCc51ZU=",
-                    "rev": "e18f48eba6b367ac68b9c477ae6cbe224e36b031",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flac": {
-                "args": {
-                    "hash": "sha256-Y5TXyJ8lVh8TaVC5S4BVxOmFxySBzPbJYEe8YJS6ZR4=",
-                    "rev": "807e251d9f8c5dd6059e547931e9c6a4251967af",
-                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flatbuffers/src": {
-                "args": {
-                    "hash": "sha256-A9nWfgcuVW3x9MDFeviCUK/oGcWJQwadI8LqNR8BlQw=",
-                    "rev": "187240970746d00bbd26b0f5873ed54d2477f9f3",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fontconfig/src": {
-                "args": {
-                    "hash": "sha256-+vd+Q6NzoWA7Ou+hkgIRhUZ0A1G+rZAh7JrP84f0wnQ=",
-                    "rev": "23b3fc6e58a13d126b9c30fafc9a16f8bd7143e9",
-                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fp16/src": {
-                "args": {
-                    "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg=",
-                    "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/freetype/src": {
-                "args": {
-                    "hash": "sha256-gUW2+dn13kexIGfU5DAY3EEzVtPzZzqjPnvDhUZXzQA=",
-                    "rev": "32fc0af22206327ffd06e1d025f13b11fd8d1a46",
-                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fuzztest/src": {
-                "args": {
-                    "hash": "sha256-PjeVtPCRoyRtXX0Q5x+EbT6tE9/FiYGdJjRqIVL29i0=",
-                    "rev": "7406afb783ff5e7f3a1a66aebb81090622716412",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fxdiv/src": {
-                "args": {
-                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/gemmlowp/src": {
-                "args": {
-                    "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs=",
-                    "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/glslang/src": {
-                "args": {
-                    "hash": "sha256-BXfe5SgjPy5a+FJh4KIe5kwvKVBvo773OfIZpOsDBLo=",
-                    "rev": "7a47e2531cb334982b2a2dd8513dca0a3de4373d",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/google_benchmark/src": {
-                "args": {
-                    "hash": "sha256-GfqY2d+Nd7ovNrXxzTRm/AYWj7GuxIO6FawzUEzwOVA=",
-                    "rev": "188e8278990a9069ffc84441cb5a024fd0bede37",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/googletest/src": {
-                "args": {
-                    "hash": "sha256-gJhv3DQQSP5BQ6GmDobq42/Gkx4AbOg/ZS80bM0WpEw=",
-                    "rev": "4fe3307fb2d9f86d19777c7eb0e4809e9694dde7",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/harfbuzz-ng/src": {
-                "args": {
-                    "hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8=",
-                    "rev": "7d936359a27abb2d7cb14ecc102463bb15c11843",
-                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/highway/src": {
-                "args": {
-                    "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI=",
-                    "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/hunspell_dictionaries": {
-                "args": {
-                    "hash": "sha256-mYDPXa64IOKLMNiBiMqDrQMR7gDPI+vdyVc+M7E+ddc=",
-                    "rev": "cccf64a8acc951afe3f47fee023908e55699bc58",
-                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/icu": {
-                "args": {
-                    "hash": "sha256-zFxeAY6lEFRGNbCOOJij0CFjp3512WkyaN1Ld0+WADs=",
-                    "rev": "a86a32e67b8d1384b33f8fa48c83a6079b86f8cd",
-                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink/src": {
-                "args": {
-                    "hash": "sha256-Z4cxFSJHyARUbeAnW51Ar7zuTMyMzi52Z9R1anN4d74=",
-                    "rev": "11ca89062782d7e5a57741a303a925f510b91015",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink_stroke_modeler/src": {
-                "args": {
-                    "hash": "sha256-h/xI/TPV2yiRLqrBgaDAkr8Nfg3RLkjHVuYX+nH99CQ=",
-                    "rev": "2cd45e8683025c28fa2efcf672ad46607e8af869",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/instrumented_libs": {
-                "args": {
-                    "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=",
-                    "rev": "69015643b3f68dbd438c010439c59adc52cac808",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jetstream/main": {
-                "args": {
-                    "hash": "sha256-ai1OYU+O3xsrKWIH6iw09KZrMJOFPfe3GQpdDDtfxXQ=",
-                    "rev": "f88580ef6265b59295f37eb0c6666466b11a0e74",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jetstream/v2.2": {
-                "args": {
-                    "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=",
-                    "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jsoncpp/source": {
-                "args": {
-                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
-                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
-                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/leveldatabase/src": {
-                "args": {
-                    "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
-                    "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
-                    "url": "https://chromium.googlesource.com/external/leveldb.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libFuzzer/src": {
-                "args": {
-                    "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=",
-                    "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaddressinput/src": {
-                "args": {
-                    "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
-                    "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
-                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaom/source/libaom": {
-                "args": {
-                    "hash": "sha256-jVbneofb6JsFKBVwafMTPZBlNkqalkFdQvexZjCmxlA=",
-                    "rev": "5d80673d723a5e2e268b124d81d425053823d875",
-                    "url": "https://aomedia.googlesource.com/aom.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++/src": {
-                "args": {
-                    "hash": "sha256-fhaWlbzkvsbz02yqJ9nf6/lVrKDYBaIYNlx++A0JFTU=",
-                    "rev": "07572e7b169225ef3a999584cba9d9004631ae66",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++abi/src": {
-                "args": {
-                    "hash": "sha256-iRVRMcK8mKyHe+8Oh5qfl3Y8HYwVwK2NlgNE7WxbKJM=",
-                    "rev": "83a852080747b9a362e8f9e361366b7a601f302c",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libdrm/src": {
-                "args": {
-                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
-                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libgav1/src": {
-                "args": {
-                    "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
-                    "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
-                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libipp/libipp": {
-                "args": {
-                    "hash": "sha256-GzLVt6RIN+FgOpcK61ya5lvdIIhQRciAb/ISIirWogY=",
-                    "rev": "4be5f77f672a3a9f1bbf3c935fb0ea8b3f86ce61",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libjpeg_turbo": {
-                "args": {
-                    "hash": "sha256-chUqHiT1HMmFRaCOgjGLVU+LxeN/iUq7y6ckrcqFYFI=",
-                    "rev": "6383cf609c1f63c18af0f59b2738caa0c6c7e379",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/liblouis/src": {
-                "args": {
-                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libpfm4/src": {
-                "args": {
-                    "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=",
-                    "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
-                    "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libphonenumber/dist": {
-                "args": {
-                    "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
-                    "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
-                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libprotobuf-mutator/src": {
-                "args": {
-                    "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=",
-                    "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsrtp": {
-                "args": {
-                    "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
-                    "rev": "a52756acb1c5e133089c798736dd171567df11f5",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsync/src": {
-                "args": {
-                    "hash": "sha256-aI7Exie3AmTy8R/Ua5lua0lCwMO1k4wMS6cxulU6iD8=",
-                    "rev": "d29ac04dc81e6b072c091c5b1342a282765ea250",
-                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libunwind/src": {
-                "args": {
-                    "hash": "sha256-C5gUvzQIO00UbB8yotxbbjbrkqe7pXVzMeLlcSH0/Bg=",
-                    "rev": "c65639bf792928e0d38aed822dc34d3e72066a6c",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libva-fake-driver/src": {
-                "args": {
-                    "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
-                    "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libvpx/source/libvpx": {
-                "args": {
-                    "hash": "sha256-5+TQo0qRaH1QnAgdQkJcGkKWYGPJO3hVIqqGEtHpwqk=",
-                    "rev": "14cd170a941f88e6fb145ebb873a3c8f87645834",
-                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebm/source": {
-                "args": {
-                    "hash": "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4=",
-                    "rev": "f2a982d748b80586ae53b89a2e6ebbc305848b8c",
-                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebp/src": {
-                "args": {
-                    "hash": "sha256-a7F97BEnwpdx9W8OsVnz+NfIYW+J1XVDSi38KsIZIfI=",
-                    "rev": "c00d83f6642e7838a12bb03bca94237f03cc2e00",
-                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libyuv": {
-                "args": {
-                    "hash": "sha256-FZufzbDupdGhlSNGjSC6XlYiTCl677vfr9VHYot4t8g=",
-                    "rev": "4825d9b29eea4dac24607245db7ec7d4c41c1964",
-                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/llvm-libc/src": {
-                "args": {
-                    "hash": "sha256-mqj2ee9F2UDMZQSD9ZAP/g5r2P56Awq+grCdcypUqFE=",
-                    "rev": "fe97633934c21742a74962d52c17b3bcba7ad824",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/lss": {
-                "args": {
-                    "hash": "sha256-89CdA7vBYudbko0nAIyHcpHMXqFZHC05kwRIUmeEWGo=",
-                    "rev": "29164a80da4d41134950d76d55199ea33fbb9613",
-                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/material_color_utilities/src": {
-                "args": {
-                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
-                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
-                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/minigbm/src": {
-                "args": {
-                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nan": {
-                "args": {
-                    "hash": "sha256-Tq6whJBeGlJhF7/ctFOEgb1W12Tu/HGNTC5ujQtk+Qk=",
-                    "owner": "nodejs",
-                    "repo": "nan",
-                    "rev": "675cefebca42410733da8a454c8d9391fcebfbc2"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/nasm": {
-                "args": {
-                    "hash": "sha256-vH3OUzfLZbaPY4DMAvSW0jKYRJmOa7aE8EfIJtZ1/Xs=",
-                    "rev": "af5eeeb054bebadfbb79c7bcd100a95e2ad4525f",
-                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nearby/src": {
-                "args": {
-                    "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA=",
-                    "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/neon_2_sse/src": {
-                "args": {
-                    "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
-                    "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/oak/src": {
-                "args": {
-                    "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8=",
-                    "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
-                    "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openh264/src": {
-                "args": {
-                    "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
-                    "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
-                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src": {
-                "args": {
-                    "hash": "sha256-DIn/qjmbuFeqzXOwyDf0/GStKv6VuCYGN/AATpD+9zM=",
-                    "rev": "734877394201dcfcc786b3c8ea057b7607a56993",
-                    "url": "https://chromium.googlesource.com/openscreen"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/buildtools": {
-                "args": {
-                    "hash": "sha256-AHPwOX5Z0R3rl49OvFsW92jlvCKvScsMYkfOJeBnWZ8=",
-                    "rev": "5df641722f2e50623646d702e0046fb68c0f5ce1",
-                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/third_party/tinycbor/src": {
-                "args": {
-                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
-                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ots/src": {
-                "args": {
-                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pdfium": {
-                "args": {
-                    "hash": "sha256-+0iNpsO+2NdPnFCnqEPAA70ymJo+IyB+MGLeBl6U9KE=",
-                    "rev": "53909bbc260e7bc9fe54f2e77bb0ad653dc345fe",
-                    "url": "https://pdfium.googlesource.com/pdfium.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/perfetto": {
-                "args": {
-                    "hash": "sha256-qhZ8ghbw3AuJh8uUbH+cCreqJs55v9PxxsykhSpXfks=",
-                    "rev": "fdb95badca57068440acc569169f602acee51d7a",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/protobuf-javascript/src": {
-                "args": {
-                    "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM=",
-                    "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024",
-                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pthreadpool/src": {
-                "args": {
-                    "hash": "sha256-VdgC6LMzcfhH2Y65Gu+Osi6BXxIq01Fmw5AehsBlX70=",
-                    "rev": "d90cd6f1493e09d12c407243f7f331a8cda55efb",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pyelftools": {
-                "args": {
-                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pywebsocket3/src": {
-                "args": {
-                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
-                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/quic_trace/src": {
-                "args": {
-                    "hash": "sha256-JmK7nmHg/BfXvFNG2oMpOV83EF+LwVLdwL6qX5FGREs=",
-                    "rev": "352288a06d2c83ae68b5a402b2219f4678be9f39",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/re2/src": {
-                "args": {
-                    "hash": "sha256-WOwDr0VEjvJyEmvrpw0YmlAnHJP0+0q28fUVpl4E7Eg=",
-                    "rev": "e7aec5985072c1dbe735add802653ef4b36c231a",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/readability/src": {
-                "args": {
-                    "hash": "sha256-lFsHXk4kEkzIbHgJiLTgeiKqiGOErzUwADo8WSZlnec=",
-                    "rev": "d7949dc47dd9ed9ee1d3b34ffdcf3bce28cde435",
-                    "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ruy/src": {
-                "args": {
-                    "hash": "sha256-+GNd+hU/fYAsgeaPnWWg90uw8rKKxTTvPS5aOpYa8zM=",
-                    "rev": "1e6e50872655a73b5250f954d7b9da9a87292fd3",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/search_engines_data/resources": {
-                "args": {
-                    "hash": "sha256-ZT9Vbvh2hI7DJziwwvU2C2CVx37CycyzdQke4E3eipg=",
-                    "rev": "97355b69daee73d74ac38f2227788458bd95d372",
-                    "url": "https://chromium.googlesource.com/external/search_engines_data.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/securemessage/src": {
-                "args": {
-                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/skia": {
-                "args": {
-                    "hash": "sha256-P3N+o4GthUON9MHQiGfxGj75FiCyxsXdkAfIM9VzM7I=",
-                    "rev": "2708a1b1540e59b8e3407405b0c991a5c7b69523",
-                    "url": "https://skia.googlesource.com/skia.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/smhasher/src": {
-                "args": {
-                    "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
-                    "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
-                    "url": "https://chromium.googlesource.com/external/smhasher.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/snappy/src": {
-                "args": {
-                    "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
-                    "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/main": {
-                "args": {
-                    "hash": "sha256-oF8ELo2qmkgaTpNzBLaC3A6gyf2iFv+FQNPGwdGqzVU=",
-                    "rev": "e2e2538900938c5d6819e9456bf33d48f806c96c",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v2.0": {
-                "args": {
-                    "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
-                    "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v2.1": {
-                "args": {
-                    "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
-                    "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v3.0": {
-                "args": {
-                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
-                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v3.1": {
-                "args": {
-                    "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=",
-                    "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-cross/src": {
-                "args": {
-                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-headers/src": {
-                "args": {
-                    "hash": "sha256-HjJjMuqTrYv5LUOWcexzPHb8nhOT4duooDAhDsd44Zo=",
-                    "rev": "b824a462d4256d720bebb40e78b9eb8f78bbb305",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-tools/src": {
-                "args": {
-                    "hash": "sha256-HSqI9VkDBgivSqEAAkSXf+u2CT1OZcPU2YcH2BF1Y9o=",
-                    "rev": "f410b3c178740f9f5bd28d5b22a71d4bc10acd49",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/sqlite/src": {
-                "args": {
-                    "hash": "sha256-13HMEpzzcFx/UKqt4V68619R+0j4B/GOl6NYlhpBk0c=",
-                    "rev": "7d348fc79216a09b864ff881d8561a6222301666",
-                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/squirrel.mac": {
-                "args": {
-                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                    "owner": "Squirrel",
-                    "repo": "Squirrel.Mac",
-                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/Mantle": {
-                "args": {
-                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                    "owner": "Mantle",
-                    "repo": "Mantle",
-                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "args": {
-                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                    "owner": "ReactiveCocoa",
-                    "repo": "ReactiveObjC",
-                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/swiftshader": {
-                "args": {
-                    "hash": "sha256-kg0beZH6AKT9TqPWF9aZRRTGHbTSVYm1pffuERv0eG4=",
-                    "rev": "04fbb7daf5a53689e067190e7ef1047c5d49e292",
-                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/text-fragments-polyfill/src": {
-                "args": {
-                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
-                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/tflite/src": {
-                "args": {
-                    "hash": "sha256-iWUx5GFHhdo3It/djUO2rc+zb5VpIVwyiMYKjB2RIE0=",
-                    "rev": "247b0cf254fbbf3d326feed3820ec24503a353a5",
-                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ukey2/src": {
-                "args": {
-                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-deps": {
-                "args": {
-                    "hash": "sha256-Ky1pMR6W0bgBq2ifVB/1b72dk2aZbIjF44Vc2Ho3iEg=",
-                    "rev": "327bc9dec2a42806ad78c284829363657bb728dc",
-                    "url": "https://chromium.googlesource.com/vulkan-deps"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-headers/src": {
-                "args": {
-                    "hash": "sha256-DIePLzDoImnaso0WYUv819wSDeA7Zy1I/tYAbsALXKg=",
-                    "rev": "2fa203425eb4af9dfc6b03f97ef72b0b5bcb8350",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-loader/src": {
-                "args": {
-                    "hash": "sha256-43eoTxe2O7MxwsC16nv1R1Xf4WkNNsTf0G5Mo46oipk=",
-                    "rev": "052ac24611eced7b0ca62cc5cca2eeeb2051fa28",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-tools/src": {
-                "args": {
-                    "hash": "sha256-uT3KUUiYZzgaAjfUhhqPsjTXE4B6XuSt/zSWE8R9lS0=",
-                    "rev": "48b5d246b2d0b1a41ee7ea1b69525ae7bb38a2ae",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-utility-libraries/src": {
-                "args": {
-                    "hash": "sha256-lDO0B7wEYT6cc/t/ZW5OAxxgRfDORoGd+pF5r5R7yoQ=",
-                    "rev": "c010c19e796035e92fb3b0462cb887518a41a7c1",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-validation-layers/src": {
-                "args": {
-                    "hash": "sha256-ZxLoVN0e58eA5ySn0MknTRMSD/bjCebFnwo2WgtrPYc=",
-                    "rev": "5e175a92548d1a507bd81fdc5db6fa1d2572a6ea",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan_memory_allocator": {
-                "args": {
-                    "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo=",
-                    "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
-                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/gtk": {
-                "args": {
-                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
-                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
-                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/kde": {
-                "args": {
-                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
-                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
-                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/src": {
-                "args": {
-                    "hash": "sha256-tdpEK7soY0aKSk6VD4nulH7ORubX8RfjXYmNAd/cWKY=",
-                    "rev": "efbc060534be948b63e1f395d69b583eebba3235",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland/src": {
-                "args": {
-                    "hash": "sha256-5iG0HaPXJCEo027TuyXlJQNGluTaAPlvwQDFbiYOEJQ=",
-                    "rev": "736d12ac67c20c60dc406dc49bb06be878501f86",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webdriver/pylib": {
-                "args": {
-                    "hash": "sha256-k5qx4xyO83jPtHaMh6aMigMJ3hsytFdFQOcZLmwPEYo=",
-                    "rev": "1e954903022e9386b9acf452c24f4458dd4c4fc1",
-                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgl/src": {
-                "args": {
-                    "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=",
-                    "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0",
-                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgpu-cts/src": {
-                "args": {
-                    "hash": "sha256-0Bn319fWpTERI31a9WahXiWi63v62rxI9aA/VUMzuAw=",
-                    "rev": "e7cad0143f136c69b345024d0a60e0d859dd7503",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webpagereplay": {
-                "args": {
-                    "hash": "sha256-wrA3iN0HEXqIg53tprARRR7ekSYFXVbqaDIt1zZeTP4=",
-                    "rev": "052833a44dd2f538b85936092bad545b6062e193",
-                    "url": "https://chromium.googlesource.com/webpagereplay.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webrtc": {
-                "args": {
-                    "hash": "sha256-rs/miFkNVNCGOTSEvSRdWWf8zg1+WU+L/Pt+TblSGy4=",
-                    "rev": "8f3537ef5b85b4c7dabed2676d4b72214c69c494",
-                    "url": "https://webrtc.googlesource.com/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/weston/src": {
-                "args": {
-                    "hash": "sha256-o49a3sp+D9FycxeB+uMcKouVvlKWoWpfws7FLEGJ/V8=",
-                    "rev": "bdba2f9adaca673fd58339d8140bc04727ee279d",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wuffs/src": {
-                "args": {
-                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
-                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
-                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xdg-utils": {
-                "args": {
-                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xnnpack/src": {
-                "args": {
-                    "hash": "sha256-f3Bcapnbzg3wjrKJY8Yq9aGm7PHttJQt3ri6blRhEBk=",
-                    "rev": "d3efd0a2fcd944931416811da6d24222c91ddd9d",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/zstd/src": {
-                "args": {
-                    "hash": "sha256-W1pQwaVAPqr9QsNmQXoefPJASXB5OsFxx7TUUXRJkjU=",
-                    "rev": "a25c1fc96f431e69abea38f52cb31e6bc074e9f1",
-                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/v8": {
-                "args": {
-                    "hash": "sha256-gicbPpfK6UnVwwT56JnAI/d0bgtM9JRBD2fpndtxxgQ=",
-                    "rev": "1860699f5321db4b18b169b415a575106e9cb3f3",
-                    "url": "https://chromium.googlesource.com/v8/v8.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            }
-        },
-        "electron_yarn_data": {
-            "hash": "sha256-JYMafgdlxleQS+kvWs6CGo8y+yGGPBtxw1AK5jklejU=",
-            "missing_hashes": {
-                "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba",
-                "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a",
-                "@oxfmt/binding-darwin-arm64@npm:0.42.0": "ed0f486a5085942727e255a9c14bfd99756d4af3ad2c2e702bfb7ab682fc9041d5327f3e89dc4dbfc9a09a6c884dbc9a79a46c720435c5ad2f2fe3f48bb9c3ac",
-                "@oxfmt/binding-darwin-x64@npm:0.42.0": "b607e67171aa33717f7fe80d9d5c8ca816ff30dbbd2b41c4b129977c749c62a4bb1f6829aa95c564d15246c98689ba153fc003a09a1549e2f3316810b35463be",
-                "@oxfmt/binding-freebsd-x64@npm:0.42.0": "c038e53f42083a56d548bd2b89765d1b36150c874e83a41631dfa039fe4fd999475a4a5a99414e43fe44654abdbdfb78c17f53fb482ba3bdc9d22f5641931a41",
-                "@oxfmt/binding-linux-arm-gnueabihf@npm:0.42.0": "79d0b84f3281c7935eb153a53b7032fbb159357580cbcac721096d87ceb124e40863c0b7786ff1b94ad2cdc9b1beabe37e972e1b959423af028e6dea0fc8e0b6",
-                "@oxfmt/binding-linux-arm-musleabihf@npm:0.42.0": "c67dfa0553ba44f0585c3bba85efcbbd42b63b59f177302693fa83cc7b6fe6a6f2509c972cae9b367eb7cd36e8578209657ac4928cf329bf816fa4bfc578d2c1",
-                "@oxfmt/binding-linux-arm64-gnu@npm:0.42.0": "f8507b36f7f2673a4d6db227ed2e98f94d30f81275820d0d25e5e6b0b9b20c7f4cc32b646ae02aac0068b90ba3d47bcbd85ad789b27f028b8ea07e168ec731ce",
-                "@oxfmt/binding-linux-arm64-musl@npm:0.42.0": "c4d0406e36248b4a8ddd62ac2d7c1b6648d23fb2b1eee471e3965d6c411b2dedfc681d227adcff50bbff5f786727bef31420610564691887cdecb50d7f1f7587",
-                "@oxfmt/binding-linux-ppc64-gnu@npm:0.42.0": "12b0eb3cff0807f898dd2e47de5712c8b57d2373108135e87f1de69902204c0527b383753983388f32e48749c479ce0f6247fbc927a2e035b2fb1f6c31ae5df7",
-                "@oxfmt/binding-linux-riscv64-gnu@npm:0.42.0": "aff4c5104769388174a69f5f4ad418f33e86ff1286117072e2200b7217aa9d30375ffb4deeabd728aac7975ed5e79832ac725725df9ff2ea6f819aef5e166353",
-                "@oxfmt/binding-linux-riscv64-musl@npm:0.42.0": "710b0b9fc2d999a66b2c9e656e40e74e71d820d8670d5ee64dc36d373f1132a0c3ddcbedba6130f832b9e8abbb0988ab95de7a6ddd4657007f05fea4a3631835",
-                "@oxfmt/binding-linux-s390x-gnu@npm:0.42.0": "8fc8ee6c1ea3369d3f7ec2f6dbe3fe846663c8e10a0ea976b1b2e150117359580d7efc904f5da0ead2f59066b1e17076aa09c1c4f2544071c29b623ada15da70",
-                "@oxfmt/binding-linux-x64-gnu@npm:0.42.0": "d46d962752e0e2978cbd9b552a0d4bebde69fa9581512dfda33e7bc645c849e2787ef6a4e2ae825e7d2abf68b895c90c4a351387d2f0d2ba336e990c54e245f0",
-                "@oxfmt/binding-linux-x64-musl@npm:0.42.0": "e757b0b12ccf6e7355e2a3123fa0bea0908e1f220b7bb3601c18203bc78f1157be8364af9df3ca56f9c0bb123aeecbf058df31a9ee12612e1149b9c6228dc6f9",
-                "@oxfmt/binding-openharmony-arm64@npm:0.42.0": "fe85007d6e7e7c1b6662a9756267de459fc7213af9ddf6f0494397d9d666a452d4a1a6f6fe6ce288d8dd4763d07b52b4534cc177bdf0e5613559f144b78e8fbb",
-                "@oxfmt/binding-win32-arm64-msvc@npm:0.42.0": "04bd529ea236c23d8dc73d95acd365612ab489b0e6a4bdd976302b933b92dcc11d4d1629e2294036f16c1e1f5120140547f65060a9e2dc8adbb21f790e2eca39",
-                "@oxfmt/binding-win32-ia32-msvc@npm:0.42.0": "9775afa164de049416abf481f062b8c670cd27a70d82a0868fa61749f741e777a76eb0a57a9ef276f158a35741d90a856a492777a0a9f17c9ac01ead32935fe3",
-                "@oxfmt/binding-win32-x64-msvc@npm:0.42.0": "5c38197ac6f874c2622b68a531b9fc9a221de05aa09c40717bba775f658680ebf964db7aa41c12271f90261bf50713cd4ebb2c10f12bf33cf2103fb9d67a88bb",
-                "@oxlint/binding-android-arm-eabi@npm:1.62.0": "ca066c115156993090f95062fa734ebc241619587b9b29db8f63ef70835a55762a8839487d360e92aacf9aab1851546076b7abc90208f9a3671ba0883b09fbba",
-                "@oxlint/binding-android-arm64@npm:1.62.0": "4519779ba0454b083cfff6e6cf955fbb7ef33700ae63a5eb418a105311adcb6c227bffab2b22be38b742ddec6deaa2370ea27bc6e325876ce21cf12dacd7d6b6",
-                "@oxlint/binding-darwin-arm64@npm:1.62.0": "35df3bec6216822a5c511800541703d0ce7605a9517a34f73a5e59746bbcac3ee7ffb440888aaef5a68d566dd772469b74c66b79c7c413e097e9cd240e0a261f",
-                "@oxlint/binding-darwin-x64@npm:1.62.0": "9f0ccc7228a5a9b41e56281959847725a1287ff7f86670cf2c104c37ed79cbc408f3117d46358da62b95355b25a89704c5d00f9aca894a9e179315546993719c",
-                "@oxlint/binding-freebsd-x64@npm:1.62.0": "062402a1a4fb00abfde96433f54ac74dc1bdb84f1698d49b0de6711220c2da8853b2c74aebebdba0189c1e22547db928548b29b8aa38ec3a8d7523298be12d84",
-                "@oxlint/binding-linux-arm-gnueabihf@npm:1.62.0": "584ca793611955a1952e7caa4aa16a8d00d535999daac5bffa4ead8f543b0a351da6b4c71c5e04f8a3c31d06d4f9a8b7c2762409d586549e5533acf989ce10df",
-                "@oxlint/binding-linux-arm-musleabihf@npm:1.62.0": "a82dc3aba571055bb67499d0235987b854ae5512779f415f7748e58d10dfa19799c777c1b316cbfdeae3f3c951bd4a584e52881c09b19d8aa050b097151b3788",
-                "@oxlint/binding-linux-arm64-gnu@npm:1.62.0": "d9ca6087f45ec1f3b259ab1127e5f9fd50df68954de8094a9fe6ac1a01d50beafbf015b71c16dad5509ab8919067693bdb0ac0dcd62f08f0afa7688b7178e565",
-                "@oxlint/binding-linux-arm64-musl@npm:1.62.0": "d1b64d5d0218125b0c71838ef7a51b88b81e9b3cf810aaf1100c6605bf5efbafe93d6728b880f1e9f4360af2e5019af249a781d7a39d7f905b3be51055981ddf",
-                "@oxlint/binding-linux-ppc64-gnu@npm:1.62.0": "d3e3043345012fb8892d3fcfc83b18c55c5a6f494ba5f5689108656ecee71c389df4e1ebac6ebad75357074cb9a23278281ef19d271b5517ff7e9b514db5e00d",
-                "@oxlint/binding-linux-riscv64-gnu@npm:1.62.0": "d969682bec86433e5b0a199fc3cdf6c25a2ff3355ea1e123e9476612a2560d1f69ef81e0911e616f75ed6024f9e6394f970876c791eab438c7bcbf5f834c9c89",
-                "@oxlint/binding-linux-riscv64-musl@npm:1.62.0": "45aa7bc86e51cb61c8519be2ce4a8bf92d6d9e92dde07c0b31655d0b317c5198ff95e0454467a9b6edbe730d72343cdb4cb8293db2c6234dd43af95038e86b4d",
-                "@oxlint/binding-linux-s390x-gnu@npm:1.62.0": "60e79cbfe33de0eecee4ace00502224c5e92fc3f2db385c291d5c256efe2e3222599172e907567505e08a46a11242b1ccffa7afb3945f1266bcfb1e23d4dcb61",
-                "@oxlint/binding-linux-x64-gnu@npm:1.62.0": "31bbec2b606af01f990b6b53c8878090d8fe8ec9c27642276217c2ead3b3f3c06e9ce1934180de0c1b6a1a7e8b2106862f6f74e7e5eca7303f7aa5441168469e",
-                "@oxlint/binding-linux-x64-musl@npm:1.62.0": "9c7095d2a94920d943a3023f5f186f040329fffa0dc9320b9c2b3fa5c18e16473b5ef93e69e68692f4721112ba45e6a27887f4f9d3a82cfc23cfa5716b79776c",
-                "@oxlint/binding-openharmony-arm64@npm:1.62.0": "1cd0b8e6148685f74f261410b55abd9443b39938f69a42d770da61c08864af96d1251c6ff90d07625466b7dc1997ed25956a8924f49ac1b29ab0ed776f8d74cc",
-                "@oxlint/binding-win32-arm64-msvc@npm:1.62.0": "b8598eefbede42c7c8327e3d3d5e13cf85a0e4c1d261b6f30ce72533e1156eee12c7e5723a2e2fedda8c485fffab12c452b8ac7edc42557615449fbdc6872753",
-                "@oxlint/binding-win32-ia32-msvc@npm:1.62.0": "14276c38660c8920bc8dc2afd231c4a722d682b4a8e8230879441b4fb4714ff72a0adebf6be8d3bcbc2e92b3da6e737d60d9a8c9dd35b076a78dc78598b209a2",
-                "@oxlint/binding-win32-x64-msvc@npm:1.62.0": "07f46eb801dda09aaa911fdbb09a1676bb954ab5e183b34bf61c51281fc697c37ef9912cb99d9f79e8053e98d31661e6a312719231841eb7a3bc6e037b4674a4"
-            }
-        },
-        "modules": "143",
-        "node": "24.15.0",
-        "version": "40.10.5"
-    },
     "41": {
         "chrome": "146.0.7680.216",
         "chromium": {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff6eb81a671b..a2db520586a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4858,10 +4858,7 @@ with pkgs;
       in
       {
         electron_39 = electron_39-bin;
-        electron_40 = getElectronPkg {
-          src = electron-source.electron_40;
-          bin = electron_40-bin;
-        };
+        electron_40 = electron_40-bin;
         electron_41 = getElectronPkg {
           src = electron-source.electron_41;
           bin = electron_41-bin;

From 05151e55adfb9d96e012b26370a1a114693b96ba Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 2 Jul 2026 17:45:24 +0200
Subject: [PATCH 0516/1386] electron_40-bin: mark as insecure

electron 40 is EOL
---
 pkgs/development/tools/electron/binary/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index f247c08562c5..a913a12d13b8 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -61,7 +61,7 @@ let
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = lib.optional (lib.versionOlder version "40.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = lib.optional (lib.versionOlder version "41.0.0") "Electron version ${version} is EOL";
   };
 
   fetcher =

From c0accf113a5fd0f841fe78ad84a74359d59f710a Mon Sep 17 00:00:00 2001
From: yaaaarn <30006414+yaaaarn@users.noreply.github.com>
Date: Tue, 14 Jul 2026 16:55:55 +0200
Subject: [PATCH 0517/1386] vuetorrent: 2.34.0 -> 2.34.1

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

diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix
index c1f3e2349fd7..95cf94284162 100644
--- a/pkgs/by-name/vu/vuetorrent/package.nix
+++ b/pkgs/by-name/vu/vuetorrent/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "vuetorrent";
-  version = "2.34.0";
+  version = "2.34.1";
 
   src = fetchFromGitHub {
     owner = "VueTorrent";
     repo = "VueTorrent";
     tag = "v${version}";
-    hash = "sha256-Zz7ZFtxT26/4HCkM/HHVyLXxbmDvhTRFaJpiXA08JPY=";
+    hash = "sha256-8Ur87sd6j5cMmzLOSseAx2PIDuLRzoaVdhff3LTDCs0=";
   };
 
-  npmDepsHash = "sha256-PxTe/anj3VgdEaSdv37XuBYD8N3gs9wc+idCboX8Bic=";
+  npmDepsHash = "sha256-pKIkXJdnlO/3OVF0xrki7v9PZS7DANvLbYc4i46wJE8=";
 
   installPhase = ''
     runHook preInstall

From e65b9cc50d13857dcb703dc25f62db1310d764e3 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 14 Jul 2026 12:46:50 +0200
Subject: [PATCH 0518/1386] zenroom: init at 5.37.2

Assisted-by: nix-init
---
 pkgs/by-name/ze/zenroom/package.nix           | 109 ++++++++++++++++++
 .../ze/zenroom/tests/arrayGenerator.zen       |   3 +
 .../ze/zenroom/tests/arrayGenerator2.zen      |   8 ++
 pkgs/by-name/ze/zenroom/tests/default.nix     |  18 +++
 4 files changed, 138 insertions(+)
 create mode 100644 pkgs/by-name/ze/zenroom/package.nix
 create mode 100644 pkgs/by-name/ze/zenroom/tests/arrayGenerator.zen
 create mode 100644 pkgs/by-name/ze/zenroom/tests/arrayGenerator2.zen
 create mode 100644 pkgs/by-name/ze/zenroom/tests/default.nix

diff --git a/pkgs/by-name/ze/zenroom/package.nix b/pkgs/by-name/ze/zenroom/package.nix
new file mode 100644
index 000000000000..d9e43ef9d6c8
--- /dev/null
+++ b/pkgs/by-name/ze/zenroom/package.nix
@@ -0,0 +1,109 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+
+  # build-time
+  cmake,
+  xxd,
+  which,
+
+  # run-time
+  readline,
+
+  # tests
+  callPackage,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zenroom";
+  version = "5.37.2";
+
+  __structuredAttrs = true;
+  dontUseCmakeConfigure = true; # cmake is a dependency, but we use make to build
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "dyne";
+    repo = "Zenroom";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gNUclaXF7C2yBywo1TAwHOfB9Pe17g6fCLhEcFq8JL0=";
+    postFetch = ''
+      # conflict on case-insensitive filesystems
+      pushd $out/docs/examples/zencode_cookbook/cookbook_when
+      rm *_move_as.out.json *_move_to.out.json
+      popd
+    '';
+  };
+
+  postPatch = ''
+    patchShebangs build/embed-lualibs
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    which # ar
+    xxd
+  ];
+
+  buildInputs = [
+    readline
+  ];
+
+  buildFlags =
+    with stdenv.hostPlatform;
+    lib.optionals (isLinux && !isMusl) [
+      "linux-lib"
+      "linux-exe"
+    ]
+    ++ lib.optionals (isLinux && isMusl) [
+      "musl"
+    ]
+    ++ lib.optionals isDarwin [
+      "osx-lib"
+      "osx-exe"
+    ]
+    ++ lib.optionals (isUnix && !isLinux && !isDarwin) [
+      "posix-lib"
+      "posix-exe"
+    ];
+
+  hardeningDisable = [ "format" ]; # -Werror=format-security
+
+  env.PREFIX = "";
+  env.DESTDIR = placeholder "out";
+
+  preInstall = ''
+    mkdir -p $out/{bin,share}
+  '';
+
+  postInstall = ''
+    install -D libzenroom${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib
+  '';
+
+  passthru.updateScript = nix-update-script { };
+  passthru.tests = callPackage ./tests { zenroom = finalAttrs.finalPackage; };
+
+  meta = {
+    description = "no-code cryptographic virtual machine";
+    longDescription = ''
+      Zenroom is a tiny, portable, and fully isolated crypto VM for building
+      privacy-preserving applications, smart contracts, and secure data
+      workflows.
+    '';
+    homepage = "https://github.com/dyne/Zenroom";
+    changelog = "https://github.com/dyne/Zenroom/blob/${finalAttrs.src.rev}/ChangeLog.md";
+    mainProgram = "zenroom";
+    platforms = lib.platforms.unix;
+    license = with lib.licenses; [
+      agpl3Plus
+      asl20 # lib/milagro-crypto-c, lib/mlkem, lib/longfellow-zk, lib/mayo
+      bsd3 # lib/zstd
+      cc0 # lib/pqclean, lib/ed25519-donna
+      mit # lib/lua54, src/varint.*, lib/mayo
+    ];
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
+  };
+})
diff --git a/pkgs/by-name/ze/zenroom/tests/arrayGenerator.zen b/pkgs/by-name/ze/zenroom/tests/arrayGenerator.zen
new file mode 100644
index 000000000000..75cfdf35b402
--- /dev/null
+++ b/pkgs/by-name/ze/zenroom/tests/arrayGenerator.zen
@@ -0,0 +1,3 @@
+Given nothing
+When I create the random array with '16' elements each of '32' bits
+Then print all data
diff --git a/pkgs/by-name/ze/zenroom/tests/arrayGenerator2.zen b/pkgs/by-name/ze/zenroom/tests/arrayGenerator2.zen
new file mode 100644
index 000000000000..848ff86271a4
--- /dev/null
+++ b/pkgs/by-name/ze/zenroom/tests/arrayGenerator2.zen
@@ -0,0 +1,8 @@
+Given nothing
+When I create the random array with '2' elements each of '8' bits
+And I rename the 'random array' to 'myTinyArray'
+And I create the random array with '4' elements each of '32' bits
+And I rename the 'random array' to 'myAverageArray'
+And I create the random array with '8' elements each of '128' bits
+And I rename the 'random array' to 'myBigFatArray'
+Then print all data
diff --git a/pkgs/by-name/ze/zenroom/tests/default.nix b/pkgs/by-name/ze/zenroom/tests/default.nix
new file mode 100644
index 000000000000..fc1f65afbd8f
--- /dev/null
+++ b/pkgs/by-name/ze/zenroom/tests/default.nix
@@ -0,0 +1,18 @@
+{
+  runCommand,
+  zenroom,
+}:
+runCommand "basic-tests"
+  {
+    nativeBuildInputs = [ zenroom ];
+  }
+  ''
+    mkdir -p $out
+
+    TEST_DIR="${./.}"
+
+    for test in "$TEST_DIR"/*.zen; do
+      TEST_NAME="$(basename $test .zen)"
+      zenroom -z $test > "$out/$TEST_NAME".json
+    done
+  ''

From da5767dbf776f838142ec26e845bd2af0d496130 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 14 Jul 2026 15:06:03 +0000
Subject: [PATCH 0519/1386] systemctl-tui: 0.5.2 -> 0.6.1

Diff: https://github.com/rgwood/systemctl-tui/compare/v0.5.2...v0.6.1

Changelog: https://github.com/rgwood/systemctl-tui/releases/tag/v0.6.1
---
 pkgs/by-name/sy/systemctl-tui/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix
index 73fae11200f1..aec78727361b 100644
--- a/pkgs/by-name/sy/systemctl-tui/package.nix
+++ b/pkgs/by-name/sy/systemctl-tui/package.nix
@@ -8,16 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "systemctl-tui";
-  version = "0.5.2";
+  version = "0.6.1";
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rgwood";
     repo = "systemctl-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r9bbEItk+DzVh6oFybaa8LZAAe35TyvvT6tuXOQlCSQ=";
+    hash = "sha256-+vPzfnRFNXY1ajhvFLyQ9j6ReaEclKSOtjsD+/as9u0=";
   };
 
-  cargoHash = "sha256-XLISZFxC3v0Hf0QX3P1HmrzACMBwFvB5hrAsZgYE7ig=";
+  cargoHash = "sha256-RXb9ITIoUtJb9SO2r2m2ukNk3EEuSrcijZ1GjzgEnYg=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From ed0d172a02ba397eec068372c519f202fb2c7fee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 15:15:20 +0000
Subject: [PATCH 0520/1386] dtop: 0.7.7 -> 0.7.9

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

diff --git a/pkgs/by-name/dt/dtop/package.nix b/pkgs/by-name/dt/dtop/package.nix
index 6d7cd35ae900..025430f7b0b3 100644
--- a/pkgs/by-name/dt/dtop/package.nix
+++ b/pkgs/by-name/dt/dtop/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dtop";
-  version = "0.7.7";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "amir20";
     repo = "dtop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kYSOJCQfoYXhdZ3cyRv/+Ifov4VzOv0gqvjueVMmnuQ=";
+    hash = "sha256-1OHtMV2GmZQIx2pVujOXoQOkc6hJdJZjca4kk4HyESM=";
   };
 
-  cargoHash = "sha256-fspIjgctyhQwyDygrSrtJBb/EYxY8o00/UJy/z89yso=";
+  cargoHash = "sha256-OHjgG5qHBz0Q74uWLkN9Ok0NiVeT71qpEjzFdMFWlfs=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 68dd877e3d3f28ab211d1d10beec3df5a813e386 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 15:14:17 +0000
Subject: [PATCH 0521/1386] python3Packages.textacy: fix build

---
 .../python-modules/textacy/default.nix        | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 4fbaf9486083..651bee904baa 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -1,6 +1,8 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
   cachetools,
   cytoolz,
   fetchPypi,
@@ -10,7 +12,6 @@
   matplotlib,
   networkx,
   numpy,
-  pyemd,
   pyphen,
   pytestCheckHook,
   requests,
@@ -20,26 +21,29 @@
   tqdm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "textacy";
   version = "0.13.0";
   pyproject = true;
+  __structuredAttrs = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY=";
+  src = fetchFromGitHub {
+    owner = "chartbeat-labs";
+    repo = "textacy";
+    tag = finalAttrs.version;
+    hash = "sha256-QVxC9oV1X5ifQ9VVYissppni1A8LACz/FVgaoG5/GFU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cachetools
     cytoolz
     floret
     jellyfish
     joblib
-    matplotlib
     networkx
     numpy
-    pyemd
     pyphen
     requests
     scikit-learn
@@ -48,6 +52,10 @@ buildPythonPackage rec {
     tqdm
   ];
 
+  optional-dependencies = {
+    vis = [ matplotlib ];
+  };
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   enabledTestPaths = [
@@ -64,6 +72,8 @@ buildPythonPackage rec {
   meta = {
     description = "Higher-level text processing, built on spaCy";
     homepage = "https://textacy.readthedocs.io/";
+    changelog = "https://github.com/chartbeat-labs/textacy/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
+    maintainers = [ ];
   };
-}
+})

From 9a5ac23baa06068eff796c79ddf26853c8acae5a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 14 Jul 2026 17:03:12 +0200
Subject: [PATCH 0522/1386] python3Packages.opensfm: odm-4-unstable-2026-07-13
 -> 0.5.1-unstable-2026-07-13

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

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index e26fdaeddaf2..ce6e1ae10513 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -53,7 +53,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "opensfm";
-  version = "odm-4-unstable-2026-07-13";
+  version = "0.5.1-unstable-2026-07-13";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -187,7 +187,10 @@ buildPythonPackage (finalAttrs: {
     );
 
     updateScript = nix-update-script {
-      extraArgs = [ "--version=branch" ];
+      extraArgs = [
+        "--version=branch"
+        "--version-regex=v(.*)"
+      ];
     };
   };
 

From d5c9ace3ed7b7d47a3b20703736734effb3c8ac5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 15:28:13 +0000
Subject: [PATCH 0523/1386] ddccontrol-db: 20260702 -> 20260714

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

diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix
index 29b822324792..49a6ffce8564 100644
--- a/pkgs/by-name/dd/ddccontrol-db/package.nix
+++ b/pkgs/by-name/dd/ddccontrol-db/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ddccontrol-db";
-  version = "20260702";
+  version = "20260714";
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol-db";
     tag = finalAttrs.version;
-    sha256 = "sha256-Jv/NYaynTvvV9zQLtvRfUBYzORWOCqP82/mVMR4Evjg=";
+    sha256 = "sha256-9X22Vt1LbaVLrjFqafnPPfsKQdLPBKxQR7cz75yqML0=";
   };
 
   nativeBuildInputs = [

From ca9a0b29d27698b5dfe77fd0b28ce2a68e52edc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 15:34:55 +0000
Subject: [PATCH 0524/1386] lxmf-rs: 0.5.1 -> 0.9.0

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

diff --git a/pkgs/by-name/lx/lxmf-rs/package.nix b/pkgs/by-name/lx/lxmf-rs/package.nix
index 2105a1395f15..2549e3f9bbde 100644
--- a/pkgs/by-name/lx/lxmf-rs/package.nix
+++ b/pkgs/by-name/lx/lxmf-rs/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lxmf-rs";
-  version = "0.5.1";
+  version = "0.9.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "FreeTAKTeam";
     repo = "LXMF-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ztJHjapogSF1qzyCBsi6mu3ByLdVTBt8y2OVEFyohKk=";
+    hash = "sha256-RKe19Tv4IP837fJX5V0T3TeauwaBXuD176lD8W8BRpo=";
   };
 
-  cargoHash = "sha256-g80lnqJ8VxGg0zHqHsQCvJO9AgXFE0ABysSr+XjXBAk=";
+  cargoHash = "sha256-BqiemIfYuqB+8qDvEXpRPtW2dW4ApcNsj3augivIMdc=";
 
   nativeBuildInputs = [
     pkg-config

From 8a25cd1b95e37acea922c9adf931cae2b684a516 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 15:38:49 +0000
Subject: [PATCH 0525/1386] concord-tui: 2.3.5 -> 2.4.0

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

diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix
index b6554a5202e1..3ee01635380c 100644
--- a/pkgs/by-name/co/concord-tui/package.nix
+++ b/pkgs/by-name/co/concord-tui/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "concord-tui";
-  version = "2.3.5";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "chojs23";
     repo = "concord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UYhwDV4tay3DqjGZNfnFNVXclAyjZKqp+gbIjXUzudE=";
+    hash = "sha256-/79Hq54qXWXLopPda6xiZ6892UpVoKXQad84QOXCTDM=";
   };
 
-  cargoHash = "sha256-S1ij7AukfmDosZz0TW9AVuriUFw4Eq0Pk6KxhcOr17o=";
+  cargoHash = "sha256-Ihr4JM0hKEvJ9FMcQ5VPtemJjjPB5mXvAeDa4G0pGSo=";
 
   buildInputs = [
     opus

From 8354b5c0884a97fe1e7a69e040d7737389deb246 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 15:40:49 +0000
Subject: [PATCH 0526/1386] cargo-binstall: 1.20.1 -> 1.21.0

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

diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 458c84524691..92faf3a87a94 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-binstall";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G6uOBdLpn5Dp91XUL+DY4MY1dqXcs0OxpR4Ls1yTnS8=";
+    hash = "sha256-6msYAVCN1i2srA4DquqcdJxUrJP1jub34c/a/4RbWCg=";
   };
 
-  cargoHash = "sha256-x9HHo/y6ikCOY1O5kScTBOY/nzvJ0P8EIIU6eRgzzXI=";
+  cargoHash = "sha256-r9iGWxrLlD83QtvZuWXIxjI2S0RO1GNwOed531FVvJk=";
 
   nativeBuildInputs = [
     pkg-config

From 026694a08ebbe1953fad96a859a386ac162807cb Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Tue, 14 Jul 2026 22:53:16 +0700
Subject: [PATCH 0527/1386] zenmonitor: fix version scheme

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

diff --git a/pkgs/by-name/ze/zenmonitor/package.nix b/pkgs/by-name/ze/zenmonitor/package.nix
index 1dea44a53e2e..e2b9f6ed5f2d 100644
--- a/pkgs/by-name/ze/zenmonitor/package.nix
+++ b/pkgs/by-name/ze/zenmonitor/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation {
   pname = "zenmonitor";
-  version = "unstable-2025-06-12";
+  version = "1.5.0-unstable-2025-06-12";
 
   src = fetchFromGitHub {
     owner = "detiam";

From db6d4b8ac10eb3c06bb7910c8d4253f88fd40fec Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Tue, 14 Jul 2026 22:54:16 +0700
Subject: [PATCH 0528/1386] zenmonitor: use hash instead of sha256

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

diff --git a/pkgs/by-name/ze/zenmonitor/package.nix b/pkgs/by-name/ze/zenmonitor/package.nix
index e2b9f6ed5f2d..ced91534b2f5 100644
--- a/pkgs/by-name/ze/zenmonitor/package.nix
+++ b/pkgs/by-name/ze/zenmonitor/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     owner = "detiam";
     repo = "zenmonitor3";
     rev = "1e1ceec7353dc418578fe8ae56536bfee6adeca3";
-    sha256 = "sha256-q5BeLu0A2XJkJL8ptN4hj/iLhQmpb16QEhOuIhNzVaI=";
+    hash = "sha256-q5BeLu0A2XJkJL8ptN4hj/iLhQmpb16QEhOuIhNzVaI=";
   };
 
   buildInputs = [ gtk3 ];

From dfa25aa36bb020ccc2f7e567079afd490f4ab828 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 15:54:24 +0000
Subject: [PATCH 0529/1386] ralphex: 1.5.1 -> 1.6.0

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

diff --git a/pkgs/by-name/ra/ralphex/package.nix b/pkgs/by-name/ra/ralphex/package.nix
index de0b83afdcc8..55e294916088 100644
--- a/pkgs/by-name/ra/ralphex/package.nix
+++ b/pkgs/by-name/ra/ralphex/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "ralphex";
-  version = "1.5.1";
+  version = "1.6.0";
 
   __structuredAttrs = true;
 
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     owner = "umputun";
     repo = "ralphex";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oW2BQIq98YwTc9h4u3KOhx6x7qgGMLetXNnOTOjM49Q=";
+    hash = "sha256-RUl5BVGc5EjeXZNjfC2WVZrrSXxR1mQyABkIxIT2NyQ=";
   };
 
   vendorHash = null;

From 0539f5c7852fc3b94db14306026328095e965acb Mon Sep 17 00:00:00 2001
From: Adam Thompson-Sharpe <adamthompsonsharpe@gmail.com>
Date: Fri, 10 Jul 2026 17:27:39 -0400
Subject: [PATCH 0530/1386] remark42: 1.15.0 -> 1.16.4

Changelog: https://github.com/umputun/remark42/releases/tag/v1.16.4

pnpm is updated from 8 to 10, and the `fetcherVersion` is also bumped to
4.
---
 pkgs/by-name/re/remark42/package.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/re/remark42/package.nix b/pkgs/by-name/re/remark42/package.nix
index c461a9aae6d5..56db00447ff8 100644
--- a/pkgs/by-name/re/remark42/package.nix
+++ b/pkgs/by-name/re/remark42/package.nix
@@ -4,21 +4,21 @@
   fetchFromGitHub,
   buildGoModule,
   nodejs-slim_22,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   testers,
 }:
 
 let
-  pnpm = pnpm_9.override { nodejs-slim = nodejs-slim_22; };
-  version = "1.15.0";
+  pnpm = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
+  version = "1.16.4";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "remark42";
     tag = "v${version}";
-    hash = "sha256-yd/qTRSZj0nZpgK77xP+XHyHcVXlNpyMzdfj6EbVcXQ=";
+    hash = "sha256-VCFpN/8GRziD7sKVw7jK33llo0AGqygW4ghHZxrluJc=";
   };
 
   remark42-web = stdenv.mkDerivation (finalAttrs: {
@@ -41,21 +41,12 @@ let
         version
         src
         sourceRoot
-        postPatch
         ;
       inherit pnpm;
       fetcherVersion = 4;
-      hash = "sha256-wFrMoSeD87H1yfMD0jBcw60DKDeh4yjka5aWyHuQssA=";
+      hash = "sha256-PInNiI8hcXzQoYWtHUy6BTQKgII7rHzlbSGFc+ixz7k=";
     };
 
-    postPatch = ''
-      substituteInPlace "package.json" "apps/remark42/package.json" \
-        --replace-fail "pnpm@8.15.9" "pnpm@${pnpm.version}"
-
-      substituteInPlace "apps/remark42/package.json" \
-        --replace-fail '"pnpm": "8.*"' '"pnpm": "9.*"'
-    '';
-
     buildPhase = ''
       runHook preBuild
 

From 04e210b7cb5067e638000b73d97f3b05e9bcd673 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Tue, 14 Jul 2026 10:02:50 -0400
Subject: [PATCH 0531/1386] tor-browser: 15.0.17 -> 15.0.18

release announcement: https://blog.torproject.org/new-release-tor-browser-15018/
changelog: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/tbb-15.0.18-build1/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
diff: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/tor-browser-140.12.0esr-15.0-1-build2...tor-browser-140.12.0esr-15.0-1-build3
firefox security advisories: https://www.mozilla.org/en-US/security/advisories/mfsa2026-67/

Fixes: CVE-2026-15718, CVE-2026-15719
---
 pkgs/by-name/to/tor-browser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index c0bd0e6adf48..3b0d8486db5e 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -102,7 +102,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg_7 ]
   );
 
-  version = "15.0.17";
+  version = "15.0.18";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-WJFDd+DVj4oKHjv7py3yVrttrrCHFcHJbyvLNOwCjhs=";
+      hash = "sha256-4e7G8M/iKU65ECMVhxGjaJwHfwVZ49RD7ro6YJT43v0=";
     };
 
     i686-linux = fetchurl {
@@ -122,7 +122,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-pKmAKDWutSp7ptJ66PMiS59aV+pRs3Oz9pV64kRuebI=";
+      hash = "sha256-lLShsQQ2thSSp4PRK9Fhza6e01Myj2mUP4qqCeyilXo=";
     };
   };
 

From 17e12191bdacabcbb74986e93f3483346140a9b7 Mon Sep 17 00:00:00 2001
From: Tyce Herrman <Tyce.Herrman@pm.me>
Date: Tue, 14 Jul 2026 11:38:11 -0400
Subject: [PATCH 0532/1386] whatcable: init at 1.1.9

Assisted-by: OpenAI Codex (GPT-5)
---
 pkgs/by-name/wh/whatcable/package.nix | 57 +++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/wh/whatcable/package.nix

diff --git a/pkgs/by-name/wh/whatcable/package.nix b/pkgs/by-name/wh/whatcable/package.nix
new file mode 100644
index 000000000000..32f8ee2cf091
--- /dev/null
+++ b/pkgs/by-name/wh/whatcable/package.nix
@@ -0,0 +1,57 @@
+{
+  fetchzip,
+  lib,
+  nix-update-script,
+  re-plistbuddy,
+  stdenvNoCC,
+  versionCheckHook,
+  writeShellScript,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "whatcable";
+  version = "1.1.9";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchzip {
+    url = "https://github.com/darrylmorley/whatcable/releases/download/v${finalAttrs.version}/WhatCable.zip";
+    hash = "sha256-0taHQE4aUJrbRdWXZZyHfJ+2EzpEiXpsj8HWg04lgXg=";
+  };
+
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications/WhatCable.app" "$out/bin"
+    cp -R . "$out/Applications/WhatCable.app"
+    ln -s "$out/Applications/WhatCable.app/Contents/Helpers/whatcable" "$out/bin/whatcable"
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = writeShellScript "whatcable-version-check" ''
+    ${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1"
+  '';
+  versionCheckProgramArg = [ "${placeholder "out"}/Applications/WhatCable.app/Contents/Info.plist" ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "macOS menu bar app that explains USB-C cable capabilities";
+    homepage = "https://whatcable.uk";
+    changelog = "https://github.com/darrylmorley/whatcable/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tyceherrman ];
+    mainProgram = "whatcable";
+    platforms = [ "aarch64-darwin" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})

From 450e6f4683ca28df136425bb00419db692df536c Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 14 Jul 2026 10:52:48 -0400
Subject: [PATCH 0533/1386] outline: fix updateScript

---
 pkgs/by-name/ou/outline/package.nix |  3 +--
 pkgs/by-name/ou/outline/update.sh   | 41 +++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/ou/outline/update.sh

diff --git a/pkgs/by-name/ou/outline/package.nix b/pkgs/by-name/ou/outline/package.nix
index 468cf3a78012..89ff4c7ca055 100644
--- a/pkgs/by-name/ou/outline/package.nix
+++ b/pkgs/by-name/ou/outline/package.nix
@@ -3,7 +3,6 @@
   lib,
   fetchFromGitHub,
   makeWrapper,
-  nix-update-script,
   nodejs,
   nixosTests,
   yarn-berry_4,
@@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     tests = {
       basic-functionality = nixosTests.outline;
     };
-    updateScript = nix-update-script { };
+    updateScript = ./update.sh;
     # alias for nix-update to be able to find and update this attribute
     inherit (finalAttrs) offlineCache;
   };
diff --git a/pkgs/by-name/ou/outline/update.sh b/pkgs/by-name/ou/outline/update.sh
new file mode 100755
index 000000000000..b87238817a8d
--- /dev/null
+++ b/pkgs/by-name/ou/outline/update.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts coreutils curl git gnused jq nix-prefetch-github yarn-berry.yarn-berry-fetcher
+
+set -o errexit -o nounset -o pipefail
+
+package="outline"
+owner="outline"
+repo="outline"
+package_dir="pkgs/by-name/${package::2}/${package}"
+
+#
+# package
+#
+
+current_version=$(nix-instantiate --eval --expr "with import ./. {}; ${package}.version" --raw)
+echo "Current version: ${current_version}"
+
+latest_version=$(curl --silent "https://api.github.com/repos/${owner}/${repo}/releases" | jq '.[0].tag_name' --raw-output | sed 's/^v//')
+echo "Latest version: ${latest_version}"
+
+if [[ "${current_version}" == "${latest_version}" ]]; then
+  echo "${package} is up to date: ${current_version}"
+  exit 0
+fi
+
+echo "Updating ${package} from ${current_version} to ${latest_version}…"
+
+update-source-version "${package}" "${latest_version}"
+
+#
+# yarn deps
+#
+
+echo "Regenerating missing-hashes.json…"
+src_path=$(nix-build --attr "${package}.src" --no-link)
+yarn-berry-fetcher missing-hashes "${src_path}/yarn.lock" >"${package_dir}/missing-hashes.json"
+
+echo "Updating offline cache hash…"
+update-source-version "${package}" --ignore-same-version --source-key=offlineCache
+
+echo "Done."

From f640b257f9d0956971b057a1a2416c9da48737f4 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 14 Jul 2026 10:58:18 -0400
Subject: [PATCH 0534/1386] outline: 1.8.1 -> 1.9.1

Changelog: https://github.com/outline/outline/releases/v1.9.1
---
 pkgs/by-name/ou/outline/missing-hashes.json | 169 +++++++++++---------
 pkgs/by-name/ou/outline/package.nix         |   8 +-
 2 files changed, 100 insertions(+), 77 deletions(-)

diff --git a/pkgs/by-name/ou/outline/missing-hashes.json b/pkgs/by-name/ou/outline/missing-hashes.json
index c557b5e13483..a14c79a082e7 100644
--- a/pkgs/by-name/ou/outline/missing-hashes.json
+++ b/pkgs/by-name/ou/outline/missing-hashes.json
@@ -31,79 +31,102 @@
   "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3": "115f627bcd7c290ddfa1d16405cc1ce388be0b295a26adb1ee2d774133a77809aa0bae83775d3c11f220544e77d34c01d607037bf9dfc6aaac67329cb5fe2818",
   "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3": "ab74755aa2afd27ad8f5277c7cb7a0c721028ba63c3e3109458689340d76ed4c901aa2c71ae5950f3a2149ae9e835e711a12842db219864107cc0c5c1fbdc0da",
   "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3": "edfea4f5455f71f608c15163467b98245d46fbd6078019347418e193968431afe632a11e8729ec39755a54563d86940899e2fe8f3d124393f91855956bd1d745",
-  "@oxc-parser/binding-android-arm-eabi@npm:0.121.0": "bca1043494dacc0b7b5de15ae18605faaf7bcc35bdebb3d7de3b6ca092b7b0813148a487e80910541f3f6dc8c95e833beff653b6cff2503f45f78982711fd69c",
-  "@oxc-parser/binding-android-arm64@npm:0.121.0": "ceceedd4695fed202d87c9b2b09107ac1fac6b64ac6f7299e78827920ce915ae6684434c730d95d07cd05d998a862477f6d21d2f3ee5a68e80b4000a890a6e1c",
-  "@oxc-parser/binding-darwin-arm64@npm:0.121.0": "6bc756fe6874ea0c9f2e4a717b32f3297a3368330ea9a41774a0ebd4b9ad95e021d393d556fd1f7f8dac9c3093c373f4a495dc3249e4de4e5ef05f788cd4c304",
-  "@oxc-parser/binding-darwin-x64@npm:0.121.0": "7733902e1cab1a17b79c52dc1d934900438343e3eed0357fbd088f39a52ab6ddf25d31b3214134ba0e0e0e486ff1735da0bbc5142cc91d1aca69d073dc43c290",
-  "@oxc-parser/binding-freebsd-x64@npm:0.121.0": "019c17c3a5bd4d419a5e378d3c401735e9f9c5f0d34b3f31f3c18cf37b7a5004e15c39326b47b8e5bd74bf74355709d524747f3b16252898759f20c2d0d2ceba",
-  "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.121.0": "5562174d8fa0a5665934bcd8d65f5895b9d03a79e502ed823bb47b14edd57c6f997da22cfbf7caa122a02a3c527b09947ad06d39ad1f3b9f30a23f4edae3432b",
-  "@oxc-parser/binding-linux-arm-musleabihf@npm:0.121.0": "1ca1d1ba6897cd67c33561199805dfe8cf709eac9ccfa9fd7a9127daf6b57157a1141c88c5c5c822800b57d2abc8bc9344408fc5d6890c1e6d78d820aa011e81",
-  "@oxc-parser/binding-linux-arm64-gnu@npm:0.121.0": "5aea47f9b977d5004ce697a0b13b519183198cc63c074a4ec932e61398851639bcaa3b44a98226e8b644c89114654b70a70356c199badfa0491c04c4460ac925",
-  "@oxc-parser/binding-linux-arm64-musl@npm:0.121.0": "4212fdfb73d16be3c60feaf2548060e85f17b807933bb81426578fd0bc5a89ac1e7b77b594b5c9a3b60daf0ee3ad9594a61554f3f9aac35e219cec7cece07f2e",
-  "@oxc-parser/binding-linux-ppc64-gnu@npm:0.121.0": "6c4ad09387ee66b0ead91f5632bcecd78297d4be50f3e17e2b16f460c877552d1943c8fd6648e3ac1d9806870c91c2bffd088fa9b368119b8d4b1dc2cbc08d95",
-  "@oxc-parser/binding-linux-riscv64-gnu@npm:0.121.0": "d41cdce188365392bd52852a3309d92daa203f240da0e5e7217aa9805fcb0db5ac8a10a26ab48570e16af9daa46622b19a89410e8cbec1d064c931f785225d22",
-  "@oxc-parser/binding-linux-riscv64-musl@npm:0.121.0": "6ae9ade15ea6ff648569d2f83e857c92873e90eb5649f62e0cf000213873b549a2dd4bb4547358f20776aa2f912fd9495721bcce429ad4c02742fffae2d92d47",
-  "@oxc-parser/binding-linux-s390x-gnu@npm:0.121.0": "14ba521e885676eb8e05cb6173d5071505e9a3798f9cb19f45fb3383eefb6def2c0e7cccea43a62eab8d73e22bb3f66143d82355e0e5ef3b8a388e4301b4d9a4",
-  "@oxc-parser/binding-linux-x64-gnu@npm:0.121.0": "0e56d93be40652b0916aa6505de2978b17949665dc4d98e2420d667f6aa8c26437b0137c909124d6adfbfc1e2ff0eb3f31cf93c7ec6e5580dd3b88cfdcb75367",
-  "@oxc-parser/binding-linux-x64-musl@npm:0.121.0": "b1c30cded47edc8ce76dc5c80e5dc70c3bbdbc09505a0f70a4f16b6f55fad7eb3e67b381556d92b883272cbf530dfb8b69cafee06e380a5a47c0debd378b1494",
-  "@oxc-parser/binding-openharmony-arm64@npm:0.121.0": "b4cc609840cc2bd914ab142ebf2404d24452a54d6673469289c100bf1af40dbd1cdfebba1b8c7804a7b285a8f2293ab748da6ebc059ab2043216af069e9ecd2f",
-  "@oxc-parser/binding-wasm32-wasi@npm:0.121.0": "20d260df5bda2e225d7253049890d99ac2a3ce8ad5df8d0f6cec9f23cda9dfd2ddbfc87457fde3e8613109868d4f885beee9df6fcb8f267adb08ed2ab5303bc0",
-  "@oxc-parser/binding-win32-arm64-msvc@npm:0.121.0": "ffb3ae5443b87baa932316bc4bf2fe92d3d67299ec16e06270047fdb6d8c5d33b19f76e486ad6dc5f7cdc3e038bde8c8cdcc3e316007f1bfdac393136f372170",
-  "@oxc-parser/binding-win32-ia32-msvc@npm:0.121.0": "768d242e04f4809101d00a383d05e47a8e90852b65f342861266910e0912eee814e6f5b2b92fa82d7712c15424f63c6a877005c2375083aa5734d7a55d83ab8b",
-  "@oxc-parser/binding-win32-x64-msvc@npm:0.121.0": "03daa39843f83f963eae2a1151029887e9c5449cf3da8dd32588c45045be53ce1d8f1b0699abfff05fc1a49911b4eafbdac1b76696ad23dd3f67bfe685acc8f9",
-  "@oxlint-tsgolint/darwin-arm64@npm:0.22.1": "7c744e93b68ce39cefc63c4ba5efe5084f96f7607eea1efe3559c3e0cac1dd6f2983f1342e4ca23660980094dd4ffcb131b299347d8fcb8f72ebff8e21ae7ab7",
-  "@oxlint-tsgolint/darwin-x64@npm:0.22.1": "bae78458587b8323484bb2ae67c1059c08ee58325e136a901e954734bf702fb7c3d2e1a08c5ce9bc72d9285d976a7813cf838f1ab8a83a9076ad6809a28bbb91",
-  "@oxlint-tsgolint/linux-arm64@npm:0.22.1": "f660bdef1eb9a27ba41d5fdeb43fd82d59b1531c266b8d2ca36c3163fccab0ea58af9de35086de0335259b4e4c59d592088abcda100dfde0b96a5d867bee8b2e",
-  "@oxlint-tsgolint/linux-x64@npm:0.22.1": "96c6b63e3b83440550de9bc2fcc85f1cda460139d9f8b7f82705aab944d85c27a79d2d95d28d3a0d6f31cd25fc668e74319f014ff1a655c3035468c841045e0d",
-  "@oxlint-tsgolint/win32-arm64@npm:0.22.1": "e4d5c1190579523aa93055307b8bbc9725898ddebfcd54746fa65bc93ef2a7d0a152acbd3f987ea75ea93d2788f8e868b003f9ed281780995f9c81210079f9cc",
-  "@oxlint-tsgolint/win32-x64@npm:0.22.1": "cc330b9096c50b579fa822952684a92fd10264d12ca13a4668e2fdfbfb5fdde1332e10668e42ecf64fb747707bddd76116ec083f7b4e9da6021b7412afbbfe1a",
-  "@oxlint/binding-android-arm-eabi@npm:1.66.0": "9e77e0b30de606bff3a4f6c3de7105aaf1aad43d3058e111d3c50bfb1e567bbee807d19a3d0285320edb9783c9ed5bb44fada8de0549788614787b4bfee2c607",
-  "@oxlint/binding-android-arm64@npm:1.66.0": "fa2aabcc7efd43adf725a15b645963f885442ed6fcceceb25158eb0f33bad84446cf2f70f604451ea1be4e4725a71e7a285f0debbf2f7e80a6acaaf5ca4e4302",
-  "@oxlint/binding-darwin-arm64@npm:1.66.0": "ec3904a64891c175271e15de0a5e5080ab68dd5add9511e0ee245a71de16bfe42e361ece4d60f049cf6ac5cc0ce637c94a71d4cb13b29d4356d811bec11f4eac",
-  "@oxlint/binding-darwin-x64@npm:1.66.0": "bbd31bffefc6fe77fcdf47717c9adc0523fa553a3bd7938a6b7394fac5115945db8ec5f6e7a5364b7987502699d33313176324e4a509f08720a919578b6aad59",
-  "@oxlint/binding-freebsd-x64@npm:1.66.0": "612a97b0a27b68e60107c5daac10e34beb1004c107cfd21bac81d4dc1b326361462ce8d34a916ee7568494e5fe7eb1b50275512559c640951ff46fc0a3688168",
-  "@oxlint/binding-linux-arm-gnueabihf@npm:1.66.0": "030fb03f14ec63cf486e4a690762dfe9d2e7e84af102cd57a0425c9654bf9e5908dc9b755d874aadc8fe8eb96fd43aa73e8fe346c06ab6ce12a352710cd28405",
-  "@oxlint/binding-linux-arm-musleabihf@npm:1.66.0": "9313ab7f453bb907c40f53fe1f452da4b3ca3f3adfa663dade5d78b6e7f9bac59897bafdc9b0ad3554db20b923bb42b00e304225f73fb5d6ac6925ad950788f3",
-  "@oxlint/binding-linux-arm64-gnu@npm:1.66.0": "f6de4fb2596095b14fb66d8a0423723f1293ffe31a0d7dfca210b851e8f96ec263600b6cbb9afbb6e3340d094b96fb9c745a56e0b70c09f5d466574ca1b6cf6a",
-  "@oxlint/binding-linux-arm64-musl@npm:1.66.0": "0959431b2b29796082f194a658b50bd66a6816451c2670f92d34f271abb538cf1c574dd423d648068e8d17bff0e98373b93bbc2883aad2f36945d9d84715f845",
-  "@oxlint/binding-linux-ppc64-gnu@npm:1.66.0": "becb9b048dcedd3f883d113898ed1d9ed674467263c37aae1cb19f3c4475eb5cc94a4f89ab57c89514de5418d8c0547ef712d117c49a2edcde77162a556fc4f2",
-  "@oxlint/binding-linux-riscv64-gnu@npm:1.66.0": "65b5bbc84bd2289c2a1974ba2274b9c8b38046ba22f8e8821d0197ff097c66578b7ce53a46985e554953c5a14f07f38fd173e2c8fbf22c8a0548953cc6dbacff",
-  "@oxlint/binding-linux-riscv64-musl@npm:1.66.0": "80486e2482f66517af323ae6b616f08dd78367cc07f53b40eb3c636a540127f07929d7aaaf67fd046f9e47c7cb9378fdf9da468637e11bc742962f4fffec7aee",
-  "@oxlint/binding-linux-s390x-gnu@npm:1.66.0": "0d0fa2dba19d7aee4fb9817bf2266fbfd32fc1eeed0786f668df269a116cdcf42a92be94170989239c5867f8ba98554124df5c3f398381e485ab00486fcba200",
-  "@oxlint/binding-linux-x64-gnu@npm:1.66.0": "d0297d2bb4bf4669caca2b6b0e7def92749cbcf85b27cca9d4530b49fa54fc009f8981dac99dfabfd8472b9e4a5b74ac9009f8659e73bd1fb3386c48f80c636e",
-  "@oxlint/binding-linux-x64-musl@npm:1.66.0": "c5a9efc367a811b68131a991132002c5fe0c8cb534543374f8f5eb6e595199fe6d4c241eea9c1fa71f9fe20685233ed199cc6574bc5d5ec274ec2d7524f50233",
-  "@oxlint/binding-openharmony-arm64@npm:1.66.0": "13424a0403b7b9feeaf578d716d0d0dcb23654c389e2c82c8b23d6f72e0eae818533f900e0716d58d6649b7b19c4a3d59004cc778225172b426dd5865f2aed12",
-  "@oxlint/binding-win32-arm64-msvc@npm:1.66.0": "77d14ced247fa9cb20104bf50ade58e085a141232ec5cfc44dfc6ee5d098fcaf2d6da96db94adaeb09e507b0cfe254abf155e79c2e4d8c4b4fca240446383ea8",
-  "@oxlint/binding-win32-ia32-msvc@npm:1.66.0": "2943723b356ad6a0a4f9a3ce16f362261d79481dbced24d9447611cc3a7ac99c844d6dbecc76eb04e2eb462ed77d6da495f8a09ad0f64bdfef8f1a3b2a35f283",
-  "@oxlint/binding-win32-x64-msvc@npm:1.66.0": "9c9a8691b2d5a64b1ab5c4798269db89e6432fd870f213e7e16a3fc04a150b9ff0371e5d4e1d4ebc8fbabd278c9aceeb053fcc60bd0b2c6341d8055359d68050",
-  "@rolldown/binding-android-arm64@npm:1.0.0-beta.53": "e2972fe9399066bb418f659c24e7589e87d8373a3b4ec7dd01c06f516c90cd04ea2dc801f2739f05e714f002bd4ef8d505dabbb9ab55437ed3d5f8395db91df5",
-  "@rolldown/binding-android-arm64@npm:1.0.0-rc.17": "7c821eb984e2dd03b05979be3116d927326a1752e7d04462f6c78721fc47fb33d1a584e8c739b181dbfb5c28170541d05f775ada38e81bb685e43d03d974abe3",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.53": "79587c0686dc0ee54368e4eeb0b8e8cc6f5786c3d55c3b0acd2ccea067b6ba21faffe82140268e7de7126192c3e54fa33742346d82ceaebf5d4c33a94c3575fc",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.17": "ddedec6840b8e32b7c45a4afe9d797bb24ea74ef222a1b443161045f0b53ec3a5752b108552fe6c99182e2553dd53498d96d3b30551cd3f1e8057559f23b1ed7",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.53": "4b855c7208400453f29aac138c8c050fee3e3f08ff7d36afb3efd705abfc67b11e55bb12ead5d845ae9c464b9855c02380772592ed09e43434ade8dd4e32f703",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.17": "b66ce82e3162261c045027b3aa061cd735c9b1395e77756e06b973f8d0e4256247ddfdb7ee8134363dfcd9d83e665b647b45b666a65c8454babdee19f6d57b40",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.53": "98672b2ececbcab5bf8732033b9e38553f75a37d0c8198762af5609ea57b9809bc8d9c8ec3e5cc6df7c9535c1a08d063d106b984fa1dfda066dc71ae6e70350d",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.17": "87b9045771edda717c7d66df105bba2c22c88214254eae48d54ca641f79b4558c2d1ae3db27d8e36b230728263d539c5f6e03e895dbed6e08afa495f634eb42d",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.53": "0760612704b1381580c337eef6b0ef096902b81dca1ff2b536a8a4f529335465d9739ea3c0883d3f7b1548089d237e18a485f0ee2e3d2d9191b0a788f95c81f9",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.17": "43e60168d359a5edae352d948a6515c40a8e047fef7541693cbf18a09d80076efb9308a804c5ea7f645883f8f6b7b43e0e14ea677df63fb4016a55ba6f63b947",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.53": "a4e4e59a5d316f72c691360027e4a843db4fad1ccf9ddac736890f4182f59612c5bcb4286420b88454658a0735ca63d0692fbba93c2fcc8009e15b3126e62266",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.17": "d6bfe49089d598886e8c9c92e45240a2404e9594c4abc25f303c8655b859e0f0b67c18947e23177ccc5fb81c9b22a1bd32f2ed052531cc41491b4261ed728342",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.53": "4f465651c516cc78513fa2b6685667acf248b076a19809252063644512ad7949faf46a64738024c266a39c411cb4be15142aa4a352dcd01e1c65486f9f623578",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.17": "be5459bf78de0931993158783af8e349a68d03610876eb131f48fa51414a45683047cd9b4ad7631f385fedc9bb89677e8d12e874104a038b63932aaa1d7bceb3",
-  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.17": "e36194c8a39afc6522ca71c2ebf4c038792bf2c0141da76e8a385bebdda077a52f95ece9bd0a3818d5c0023e7e8ce708566d42ecd2ff31296a26a41ed6847aa4",
-  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.17": "288ce91c69b13e37b2106fcfb663a981aba9de65d3bb4d3cd8c17b9e8193f3de44d08d1201c4d3a18fdeec5a89256d5b3b4d5bb913ff023cb577c403f8889917",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.53": "702a095a2c4b59a48da26be306172585ee01d284900984c56e663cd15b82748e90b7fa96c0d894651d98ca456ac59fe3e70ff88680a636b6c23353919a04d762",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.17": "d532e43e02e0a84c71ff9be34791d7b32b71786bac4921f9e4f92da39a7d5daeabeb4188c7cc088a8a80ab0691dcf1cc9d414396ce7ff6a970b1374e033df8f6",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.53": "b410d862c88ec59e8e8a31934ab78ed81b31ed00ed69057038a232d44ee9b7942d1f29ee48991e3a0b2fbcbec889d7819166f77679c907271e7f9a381414d1db",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.17": "56aecbe0a2aeaedd558c62a5057a7f915ecada0528a27b5edd80478d948c3645104a56c88121c71edefe9a6af7500f053724103099a90764eb8b84c3ee1f9536",
-  "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.53": "3dd98fa2c676472bfcf825ee561ac3e8046d48d87d4beab5cc312c871be65387e5b527977b9ac7e2c2d4c8f0e7249d2d536c7cd5124b5550e37bf295cb91729d",
-  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.17": "cc7a806e106f4c0d24400af42155b8b396f712e25d76e13b033895b3b635e21edb2246d3c8592c86989c7aaae1ded1708d36516472555bbed3ccaffc939403a4",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.53": "3645fc9eac2f4e8b6f5f1552154a8ae1ed5c1975a37f0da22bb4ec9d8dcd4b8d346feb013a927e9254c33bea7b2b4fc2ff5cfebe3c791f215663ac983bf03306",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.17": "e6fb0aff901de475a4874af6b0473b396bf1bddf6cbb9acbdb6d4c9318ab2fa3e09d80435ecaeb7866b03effea79c57db9a271b5c720007341949e06828c8385",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.53": "d0ecd1a1fe4388ae11d7bacace91694ad0135cf25a0200f7b7ae3ce9fac637ff079c5140a680288d3f7fc35eea0100d1a176ed43db4d88c86429804cb6a800e1",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.17": "d3724ce9f4117d28f903ae1bfc34e3a3efac853691577e511cef91259eb8355dc24f2f27a832bbbd9ad3323dc1b0c3ddbdc4c791ae2a6dd5e5b0c9051384d4d0",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.53": "bbc80dbfb97a1780f0666ffd111f1fbe2b6b2cc1d60102cf41bb0fd03788e020552c94a5e82f95dc75b3696fe0f986a1a362fc7c62bcd899892986a4391fc63a",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.17": "6f4a348202955f74481ccf1c0ec5fa96671507353b6a7f680b920c773f0dda4ebd46c1561428efcefacb9b4d279cd550c80a79fa261f8db173b527ae9a671eca",
+  "@napi-rs/nice-android-arm-eabi@npm:1.1.1": "a1f8caf7bba36f2131303d7bee53e98f46521e499f4b1ba25f5ab770d8acea36abc1792c53e5c6db4235ff1873ee7c94d2ab2f38c8d492ddbdf47fbc6e92c423",
+  "@napi-rs/nice-android-arm64@npm:1.1.1": "5f623438ee64b9e9df5fa8f7b6533776e9774e8edd2aca6945f85869a4f3232c2f30d3a69ad1ce54e775e4747085e57ab473c8421551bda65d809ab65332a8bd",
+  "@napi-rs/nice-darwin-arm64@npm:1.1.1": "733a2d0b606efb52d5532c9a00c54e8c664ecb794fba302c14055d0145baa02b5a50459ef07c171416a5f941e2779cef7406181df7e7969f978ee1d1fdcf2b5f",
+  "@napi-rs/nice-darwin-x64@npm:1.1.1": "f99af3768f04db9fb91d54e460e4e315242d3d8ff3ab0d013c56f4bdf62497d223459cf41554dc0914d11e97f39c2b154c517c3d5996c0ef0297d18702c51b29",
+  "@napi-rs/nice-freebsd-x64@npm:1.1.1": "0d317f65d4d07ae3c8d5d6a424b6b10c599728eef8d58f89ceef2491dffb849bf5744b0eb59c0feeea461b1fd4959db676dc471cdff10ce1304d06246178ce0e",
+  "@napi-rs/nice-linux-arm-gnueabihf@npm:1.1.1": "ed67fd70224048f84401cc1167210d2ab306eac252a83eed96357c49499029205b83e1cfdc606427c46edafb113c0c17613a5de7f122947d4ed6bf3cd7663287",
+  "@napi-rs/nice-linux-arm64-gnu@npm:1.1.1": "9477d397afb1df69647adb449c0d05300a99abf6038a3e2eb63307908375b9a6fa271fe5f7ed211b1b55e87dd9c6ce25f41a6f0f270fa45af13a3a84f546be72",
+  "@napi-rs/nice-linux-arm64-musl@npm:1.1.1": "a754ae5275a306f70eb621e855f234318c9b4db323e10dac3d180c1e66953cb5505e8a1ef13677492839f160c28cc14583b22b3953a061d5b42a7cb7b0dcf42e",
+  "@napi-rs/nice-linux-ppc64-gnu@npm:1.1.1": "91c96752d3b0c57156dfe0885b8124e933197a3a84d4f312986721b37abc1f129f9f071b73142c2074d7e848bab8b8a16e6d246e8c355fda9ed6817ea6450330",
+  "@napi-rs/nice-linux-riscv64-gnu@npm:1.1.1": "e898401c486a5b637426562bb93b12609349119812273b5c19ebc565e516c1246043888ee2c5d24c6178c93288a761284813e495c026c74466f832ef5d63d906",
+  "@napi-rs/nice-linux-s390x-gnu@npm:1.1.1": "0ef13c6beca52613a76c38f70e60ac4959ad08f9d898f64036be8d45ad8266e1f4fc64cf1ba669e55a5869c64a3c2c9a9ea4d4d3836a5b6941fb147a7ee0abd7",
+  "@napi-rs/nice-linux-x64-gnu@npm:1.1.1": "d5ce16822498a12d29c59d5aaa5af4346bb9394d45342706392c2e27915dea9cb37692f0c7fc69dab8c65d31556dec851d631a8d557598bc32d57c3788835dc6",
+  "@napi-rs/nice-linux-x64-musl@npm:1.1.1": "debb8a7067c1d20ce4c29c897e470ef84fa8f66014c0c8e7fe66d6676d6e9199a0936ec3cf3098f89ca1fa1f2628c27d32991f933a7a33da304f1baa45af0eb9",
+  "@napi-rs/nice-openharmony-arm64@npm:1.1.1": "086899cc30d453380399afea4e827cca1428f9cdfc7e253289b0fd41a84c76850315f0070432a00c3c9f80608ac42d638ad836fcad742f437c1fd9465d8a83c4",
+  "@napi-rs/nice-win32-arm64-msvc@npm:1.1.1": "653a7b04d9caa311d793f12d2c2323830a0863737fa4e0cf4ceb5adbb85d30b29d02fb59e5d513e5375273054a965777c83732b25592e80a574f15114bdf96c2",
+  "@napi-rs/nice-win32-ia32-msvc@npm:1.1.1": "f32fcebde27d2e8022e6ea2c8a4fad0676b59c24373c8f7e6fafe3711932a743798909122937278f94c42cba952f5403ed1dc1879544e508299af88ecbbbd68c",
+  "@napi-rs/nice-win32-x64-msvc@npm:1.1.1": "657bf5caa5b07b16f39b3fca7d7f99a0609a01ffbb620ff167652145c0e5c3ee1bbc19f4ed09b9e4373da8a1f84870b58152bb6c44288a3e9cb46ca8a236cec8",
+  "@oxc-parser/binding-android-arm-eabi@npm:0.132.0": "11d7e411090bbec8d07a867a7954aee5417c0ee9a985f1bb217aa6ff12e53d0a6919fc06e27c2d091dbfd02ffbf74edfcee0224b38e642a4138c4a522a1a861b",
+  "@oxc-parser/binding-android-arm64@npm:0.132.0": "dc00b1c88ef74c101af44aa62f54659a720e169339ef0971df70ffe32ff2e768051c24e1038d087fe2f9733045f213fd806bd73f3493280f1c170a1bfd04cea6",
+  "@oxc-parser/binding-darwin-arm64@npm:0.132.0": "8705914f91d01f534bf61cebead3e90cb4497787292faf46e5d198093a9500a2466a74a00f5efd204a1d329ff7da4b7329ef4b8840ba2e378a98872a0e21a3d3",
+  "@oxc-parser/binding-darwin-x64@npm:0.132.0": "4b90b26f7a997556e89c7d4648ee845f5e502dabbfbd2b330cccad756dd7b322e9a6195fdd1f33e278059a40292f754b7da7dd15db4baafb441c304e4cafc7eb",
+  "@oxc-parser/binding-freebsd-x64@npm:0.132.0": "60c04e9f3dd5f3addecdf85873ccc8a79d880e0237be07a597c1fff980e0cfe60d3b0a6b9400a89323c8fd48776a7e172a58b6bde9e3bff781ab5e4d80f2def0",
+  "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.132.0": "eba579d9c7444748f9e82aad19accb80dfbff7ab66dc7f3766da790f97abc190dec8fe430a3af97d4c0f34c9353bb0563094f91efe7f893083a80f2f7ca4dbc8",
+  "@oxc-parser/binding-linux-arm-musleabihf@npm:0.132.0": "03765d72b81dacfd98c46c40fbdddff3361b92cf65e55176886780f158d563a18800bd744c374db28b3664c5eb1b14cd71b1a84cafc64e93d291ec226ed77a7c",
+  "@oxc-parser/binding-linux-arm64-gnu@npm:0.132.0": "aa9f9386d334953839bf0febb457c670f29b2545fba81c957efbf5701600c8f7024ac69f97a8d76de28609f00ffb2488be5c47907328f96c11d4d544c8c55277",
+  "@oxc-parser/binding-linux-arm64-musl@npm:0.132.0": "3f7037a6d4c81816509944a316f239ba7d233a099608ee08f882160067b4542570625bd81ac4029060da1f48a1ca12de74a049c6dfe84f6215d8fb8d77d06bc0",
+  "@oxc-parser/binding-linux-ppc64-gnu@npm:0.132.0": "63937000054bd2a986ebdaf6a92c6bdab926b52744b2e805727503f785eef692a3e1fa1fc85163f63020c6222107ce7fc4c97b4175a847c3774b67a1a904d1ba",
+  "@oxc-parser/binding-linux-riscv64-gnu@npm:0.132.0": "ce3c1c0f048d93fb75399f82bebb97f8c6079e3811bc9a741709906dee379a57660e45d379471beb4b52bd84223750acbdc4a52d34d0a0b6d9b49db5aa1f6ea6",
+  "@oxc-parser/binding-linux-riscv64-musl@npm:0.132.0": "f0eee8f514ae5906981594566180b11e5a8eff72840b3219493ce9bcb0ece6f7e69e37ca3e98b0e228a3a175b65a9730573be1e567652bd91875137a03a42aba",
+  "@oxc-parser/binding-linux-s390x-gnu@npm:0.132.0": "99988465bd899276e9e1c89715080493b91d5096e2a76433b44ee5225a761d77ce932ccd5c47ec16f2c259a11e6ee34e0074334e437774dde6ab74c4637bba07",
+  "@oxc-parser/binding-linux-x64-gnu@npm:0.132.0": "c4416d3014931b1831bf9cd11eaeafd44876a3dcf56f45c052a6d8f634b047f5851a0b822ac1621d1fe185a0109f2acefcd10507c51c2845c219cac08a16e185",
+  "@oxc-parser/binding-linux-x64-musl@npm:0.132.0": "4b45901795cf1eb2f53617e0619fca45b6efb52690ef1d77b3fcad07dbb25f854e7eb2c6317883ba6895521ec38828655ac9cf77fab2d2b27e4a59e7b14abcb5",
+  "@oxc-parser/binding-openharmony-arm64@npm:0.132.0": "46b3d666749e0e66e46810fcfbda37b65196fbedb31ffb9461bda2881f007a233f1c360d533d692f5789864ea99f842f1101edc4dd85e929cb64ef3a8f4c0684",
+  "@oxc-parser/binding-wasm32-wasi@npm:0.132.0": "63c0ca72ad2439c46212687caa3ca77f79312382d313c492b4f940edf71eecb14057325c4bfc78614f66579813add04aad8409ff32a684dcba7e32888d93d5e7",
+  "@oxc-parser/binding-win32-arm64-msvc@npm:0.132.0": "1c8db4cddad78adf0d5113047e7d85ca99ee6cf24db0b5cf143cc30461620e141cc42038928903c3d605e7dd449bb9a48030d15bfdcbccdd648c86e80f6316ce",
+  "@oxc-parser/binding-win32-ia32-msvc@npm:0.132.0": "38d5fe8cd2c5c0d2b3761fcc33062945e030951507b2d434ae060f9363686f267560ddad79e693d56cc9a784d74f5721eae019b18b283ae4f3651215a0a64aca",
+  "@oxc-parser/binding-win32-x64-msvc@npm:0.132.0": "3730b86c60ecc874a4c084cf7b020d7290996360bab49d669e2a931f999d53d9fecf9fda9b64fcfcaae34a08dbb41f6088ba10b03f1557f97dc8d91f67aa4074",
+  "@oxfmt/binding-android-arm-eabi@npm:0.55.0": "db8a91daa54aefc35d0df1514e1e62aa3e2c91e9de8aa8ed7405ca5c156265b99b07013b36739605283d4156a2aef76ef09d0958c4d81a3be54a0cbbfef4335d",
+  "@oxfmt/binding-android-arm64@npm:0.55.0": "8da5bc33f3e9a1ab77ff6e605b4f0a552caf0e1a25d01d0283751be241895aee803813a01b4f0afad0eefcec6617cbc22231907911d305f613f2af7ae0bc4b30",
+  "@oxfmt/binding-darwin-arm64@npm:0.55.0": "ecb275e4cecdab5a662b447f47e4543cfefa2a80fcca5866495059588e1b501ac9ca43d3dfedbc4c1c575c89bc28ceba861e6fbbd46b0a348e57a7a6e02267ab",
+  "@oxfmt/binding-darwin-x64@npm:0.55.0": "8f26b824c2e45346b3fdb2b3b9077a0a23248c30a0c658a4b7fdba96d241ff6dec9b5ae1cc194ccd237da6f0ff728cfd0c7a93536735d94f50ed6fbbeeeeb3a1",
+  "@oxfmt/binding-freebsd-x64@npm:0.55.0": "06893834ac0a8b260395124da57202a7064bd663b7cc573273e92695169f01c68250c4d6a6654e19ff59ae9cd47e56294da053a792a7433637174ade3db10430",
+  "@oxfmt/binding-linux-arm-gnueabihf@npm:0.55.0": "95b008c5eb6853a955ef3d12ed8def4be2527dd1b16bc27df739e6673f6eec4ffe5ce534bd5330b9211e85a6c12efa40c19d6676001dddf83aebc0c8edd28451",
+  "@oxfmt/binding-linux-arm-musleabihf@npm:0.55.0": "37ce178c61351907abafc8a7ca3502f884f9a01a07c89f0ab8b4fd7e585f7993beb391f7c334a59195b61c976fd3827896a8a6beb41302cde57f0d09991d1ee6",
+  "@oxfmt/binding-linux-arm64-gnu@npm:0.55.0": "bf70fd44e3b78e27dec4a9b8af1b5490131edee6e6a634a9eae5459dc57c23b05eb1b749777b640ea3f6a71841ad99e4528a5868ebe21afceea79e8dbf1c58a3",
+  "@oxfmt/binding-linux-arm64-musl@npm:0.55.0": "f86c290c3af1009cbf1961fd6069859a2611b3da7ce8ba445a30b981d561883f744b485be49b9aa9edb9b3da3e27cbf641ea55ecd8cb38e4693326e8b79a4aa8",
+  "@oxfmt/binding-linux-ppc64-gnu@npm:0.55.0": "dee16ab629f31db5f0158d2f444776373a8e27f8640b72e03286beb3b5ba250d1fcd0f10f2c3d14e81d2817fc48bf5a5ae67899ee372d76f9df62db997dff69a",
+  "@oxfmt/binding-linux-riscv64-gnu@npm:0.55.0": "2903deed7cd31924a98e40bf1ceec4607c95cfc5780264646b0e598fc26a1141febf2fdb154dfff9b49a7be7856bd4bd67a7c59a3f0e3e07903067e1d51373da",
+  "@oxfmt/binding-linux-riscv64-musl@npm:0.55.0": "5c64f07da7847c745872fe837e393222a1e8827f292dfffef4217e42cb8a0b41b81a0bede62173508528b3d8a0fb4dc4eedb319d9406c87d412589d4496a47da",
+  "@oxfmt/binding-linux-s390x-gnu@npm:0.55.0": "8e484ececcc25fbd5379c31f8599af97929e9a2baa46731e351b757df3b0df50cd7e04dd9a28317b2b148cb18c720409712f7b8c0f42b2fd5b18123e3c509369",
+  "@oxfmt/binding-linux-x64-gnu@npm:0.55.0": "4040e25bfa22475c2fefb47dafacaad9cb0c97845c0b541aa3730e4fcd83ef03da815d5116d04364cea111941670000423689b08b8dacb9fc3699d2cb55a2466",
+  "@oxfmt/binding-linux-x64-musl@npm:0.55.0": "85ea999af23c3b1e5ddf8f06aeb619895328475d1824eec599f6de408ef7ad9f917513329ed47e0867aa606b4718d451699a393a7f23f3c45950199a0bd20da5",
+  "@oxfmt/binding-openharmony-arm64@npm:0.55.0": "e23c4e65a7dfe5cae461972ac944e25a567b03a4e8ae04f19ffc79b6e97d222b4c52616cd66ae476f67e3837dfb53d8ff5e01ce96446875874a1a2f3a39004a2",
+  "@oxfmt/binding-win32-arm64-msvc@npm:0.55.0": "6b60e8f6d17b613fb4c0972562cc30fb52848f432d93053933e2b308a1ca6b278ef76512cb7f9fd6b1f91bd4d09f682fa30a84a04b6efeab18868b9d13c57f3d",
+  "@oxfmt/binding-win32-ia32-msvc@npm:0.55.0": "e62d050b0bd25ff69a0e05871748a0f1ecbab6422d316011dde1ee7282b3aa486b935b696c227f1974213cf694a2ddf990612d60397082be980e8baec4e91ef0",
+  "@oxfmt/binding-win32-x64-msvc@npm:0.55.0": "0253d8ba81515c47cb3f1e50a41f47b57c6bf8ec547f9c8a95195e109f9478beb37a69a304663499a610514c4f2f778f91be9b62a6bdb953e1b85a8430ceee9d",
+  "@oxlint-tsgolint/darwin-arm64@npm:0.23.0": "e17e81055c2182b06ec51766941d1ae6a0381b4a1e052b026d2f592e6da3880258ab19e064bd118dcc48f86b60a18c33b4c8abaced11370da3ee0c4ca00e3e5b",
+  "@oxlint-tsgolint/darwin-x64@npm:0.23.0": "37cc945adfc7b647880f76bc67d51eac57a99cac22a096338eaebd1e2f37b1553124f244bee52e7f8434820dfd909a2ea95c383091f6d3b5e79636c6cf09b660",
+  "@oxlint-tsgolint/linux-arm64@npm:0.23.0": "8e86218c4d947affa90b2fd148d75899f88fad013cafadfd7f3e7d780230f23af982502c4e3c28c418ac39b3ecb1e19bb9e00011176950c93ecc7a95b95df307",
+  "@oxlint-tsgolint/linux-x64@npm:0.23.0": "6bf6a5ff95c7bc92a6a6590db83f9b6dc595b60cc5237aa4262f7c9c5ee025b351a6b541bd01f7c9ef5d5e48e636d758e3e23242197a7d7181c42e99bb101879",
+  "@oxlint-tsgolint/win32-arm64@npm:0.23.0": "19d0e140073c7bb4b0df1845df03b33fde14889331c99978d4052aeae8ae288fbd1e968ab7ac163f39d0fef35ac026f27f049eabfa713f69a8bdad5416ff509e",
+  "@oxlint-tsgolint/win32-x64@npm:0.23.0": "c4cc0d3155382b81e6949297b993db383b37130dae254aaa450e72d5991b7d8ef9d34dde95e86f42297ad896c276eb2a5b1cd54da101dcec09153e99a8fa8e0f",
+  "@oxlint/binding-android-arm-eabi@npm:1.70.0": "576c756510ae4141c731669f45d89d4e66b80c40e094c492d5a96f6f6fe8e91af7010ff3760199a305cf788310692f832dc059ef38ccfbc74ebcfdb7afe6ab55",
+  "@oxlint/binding-android-arm64@npm:1.70.0": "85bbf851de0860fb18bb8c839ef50edfe95a2eae9e59a393055f1ece175e5b5324193c9be6c784e5d97ec300e7dcab4f83a29c7e50346b36efd7c16d8a901a19",
+  "@oxlint/binding-darwin-arm64@npm:1.70.0": "1b80940373898596c5fcfba65815581ea34ad916d41c97894f626abce094acac8555bf416e308b46ae81afdf42623618cb7463863a159c000ab130dd25bfdfd5",
+  "@oxlint/binding-darwin-x64@npm:1.70.0": "c84cdc76878cd085c2a2a963e5fac7d2e07fc7601e747404710e074a3766ac438438a047c48745ace76eb59f92cc8ab72036868af10068a549ed694301d55978",
+  "@oxlint/binding-freebsd-x64@npm:1.70.0": "9f76aa70ca71851978a9461f2d2bb3b009bde4a06f930b3f59e35a803c4718961cd7cc64b6d20996832529fe99f5d47a0c8a9fe5137ce18b7e9c879a0f721b0d",
+  "@oxlint/binding-linux-arm-gnueabihf@npm:1.70.0": "0755e542d531ff5a282714bfe6b207cd787f959952bd7cc3dca1567dbbe414cea6e50a99a1e83950b2e2ac4909c8191206cb7f592636dd332f0e69c90e2af641",
+  "@oxlint/binding-linux-arm-musleabihf@npm:1.70.0": "116fae450766a6d935c1ea72cab0ae34b07a0131bc81aa40741c506c682392d6f988fb4674aec9d27e43f3621df6d3a7c6621226d2884b26540db9cba289fa90",
+  "@oxlint/binding-linux-arm64-gnu@npm:1.70.0": "078d14a8c161453c885f85a96d8ca65875d2010decbd53dee97ed5b2e36df6a2bb4e49e5a8877ffafcdcae87442af560579be2bc504689d422b6bb6e1223ab04",
+  "@oxlint/binding-linux-arm64-musl@npm:1.70.0": "bf470dcc1fe242e2dba012a78cbd9aadda938e3864125df407457ae8a3d6372768b3107018ed935e994d567660d65b114f8125a29cb6aeaa28cd0c3c9be1ce8b",
+  "@oxlint/binding-linux-ppc64-gnu@npm:1.70.0": "c2c6e315722208d0a5b69b6914123879fb575d1a47114b86b6bc642978305302e4a442065eba68613870d262f37bce4d76f94f2e33ffbfa009cdacc7d911b3c3",
+  "@oxlint/binding-linux-riscv64-gnu@npm:1.70.0": "281cb6a85618c8d18416976627f5aad57efe9c6f9bc4a3f9846832616d38aff1811018575aa4e86446d54eb56bfa9a50f3fab50b79ed3fe342cff3e02894ec97",
+  "@oxlint/binding-linux-riscv64-musl@npm:1.70.0": "c583ba96d48900d3d62aaf9399fed3b1d4c0f6310883192c5dc1624baa6ab80428453eeb56452cbfd636359b853b5582895e7075d844235d79d3f8227a606910",
+  "@oxlint/binding-linux-s390x-gnu@npm:1.70.0": "a831b82844d8de4d9914c8a7083f65460309a00f2cd06e01b5b4b5709bca10261143c8742c5f332e76a477a9f49706d91ba03700f68ca973a689226509d1345a",
+  "@oxlint/binding-linux-x64-gnu@npm:1.70.0": "8aec65aa456257f37462083fa532b7fac14956320dc5e59d94b7fa2bf38783ffb30e0b1d01ed86f097bffc922f4e0ee7b5381aa17e3e31342c30191dc91944cb",
+  "@oxlint/binding-linux-x64-musl@npm:1.70.0": "cbfe64382cd29e256146e03aa7d424ba52d6cd097f413abf4e905b4eebe8b1a71aade73a09fe4afe7b1a43be3709161c0d0fede9042678eabf406dcffac9fd33",
+  "@oxlint/binding-openharmony-arm64@npm:1.70.0": "f0138fe9858816026bc50a84332a53d9c9c7121b621539a1d3de87eddadb2c5c8fb387ebbb4cc6676e99a9b16921db9d6138570d43c217d41c215751f1ac357b",
+  "@oxlint/binding-win32-arm64-msvc@npm:1.70.0": "338873a04a5c00ff76be3bcdc1991cfe65c35257f1703b984da009c6e0abf31d06a6b3b3943d76db4c1423116299d6f29a1c0485c4f528cc24b49b3ef1302103",
+  "@oxlint/binding-win32-ia32-msvc@npm:1.70.0": "3149d183b7f4d8c90348a24521d0a442d3673b55e4e0a6d2bc26e618e57a33f24cc76492156254d79acaf986803ebdec8d7f310db1547802a49c5e0a4a0fa593",
+  "@oxlint/binding-win32-x64-msvc@npm:1.70.0": "bc410bfd875fe7e677bed2c8c90a5380155543136130dbc363a72c796c84926e1e79cf072da040ba82c87f5d1ed616e71a17caebf876a76d880217d22760a698",
+  "@rolldown/binding-android-arm64@npm:1.0.3": "35e2b7f9e54c526cee5433351b0ef376dd1657d8a6eecf00512dec4720bb02594268bf8d3b661199917bdd286d4370bf3c3461b08eb74f0eae77bd13585e260a",
+  "@rolldown/binding-darwin-arm64@npm:1.0.3": "7e7d168d091053100a785c0240d6d6134039bf0fb7a658624fa33426b148e9b8131d1690729b32a7b1e65329879c15601b7afd576e149ca6feb6302c530ed860",
+  "@rolldown/binding-darwin-x64@npm:1.0.3": "0721c045d1446138e49dca250c8716c1b2eb4f1595bf1226a2c273befa063f91c4623e4cd5d338e969626e4281541b958c4a3d4649c0c553da0ec42292450a8d",
+  "@rolldown/binding-freebsd-x64@npm:1.0.3": "faa48a73ac1b1a4af8ed7b67932a59b62f139d76f21d1ccbe5efb5ab8a5a61e1f5de0b5d9367a9ecd8759bdab3aa1734aefd2214bbe2cfc4b0cb119f6e5391da",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": "fab607d7639bf6d3393f6e0da0c9680e2d357b550abc50d7dc60cd45e25c788cddee38deac074d9c987e22532d83dcd8a76564710654663bd65622a190548c72",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.3": "a067fc8d80a6af88893010abb55d697221afa8f9d3f468082bc759305f2decbf16f8655a5313e6e608d1b2f103d28922607290ab85d575b78930bc9daa777204",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.3": "b1264d8302780c991260991733cf156c1ed43fed66fce60e5a265577aced196b92907cfcbe8d3262621b8e08106f1f555743c601fe60676c08ffae0edd821128",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": "82f33061f5003b99bac68a0637bf7665f6fb2b22cfc025e4d7762afefe703af2acc1cd2df8ff07bb000b0eecd3e59959992481a5b03794604af090eaa843c70f",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.3": "a6a3811352aa5db6a793879bf405bb98eaeca06cfd1aae959a9ed70db39b28e0a022ca50524cdd26d0447fa7b9c5ef913281cf543f816ac6e3ea6b6d620af88a",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.3": "13ece4e580f022a1a70031da2036448097bc38d040d1e87ee81cffd9e1ab8b64673e92843718470e3d07ea664171dc2c20d766cbafbb0ca8774e3c4f0b122c7d",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.3": "6beeffe835e820679868021e01fb629fe124813911dd625bd3d24b1592450c06131b360e284396aca04798e6a85f988917ea00e95b3ea087a32a45441bad3235",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.3": "f8e8352edde4d2345e3e360bb050915daf0d9ee4c491024a08e56088801994f2cbdf0152f81115a089c1870863e6384135765126114cf8481933bc15678e1dde",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.3": "3f73081fc41cbd8c117183fecb0f491a71278472c0640b54e57a3a6705005f54d7997c610244d2ff651d5d688a20596ab1119e3dccf607f59fdea4ec0621da49",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.3": "a29f05721b276acdeb7f00b43b9c6241f9c4cc60b820d6b9217d205cfd0ee66a82a29da501e60163c66ce7cc8cb6362f88933b466dea66e3219b38d15954873e",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.3": "d6afa484d89c9479561a0621709dfc9737584515f87e96fa74f7d153bbde74f81b6ba7aac92187189ffb4dd1795fa152c596a04ae9a41ffab7437babc5a15838",
   "@rollup/rollup-android-arm-eabi@npm:4.60.4": "713883389421bcaea56b37c79e624da343aeaa28812de226542407bb1e62c3593c24b0b94ee2fa74893963b124b1d6a6eac4b10bbd54c1736923dc67a953b3de",
   "@rollup/rollup-android-arm64@npm:4.60.4": "04117967684c227a7d764e13f85c66093619ff8a800a2004138a258cbfeb4748db8bc477496e0c9421c1cbb1ad5ca92e2665a143c6cdba33502aa59cd2c04ffe",
   "@rollup/rollup-darwin-arm64@npm:4.60.4": "3e7fe7279af3981c4e9b5cc4ca3099ff403545a1b63e2e66c2f5fae400fdd05c82ec430d087c0f444b59fb56a23a5ac3b802129d99c9e13be4a299aa8d2cf538",
diff --git a/pkgs/by-name/ou/outline/package.nix b/pkgs/by-name/ou/outline/package.nix
index 89ff4c7ca055..b8ed986bc21b 100644
--- a/pkgs/by-name/ou/outline/package.nix
+++ b/pkgs/by-name/ou/outline/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "outline";
-  version = "1.8.1";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jdG1sIJN1UiajsZ86+ztY3uXZgdS5MxjaPaKw/Glepo=";
+    hash = "sha256-F9JdeCuzmYeV2hxk0b1thQgo4cRl+aeUbBjK0MLzKH8=";
   };
 
   patches = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes patches;
-    hash = "sha256-uSXw/x+4d22ow7QE3nduTUDNlZebCrnW6OIzhSugcXw=";
+    hash = "sha256-xj6IBvANRQr2C/R47KrsSacPXqwtrAGv4ZeidJ4T5Hc=";
   };
 
   buildPhase = ''
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Fastest wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible";
     homepage = "https://www.getoutline.com/";
-    changelog = "https://github.com/outline/outline/releases";
+    changelog = "https://github.com/outline/outline/releases/v${finalAttrs.version}";
     license = lib.licenses.bsl11;
     maintainers = with lib.maintainers; [
       cab404

From 6f39ac6c3d33a22750ab37e3b8b28c48883ff630 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 16:15:01 +0000
Subject: [PATCH 0535/1386] wlc: 2.0.1 -> 2.1.0

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

diff --git a/pkgs/by-name/wl/wlc/package.nix b/pkgs/by-name/wl/wlc/package.nix
index fb49acc45ad7..2368b6c7f951 100644
--- a/pkgs/by-name/wl/wlc/package.nix
+++ b/pkgs/by-name/wl/wlc/package.nix
@@ -6,12 +6,12 @@
 
 python3.pkgs.buildPythonPackage rec {
   pname = "wlc";
-  version = "2.0.1";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2g6TDcX5AXLjWKSlIGTt6J1RRuZvxmAUX9lSKCAwYnY=";
+    hash = "sha256-aljCKtVrVyHCz6jd6XtBbhi1xm207lc25DU+1bqJYos=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 78e3a0877691fac433ce626641597f14de0d06af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 14 Jul 2026 09:16:00 -0700
Subject: [PATCH 0536/1386] python3Packages.paho-mqtt: regenerate certificates
 for tests

The certificate tests/ssl/server.crt expired on July 6, 2026, leading to

    ssl.SSLError: [SSL: SSLV3_ALERT_CERTIFICATE_EXPIRED] ssl/tls alert certificate expired (_ssl.c:1032)

in the tests.
---
 pkgs/development/python-modules/paho-mqtt/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
index ac25b8275f16..b0ea0015bb42 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
+  openssl,
   pytestCheckHook,
 }:
 
@@ -27,11 +28,17 @@ buildPythonPackage rec {
     hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY=";
   };
 
+  postPatch = ''
+    substituteInPlace tests/ssl/gen.sh \
+      --replace-fail "c_rehash certs" "#c_rehash certs"
+  '';
+
   build-system = [
     hatchling
   ];
 
   nativeCheckInputs = [
+    openssl
     pytestCheckHook
   ];
 
@@ -44,6 +51,10 @@ buildPythonPackage rec {
 
     # paho.mqtt not in top-level dir to get caught by this
     export PYTHONPATH=".:$PYTHONPATH"
+
+    pushd tests/ssl
+    HOME="$(mktemp -d)" ./gen.sh
+    popd
   '';
 
   disabledTests = [

From 57a976ec63dc24420b30b3a7a2de61fdd13de368 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 16:24:36 +0000
Subject: [PATCH 0537/1386] python3Packages.georss-client: 0.19 -> 2026.6.1

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

diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix
index 48df41452ef1..fef9ad854153 100644
--- a/pkgs/development/python-modules/georss-client/default.nix
+++ b/pkgs/development/python-modules/georss-client/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "georss-client";
-  version = "0.19";
+  version = "2026.6.1";
   pyproject = true;
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-client";
     tag = "v${version}";
-    hash = "sha256-+CmauNb+5mDbZXQCd8ZxZCz6FSfEPAnktkMjvQueiO0=";
+    hash = "sha256-3JaFZY6c5wlJs2yE3KJITJIeCgifzurW7chOfQubQ5w=";
   };
 
   build-system = [ setuptools ];

From ad1d90a90cc67774f21a1468cc90fe8aeb518eb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 16:37:51 +0000
Subject: [PATCH 0538/1386] python3Packages.cssbeautifier: 2.0.1 -> 2.0.3

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

diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix
index 65533d884fa0..ed9c278d554e 100644
--- a/pkgs/development/python-modules/cssbeautifier/default.nix
+++ b/pkgs/development/python-modules/cssbeautifier/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "cssbeautifier";
-  version = "2.0.1";
+  version = "2.0.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9hAsBYnIW+PBoBbO527jZh7kvV2ojUil+HCL+vZjriY=";
+    hash = "sha256-LC/RKTQlYQKd6GsXRO+iMcn6/iYCPbyYih3rDKD1yEU=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 4e21b7029ef0bef224c2c1347f449eee8fee13e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 14 Jul 2026 09:27:09 -0700
Subject: [PATCH 0539/1386] authentik: unpin structlog in
 django-{channels,dramatiq}-postgres

---
 pkgs/by-name/au/authentik/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index f1a75fdd3fea..13b363cbded6 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -307,7 +307,11 @@ let
 
         build-system = with final; [ hatchling ];
 
-        propagatedBuildInputs =
+        pythonRelaxDeps = [
+          "structlog"
+        ];
+
+        dependencies =
           with final;
           [
             channels
@@ -329,7 +333,11 @@ let
 
         build-system = with final; [ hatchling ];
 
-        propagatedBuildInputs =
+        pythonRelaxDeps = [
+          "structlog"
+        ];
+
+        dependencies =
           with final;
           [
             cron-converter

From fc253511aa90ccf5fa612b47c3290bf9d84313d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 16:41:31 +0000
Subject: [PATCH 0540/1386] octavePackages.control: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index afc3976c2eef..d152f0fb8d81 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -11,14 +11,14 @@
 
 buildOctavePackage rec {
   pname = "control";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "pkg-control";
     tag = "${pname}-${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-NOZi003brDQ5nVyP7w5n7hxhafbiBwMPErhhTQhn2bw=";
+    sha256 = "sha256-Miv+XFt8yAx890VfwI6lchW5u2wkaeOV3OfYNr9xWxs=";
   };
 
   # Running autoreconfHook inside the src directory fixes a compile issue about

From 2db26c2259efc8a68878dacf83927e2df00f826c Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 14 Jul 2026 18:41:37 +0200
Subject: [PATCH 0541/1386] acme: fix version scheme

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

diff --git a/pkgs/by-name/ac/acme/package.nix b/pkgs/by-name/ac/acme/package.nix
index 8131a6dcdd99..bc3ea21358e7 100644
--- a/pkgs/by-name/ac/acme/package.nix
+++ b/pkgs/by-name/ac/acme/package.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "acme";
-  version = "unstable-2021-11-05";
+  version = "0.97-unstable-2021-11-05";
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk";

From d0684eabb327795fb543942d1cc6d6b56da1b2a2 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:43:36 +0100
Subject: [PATCH 0542/1386] qalculate-qt: add maintainer magicquark

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

diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 82cb820f2394..7f8d43c348e7 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -47,7 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Ultimate desktop calculator";
     homepage = "http://qalculate.github.io";
-    maintainers = [ ];
+    maintainers = [
+      lib.maintainers.magicquark
+    ];
     license = lib.licenses.gpl2Plus;
     mainProgram = "qalculate-qt";
     platforms = lib.platforms.unix;

From 3c4808eda819a5a4555a721fcbddde388a79d871 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:44:13 +0100
Subject: [PATCH 0543/1386] qalculate-qt: 5.11.0 -> 5.12.0

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

diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 7f8d43c348e7..9ac1ec8f7d12 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.11.0";
+  version = "5.12.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5u/YA5/k7JQclIqJUKvzGEenEhndo52m23XlFjkhw78=";
+    hash = "sha256-zeHpTe4DlurFqdsrJBlXSl+vXCOdhJRCjHLDpFf2u1o=";
   };
 
   nativeBuildInputs = with qt6; [

From edddd2ed0243bf69757b90e8dd278652b06c6781 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Tue, 14 Jul 2026 03:42:57 -0400
Subject: [PATCH 0544/1386] keycloak.plugins.keycloak-metrics-spi: drop

Signed-off-by: Anish Pallati <i@anish.land>
---
 doc/release-notes/rl-2611.section.md          |  2 +
 nixos/tests/keycloak.nix                      | 10 +----
 pkgs/by-name/ke/keycloak/all-plugins.nix      |  6 ++-
 .../keycloak/keycloak-metrics-spi/default.nix | 45 -------------------
 4 files changed, 9 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 0b02ac2f8337..7decf27c018d 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -51,6 +51,8 @@
 
 - `zerofs` has been updated from `1.x` to `2.x` which is a breaking change. Volumes created by earlier releases are refused at open with a clear error. There is no migration tool; older volumes remain readable and writable by the release that created them.
 
+- `keycloak.plugins.keycloak-metrics-spi` has been removed. Keycloak exposes Prometheus metrics natively on its management interface; enable them with the `metrics-enabled` setting (and `event-metrics-user-enabled` for login and event counters). See [Gaining insights with metrics](https://www.keycloak.org/observability/configuration-metrics).
+
 - `alps` has been rewritten upstream, see [upstream repository](https://github.com/migadu/alps) for documentation.
 
 - `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias.
diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix
index 28b47661f3d8..8c5227dd443e 100644
--- a/nixos/tests/keycloak.nix
+++ b/nixos/tests/keycloak.nix
@@ -38,6 +38,7 @@ let
                 enable = true;
                 settings = {
                   hostname = certs.domain;
+                  metrics-enabled = true;
                 };
                 inherit initialAdminPassword;
                 sslCertificate = "${certs.${certs.domain}.cert}";
@@ -50,7 +51,6 @@ let
                 };
                 plugins = with config.services.keycloak.package.plugins; [
                   keycloak-discord
-                  keycloak-metrics-spi
                 ];
               };
               environment.systemPackages = with pkgs; [
@@ -131,13 +131,7 @@ let
                      | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header
             """)
 
-            # Register the metrics SPI
-            keycloak.succeed(
-                """${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt""",
-                """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password "$(<${adminPasswordFile})" """,
-                """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'""",
-                """curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'"""
-            )
+            keycloak.succeed("curl -sSf https://${certs.domain}:9000/metrics | grep '^jvm_'")
 
             # Publish the realm, including a test OIDC client and user
             keycloak.succeed(
diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix
index 5e36541557b5..183ed6657613 100644
--- a/pkgs/by-name/ke/keycloak/all-plugins.nix
+++ b/pkgs/by-name/ke/keycloak/all-plugins.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  config,
   callPackage,
   fetchMavenArtifact,
   junixsocket-common,
@@ -9,7 +11,6 @@
   keycloak-discord = callPackage ./keycloak-discord { };
   keycloak-enforce-mfa-authenticator = callPackage ./keycloak-enforce-mfa-authenticator { };
   keycloak-magic-link = callPackage ./keycloak-magic-link { };
-  keycloak-metrics-spi = callPackage ./keycloak-metrics-spi { };
   keycloak-orgs = callPackage ./keycloak-orgs { };
   keycloak-remember-me-authenticator = callPackage ./keycloak-remember-me-authenticator { };
   keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth { };
@@ -40,3 +41,6 @@
       hash = "sha256-xHxzBxriSd/OU8gEcDG00VRkJYPYJDfAfPh/FkQe+zg=";
     }).passthru.jar;
 }
+// lib.optionalAttrs config.allowAliases {
+  keycloak-metrics-spi = throw "keycloak.plugins.keycloak-metrics-spi has been removed in favor of Keycloak's native metrics."; # Added 2026-07-14
+}
diff --git a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix
deleted file mode 100644
index 7ae12fc8023a..000000000000
--- a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  maven,
-  lib,
-  stdenv,
-  fetchFromGitHub,
-}:
-maven.buildMavenPackage rec {
-  pname = "keycloak-metrics-spi";
-  version = "7.0.0";
-
-  src = fetchFromGitHub {
-    owner = "aerogear";
-    repo = "keycloak-metrics-spi";
-    tag = version;
-    hash = "sha256-C6ueYhSMVMGpjHF5QQj9jfaS9sGTZ3wKZq2xmNgTmAg=";
-  };
-
-  mvnHash =
-    let
-      mvnHashes = {
-        "aarch64-darwin" = "sha256-L+LVJGBVhkaWOdXpHep9f2s7hLr3enf5POm8U+Y7I1w=";
-        "x86_64-darwin" = "sha256-G/e0mgAGP+6zvX3b0EuI95bdLT7Bzwh1GgcAfxzsIhE=";
-        "aarch64-linux" = "sha256-Nrs+gqRYPKXWRr0COAsKmOrNaza2fxhEAJ5x896tKvA=";
-        "x86_64-linux" = "sha256-oHMkzXHR4mETH6VsxhFuap3AcjvTXytNkKlLY/mzT3g=";
-      };
-    in
-    mvnHashes.${stdenv.hostPlatform.system}
-      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://github.com/aerogear/keycloak-metrics-spi";
-    description = "Keycloak Service Provider that adds a metrics endpoint";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      benley
-      anish
-    ];
-  };
-}

From 52f857a58987e691567a8ae44a335103f46f90b0 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:50:25 +0100
Subject: [PATCH 0545/1386] qalculate-qt: enable __structuredattrs

---
 pkgs/by-name/qa/qalculate-qt/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 9ac1ec8f7d12..9b0504ddd8c8 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-zeHpTe4DlurFqdsrJBlXSl+vXCOdhJRCjHLDpFf2u1o=";
   };
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = with qt6; [
     qmake
     pkg-config

From 7d30d4732cd5e39b1861c8cdff1eab2ac0e931a1 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 14 Jul 2026 18:50:44 +0200
Subject: [PATCH 0546/1386] catdvi: enable __structuredAttrs, strictDeps

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

diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix
index 7433873ed170..298fff300310 100644
--- a/pkgs/by-name/ca/catdvi/package.nix
+++ b/pkgs/by-name/ca/catdvi/package.nix
@@ -19,6 +19,10 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "catdvi";
   version = "0.14";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchurl {
     url = with finalAttrs; "http://downloads.sourceforge.net/catdvi/catdvi-${version}.tar.bz2";
     hash = "sha256-orVQVdQuRXp//OGkA7xRidNi4+J+tkw398LPZ+HX+k8=";
@@ -51,13 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     '') buildPlatformTools
   );
 
-  nativeBuildInputs = [
-    texlive.bin.core
-    texlive.bin.core.dev
-  ];
-
   buildInputs = [
     tex
+    texlive.bin.core
   ];
 
   makeFlags = [

From fe64ea753d8b22a7a440ba102f91d97bdff0ebbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 14 Jul 2026 10:14:35 -0700
Subject: [PATCH 0547/1386] python3Packages.paho-mqtt_1: init at 1.6.1

---
 .../python-modules/paho-mqtt/1.nix            | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/paho-mqtt/1.nix

diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix
new file mode 100644
index 000000000000..6932b26dff79
--- /dev/null
+++ b/pkgs/development/python-modules/paho-mqtt/1.nix
@@ -0,0 +1,62 @@
+{
+  buildPythonPackage,
+  esphome,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+let
+  testing = fetchFromGitHub {
+    owner = "eclipse";
+    repo = "paho.mqtt.testing";
+    rev = "a4dc694010217b291ee78ee13a6d1db812f9babd";
+    hash = "sha256-SQoNdkWMjnasPjpXQF2yV97MUra8gb27pc3rNoA8Rjw=";
+  };
+in
+buildPythonPackage (finalAttrs: {
+  pname = "paho-mqtt";
+  version = "1.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "eclipse";
+    repo = "paho.mqtt.python";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "paho.mqtt" ];
+
+  doCheck = false;
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    ln -s ${testing} paho.mqtt.testing
+
+    # paho.mqtt not in top-level dir to get caught by this
+    export PYTHONPATH=".:$PYTHONPATH"
+  '';
+
+  disabledTests = [
+    # Fails during teardown
+    # RuntimeError: Client 01-zero-length-clientid.py exited with code None, expected 0
+    "test_01_zero_length_clientid"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    changelog = "https://github.com/eclipse/paho.mqtt.python/blob/${finalAttrs.src.tag}/ChangeLog.txt";
+    description = "MQTT version 5.0/3.1.1 client class";
+    homepage = "https://eclipse.org/paho";
+    license = lib.licenses.epl20;
+    inherit (esphome.meta) maintainers;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ccb3285fe6d..65e76b0ee766 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12713,6 +12713,8 @@ self: super: with self; {
 
   paho-mqtt = callPackage ../development/python-modules/paho-mqtt/default.nix { };
 
+  paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { };
+
   paintcompiler = callPackage ../development/python-modules/paintcompiler { };
 
   pajgps-api = callPackage ../development/python-modules/pajgps-api { };

From fd52742f71d9b4f1cb56f95aa4be38fed8b62e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 14 Jul 2026 10:15:07 -0700
Subject: [PATCH 0548/1386] esphome: use paho-mqtt_1

---
 pkgs/by-name/es/esphome/package.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 9a69084ffd7a..936f0caabe46 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -18,16 +18,7 @@ let
     packageOverrides = self: super: {
       esphome-dashboard = self.callPackage ./dashboard.nix { };
 
-      paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec {
-        version = "1.6.1";
-        src = fetchFromGitHub {
-          inherit (oldAttrs.src) owner repo;
-          tag = "v${version}";
-          hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg=";
-        };
-        build-system = with self; [ setuptools ];
-        doCheck = false;
-      });
+      paho-mqtt = self.paho-mqtt_1;
     };
   };
 in

From 3e897f9978f3e29d5265020f64e90f89ce995391 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Tue, 14 Jul 2026 12:22:04 -0500
Subject: [PATCH 0549/1386] wivrn: 26.6.1 -> 26.6.2

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

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index dc157a42d4ff..6f6171c1834b 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -56,13 +56,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "26.6.1";
+  version = "26.6.2";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eXU7hYLYchAb6AbCyINfTmOp0NdxK35Kg9tcid2ucg4=";
+    hash = "sha256-5e0XeP5DCdVrSQeDgNuCZP5McRbwybnpKuJw9cxHNPI=";
   };
 
   monado = applyPatches {

From 7eef2bac73ac5cf6f87ab0ee4aa420e196332f8c Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 14 Jul 2026 13:42:51 -0400
Subject: [PATCH 0550/1386] pi-coding-agent: 0.80.6 -> 0.80.7

Changelog: https://github.com/earendil-works/pi/blob/main/packages/coding-agent/CHANGELOG.md
---
 pkgs/by-name/pi/pi-coding-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index 2f036acdaab1..5ff7ab766f01 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -12,16 +12,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.80.6";
+  version = "0.80.7";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-e/wcHruEcBAHDF5tKvwew7LXjVp0eraHh2k+QaL2sCA=";
+    hash = "sha256-s7dD82fugvWRvqL1VTcEwCIR5JI6t7VeFHR9NdMtG00=";
   };
 
-  npmDepsHash = "sha256-xXEOR0epZcfbXayYGyJdBiFVliamBexqA+1Sd7wlGhU=";
+  npmDepsHash = "sha256-Bd/NIt3lyQR5Y7P+HksPxMQvJc0AjVfDi1M1bH3/eOg=";
 
   npmWorkspace = "packages/coding-agent";
 

From cb603799f430d0d740f7f20a9f15aef4a780a705 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 14 Jul 2026 20:55:22 +0300
Subject: [PATCH 0551/1386] opencloud: 7.2.0 -> 7.3.0

Diff: https://github.com/opencloud-eu/opencloud/compare/v7.2.0...v7.3.0

Changelog: https://github.com/opencloud-eu/opencloud/blob/v7.3.0/CHANGELOG.md
---
 pkgs/by-name/op/opencloud/idp-web.nix | 2 +-
 pkgs/by-name/op/opencloud/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix
index 1d7f65bda3e5..46e322e7424f 100644
--- a/pkgs/by-name/op/opencloud/idp-web.nix
+++ b/pkgs/by-name/op/opencloud/idp-web.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     pnpm = pnpm_11;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
     fetcherVersion = 4;
-    hash = "sha256-pQ01vBvC29B5oxDWtt7anI5QtFbvQFFBVamQtA2WTNo=";
+    hash = "sha256-buDYvRw4NTLxFSdDRZHiuXMVe9fJbe2iu5hr+zh6KLs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix
index 983299455638..6f9b665171fd 100644
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "opencloud";
-  version = "7.2.0";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "opencloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GAoDEXk7sBN7N0V/msi/fcJS72RqqlF6Qb5B9hArmvk=";
+    hash = "sha256-2YwDH4qD4PCbfi/nNGPqwtJIpf8MPMGrVRslNWOoDPM=";
   };
 
   postPatch = ''

From 0f718c1de397cfca76e6d5e1345a20202e8e5153 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 14 Jul 2026 20:57:23 +0300
Subject: [PATCH 0552/1386] opencloud.web: 7.1.2 -> 7.2.0

Diff: https://github.com/opencloud-eu/web/compare/v7.1.2...v7.2.0

Changelog: https://github.com/opencloud-eu/web/blob/v7.2.0/CHANGELOG.md
---
 pkgs/by-name/op/opencloud/web.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix
index 63367385af39..13e0d4a25879 100644
--- a/pkgs/by-name/op/opencloud/web.nix
+++ b/pkgs/by-name/op/opencloud/web.nix
@@ -10,20 +10,20 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencloud-web";
-  version = "7.1.2";
+  version = "7.2.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zwD/Mn7jL960EVaG3gVqFo6FPPMhQTMz3LKy8ZnOObk=";
+    hash = "sha256-BiOue8+zQ3+6RLiDbLMnxKEen2aav3bljji4d+0Hr5c=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_11;
     fetcherVersion = 4;
-    hash = "sha256-YEdZ5B11I6U140qam7e1TMOacRqUeINhr/TI13ddAa0=";
+    hash = "sha256-gCsgnOEi9rvtwTZy8J/i63D92Gl2V9ZihxCJ+Y5hLUE=";
   };
 
   nativeBuildInputs = [

From cf114a2eda5ecf2d03fee73777eabfd11f0c62d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 18:05:32 +0000
Subject: [PATCH 0553/1386] tpnote: 1.26.4 -> 1.26.6

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 5de922579090..8fc231900d75 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
-  version = "1.26.4";
+  version = "1.26.6";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RoFamyNkUkB+94ZcVcyIJ6OvX0T9NAzkYido5sU6IAc=";
+    hash = "sha256-ELRR2nIbkbD/WWS93lyHHYoPY/KLUBO9+/13UUFhA6Y=";
   };
 
-  cargoHash = "sha256-kJCp285pQCUtHCUEDehNFlz87K72XmYp5z6vJD790sQ=";
+  cargoHash = "sha256-gFfESz0yn9AJ4QCujaUyXrFnxyHzqi3IX5Gg0Gma0DQ=";
 
   nativeBuildInputs = [
     cmake

From 27bd73bfe6ac60bc6919091f242a15f2af485c03 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 5 Jul 2026 14:16:21 -0700
Subject: [PATCH 0554/1386] python3Packages.peakrdl-cheader: remove unnused
 dependency

---
 pkgs/development/python-modules/peakrdl-cheader/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/peakrdl-cheader/default.nix b/pkgs/development/python-modules/peakrdl-cheader/default.nix
index 1bef65a58fee..c7e605089f63 100644
--- a/pkgs/development/python-modules/peakrdl-cheader/default.nix
+++ b/pkgs/development/python-modules/peakrdl-cheader/default.nix
@@ -4,7 +4,6 @@
   gitUpdater,
   jinja2,
   lib,
-  peakrdl,
   setuptools,
   setuptools-scm,
   systemrdl-compiler,
@@ -30,7 +29,6 @@ buildPythonPackage (finalAttrs: {
 
   dependencies = [
     jinja2
-    peakrdl
     systemrdl-compiler
   ];
 

From f2630aede95bef7855bd256d9c1e1e7d5d441a30 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 5 Jul 2026 14:16:55 -0700
Subject: [PATCH 0555/1386] python3Packages.peakrdl-regblock: cleanup

Remove unused dependency and switch to finalAttrs-style package definition.
---
 .../python-modules/peakrdl-regblock/default.nix           | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/peakrdl-regblock/default.nix b/pkgs/development/python-modules/peakrdl-regblock/default.nix
index 040c768fc1db..bc83640a9a3d 100644
--- a/pkgs/development/python-modules/peakrdl-regblock/default.nix
+++ b/pkgs/development/python-modules/peakrdl-regblock/default.nix
@@ -4,13 +4,12 @@
   gitUpdater,
   jinja2,
   lib,
-  peakrdl,
   setuptools,
   setuptools-scm,
   systemrdl-compiler,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "peakrdl-regblock";
   version = "1.3.1";
 
@@ -19,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SystemRDL";
     repo = "PeakRDL-regblock";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UyDM8+hnZP5G9JqprBjVaL1kr5NyJXITaBVCfNEs2Cs=";
   };
 
@@ -30,7 +29,6 @@ buildPythonPackage rec {
 
   dependencies = [
     jinja2
-    peakrdl
     systemrdl-compiler
   ];
 
@@ -42,4 +40,4 @@ buildPythonPackage rec {
     license = lib.licenses.lgpl3;
     maintainers = [ lib.maintainers.jmbaur ];
   };
-}
+})

From 62f48359cb62278fcf620eb8ab51e859a5fd498c Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 5 Jul 2026 14:17:24 -0700
Subject: [PATCH 0556/1386] python3Packages.peakrdl-rust: cleanup

Remove unused dependency and switch to finalAttrs-style package definition.
---
 pkgs/development/python-modules/peakrdl-rust/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/peakrdl-rust/default.nix b/pkgs/development/python-modules/peakrdl-rust/default.nix
index a13ed8a20b49..31e0d933844f 100644
--- a/pkgs/development/python-modules/peakrdl-rust/default.nix
+++ b/pkgs/development/python-modules/peakrdl-rust/default.nix
@@ -4,12 +4,11 @@
   fetchFromGitHub,
   jinja2,
   lib,
-  peakrdl,
   systemrdl-compiler,
   uv-build,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "peakrdl-rust";
   version = "0.7.3";
 
@@ -18,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darsor";
     repo = "PeakRDL-rust";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1rdTz3w1SEDFWpTjKIk9eLgj3F09lDOMqqdUf8iDd7g=";
   };
 
@@ -27,7 +26,6 @@ buildPythonPackage rec {
   dependencies = [
     case-converter
     jinja2
-    peakrdl
     systemrdl-compiler
   ];
 
@@ -37,4 +35,4 @@ buildPythonPackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = [ lib.maintainers.jmbaur ];
   };
-}
+})

From 77b37b546a8f45a63b50cb820a310f8f161f7ef5 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 5 Jul 2026 14:18:00 -0700
Subject: [PATCH 0557/1386] python3Packages.peakrdl-ipxact: cleanup

Remove unused dependency and switch to finalAttrs-style package definition.
---
 .../python-modules/peakrdl-ipxact/default.nix        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/peakrdl-ipxact/default.nix b/pkgs/development/python-modules/peakrdl-ipxact/default.nix
index f8fdd217bc75..adfe6e5d89b8 100644
--- a/pkgs/development/python-modules/peakrdl-ipxact/default.nix
+++ b/pkgs/development/python-modules/peakrdl-ipxact/default.nix
@@ -3,13 +3,12 @@
   fetchFromGitHub,
   gitUpdater,
   lib,
-  peakrdl,
   setuptools,
   setuptools-scm,
   systemrdl-compiler,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "peakrdl-ipxact";
   version = "3.5.0";
 
@@ -18,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SystemRDL";
     repo = "PeakRDL-ipxact";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GFHgIyK82dt+/t0XbDdk61q0DXUOabxtjlhZhgacUVA=";
   };
 
@@ -27,10 +26,7 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies = [
-    peakrdl
-    systemrdl-compiler
-  ];
+  dependencies = [ systemrdl-compiler ];
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
@@ -40,4 +36,4 @@ buildPythonPackage rec {
     license = lib.licenses.lgpl3;
     maintainers = [ lib.maintainers.jmbaur ];
   };
-}
+})

From f7e936711f40379d082231531c1a7caf0878e811 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 18:15:31 +0000
Subject: [PATCH 0558/1386] python3Packages.yalexs-ble: 3.3.1 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix
index 6a202d8797c9..24ba441773ff 100644
--- a/pkgs/development/python-modules/yalexs-ble/default.nix
+++ b/pkgs/development/python-modules/yalexs-ble/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "yalexs-ble";
-  version = "3.3.1";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Yale-Libs";
     repo = "yalexs-ble";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TztulpCpTQefyFURZCjDVAVYTQCEs0KIcFGQGDjj02o=";
+    hash = "sha256-sNWLyg+ltwFu14QjoboA6r9zR+5jDHIy+F22Q7+GdoY=";
   };
 
   build-system = [ poetry-core ];

From a66fe2a0cc783c6afadcfa007ae0842fcc67fe75 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 5 Jul 2026 14:18:28 -0700
Subject: [PATCH 0559/1386] python3Packages.peakrdl-cli: move from
 python3Packages.peakrdl

This makes the derivation name for peakrdl-cli consistent with that of
the project name in pyproject.toml.
---
 .../{peakrdl => peakrdl-cli}/default.nix               | 10 +++++-----
 pkgs/top-level/python-aliases.nix                      |  1 +
 pkgs/top-level/python-packages.nix                     |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/development/python-modules/{peakrdl => peakrdl-cli}/default.nix (83%)

diff --git a/pkgs/development/python-modules/peakrdl/default.nix b/pkgs/development/python-modules/peakrdl-cli/default.nix
similarity index 83%
rename from pkgs/development/python-modules/peakrdl/default.nix
rename to pkgs/development/python-modules/peakrdl-cli/default.nix
index afa16f433a2b..112089c410d8 100644
--- a/pkgs/development/python-modules/peakrdl/default.nix
+++ b/pkgs/development/python-modules/peakrdl-cli/default.nix
@@ -9,8 +9,8 @@
   typing-extensions,
 }:
 
-buildPythonPackage rec {
-  pname = "peakrdl";
+buildPythonPackage (finalAttrs: {
+  pname = "peakrdl-cli";
   version = "1.5.0";
 
   pyproject = true;
@@ -18,10 +18,10 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SystemRDL";
     repo = "PeakRDL";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-SqLhOzx0gUVG8k4ikNbx8p1vO/ZqTQ/KAtidRWM2SZI=";
   };
-  sourceRoot = "${src.name}/peakrdl-cli";
+  sourceRoot = "${finalAttrs.src.name}/peakrdl-cli";
 
   build-system = [
     setuptools
@@ -42,4 +42,4 @@ buildPythonPackage rec {
     maintainers = [ lib.maintainers.jmbaur ];
     mainProgram = "peakrdl";
   };
-}
+})
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 16df0610345a..e59d88ce3f66 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -417,6 +417,7 @@ mapAliases {
   pathpy = throw "'pathpy' has been renamed to/replaced by 'path'"; # Converted to throw 2025-10-29
   pcbnew-transition = throw "'pcbnew-transition' has been renamed to/replaced by 'pcbnewtransition'"; # Converted to throw 2025-10-29
   pdfminer = throw "'pdfminer' has been renamed to/replaced by 'pdfminer-six'"; # Converted to throw 2025-10-29
+  peakrdl = throw "'peakrdl' has been renamed to/replaced by 'peakrdl-cli'"; # added 2026-07-14
   pep257 = throw "'pep257' has been renamed to/replaced by 'pydocstyle'"; # Converted to throw 2025-10-29
   percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25
   pilight = throw "'pilight' has been removed, because it is unmaintained since 2019 and the integration was removed from Home Assistant."; # added 2026-05-06
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ccb3285fe6d..3694b06b8468 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12967,10 +12967,10 @@ self: super: with self; {
 
   peacasso = callPackage ../development/python-modules/peacasso { };
 
-  peakrdl = callPackage ../development/python-modules/peakrdl { };
-
   peakrdl-cheader = callPackage ../development/python-modules/peakrdl-cheader { };
 
+  peakrdl-cli = callPackage ../development/python-modules/peakrdl-cli { };
+
   peakrdl-ipxact = callPackage ../development/python-modules/peakrdl-ipxact { };
 
   peakrdl-markdown = callPackage ../development/python-modules/peakrdl-markdown { };

From ebcc350a3b128bd2a629b3d4d9c70d3603e00769 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 5 Jul 2026 14:19:10 -0700
Subject: [PATCH 0560/1386] python3Packages.peakrdl-markdown: cleanup

This moves the package definition to use the finalAttrs-style, as well
as consumes the newly named "peakrdl-cli" package instead of the "peakrdl" one.
---
 .../python-modules/peakrdl-markdown/default.nix    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/peakrdl-markdown/default.nix b/pkgs/development/python-modules/peakrdl-markdown/default.nix
index eb59158f6ad8..3e5898da75b1 100644
--- a/pkgs/development/python-modules/peakrdl-markdown/default.nix
+++ b/pkgs/development/python-modules/peakrdl-markdown/default.nix
@@ -3,12 +3,13 @@
   fetchFromGitHub,
   gitUpdater,
   lib,
-  peakrdl,
-  py-markdown-table,
+  peakrdl-cli,
   poetry-core,
+  py-markdown-table,
+  systemrdl-compiler,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "peakrdl-markdown";
   version = "1.0.3";
 
@@ -17,15 +18,16 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SystemRDL";
     repo = "PeakRDL-markdown";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Dt8FxnvvXY9nVhFehIcfSC9mFbbEzEuaVnBMu032dug=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
-    peakrdl
+    peakrdl-cli
     py-markdown-table
+    systemrdl-compiler
   ];
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
@@ -36,4 +38,4 @@ buildPythonPackage rec {
     license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.jmbaur ];
   };
-}
+})

From 63b118e3270208700dca8676216302fd40006793 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 14 Jul 2026 09:10:41 -0700
Subject: [PATCH 0561/1386] python3Packages.uuid-utils: modernize

---
 .../development/python-modules/uuid-utils/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/uuid-utils/default.nix b/pkgs/development/python-modules/uuid-utils/default.nix
index 0e76ff406aa3..aebb314238c7 100644
--- a/pkgs/development/python-modules/uuid-utils/default.nix
+++ b/pkgs/development/python-modules/uuid-utils/default.nix
@@ -7,20 +7,21 @@
   rustPlatform,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "uuid-utils";
   version = "0.16.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "aminalaee";
     repo = "uuid-utils";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-5pGBc1+2Vx0nIwhLFBy/Mx5GLLzA7Oj4eWPPCfBV1v4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname src version;
+    inherit (finalAttrs) pname src version;
     hash = "sha256-o9fmecoYGu+UR0/Km6sGq5buVo8qHKnBSuvvfogmkx0=";
   };
 
@@ -50,8 +51,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings to Rust UUID";
     homepage = "https://github.com/aminalaee/uuid-utils";
-    changelog = "https://github.com/aminalaee/uuid-utils/releases/tag/${src.tag}";
+    changelog = "https://github.com/aminalaee/uuid-utils/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ sarahec ];
   };
-}
+})

From e24285324ac86b6f0143464437177f899a791764 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 14 Jul 2026 09:12:36 -0700
Subject: [PATCH 0562/1386] python3Packages.uuid-utils: 0.16.1 -> 0.17.0

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

diff --git a/pkgs/development/python-modules/uuid-utils/default.nix b/pkgs/development/python-modules/uuid-utils/default.nix
index aebb314238c7..e2e0b87c5573 100644
--- a/pkgs/development/python-modules/uuid-utils/default.nix
+++ b/pkgs/development/python-modules/uuid-utils/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "uuid-utils";
-  version = "0.16.1";
+  version = "0.17.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -17,12 +17,12 @@ buildPythonPackage (finalAttrs: {
     owner = "aminalaee";
     repo = "uuid-utils";
     tag = finalAttrs.version;
-    hash = "sha256-5pGBc1+2Vx0nIwhLFBy/Mx5GLLzA7Oj4eWPPCfBV1v4=";
+    hash = "sha256-AshQOXB6o1CMByRn9um8E2Y4sexyRu4W8H3NelFe1HM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname src version;
-    hash = "sha256-o9fmecoYGu+UR0/Km6sGq5buVo8qHKnBSuvvfogmkx0=";
+    hash = "sha256-vf6w+oYH3tdxvV5TLSgZOAXlFypCe2swjkw25VWCqB8=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 4817d0d105afdc2b8a339bd2032424fc94b67bfc Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 14 Jul 2026 20:33:34 +0200
Subject: [PATCH 0563/1386] apg: fix version scheme

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

diff --git a/pkgs/by-name/ap/apg/package.nix b/pkgs/by-name/ap/apg/package.nix
index 6e9f75e175fe..cff5c824551c 100644
--- a/pkgs/by-name/ap/apg/package.nix
+++ b/pkgs/by-name/ap/apg/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation {
   pname = "apg";
-  version = "unstable-2015-01-29";
+  version = "2.3.0b-unstable-2015-01-29";
 
   src = fetchFromGitHub {
     owner = "wilx";

From dded97b006b6bcfcfa189d8ce2a14c1f8ad084a9 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:39:54 +0700
Subject: [PATCH 0564/1386] python3Packages.vcversioner: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix
index d0f69829980e..58ccc5999959 100644
--- a/pkgs/development/python-modules/vcversioner/default.nix
+++ b/pkgs/development/python-modules/vcversioner/default.nix
@@ -2,18 +2,21 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "vcversioner";
   version = "2.16.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns";
   };
 
+  build-system = [ setuptools ];
+
   meta = {
     description = "Take version numbers from version control";
     homepage = "https://github.com/habnabit/vcversioner";

From 51b9dbb26cac1910c1e65d8ec4e4f2047560181f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:41:07 +0700
Subject: [PATCH 0565/1386] python3Packages.usbrelay-py: migrate to pyproject

---
 pkgs/os-specific/linux/usbrelay/python.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/usbrelay/python.nix b/pkgs/os-specific/linux/usbrelay/python.nix
index 95114b0ddb20..376e2bf61bf5 100644
--- a/pkgs/os-specific/linux/usbrelay/python.nix
+++ b/pkgs/os-specific/linux/usbrelay/python.nix
@@ -1,10 +1,16 @@
-{ buildPythonPackage, usbrelay }:
+{
+  buildPythonPackage,
+  setuptools,
+  usbrelay,
+}:
 
 buildPythonPackage {
-  format = "setuptools";
   pname = "usbrelay_py";
+  pyproject = true;
   inherit (usbrelay) version src;
 
+  build-system = [ setuptools ];
+
   preConfigure = ''
     cd usbrelay_py
   '';

From 3f07b6fc3287d5a6a752a004aedd341447be8362 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:41:13 +0700
Subject: [PATCH 0566/1386] python3Packages.varint: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/varint/default.nix b/pkgs/development/python-modules/varint/default.nix
index e8741ebeca82..187a98154d62 100644
--- a/pkgs/development/python-modules/varint/default.nix
+++ b/pkgs/development/python-modules/varint/default.nix
@@ -2,17 +2,20 @@
   buildPythonPackage,
   fetchPypi,
   lib,
+  setuptools,
 }:
 buildPythonPackage rec {
   pname = "varint";
   version = "1.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "a6ecc02377ac5ee9d65a6a8ad45c9ff1dac8ccee19400a5950fb51d594214ca5";
   };
 
+  build-system = [ setuptools ];
+
   # No tests are available
   doCheck = false;
 

From ea3f1f2fda7a5af9508bca6a8c4877a5cb226422 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:41:14 +0700
Subject: [PATCH 0567/1386] python3Packages.variants: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix
index bd8f044b57f6..eb0f2cf11300 100644
--- a/pkgs/development/python-modules/variants/default.nix
+++ b/pkgs/development/python-modules/variants/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pytestCheckHook,
   setuptools-scm,
   six,
@@ -10,14 +11,17 @@
 buildPythonPackage rec {
   pname = "variants";
   version = "0.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-UR91tM90g8J+TYbZrM8rUxcmeQDBZtF2Nr7u0RiSm5A=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook

From a1a36bfe71225fdc12b6a8d31cae2addcf873571 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 12:03:08 -0400
Subject: [PATCH 0568/1386] freebsd.libcompiler_rt: init

---
 .../bsd/freebsd/pkgs/libcompiler_rt.nix       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix
new file mode 100644
index 000000000000..1d6f44e3fd19
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix
@@ -0,0 +1,31 @@
+{
+  stdenv,
+  lib,
+  mkDerivation,
+  include,
+}:
+
+mkDerivation {
+  path = "lib/libcompiler_rt";
+  extraPaths = [
+    "contrib/llvm-project/compiler-rt"
+  ];
+
+  buildInputs = [
+    include
+  ];
+
+  # The build system is importing source files from another directory,
+  # then trying to put the objects in lib/libcompiler_rt
+  # It does not create subdirectories in the lib/libcompiler_rt directory.
+  preBuild = ''
+    mkdir cpu_model
+  ''
+  + lib.optionalString stdenv.hostPlatform.isx86_64 ''
+    mkdir i386
+  '';
+
+  noLibc = true;
+
+  alwaysKeepStatic = true;
+}

From 9ab1989aba6b1b1a108e6fa3c342a29aad3f3a14 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 14:41:39 -0400
Subject: [PATCH 0569/1386] freebsd: Build packages with compiler-rt

---
 .../patches/15.0/bmake-no-compiler-rt.patch   | 11 ----------
 .../15.0/libc-no-force--lcompiler-rt.patch    | 21 -------------------
 .../15.0/rtld-no-force--lcompiler-rt.patch    | 10 ---------
 .../bsd/freebsd/pkgs/libcMinimal.nix          |  2 ++
 pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix  |  2 ++
 .../os-specific/bsd/freebsd/pkgs/rtld-elf.nix |  2 ++
 6 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
 delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
 delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch

diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
deleted file mode 100644
index 20be3503fd17..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/share/mk/src.libnames.mk	2023-12-21 23:56:50.767042385 -0800
-+++ b/share/mk/src.libnames.mk	2023-12-21 23:56:39.671089506 -0800
-@@ -392,7 +392,7 @@
- _DP_ztest=	geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp
- # The libc dependencies are not strictly needed but are defined to make the
- # assert happy.
--_DP_c=		compiler_rt sys
-+_DP_c=		sys
- # Use libssp_nonshared only on i386 and power*.  Other archs emit direct calls
- # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared.
- .if ${MK_SSP} != "no" && \
diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
deleted file mode 100644
index 3cc8fee77355..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lib/libc/Makefile
-+++ b/lib/libc/Makefile
-@@ -58,7 +58,6 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
- # Link with static libcompiler_rt.a.
- #
- LDFLAGS+= -nodefaultlibs
--LIBADD+=	compiler_rt
- LIBADD+=	sys
- 
- .if ${MK_SSP} != "no" && \
---- a/lib/libsys/Makefile
-+++ b/lib/libsys/Makefile
-@@ -46,7 +46,6 @@
- #
- LDFLAGS+= -nodefaultlibs
- LDFLAGS+= -Wl,-Bsymbolic
--LIBADD+=	compiler_rt
-
- .if ${MK_SSP} != "no" && \
-     (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "")
-
diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch
deleted file mode 100644
index 45f0d0c51eec..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libexec/rtld-elf/Makefile
-+++ b/libexec/rtld-elf/Makefile
-@@ -86,7 +86,6 @@ 
- 
- # Some of the required math functions (div & mod) are implemented in
- # libcompiler_rt on some architectures.
--LIBADD+=	compiler_rt
- 
- .include <bsd.prog.mk>
- ${PROG_FULL}:  ${VERSION_MAP}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
index 6ad205b215ab..515fcc7d82fc 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
@@ -9,6 +9,7 @@
   i18n,
   libsys,
   llvmPackages,
+  libcompiler_rt,
   extraSrc ? [ ],
 }:
 
@@ -52,6 +53,7 @@ mkDerivation {
   buildInputs = [
     include
     libsys
+    libcompiler_rt
   ];
 
   extraNativeBuildInputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
index 67611f7e0ce1..a4360a99021c 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation,
   include,
+  libcompiler_rt,
   csu,
 }:
 
@@ -25,6 +26,7 @@ mkDerivation {
   buildInputs = [
     include
     csu
+    libcompiler_rt
   ];
 
   preBuild = ''
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index eef5e067da29..db41b450a168 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -7,6 +7,7 @@
   flex,
   byacc,
   csu,
+  libcompiler_rt,
   extraSrc ? [ ],
 }:
 
@@ -55,6 +56,7 @@ mkDerivation {
   buildInputs = [
     include
     libsys
+    libcompiler_rt
   ];
 
   extraNativeBuildInputs = [

From 25a581579fd75f10e6465b14663a2440ebb9ec12 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 10:40:32 -0400
Subject: [PATCH 0570/1386] freebsd: fix compile for aarch64-freebsd

---
 pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix |  5 +++++
 pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix      |  6 ++++++
 pkgs/os-specific/bsd/freebsd/pkgs/msun.nix        |  5 +++++
 pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix    |  5 +++++
 pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix | 14 +++++++++-----
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
index 515fcc7d82fc..01473102e061 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   rpcgen,
@@ -40,6 +42,9 @@ mkDerivation {
     "include/paths.h"
     "include/gssapi"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
+  ]
   ++ extraSrc;
 
   outputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
index 6bcc4639d15f..22e2f32bf868 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   libcMinimal,
@@ -30,6 +32,10 @@ mkDerivation {
 
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib"
+  ''
+  # Undefined symbols in the version script related to arm-optimized-routines
+  + lib.optionalString (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS --undefined-version"
   '';
 
   postBuild = ''
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix b/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
index 87e081c6c445..3f9f0414f581 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   libcMinimal,
@@ -10,6 +12,9 @@ mkDerivation {
   path = "lib/msun";
   extraPaths = [
     "lib/libc" # wants arch headers
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
   ];
 
   outputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index db41b450a168..5fcb65fcb811 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   fetchpatch,
   include,
@@ -33,6 +35,9 @@ mkDerivation {
     "sys/crypto"
     "include/gssapi"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
+  ]
   ++ extraSrc;
 
   patches = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index e2a765552add..fa7bba6025e2 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -26,6 +26,7 @@
   kldxref,
   ctfconvert,
   ctfmerge,
+  dtc,
 }:
 let
   baseConfigFile =
@@ -35,7 +36,7 @@ let
       extraConfig
     else
       writeText "extraConfig" extraConfig;
-  hostArchBsd = freebsd-lib.mkBsdArch stdenv;
+  hostMachineBsd = freebsd-lib.mkBsdMachine stdenv;
   filteredSource = filterSource {
     pname = "sys";
     path = "sys";
@@ -57,7 +58,7 @@ let
       done
     ''
     + lib.optionalString (baseConfigFile != null) ''
-      cat ${baseConfigFile} >>sys/${hostArchBsd}/conf/${baseConfig}
+      cat ${baseConfigFile} >>sys/${hostMachineBsd}/conf/${baseConfig}
     '';
   };
 
@@ -93,7 +94,9 @@ mkDerivation rec {
     kldxref
     ctfconvert
     ctfmerge
-  ];
+  ]
+  # Device trees are built in the same sys package
+  ++ lib.optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) dtc;
 
   # --dynamic-linker /red/herring is used when building the kernel.
   NIX_ENFORCE_PURITY = 0;
@@ -125,7 +128,8 @@ mkDerivation rec {
 
   KODIR = "${placeholder "out"}/kernel";
   KMODDIR = "${placeholder "out"}/kernel";
-  DTBDIR = "${placeholder "out"}/dbt";
+  DTBDIR = "${placeholder "out"}/dtb";
+  DTBODIR = "${placeholder "out"}/dtb/overlays";
 
   KERN_DEBUGDIR = "${placeholder "debug"}/lib/debug";
   KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel";
@@ -136,7 +140,7 @@ mkDerivation rec {
   configurePhase = ''
     runHook preConfigure
 
-    cd ${hostArchBsd}/conf
+    cd ${hostMachineBsd}/conf
     config ${baseConfig}
 
     runHook postConfigure

From 59a3770b9fc4d72563733c936ed1a39660a6a704 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:42:18 +0700
Subject: [PATCH 0571/1386] python3Packages.vdf: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix
index dbe58cc29206..33fb0f95a11b 100644
--- a/pkgs/development/python-modules/vdf/default.nix
+++ b/pkgs/development/python-modules/vdf/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch2,
+  setuptools,
   mock,
   pytestCheckHook,
   nix-update-script,
@@ -11,7 +12,7 @@
 buildPythonPackage rec {
   pname = "vdf";
   version = "3.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ValvePython";
@@ -28,6 +29,8 @@ buildPythonPackage rec {
     })
   ];
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     mock
     pytestCheckHook

From eb449d7a6a35cf71d985c60aa03dc262ed9f206e Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:42:21 +0700
Subject: [PATCH 0572/1386] python3Packages.venstarcolortouch: migrate to
 pyproject

---
 .../python-modules/venstarcolortouch/default.nix           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix
index 871c381848ad..7fc190106bcb 100644
--- a/pkgs/development/python-modules/venstarcolortouch/default.nix
+++ b/pkgs/development/python-modules/venstarcolortouch/default.nix
@@ -2,20 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   requests,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "venstarcolortouch";
   version = "0.22";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-R9BJmZcseYlFLcoDUxfH3M0FO5GVsDtw7smK2dmLlNo=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   # Project has no tests
   doCheck = false;

From 9423476732a5d874668696804ba7528b8e1fe2c5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:42:30 +0700
Subject: [PATCH 0573/1386] python3Packages.utils: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix
index d7d229d44ed7..d54cd141efdb 100644
--- a/pkgs/development/python-modules/utils/default.nix
+++ b/pkgs/development/python-modules/utils/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   mock,
   pytestCheckHook,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "utils";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "haaksmash";
@@ -18,6 +19,8 @@ buildPythonPackage rec {
     sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     mock
     pytestCheckHook

From d6bc83f75d2ea745ca2ce4e66c7acfa3ac0d21ec Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:43:28 +0700
Subject: [PATCH 0574/1386] python3Packages.variants: modernize

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

diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix
index eb0f2cf11300..41c5f862636f 100644
--- a/pkgs/development/python-modules/variants/default.nix
+++ b/pkgs/development/python-modules/variants/default.nix
@@ -8,13 +8,16 @@
   six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "variants";
   version = "0.2.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    pname = "variants";
+    inherit (finalAttrs) version;
     hash = "sha256-UR91tM90g8J+TYbZrM8rUxcmeQDBZtF2Nr7u0RiSm5A=";
   };
 
@@ -33,8 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library providing syntactic sugar for creating variant forms of a canonical function";
     homepage = "https://github.com/python-variants/variants";
-    changelog = "https://github.com/python-variants/variants/releases/tag/${version}";
+    changelog = "https://github.com/python-variants/variants/releases/tag/${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rakesh4g ];
   };
-}
+})

From 9b02cdbe94925172542e4f7b74d36e2492f8f462 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:43:29 +0700
Subject: [PATCH 0575/1386] python3Packages.varint: modernize

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

diff --git a/pkgs/development/python-modules/varint/default.nix b/pkgs/development/python-modules/varint/default.nix
index 187a98154d62..30212770567a 100644
--- a/pkgs/development/python-modules/varint/default.nix
+++ b/pkgs/development/python-modules/varint/default.nix
@@ -4,14 +4,17 @@
   lib,
   setuptools,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "varint";
   version = "1.0.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "a6ecc02377ac5ee9d65a6a8ad45c9ff1dac8ccee19400a5950fb51d594214ca5";
+    pname = "varint";
+    inherit (finalAttrs) version;
+    hash = "sha256-puzAI3esXunWWmqK1Fyf8drIzO4ZQApZUPtR1ZQhTKU=";
   };
 
   build-system = [ setuptools ];
@@ -27,4 +30,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rakesh4g ];
   };
-}
+})

From f35c3a75837f4abca1f98d5e2f0a86d810276642 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:43:39 +0700
Subject: [PATCH 0576/1386] python3Packages.vcversioner: modernize

---
 .../python-modules/vcversioner/default.nix          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix
index 58ccc5999959..0917620dd968 100644
--- a/pkgs/development/python-modules/vcversioner/default.nix
+++ b/pkgs/development/python-modules/vcversioner/default.nix
@@ -5,21 +5,26 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "vcversioner";
   version = "2.16.0.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns";
+    pname = "vcversioner";
+    inherit (finalAttrs) version;
+    hash = "sha256-2uYMF6R5eB9EpAEHAYM/GCkUCx7szSWHYqdJdKoG4Zs=";
   };
 
   build-system = [ setuptools ];
 
+  pythonImportsCheck = [ "vcversioner" ];
+
   meta = {
     description = "Take version numbers from version control";
     homepage = "https://github.com/habnabit/vcversioner";
     license = lib.licenses.isc;
   };
-}
+})

From 807ab51a375b25056f4c66b055d606ad4e4917f3 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:44:43 +0700
Subject: [PATCH 0577/1386] python3Packages.venstarcolortouch: modernize

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

diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix
index 7fc190106bcb..4f16fe6cfa43 100644
--- a/pkgs/development/python-modules/venstarcolortouch/default.nix
+++ b/pkgs/development/python-modules/venstarcolortouch/default.nix
@@ -11,8 +11,11 @@ buildPythonPackage (finalAttrs: {
   version = "0.22";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit (finalAttrs) pname version;
+    pname = "venstarcolortouch";
+    inherit (finalAttrs) version;
     hash = "sha256-R9BJmZcseYlFLcoDUxfH3M0FO5GVsDtw7smK2dmLlNo=";
   };
 

From 6e8b1186883bda126f9aadae6e248ad02c2b9c4c Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:44:48 +0700
Subject: [PATCH 0578/1386] python3Packages.vdf: modernize

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

diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix
index 33fb0f95a11b..1d5e8f6720f5 100644
--- a/pkgs/development/python-modules/vdf/default.nix
+++ b/pkgs/development/python-modules/vdf/default.nix
@@ -9,15 +9,17 @@
   nix-update-script,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "vdf";
   version = "3.4";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "ValvePython";
     repo = "vdf";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU=";
   };
 
@@ -48,4 +50,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kira-bruneau ];
   };
-}
+})

From 81e2b00da2ad765b70f0bb30d56c632329e322e1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:45:03 +0700
Subject: [PATCH 0579/1386] python3Packages.utils: modernize

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

diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix
index d54cd141efdb..ced84a781e69 100644
--- a/pkgs/development/python-modules/utils/default.nix
+++ b/pkgs/development/python-modules/utils/default.nix
@@ -7,16 +7,18 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "utils";
   version = "1.0.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "haaksmash";
     repo = "pyutils";
-    rev = version;
-    sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr";
+    tag = finalAttrs.version;
+    hash = "sha256-eb2trh3eawdAcPo3De9NgYN2HT1+FGju/F4V7lga+R4=";
   };
 
   build-system = [ setuptools ];
@@ -34,4 +36,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ lgpl3Only ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From cb7be403c8c89bc290dcb411c8f0e4de854c9feb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 18:48:26 +0000
Subject: [PATCH 0580/1386] openvpn3: 27 -> 27.1

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

diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index 1e02705d6a55..6fa76e6e2ff3 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -37,13 +37,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openvpn3";
-  version = "27";
+  version = "27.1";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "openvpn3-linux";
     tag = "v${version}";
-    hash = "sha256-H+QF0Z1IUKx2U0+V7KHaAd/AKbuJEKLIwqyK2srD8DM=";
+    hash = "sha256-Egt6lVcvlmxnABw4v0cdROQzVdkA3DgOGGCSgl+QFdM=";
     # `openvpn3-core` is a submodule.
     # TODO: make it into a separate package
     fetchSubmodules = true;

From d8f7f89d99f767ade41bae9d6a63dbaa13579575 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Tue, 14 Jul 2026 19:29:28 +0000
Subject: [PATCH 0581/1386] netdata: fix dontStrip typo

As part of the #532401 tracking issue.
---
 pkgs/tools/system/netdata/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 1140ae4d7086..9fbfe0938c61 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation (
     # We pick zlib.dev as a simple canary package with pkg-config input.
     disallowedReferences = lib.optional (!withDebug) zlib.dev;
 
-    donStrip = withDebug || withLibbacktrace;
+    dontStrip = withDebug || withLibbacktrace;
     env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
 
     postInstall = ''

From 5e80c33857a25432ff8577abbe25d6059fa74fdc Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 7 Jul 2026 18:35:25 +0200
Subject: [PATCH 0582/1386] ttl: 0.19.1 -> 0.21.0

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

diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index 951013b18b87..9414fbbf0929 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -9,21 +9,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ttl";
-  version = "0.19.1";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "lance0";
     repo = "ttl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xY0z5GH6aLL38wOH6B2V9pAv9HnrJfpmQDjDKGSL4qo=";
+    hash = "sha256-bna3zD1RI2eSYX+IyDxi8IB/gys8PDDRThDdcUfcHR0=";
   };
 
-  cargoHash = "sha256-zYO3sY/MdDPfypDeseabTtwMeeUZQ8OiVfch+5fRetI=";
+  cargoHash = "sha256-VLNDcP7LjClYEqew0xDQdevMM0LKJJnUXxh6tBtx6lw=";
 
   nativeBuildInputs = [
     installShellFiles
     versionCheckHook
   ];
+
   doInstallCheck = true;
 
   postInstall = ''

From 909a3835fa75e69c0d98298fe09f5d3a0d2e2def Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 19:46:29 +0000
Subject: [PATCH 0583/1386] sipvicious: 0.3.7 -> 0.3.8

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

diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix
index 9be9e0a2d240..448689118616 100644
--- a/pkgs/by-name/si/sipvicious/package.nix
+++ b/pkgs/by-name/si/sipvicious/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "sipvicious";
-  version = "0.3.7";
+  version = "0.3.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EnableSecurity";
     repo = "sipvicious";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OQq1PP0qoETu+0qs2vhkgVU5FVZA5wnWMKU+lKJrvv4=";
+    hash = "sha256-qUdK8IbLnuQU3hv6+x3R84y83Ts8lNIGsOANFgkReE0=";
   };
 
   build-system = [

From 1489b666ca42232e3501f3c1fae0f4045b0da495 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 19:47:30 +0000
Subject: [PATCH 0584/1386] oh-my-posh: 29.26.1 -> 29.28.0

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

diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix
index 87ea74ede309..b99f25ba4cbd 100644
--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "oh-my-posh";
-  version = "29.26.1";
+  version = "29.28.0";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "oh-my-posh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hE3L7emTk7MxzBUqSUDNKYiA2H1w9mcGhPYiR1OhYxg=";
+    hash = "sha256-8V1Wu3wqakwSVNb/WPlxRy9KL33frb8nqWeorHuIuzI=";
   };
 
   vendorHash = "sha256-6DX/x9uWUbwXy9ccB6NIVRKsOc1nJXtctItONAI7zPQ=";

From bc2f01b11a16e294e9fdb4287902fa0f34c89757 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 7 Jul 2026 18:35:25 +0200
Subject: [PATCH 0585/1386] ttl: disable update check

The update-check of ttl is now a feature. To deselect this
we have to disable all default features.
---
 pkgs/by-name/tt/ttl/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index 9414fbbf0929..a987fc3d23e6 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -27,6 +27,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
 
+  # opt ouf of default features to deselect the update-check feature
+  buildNoDefaultFeatures = true;
+
   postInstall = ''
     installShellCompletion --cmd ttl \
       --bash <($out/bin/ttl --completions bash) \

From ed7f4ae3f75a6ab6f5922b3bf3094f7eed1676bd Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 7 Jul 2026 18:35:25 +0200
Subject: [PATCH 0586/1386] ttl: add herbetom as maintainer

---
 pkgs/by-name/tt/ttl/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index a987fc3d23e6..7dace95ae3cc 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -51,7 +51,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "ttl";
     homepage = "https://github.com/lance0/ttl";
     changelog = "https://github.com/lance0/ttl/releases/tag/v${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ vincentbernat ];
+    maintainers = with lib.maintainers; [
+      vincentbernat
+      herbetom
+    ];
     license = with lib.licenses; [
       asl20
       mit

From d809929f11d717084fb59c0160bc47e635dc8bcb Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 11 Jul 2026 16:03:55 -0500
Subject: [PATCH 0587/1386] citrix-workspace: drop unused gtk2-era inputs

gtk2, gtk2-x11, gtk_engines, gnome2.gtkglext, libpng12 and x264 are
leftovers from the era of bundling Citrix's WebKitGTK 4.0; no ELF in the
26.04 payload links any of them.
---
 pkgs/by-name/ci/citrix-workspace/package.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix
index 583e8368fd9a..18a818a00f07 100644
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -18,12 +18,8 @@
   gdk-pixbuf,
   glib,
   glib-networking,
-  gnome2,
   gst_all_1,
-  gtk2,
-  gtk2-x11,
   gtk3,
-  gtk_engines,
   harfbuzzFull,
   heimdal,
   hyphen,
@@ -41,7 +37,6 @@
   libjson,
   libmanette,
   libnotify,
-  libpng12,
   libpulseaudio,
   libredirect,
   libseccomp,
@@ -77,7 +72,6 @@
   xprop,
   xdpyinfo,
   libxcb,
-  x264,
   zlib,
 
   extraCerts ? [ ],
@@ -168,11 +162,7 @@ stdenv.mkDerivation rec {
     fuse3'
     gdk-pixbuf
     glib-networking
-    gnome2.gtkglext
-    gtk2
-    gtk2-x11
     gtk3
-    gtk_engines
     harfbuzzFull
     heimdal
     hyphen
@@ -188,7 +178,6 @@ stdenv.mkDerivation rec {
     libjson
     libmanette
     libnotify
-    libpng12
     libpulseaudio
     libseccomp
     libsecret
@@ -212,7 +201,6 @@ stdenv.mkDerivation rec {
     libxaw
     libxmu
     libxtst
-    x264
     zlib
   ]
   ++ gstPackages;

From 7454e526809a5359d082107402d412db76391d79 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 11 Jul 2026 16:06:08 -0500
Subject: [PATCH 0588/1386] citrix-workspace: remove stale wfica.sh launcher

hinst writes an FHS wfica.sh launcher even on non-root installs; it
hardcodes /opt/Citrix paths and carries none of the wrapper environment,
so it is dead weight in the store.
---
 pkgs/by-name/ci/citrix-workspace/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix
index 18a818a00f07..e3b775f42844 100644
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -332,6 +332,9 @@ stdenv.mkDerivation rec {
       # the tarball still contains the legacy WebKitGTK 4.0 bundle.
       rm -rf "$ICAInstDir/Webkit2gtk4.0"
 
+      # FHS launcher hinst generates even for non-root installs; it hardcodes
+      # store paths without any of the wrapper environment.
+      rm -f "$ICAInstDir/wfica.sh"
       if [ -f "$ICAInstDir/util/setlog" ]; then
         chmod +x "$ICAInstDir/util/setlog"
         ln -sf "$ICAInstDir/util/setlog" "$out/bin/citrix-setlog"

From aeb6152ad76ff161169af841e68f68d2c7981a18 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 11 Jul 2026 16:09:22 -0500
Subject: [PATCH 0589/1386] citrix-workspace: install MIME definitions and app
 icon

hinst registers Citrix-mime_types.xml and the Citrix-Receiver icon via
xdg tooling; without them the application/x-ica and
application/vnd.citrix.receiver.configure types are undefined and the
desktop entries reference a missing icon. Install both into share/, and
copy only *.desktop into share/applications so the MIME XML no longer
lands there.
---
 pkgs/by-name/ci/citrix-workspace/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix
index 583e8368fd9a..4f60c9a9115e 100644
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -413,7 +413,12 @@ stdenv.mkDerivation rec {
       done
 
       echo "Copy .desktop files."
-      cp $out/opt/citrix-icaclient/desktop/* $out/share/applications/
+      cp $out/opt/citrix-icaclient/desktop/*.desktop $out/share/applications/
+
+      install -Dm444 "$ICAInstDir/desktop/Citrix-mime_types.xml" \
+        $out/share/mime/packages/Citrix-mime_types.xml
+      install -Dm444 "$ICAInstDir/icons/000_Receiver_64.png" \
+        $out/share/icons/hicolor/64x64/apps/Citrix-Receiver.png
 
       runHook postInstall
     '';

From 6467726cf350f7ad14f902769331369468fbc8e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 20:10:19 +0000
Subject: [PATCH 0590/1386] bazaar: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index 945fd707bf14..0300802cf929 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -34,7 +34,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bazaar";
-  version = "0.9.0";
+  version = "0.9.1";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "bazaar-org";
     repo = "bazaar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6MDrMXwtNcNJtnoRwfIKVulHu4FtVb4hhCtqIxmlz4A=";
+    hash = "sha256-9J+XI5JnV8Yfk3xRI/VM5RSG4eMafbw2rBRpPMIu5yA=";
   };
 
   nativeBuildInputs = [

From 8966f7886e31e4bad0b06b10070c48509c9c7ee3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 20:11:13 +0000
Subject: [PATCH 0591/1386] lexy: 0.6.0 -> 0.6.3

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

diff --git a/pkgs/by-name/le/lexy/package.nix b/pkgs/by-name/le/lexy/package.nix
index 192651fb22f8..b3fb30eeafc9 100644
--- a/pkgs/by-name/le/lexy/package.nix
+++ b/pkgs/by-name/le/lexy/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "lexy";
-  version = "0.6.0";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antoniorodr";
     repo = "lexy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1Q7ntShhzE9OUrifIV9GjCp6BvUv1OmtH7SRLGYUhYU=";
+    hash = "sha256-OT+RaoIC+CxHHFdi3Hp405B/tWCTsPPrK8aDowKOUFc=";
   };
 
   build-system = [

From 2613c1948edc8d860416b4d018ce502125288433 Mon Sep 17 00:00:00 2001
From: uncenter <uncenter@uncenter.dev>
Date: Tue, 14 Jul 2026 14:08:33 -0400
Subject: [PATCH 0592/1386] vue-language-server: 3.3.6 -> 3.3.7

---
 .../add-pkg-pr-new-integrities.patch          | 32 -------------------
 .../vu/vue-language-server/package.nix        | 12 ++-----
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/by-name/vu/vue-language-server/add-pkg-pr-new-integrities.patch

diff --git a/pkgs/by-name/vu/vue-language-server/add-pkg-pr-new-integrities.patch b/pkgs/by-name/vu/vue-language-server/add-pkg-pr-new-integrities.patch
deleted file mode 100644
index eaae2e1f5f64..000000000000
--- a/pkgs/by-name/vu/vue-language-server/add-pkg-pr-new-integrities.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
-@@ -870 +870 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-core@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-GntAKmJ45uB5NUKeEw15qGpNmL9i81HmTv2OtqreAxT2uQb5Adurtx5VouR150tRhnkXoYUiVPzYGs++U+WLfg==, tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-core@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -877 +877 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-dom@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-vbZgliMbBuVO1sYRhbczWWcQlwd8e+Wj6tGBh1PvRws6aJLu7nhMPb0LJU9wrW5EKFcjckGpwMtH3aOK/8padw==, tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-dom@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -884 +884 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-sfc@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-e10xJOKE+jTmuoManPxtkRCUgu+IzpV67ZEcddzdE5+Va4gQuPTm4dzCYo0yEztyBH57AuhN8P3H1hC5SxyFuw==, tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-sfc@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -891 +891 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-ssr@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-FxLmgdj7z0ljbHiT+PR4PtX+XNA+Pfb1Ror+9AP01fmHKGFb9ZVKqx0vBq4a2TtZXcgn5740IHiD0lovufBlFA==, tarball: https://pkg.pr.new/vuejs/core/@vue/compiler-ssr@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -898 +898 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/reactivity@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-U4sPiVx/HN+SU/3nRxSvebg7diEsDK1x+xnbCoNy1IwVpNuogxyRz/L9bOGBIB9vlMmgmxsntDBltZVzoelwcQ==, tarball: https://pkg.pr.new/vuejs/core/@vue/reactivity@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -902 +902 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/runtime-core@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-qKrCQUE2loNGO+zZ8S8TuSn2p0zaDTPZTom1RvaIVsriAYpd5AZdiy7b7PwT1OxdHK/OM3sZ1vvjysmQDUJLRg==, tarball: https://pkg.pr.new/vuejs/core/@vue/runtime-core@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -906 +906 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/runtime-dom@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-k6YZlI+NYcDvj98OEmEpNteTX1q9l1dL2KCUCwCDmyAw2Re9Yz1J4JFEEnLCMz0+YSKoXg12lGj9lYVsuS6osw==, tarball: https://pkg.pr.new/vuejs/core/@vue/runtime-dom@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -910 +910 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/server-renderer@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-yTJTHlRXU1qOXkQutMIF0w+s7zIfMACmiTrJQ4LZ50OAXKiWmt93nrSjXh6ePOP+KeRqvAOFBsZhlmnfxHHh/A==, tarball: https://pkg.pr.new/vuejs/core/@vue/server-renderer@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -919 +919 @@
--    resolution: {tarball: https://pkg.pr.new/vuejs/core/@vue/shared@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-HCZjsf5q9+i2SxsraMsFVQvoSzW3/K6CC9Myg1CZJxP2MH+n6RYGqvJSEnjBCO3tX+JxLSrm06aYhn5FIZhhEw==, tarball: https://pkg.pr.new/vuejs/core/@vue/shared@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-@@ -1660 +1660 @@
--    resolution: {tarball: https://pkg.pr.new/vue@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
-+    resolution: {integrity: sha512-lSY4wGk59hpvPBRJ1femqnUMekvvWGZsy4ggQBTJ8Z6fhDxO6U/w2l+M5vU93qsw2mcf9v+iuzLbEIc41y6B9w==, tarball: https://pkg.pr.new/vue@e1bc0eb02e22bc0c236e1471c11d96a368764b72}
diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 1c085743e148..da03e279fef6 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -14,30 +14,24 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.3.6";
+  version = "3.3.7";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uiYhVVRiHyq+0S8czBY082vsqtCPqj29K9DjH0f+8u4=";
+    hash = "sha256-+jtnbSZFvRwl03iW6u6pZXMuql1LxIQZaPPaQUL+saQ=";
   };
 
-  patches = [ ./add-pkg-pr-new-integrities.patch ];
-
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs)
-      patches
       pname
       src
       version
       ;
     inherit pnpm;
     fetcherVersion = 4;
-    prePnpmInstall = ''
-      pnpm config set --location project --json trustPolicyExclude '["volar-service-pug@0.0.71"]'
-    '';
-    hash = "sha256-6xu+z7rrI+YfmpcL5ycwjjeSAfDkkhSgeKBZO34p9Dw=";
+    hash = "sha256-OAPNM8Ngx9x3XcWIq6pw7LWadcGWhl29AjGjqoIEveo=";
   };
 
   nativeBuildInputs = [

From 62a232f009162f8f1eab3382f1804b10fa2c2923 Mon Sep 17 00:00:00 2001
From: uncenter <uncenter@uncenter.dev>
Date: Tue, 14 Jul 2026 14:15:55 -0400
Subject: [PATCH 0593/1386] vue-language-server: patch pnpm for failure on
 darwin

---
 pkgs/by-name/vu/vue-language-server/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index da03e279fef6..a411ff662d5b 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -6,11 +6,15 @@
   pnpmConfigHook,
   pnpm_11,
   nodejs,
+  nodejs-slim_latest,
   nix-update-script,
   makeBinaryWrapper,
 }:
 let
-  pnpm = pnpm_11;
+  # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627.
+  pnpm = pnpm_11.override {
+    nodejs-slim = nodejs-slim_latest;
+  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";

From 5c1083d90ca2a366946e77739fe462ab1fe81d03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 20:18:12 +0000
Subject: [PATCH 0594/1386] slurm: 26.05.1.1 -> 26-05-2-1

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

diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 05c21505ab71..95b4f3fcdb10 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slurm";
-  version = "26.05.1.1";
+  version = "26-05-2-1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "slurm";
     # The release tags use - instead of .
     tag = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-ZH80Ws/9+7pjDe7aZyyDHXFbNvmw8C7OJXiw5+/3jkA=";
+    hash = "sha256-HkBHwN/j0do+CPpouG6qswZEOeY17owmA980wVubiw4=";
   };
 
   outputs = [

From 455149b38fb272a173f66c59bde78f61af1d3299 Mon Sep 17 00:00:00 2001
From: liv <liv+git@spacegli.de>
Date: Tue, 14 Jul 2026 20:29:27 +0200
Subject: [PATCH 0595/1386] opentelemetry-collector-releases: add updateScript

Before this there was no auto-updates for
opentelemetry-collector-releases, but since
opentelemetry-collector-builder received auto-updates the versioning
regularly broke. This adds an updateScript that updates both at the
same time.
---
 .../misc/opentelemetry-collector/builder.nix  |  4 ++-
 .../misc/opentelemetry-collector/releases.nix | 28 +++++++++++--------
 .../misc/opentelemetry-collector/update.sh    | 19 +++++++++++++
 3 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100755 pkgs/tools/misc/opentelemetry-collector/update.sh

diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix
index 3414c4a24218..2a608bdbbf51 100644
--- a/pkgs/tools/misc/opentelemetry-collector/builder.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix
@@ -6,7 +6,7 @@
 buildGoModule rec {
   pname = "ocb";
   # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
-  # whenever that version changes.
+  # whenever this version changes.
   version = "0.155.0";
 
   src = fetchFromGitHub {
@@ -31,6 +31,8 @@ buildGoModule rec {
     "-skip TestGenerateAndCompile|TestReplaceStatementsAreComplete|TestVersioning|TestRunInit"
   ];
 
+  passthru.updateScript = ./update.sh;
+
   # Rename to ocb (it's generated as "builder")
   postInstall = ''
     mv $out/bin/builder $out/bin/ocb
diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix
index db447e24cddd..8e64957275cc 100644
--- a/pkgs/tools/misc/opentelemetry-collector/releases.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   installShellFiles,
   testers,
-  nixosTests,
   opentelemetry-collector-builder,
-  pkgs,
   go,
   git,
   cacert,
@@ -17,12 +15,10 @@ let
   builder = "${opentelemetry-collector-builder}/bin/ocb";
 
   # Keep the version in sync with the builder.
-  rev = opentelemetry-collector-builder.src.rev;
-
-  version = lib.removePrefix "cmd/builder/v" rev;
+  version = "0.151.0";
 
   # This is a weird meta-repo where all the open-telemetry collectors are.
-  src = fetchFromGitHub {
+  releasesSrc = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector-releases";
     rev = "v${version}";
@@ -39,7 +35,10 @@ let
       hash,
     }:
     stdenv.mkDerivation {
-      inherit name;
+      # Inherit the version from the builder, so that updates there trigger
+      # a rebuild here.
+      inherit version;
+      pname = "${name}-src";
 
       nativeBuildInputs = [
         cacert
@@ -47,7 +46,7 @@ let
         go
       ];
 
-      inherit src;
+      src = releasesSrc;
 
       outputHash = hash;
       outputHashMode = "recursive";
@@ -117,11 +116,16 @@ let
             --zsh <($out/bin/${name} completion zsh)
         '';
 
-        passthru.tests = {
-          version = testers.testVersion {
-            inherit package version;
-            command = "${name} -v";
+        passthru = {
+          tests = {
+            version = testers.testVersion {
+              inherit package version;
+              command = "${name} -v";
+            };
           };
+          # The updatescript for the builder updates the releases
+          updateScript = null;
+          inherit releasesSrc;
         };
 
         meta = {
diff --git a/pkgs/tools/misc/opentelemetry-collector/update.sh b/pkgs/tools/misc/opentelemetry-collector/update.sh
new file mode 100755
index 000000000000..251b05b7b98a
--- /dev/null
+++ b/pkgs/tools/misc/opentelemetry-collector/update.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq nix-update common-updater-scripts
+set -euf
+
+# Get latest version from releases repo
+version=$(curl https://api.github.com/repos/open-telemetry/opentelemetry-collector-releases/releases/latest | jq -r '.name')
+version=${version#v}
+
+# Update builder
+nix-update opentelemetry-collector-builder --version="${version}"
+
+# Update the otel-collector-releases source
+update-source-version opentelemetry-collector-releases.otelcol "${version}" --source-key="releasesSrc"
+
+# Update the individual distributions
+for dist in {"",-contrib,-k8s,-otlp}
+do
+  nix-update "opentelemetry-collector-releases.otelcol${dist}" --version skip
+done

From 0d4e839df40466e2020ee321da299ba63c6a0e9b Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 16:47:28 -0400
Subject: [PATCH 0596/1386] sqlite: Do not run tests on BSD

---
 pkgs/development/libraries/sqlite/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index bc27578cda3d..9ac51240bc0c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -132,7 +132,8 @@ stdenv.mkDerivation rec {
   '';
 
   # SQLite’s tests are unreliable on Darwin. Sometimes they run successfully, but often they do not.
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  # The tests are only defined for Darwin, Linux, Windows, and OpenBSD, not any other unix-like OS.
+  doCheck = stdenv.hostPlatform.isLinux;
   # When tcl is not available, only run test targets that don't need it.
   checkTarget = lib.optionalString stdenv.hostPlatform.isStatic "fuzztest sourcetest";
 

From 1cb8890b45b4cde05015a45daa04c11d8b1ce407 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 20:52:26 +0000
Subject: [PATCH 0597/1386] fzf-zsh-plugin: 1.0.0-unstable-2026-06-30 ->
 1.0.0-unstable-2026-07-09

---
 pkgs/by-name/fz/fzf-zsh-plugin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
index 705e4a99b5f1..f955a1c27f89 100644
--- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
+++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "fzf-zsh-plugin";
-  version = "1.0.0-unstable-2026-06-30";
+  version = "1.0.0-unstable-2026-07-09";
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "fzf-zsh-plugin";
-    rev = "6f953534d4c69a7340d27b7dcf14f406a22bed61";
-    hash = "sha256-RQrxCU7f3LSepUYm0+2ljvJfzVh8yp4NMJHxssA60Vk=";
+    rev = "92187cbc8fe91b7c5ab3a186e566682f64286879";
+    hash = "sha256-JedEqrcaJmVL8PF850xP7csgvFzDpcCqW8lJ/5WHklY=";
   };
 
   strictDeps = true;

From d875aae52964b8323a2ac7b203df0ecd205c573a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 14 Jul 2026 13:39:40 -0700
Subject: [PATCH 0598/1386] doc: fix mmdoc fenced div rendering

---
 doc/build-helpers/trivial-build-helpers.chapter.md | 4 ++--
 lib/attrsets.nix                                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md
index aa57779cb1b2..d4c1ca026342 100644
--- a/doc/build-helpers/trivial-build-helpers.chapter.md
+++ b/doc/build-helpers/trivial-build-helpers.chapter.md
@@ -165,7 +165,7 @@ They are useful for creating files from Nix expressions, and are all implemented
 Each of these functions will cause a derivation to be produced.
 When you coerce the result of each of these functions to a string with [string interpolation](https://nixos.org/manual/nix/stable/language/string-interpolation) or [`toString`](https://nixos.org/manual/nix/stable/language/builtins#builtins-toString), it will evaluate to the [store path](https://nixos.org/manual/nix/stable/store/store-path) of this derivation.
 
-:::: {.note}
+::: {.note}
 Some of these functions will put the resulting files within a directory inside the [derivation output](https://nixos.org/manual/nix/stable/language/derivations#attr-outputs).
 If you need to refer to the resulting files somewhere else in a Nix expression, append their path to the derivation's store path.
 
@@ -190,7 +190,7 @@ writeShellScript "evaluate-my-file.sh" ''
   cat ${my-file}/share/my-file
 ''
 ```
-::::
+:::
 
 ### `makeDesktopItem` {#trivial-builder-makeDesktopItem}
 
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index ed2fa9770410..d006ed79a2ae 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1140,7 +1140,7 @@ rec {
 
     For a function that gives you control over what counts as a leaf, see `mapAttrsRecursiveCond`.
 
-    :::{#map-attrs-recursive-example .example}
+    ::: {.example #map-attrs-recursive-example}
     # Map over leaf attributes
 
     ```nix
@@ -1165,7 +1165,7 @@ rec {
     If the predicate returns false, `mapAttrsRecursiveCond` does not recurse, but instead applies the mapping function.
     If the predicate returns true, it does recurse, and does not apply the mapping function.
 
-    :::{#map-attrs-recursive-cond-example .example}
+    ::: {.example #map-attrs-recursive-cond-example}
     # Map over an leaf attributes defined by a condition
 
     Map derivations to their `name` attribute.

From 35260ee51a5e16a075c748da65f878d4baee5ee6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 14 Jul 2026 14:03:26 -0700
Subject: [PATCH 0599/1386] doc: fix additional malformed fenced divs

---
 doc/build-helpers/fixed-point-arguments.chapter.md | 1 +
 lib/customisation.nix                              | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/build-helpers/fixed-point-arguments.chapter.md b/doc/build-helpers/fixed-point-arguments.chapter.md
index 197aea8136d5..38601a64eae4 100644
--- a/doc/build-helpers/fixed-point-arguments.chapter.md
+++ b/doc/build-helpers/fixed-point-arguments.chapter.md
@@ -143,3 +143,4 @@ lib.extendMkDerivation {
     });
 }
 ```
+:::
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 9bb7e01d8f13..883f99928a49 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -564,7 +564,7 @@ rec {
 
     # Examples
 
-    :::{#ex-makeScope .example}
+    :::{.example #ex-makeScope}
     # Create an interdependent package set on top of `pkgs`
 
     The functions in `foo.nix` and `bar.nix` can depend on each other, in the sense that `foo.nix` can contain a function that expects `bar` as an attribute in its argument.
@@ -593,7 +593,7 @@ rec {
     ```
     :::
 
-    :::{#ex-makeScope-callPackage .example}
+    :::{.example #ex-makeScope-callPackage}
     # Using `callPackage` from a scope
 
     ```nix

From dd32abcf4fc7d6b4d1922da18c0aaa3dd591f8b7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 23:07:06 +0200
Subject: [PATCH 0600/1386] python3Packages.pyworxcloud: 6.4.1 -> 6.4.2

Diff: https://github.com/MTrab/pyworxcloud/compare/v6.4.1...v6.4.2

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

diff --git a/pkgs/development/python-modules/pyworxcloud/default.nix b/pkgs/development/python-modules/pyworxcloud/default.nix
index c4926d11a812..9094d60fe0ce 100644
--- a/pkgs/development/python-modules/pyworxcloud/default.nix
+++ b/pkgs/development/python-modules/pyworxcloud/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyworxcloud";
-  version = "6.4.1";
+  version = "6.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MTrab";
     repo = "pyworxcloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ouyR0BNUqu8ywSfzfjd3oIXPxVHcyXumFYthsPk+4i4=";
+    hash = "sha256-cr1zQwyavvAo9AJtTVof+Pw6BEdDAf5G+Msspx3OOZ0=";
   };
 
   pythonRelaxDeps = [ "awsiotsdk" ];

From 315e600235eae4a5900b760d38755ca17323e274 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 14 Jul 2026 23:09:11 +0200
Subject: [PATCH 0601/1386] prek: add thunze to maintainers

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

diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index 90396474384d..b55fcf3467ba 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -56,6 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "prek";
     changelog = "https://github.com/j178/prek/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = [ lib.licenses.mit ];
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.thunze ];
   };
 })

From 2ccf3c9312578d5abb0e3167c4e2764d675f49ab Mon Sep 17 00:00:00 2001
From: Fiona Schirm <meow@fiona.pet>
Date: Tue, 14 Jul 2026 22:17:58 +0200
Subject: [PATCH 0602/1386] maintainers: add fiona

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30f8d61a2c70..7412cbfd3f5c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9107,6 +9107,12 @@
     githubId = 41450706;
     name = "fin-w";
   };
+  fiona = {
+    email = "mail@fiona.hamburg";
+    github = "Fiona42069";
+    githubId = 260108682;
+    name = "fiona";
+  };
   fionera = {
     email = "nix@fionera.de";
     github = "fionera";

From 9447c6173a92d37f19fc2534622e9e8b3e6e44da Mon Sep 17 00:00:00 2001
From: Fiona Schirm <meow@fiona.pet>
Date: Tue, 14 Jul 2026 22:45:10 +0200
Subject: [PATCH 0603/1386] tree-sitter-grammars.tree-sitter-linkerscript: init
 at 1.0.0

---
 .../tr/tree-sitter/grammars/grammar-sources.nix      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index de9d58c96f0e..c61242bd528e 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1493,6 +1493,18 @@
     };
   };
 
+  linkerscript = {
+    version = "1.0.0";
+    url = "github:tree-sitter-grammars/tree-sitter-linkerscript";
+    hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA=";
+    meta = {
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        fiona
+      ];
+    };
+  };
+
   llvm = {
     version = "1.1.0-unstable-2025-08-22";
     url = "github:benwilliamgraham/tree-sitter-llvm";

From 2217f7ad56e273c87c07ca2219229e2a0c0d6b9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 21:20:52 +0000
Subject: [PATCH 0604/1386] terraform-providers.pagerduty_pagerduty: 3.33.1 ->
 3.34.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a79d0db56d6c..6dfc194c6fe1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1085,11 +1085,11 @@
     "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
   },
   "pagerduty_pagerduty": {
-    "hash": "sha256-SBPy6elle5eSGY67JZEkfaov1jkfaqmvDGPEO9Zd8AY=",
+    "hash": "sha256-+0edUEoaJCg8iDZxRQVQMiP3pLROTi19djEhS5LiRHw=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.33.1",
+    "rev": "v3.34.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 0b7fc9becf4a5f68311bbb9fa75045c698f60d4b Mon Sep 17 00:00:00 2001
From: liv <liv+git@spacegli.de>
Date: Tue, 14 Jul 2026 23:28:40 +0200
Subject: [PATCH 0605/1386] opentelemetry-collector-releases: 0.151.0 ->
 0.155.0

---
 .../misc/opentelemetry-collector/releases.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix
index 8e64957275cc..00d246ed7444 100644
--- a/pkgs/tools/misc/opentelemetry-collector/releases.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix
@@ -15,14 +15,14 @@ let
   builder = "${opentelemetry-collector-builder}/bin/ocb";
 
   # Keep the version in sync with the builder.
-  version = "0.151.0";
+  version = "0.155.0";
 
   # This is a weird meta-repo where all the open-telemetry collectors are.
   releasesSrc = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector-releases";
     rev = "v${version}";
-    hash = "sha256-5AoUgGZEvxbvlksD1P84lxMrHPAP05cN21fABK4UXRg=";
+    hash = "sha256-w4J5Q7cztSQyjqHH5L0blDUiFO6+fK4/dLoQT+ftUSE=";
   };
 
   # Then from this src, we use the tool to generate some go code, including
@@ -152,26 +152,26 @@ in
 lib.recurseIntoAttrs {
   otelcol = mkDistribution {
     name = "otelcol";
-    sourceHash = "sha256-4PpZ6anKPkFyVcARJJSEpyy3duTCyrMnnAnh6CWwjUc=";
-    vendorHash = "sha256-OoXz9rFIipM0tc6kvkkPdUtYXVIfo0L40V4SUfwSF6M=";
+    sourceHash = "sha256-JY/jg5SeZ90lVLo+t6MuxZAMZ5IpNwEQEz9kC2uYc+8=";
+    vendorHash = "sha256-tEA2wCtk2Pm7YJem5jOB/1Iz7K1jKKl/N9VKSumC+WA=";
   };
 
   otelcol-contrib = mkDistribution {
     name = "otelcol-contrib";
-    sourceHash = "sha256-wUmpivqLSnRYGTJn3IIlpwFXORmK4FJrc8U472YPV2o=";
-    vendorHash = "sha256-7Rb3Ku0q+5cBvgtd/oZaLaFa4chv0b/MzaHEpJvJ6rE=";
+    sourceHash = "sha256-ANIyUa0bibTYRWC1RZbvYFitaEkmLOiubQxFfmzj4kQ=";
+    vendorHash = "sha256-dPaDmhO4XASQ1y3NyetxnJuTr+pIDwF/rwrN5QkBBCA=";
     proxyVendor = true; # hash mismatch between linux and darwin
   };
 
   otelcol-k8s = mkDistribution {
     name = "otelcol-k8s";
-    sourceHash = "sha256-yNhE0CwMNus12QDSbP/x9irrIcOdez0e/RpXFFRQ2LE=";
-    vendorHash = "sha256-2ZzLCMTafbpmSpkpwvYgkP/Myg/QD1LHgiMigbj3x9I=";
+    sourceHash = "sha256-cZ+ok52ceYkQE9bG+FFTFYONUQfsC8kbJk5SLZ8IIYU=";
+    vendorHash = "sha256-qwlZr0LoXZWf72flpORf19PAkHdITY8bxJGkacG2j+A=";
   };
 
   otelcol-otlp = mkDistribution {
     name = "otelcol-otlp";
-    sourceHash = "sha256-+cffC4sOlyPWtydkPZz7M0NF2Q3heQ04/pEB8d+942c=";
-    vendorHash = "sha256-WiP+TYj7VZBt3tP4C/ZvQwkDP8/b4F+Bc7Z95p0tBTI=";
+    sourceHash = "sha256-W1QHjHMn6xWVN08FpJi2YcKzkpxTPbq9MYIbdQxVHHY=";
+    vendorHash = "sha256-gX1D+RPCwcp9UMpzAzEYHDsBrn2KdfN/4RxcgKHViYQ=";
   };
 }

From df409de1141658d081990d6b4e41eb24f0409147 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 21:31:14 +0000
Subject: [PATCH 0606/1386] thunderkittens: 0-unstable-2026-06-15 ->
 0-unstable-2026-07-13

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

diff --git a/pkgs/by-name/th/thunderkittens/package.nix b/pkgs/by-name/th/thunderkittens/package.nix
index 794b9778cc6f..fc43e415d613 100644
--- a/pkgs/by-name/th/thunderkittens/package.nix
+++ b/pkgs/by-name/th/thunderkittens/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation {
   pname = "thunderkittens";
-  version = "0-unstable-2026-06-15";
+  version = "0-unstable-2026-07-13";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "HazyResearch";
     repo = "ThunderKittens";
-    rev = "02e9acbd8c330564357a9e2df929e938ac67d6d0";
-    hash = "sha256-GXrKCMKMDnQO7hNj4WZmmANSVJqEioIArwQWoE+/jVM=";
+    rev = "1c3920d993404dd49a6d4c7267ea11d583bd5c68";
+    hash = "sha256-I/pzSZDx5eEimz8s+GQrQroqyQOEtNB+kas99LBM590=";
   };
 
   dontBuild = true;

From 733a5af4ffcc09090319241c914d23a6d57b4287 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 14 Jul 2026 17:23:32 -0400
Subject: [PATCH 0607/1386] google-chrome: 150.0.7871.114 -> 150.0.7871.124

Announcement: https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_0353146366.html
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 36e78cd0f4c6..a262b9f96d01 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -179,11 +179,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "150.0.7871.114";
+    version = "150.0.7871.124";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-DxnmjcpXSEljLiUinxWFPSvqwz+gZJj+7UPzRii8LVM=";
+      hash = "sha256-TGNqvSrB9vMXb1K7QBCqN9ErWsBMQNyp6rEZksHHXNw=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -289,11 +289,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "150.0.7871.115";
+    version = "150.0.7871.125";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acd57hhfrcygivr2dnxpq2q56zka_150.0.7871.115/GoogleChrome-150.0.7871.115.dmg";
-      hash = "sha256-AB16I7Tl/E4F4ydXHSLeyoKAWNwP7JSL0wLyrUvn3FE=";
+      url = "http://dl.google.com/release2/chrome/kjpfr4hhda65lyoxi6u4o42bke_150.0.7871.125/GoogleChrome-150.0.7871.125.dmg";
+      hash = "sha256-ulMe+AP65d9VB2O7vhLnSX+dUfC7XqWd4GaOEQXGBac=";
     };
 
     dontPatch = true;

From 6c181cba9191e191f77946df98182f4f25853c3c Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Tue, 30 Jun 2026 14:35:04 -0700
Subject: [PATCH 0608/1386] iruby: 0.8.2 -> 0.8.3

---
 pkgs/by-name/ir/iruby/Gemfile      |   2 +-
 pkgs/by-name/ir/iruby/Gemfile.lock |  45 ++++++---
 pkgs/by-name/ir/iruby/gemset.nix   | 148 +++++++++++++++++++++++++----
 3 files changed, 161 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/ir/iruby/Gemfile b/pkgs/by-name/ir/iruby/Gemfile
index 3998b5c6e99a..4a466e235bbb 100644
--- a/pkgs/by-name/ir/iruby/Gemfile
+++ b/pkgs/by-name/ir/iruby/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'iruby', "0.8.2"
+gem 'iruby', "0.8.3"
diff --git a/pkgs/by-name/ir/iruby/Gemfile.lock b/pkgs/by-name/ir/iruby/Gemfile.lock
index 972a50ba6bf4..4c8a24f9b13d 100644
--- a/pkgs/by-name/ir/iruby/Gemfile.lock
+++ b/pkgs/by-name/ir/iruby/Gemfile.lock
@@ -1,35 +1,54 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    cgi (0.5.2)
     data_uri (0.1.0)
-    ffi (1.15.5)
+    date (3.5.1)
+    erb (4.0.4.1)
+      cgi (>= 0.3.3)
+    ffi (1.17.4)
     ffi-rzmq (2.0.7)
       ffi-rzmq-core (>= 1.0.7)
     ffi-rzmq-core (1.0.7)
       ffi
-    io-console (0.6.0)
-    irb (1.7.4)
-      reline (>= 0.3.6)
-    iruby (0.8.2)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    iruby (0.8.3)
       data_uri (~> 0.1)
       ffi-rzmq
       irb
       logger
       mime-types (>= 3.3.1)
-      multi_json (~> 1.11)
     logger (1.7.0)
-    mime-types (3.5.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
-    multi_json (1.15.0)
-    reline (0.3.8)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0414)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.4.0)
+      date
+      stringio
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
       io-console (~> 0.5)
+    stringio (3.2.0)
+    tsort (0.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  iruby (= 0.8.2)
+  iruby (= 0.8.3)
 
 BUNDLED WITH
-   2.6.9
+   2.3.9
diff --git a/pkgs/by-name/ir/iruby/gemset.nix b/pkgs/by-name/ir/iruby/gemset.nix
index 0b875d6e8a6f..6bc68cee3f16 100644
--- a/pkgs/by-name/ir/iruby/gemset.nix
+++ b/pkgs/by-name/ir/iruby/gemset.nix
@@ -1,4 +1,14 @@
 {
+  cgi = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1fzqwshg1xzbdm97havskfp6wifsgbjii00dzba0y6bih4lk1jk1";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
   data_uri = {
     groups = [ "default" ];
     platforms = [ ];
@@ -9,15 +19,36 @@
     };
     version = "0.1.0";
   };
+  date = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm";
+      type = "gem";
+    };
+    version = "3.5.1";
+  };
+  erb = {
+    dependencies = [ "cgi" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "097f4xvjq5k0m0i9mjwpl8vmqrl1wpbllc624f6fqk5s484sgqj7";
+      type = "gem";
+    };
+    version = "4.0.4.1";
+  };
   ffi = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
+      sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw";
       type = "gem";
     };
-    version = "1.15.5";
+    version = "1.17.4";
   };
   ffi-rzmq = {
     dependencies = [ "ffi-rzmq-core" ];
@@ -46,21 +77,26 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff";
+      sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.8.2";
   };
   irb = {
-    dependencies = [ "reline" ];
+    dependencies = [
+      "pp"
+      "prism"
+      "rdoc"
+      "reline"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8";
+      sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y";
       type = "gem";
     };
-    version = "1.7.4";
+    version = "1.18.0";
   };
   iruby = {
     dependencies = [
@@ -69,16 +105,15 @@
       "irb"
       "logger"
       "mime-types"
-      "multi_json"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11lb7flkqpaff303g6lj9vzdw9zc0s2qmz36a6i4x4qj559bz30n";
+      sha256 = "13qdw2ykzn6yjs4biiyvy1dr5j5v3kb1q7r98ds0kvg22rbs1s56";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "0.8.3";
   };
   logger = {
     groups = [ "default" ];
@@ -91,35 +126,88 @@
     version = "1.7.0";
   };
   mime-types = {
-    dependencies = [ "mime-types-data" ];
+    dependencies = [
+      "logger"
+      "mime-types-data"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5";
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.7.0";
   };
   mime-types-data = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2023.0808";
+    version = "3.2026.0414";
   };
-  multi_json = {
+  pp = {
+    dependencies = [ "prettyprint" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "0w5mha75hs8gdj75g8vl0sxpyp8rzvwq8a4jcmi4ah8cf370zjyz";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "0.6.4";
+  };
+  prettyprint = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  prism = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  psych = {
+    dependencies = [
+      "date"
+      "stringio"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql";
+      type = "gem";
+    };
+    version = "5.4.0";
+  };
+  rdoc = {
+    dependencies = [
+      "erb"
+      "psych"
+      "tsort"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46";
+      type = "gem";
+    };
+    version = "7.2.0";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -127,9 +215,29 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb";
+      sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
       type = "gem";
     };
-    version = "0.3.8";
+    version = "0.6.3";
+  };
+  stringio = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63";
+      type = "gem";
+    };
+    version = "3.2.0";
+  };
+  tsort = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
+      type = "gem";
+    };
+    version = "0.2.0";
   };
 }

From 0e2420ac8d20a992301db957e14c6ac681db8e5f Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Tue, 30 Jun 2026 14:47:11 -0700
Subject: [PATCH 0609/1386] iruby: expose jupyter kernel definition with the
 others

---
 pkgs/by-name/ir/iruby/package.nix | 2 +-
 pkgs/top-level/all-packages.nix   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ir/iruby/package.nix b/pkgs/by-name/ir/iruby/package.nix
index 9054540ab378..b69da51d9eb8 100644
--- a/pkgs/by-name/ir/iruby/package.nix
+++ b/pkgs/by-name/ir/iruby/package.nix
@@ -7,7 +7,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel iruby.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.iruby = iruby.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.iruby = iruby.definition; }) ]' -c jupyter-notebook
 
 let
   self = bundlerApp {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd203b155387..c7b1da3f770c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2321,6 +2321,7 @@ with pkgs;
       clojure = clojupyter.definition;
       octave = octave-kernel.definition;
       r = r-ark-kernel.definition;
+      ruby = iruby.definition;
       # wolfram = wolfram-for-jupyter-kernel.definition; # unfree
     };
   };

From 1a2ee25b7d3614f855b0b4a35a06d962b9c8c6af Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 14 Jul 2026 23:40:05 +0200
Subject: [PATCH 0610/1386] six-sines: 1.1.0 -> 1.2.0

---
 pkgs/by-name/si/six-sines/package.nix | 53 ++++++++++++++-------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/si/six-sines/package.nix b/pkgs/by-name/si/six-sines/package.nix
index 14100abc6c98..1f03f2f282ce 100644
--- a/pkgs/by-name/si/six-sines/package.nix
+++ b/pkgs/by-name/si/six-sines/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   cmake,
   pkg-config,
   autoPatchelfHook,
@@ -22,9 +23,6 @@
   libxrandr,
   libxrender,
   libxscrnsaver,
-  # clap-wrapper's Linux standalone GUI host (auto-detected via pkg-config;
-  # if absent, the standalone still builds but can't show plugin windows)
-  gtkmm3,
 }:
 
 let
@@ -34,18 +32,19 @@ let
   # `base_sdks.cmake` short-circuits the CPM path when *_SDK_ROOT is set.
   #
   # Revisions are pinned to whatever the clap-wrapper submodule at the
-  # six-sines v1.1.0 tag requests in cmake/base_sdks.cmake. When bumping
+  # six-sines v1.2.0 tag requests in cmake/base_sdks.cmake. When bumping
   # six-sines, re-check those tags here.
   vst3sdk = fetchFromGitHub {
     owner = "steinbergmedia";
     repo = "vst3sdk";
-    rev = "v3.7.6_build_18";
+    rev = "v3.8.0_build_66";
     fetchSubmodules = true;
-    hash = "sha256-MeMb09bM8D4FPHWvvRbmWbiyO9u8JVxyfgv4jmeogLI=";
+    hash = "sha256-9HnDOOiKT0ploNJukk4vcZjBLS5gL4SdvmfFqZJPIxA=";
     # The `doc` submodule is ~130 MB of PDFs we never reference. The
     # `vstgui4` submodule isn't touched by clap-wrapper's VST3 glue either,
-    # but it's small (~12 MB) and removing it would diverge further from
-    # upstream Steinberg, so leave it in.
+    # but it — like the `tutorials` submodule that appeared in 3.8.0 — is
+    # small, and removing more would diverge further from upstream
+    # Steinberg, so leave both in.
     postFetch = ''
       rm -rf $out/doc
     '';
@@ -68,7 +67,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "six-sines";
-  version = "1.1.0";
+  version = "1.2.0";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -77,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "six-sines";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-IQLGC86FqS3dptPzNpHEYKB59MWFDKsOPGM+FuzGcPo=";
+    hash = "sha256-6m3+IthBnBvRX8gB8JH3NVN7ot3jTn5zSl/HYUB5Zy4=";
   };
 
   nativeBuildInputs = [
@@ -110,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxrandr
     libxrender
     libxscrnsaver
-    gtkmm3
   ];
 
   # JUCE loads several X11 libraries via dlopen() in juce_XSymbols_linux.h
@@ -154,20 +152,16 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "VST3_SDK_ROOT" "${vst3sdk}")
     (lib.cmakeFeature "RTAUDIO_SDK_ROOT" "${rtaudio-src}")
     (lib.cmakeFeature "RTMIDI_SDK_ROOT" "${rtmidi-src}")
-
-    # CMake 4 hard-removed support for cmake_minimum_required(VERSION < 3.5).
-    # The bundled libsamplerate submodule still declares `VERSION 3.1..3.18`
-    # at the top of its CMakeLists.txt and refuses to configure otherwise.
-    # 3.5 is the value CMake itself suggests in the error.
-    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
   ];
 
-  # The CMakeLists exposes a `six-sines_all` custom target that aggregates
-  # the `_clap`, `_vst3`, and `_standalone` sub-targets (`_auv2` is
-  # APPLE-gated and absent on Linux). The default ALL target would build
-  # the same outputs in practice — the test subdir is already EXCLUDE_FROM_ALL
-  # — but going through `six-sines_all` matches what upstream documents and
-  # keeps the surface narrow if extra default targets ever land later.
+  # clap-wrapper's make_clapfirst_plugins() defines a `six-sines_all` custom
+  # target that aggregates the `_clap`, `_vst3`, and `_standalone`
+  # sub-targets (`_auv2` is APPLE-gated and absent on Linux). The default
+  # ALL target would build the same outputs in practice — the test subdir
+  # is EXCLUDE_FROM_ALL and the installer helper target added in 1.2.0 is
+  # likewise outside it — but going through `six-sines_all` matches what
+  # upstream documents and keeps the surface narrow if extra default
+  # targets ever land later.
   buildPhase = ''
     runHook preBuild
     cmake --build . --config Release --parallel "$NIX_BUILD_CORES" --target six-sines_all
@@ -193,6 +187,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  # nix-update bumps version + src hash, but knows nothing about the
+  # vst3sdk pin in the let-binding above — on every bump, re-check the
+  # tag requested by the clap-wrapper submodule's cmake/base_sdks.cmake.
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Small synthesizer exploring audio-rate inter-modulation of sine waves (FM/PM/AM)";
     longDescription = ''
@@ -208,9 +207,11 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ magnetophon ];
     mainProgram = "six-sines";
-    # cmake/compile-options.cmake hard-codes `-march=nehalem` for non-Apple
-    # builds, and clap-wrapper hard-codes the VST3 bundle architecture path
-    # to `x86_64-linux`. aarch64-linux would require patching both.
+    # Since 1.2.0 upstream selects `-march=armv8-a` on aarch64 (`nehalem`
+    # only on x86), and clap-wrapper derives the VST3 bundle arch dir from
+    # CMAKE_SYSTEM_PROCESSOR instead of hard-coding x86_64-linux, so
+    # aarch64-linux should now be viable — add it once a build has been
+    # verified.
     platforms = [ "x86_64-linux" ];
   };
 })

From 40990fc494728e6557ff5817b3b59e776d50e2e8 Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Tue, 30 Jun 2026 15:19:53 -0700
Subject: [PATCH 0611/1386] jupyter-kernels: update comments to use working
 commands

---
 .../applications/editors/jupyter-kernels/clojupyter/default.nix | 2 +-
 pkgs/applications/editors/jupyter-kernels/octave/default.nix    | 2 +-
 pkgs/applications/editors/jupyter-kernels/wolfram/default.nix   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
index ee081737e355..af56ba9147eb 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
@@ -13,7 +13,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel clojupyter.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.clojure = clojupyter.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.clojure = clojupyter.definition; }) ]' -c jupyter-notebook
 
 let
   cljdeps = import ./deps.nix { inherit pkgs; };
diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
index 74ea3d9b60f5..f4b9202b8109 100644
--- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
@@ -12,7 +12,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel octave-kernel.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.octave = octave-kernel.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.octave = octave-kernel.definition; }) ]' -c jupyter-notebook
 
 let
   kernel = callPackage ./kernel.nix {
diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
index 92ffdcb38e8a..89efbb9d041e 100644
--- a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
@@ -7,7 +7,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel wolfram-for-jupyter-kernel.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }) ]' -c jupyter-notebook
 
 let
   kernel = callPackage ./kernel.nix { };

From 1002e81ccb21e4c7dc54d2eca3a3e61c1b9670a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 21:45:56 +0000
Subject: [PATCH 0612/1386] buildpack: 0.40.3 -> 0.40.8

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

diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix
index 09dcb0b5cc33..9cc9b7fc1cc1 100644
--- a/pkgs/by-name/bu/buildpack/package.nix
+++ b/pkgs/by-name/bu/buildpack/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pack";
-  version = "0.40.3";
+  version = "0.40.8";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KKgF05oJDgMQExJtsAc6weor4OxUZl4xNIFY0VoQfs4=";
+    hash = "sha256-mD32ZQ/PxiWnOvCdDFlNx1NIevhfgPcg9+ToUmfM6jo=";
   };
 
-  vendorHash = "sha256-sRITmNcCwJw4aXLv/wKYOTZai95YY/DY87F4P2+7b5A=";
+  vendorHash = "sha256-0cyxhyEt4P+sd0FmN177rsTugWM0x2Ebk1LEHtX9wZE=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bd73e09597f5ea15382d270ab28093d627203e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 14 Jul 2026 23:48:09 +0200
Subject: [PATCH 0613/1386] gitea: 1.26.4 -> 1.27

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.27.0
Diff: https://github.com/go-gitea/gitea/compare/v1.26.4...v1.27.0
---
 pkgs/by-name/gi/gitea/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index dfae5dbc37ec..1191c645692f 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -13,14 +13,14 @@
   openssh,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm_10,
+  pnpm_11,
   stdenv,
   sqliteSupport ? true,
   nixosTests,
 }:
 
 let
-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
 
   frontend = stdenv.mkDerivation (finalAttrs: {
     pname = "gitea-frontend";
@@ -30,7 +30,7 @@ let
       inherit (finalAttrs) pname version src;
       inherit pnpm;
       fetcherVersion = 4;
-      hash = "sha256-FroVRhNzCLtbW9Z0s6xr4l0mIX+hY4KOomZAhPILWlY=";
+      hash = "sha256-VAXSj+AYV6uEdCAD/sEzeydqn4cqNL+ITfrGq41jaLI=";
     };
 
     nativeBuildInputs = [
@@ -53,18 +53,18 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "gitea";
-  version = "1.26.4";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xfLhiQMygYKgSMrvmH2V/LIMeaA4ovOeUDT4RUwhvgo=";
+    hash = "sha256-Pn1V4U43d4lTKRO7AftgKDDWls2z+3IeZgPBaKZlbow=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-VyzfBZnxnubNIdf+xwLav4W4DgapcLLKN1aKrZ9NbDg=";
+  vendorHash = "sha256-YRBMGWKIZgMxOXaXG2bIBj1XzkhSwiMyfRy+yQGw+Bo=";
 
   outputs = [
     "out"
@@ -79,14 +79,14 @@ buildGoModule (finalAttrs: {
   overrideModAttrs = _: {
     postPatch = ''
       substituteInPlace go.mod \
-        --replace-fail "go 1.26.3" "go 1.26"
+        --replace-fail "go 1.26.4" "go 1.26.0"
     '';
   };
 
   postPatch = ''
     substituteInPlace modules/setting/server.go --subst-var data
     substituteInPlace go.mod \
-      --replace-fail "go 1.26.3" "go 1.26"
+      --replace-fail "go 1.26.4" "go 1.26.0"
   '';
 
   subPackages = [ "." ];
@@ -112,6 +112,7 @@ buildGoModule (finalAttrs: {
     mkdir -p $out
     cp -R ./options/locale $out/locale
 
+    mv $out/bin/gitea{.dev,}
     wrapProgram $out/bin/gitea \
       --prefix PATH : ${
         lib.makeBinPath [

From c22f438f9d604a3e6c62af601c4a9330bd953341 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 14 Jul 2026 19:47:56 +0200
Subject: [PATCH 0614/1386] chromium,chromedriver: 150.0.7871.114 ->
 150.0.7871.124

https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_0353146366.html

This update includes 15 security fixes.

CVEs:
CVE-2026-15764 CVE-2026-15765 CVE-2026-15766 CVE-2026-15767
CVE-2026-15768 CVE-2026-15769 CVE-2026-15770 CVE-2026-15771
CVE-2026-15772 CVE-2026-15773 CVE-2026-15774 CVE-2026-15775
CVE-2026-15776 CVE-2026-15777 CVE-2026-15778
---
 .../networking/browsers/chromium/info.json    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index a3bc7a312ec7..c4ef999b274b 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "150.0.7871.114",
+    "version": "150.0.7871.124",
     "chromedriver": {
-      "version": "150.0.7871.115",
-      "hash_darwin": "sha256-3QytnwfqPqpYL2TMTMykvT+yAfZqWiRHMbMEK+whe0Q=",
-      "hash_darwin_aarch64": "sha256-jJ1URVS4led/1rTODm3t8wewJ8oIOzKIrq1utn5JJ3s="
+      "version": "150.0.7871.125",
+      "hash_darwin": "sha256-HJTBS6eRmAsxrn7WW4hCxMCXdzn+1PYz1W0uZHJ38yk=",
+      "hash_darwin_aarch64": "sha256-VCgkc6MeMPbt0F2ZVTJNn9yJbSYNhy1zr8KzPVaVi0I="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "f405107495a07cb1bfcf687d4af8d91117098db6",
-        "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=",
+        "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa",
+        "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "8d3c5a8caebd836b99fa32062951a401910eba33",
-        "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8="
+        "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
+        "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -552,8 +552,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272",
-        "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI="
+        "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8",
+        "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -657,8 +657,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0",
-        "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA="
+        "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
+        "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -827,8 +827,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16",
-        "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g="
+        "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744",
+        "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",

From 21a09f0493401fe64922f79b1f4708e9967abd4d Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 14 Jul 2026 21:46:46 +0200
Subject: [PATCH 0615/1386] openbao: 2.5.5 -> 2.6.0

https://github.com/openbao/openbao/releases/tag/v2.6.0

diff: https://github.com/openbao/openbao/compare/v2.5.5...v2.6.0
---
 pkgs/by-name/op/openbao/package.nix |  6 ++--
 pkgs/by-name/op/openbao/ui.nix      | 50 +++++++++++++----------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 2ca7c101dd8b..68348dc22ae7 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.5.5";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-75Rm9EGkvUKJ05d55bboPAE+Nm/GLLgH1TqDrExkJO0=";
+    hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4=";
   };
 
-  vendorHash = "sha256-3d3g6f0O7X+aedYCfLbqLNuITKNQuxZkApWTTKSk7lA=";
+  vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix
index 0a6e634e2b5e..44b2c4e1a377 100644
--- a/pkgs/by-name/op/openbao/ui.nix
+++ b/pkgs/by-name/op/openbao/ui.nix
@@ -1,50 +1,46 @@
 {
   stdenvNoCC,
   openbao,
-  yarn-berry_3,
-  nodejs_22,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  pnpmBuildHook,
+  pnpm_10,
+  # https://github.com/openbao/openbao/issues/731
+  nodejs-slim_22,
 }:
 let
-
-  yarn = yarn-berry_3.override { nodejs = nodejs_22; };
-
+  nodejs-slim = nodejs-slim_22;
+  pnpm = pnpm_10.override { inherit nodejs-slim; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = openbao.pname + "-ui";
   inherit (openbao) version src;
   sourceRoot = "${finalAttrs.src.name}/ui";
 
-  offlineCache = yarn.fetchYarnBerryDeps {
-    inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg=";
-  };
-
   nativeBuildInputs = [
-    yarn.yarnBerryConfigHook
-    nodejs_22
-    yarn
+    pnpmConfigHook
+    pnpmBuildHook
+    pnpm
+    nodejs-slim
   ];
 
-  env.YARN_ENABLE_SCRIPTS = 0;
-
-  preConfigure = ''
-    printYarnErrors() {
-      cat /build/*.log
-    }
-    failureHooks+=(printYarnErrors)
-  '';
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      sourceRoot
+      ;
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-9Q5celZSwMgSS8qcj8sDH/JLv48lgDMOylANvXSnhsU=";
+  };
 
   postConfigure = ''
     substituteInPlace .ember-cli \
       --replace-fail "../http/web_ui" "$out"
   '';
 
-  buildPhase = ''
-    runHook preBuild
-    yarn run ember build --environment=production
-    runHook postBuild
-  '';
-
   dontInstall = true;
 
   meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // {

From 80aaddc8090cff83625419c45cebf30b66fe1580 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 00:43:16 +0200
Subject: [PATCH 0616/1386] aritim-dark: fix version scheme

---
 pkgs/by-name/ar/aritim-dark/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/aritim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix
index e57692cddc64..6ff829f7261c 100644
--- a/pkgs/by-name/ar/aritim-dark/package.nix
+++ b/pkgs/by-name/ar/aritim-dark/package.nix
@@ -6,7 +6,7 @@
 
 stdenvNoCC.mkDerivation {
   pname = "aritim-dark";
-  version = "unstable-2021-12-29";
+  version = "0.7-unstable-2021-12-29";
 
   src = fetchFromGitHub {
     owner = "Mrcuve0";

From 520b11fa1c273d2d7c729b416cfb3878c4713c78 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 00:47:01 +0200
Subject: [PATCH 0617/1386] arftracksat: fix version scheme

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

diff --git a/pkgs/by-name/ar/arftracksat/package.nix b/pkgs/by-name/ar/arftracksat/package.nix
index 38c1f53cd6c7..a4199fc3f5ad 100644
--- a/pkgs/by-name/ar/arftracksat/package.nix
+++ b/pkgs/by-name/ar/arftracksat/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation {
   pname = "arftracksat";
-  version = "unstable-2025-09-15";
+  version = "1.0-unstable-2025-09-15";
 
   src = fetchFromGitHub {
     owner = "arf20";

From c60d5f0b18100d0ec6230d01f84b176b5db7de67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 22:48:44 +0000
Subject: [PATCH 0618/1386] python3Packages.jupyter-book: 2.1.5 -> 2.1.6

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

diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix
index 81b8ecacaa8d..d6c7434e385a 100644
--- a/pkgs/development/python-modules/jupyter-book/default.nix
+++ b/pkgs/development/python-modules/jupyter-book/default.nix
@@ -26,19 +26,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "jupyter-book";
-  version = "2.1.5";
+  version = "2.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyter-book";
     repo = "jupyter-book";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0osykGqNr16il67ubfglTchTl3anQWrjlaySxBWh/yk=";
+    hash = "sha256-J0WzzKg46+0mvZ4goUPfkjO70HsAXQGv1JaoFs8JZ18=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-H7ZsDMNXU9u0jvmbrcWzUoFjD+y1OlmNVLK9WEfDJyU=";
+    hash = "sha256-y0QCZhsgcdFlgsjsCZFvLOQP27e5JD0QL0uP2XmpQEs=";
   };
 
   build-system = [

From bdc022adc44cda4c4f95986b70a4a47c6108a0db Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 00:48:54 +0200
Subject: [PATCH 0619/1386] armitage: fix version scheme

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

diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix
index 1d384ca08e51..286fc11eacb0 100644
--- a/pkgs/by-name/ar/armitage/package.nix
+++ b/pkgs/by-name/ar/armitage/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "armitage";
-  version = "unstable-2022-12-05";
+  version = "1.0-unstable-2022-12-05";
 
   src = fetchFromGitHub {
     owner = "r00t0v3rr1d3";

From 63baf05219ab0d9dbb634cf4a0c0a54027fdc53a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 22:49:29 +0000
Subject: [PATCH 0620/1386] attic-client: 0-unstable-2026-06-26 ->
 0-unstable-2026-07-06

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

diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix
index 5a23514ca537..38a5ca86c26e 100644
--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@@ -21,13 +21,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "attic";
-  version = "0-unstable-2026-06-26";
+  version = "0-unstable-2026-07-06";
 
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "attic";
-    rev = "b7c905657cb81b8ec9c26b0d9f53aa2e4f231810";
-    hash = "sha256-//gQFVLVFhwHyI9yrpPqX0MQJGYqS6nE/iLV872K+PU=";
+    rev = "7a19204df10d606c5070e6bb72615c3461900c05";
+    hash = "sha256-AyXLhsc2drC+lunm+TB6Xs6XMMJ/m4B1YjMM1N8JXhU=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   buildInputs = lib.optional needNixInclude nix ++ [ boost ];
 
   cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
-  cargoHash = "sha256-fYWRlgP3uwntULe6o2MC1yB/ea2x+27m1Op7o2wUd+U=";
+  cargoHash = "sha256-UGgM78QEWJ2QgbQhxEI+yLYXH6T4ey+1oenPTMlJ3GU=";
 
   env = {
     ATTIC_DISTRIBUTOR = "nixpkgs";

From 7d56b8198e9da23494e33b53a7873ed91220542c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 22:53:45 +0000
Subject: [PATCH 0621/1386] swaylock-plugin: 1.8.6 -> 1.8.7

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

diff --git a/pkgs/by-name/sw/swaylock-plugin/package.nix b/pkgs/by-name/sw/swaylock-plugin/package.nix
index abc2506d0392..367ba39197f5 100644
--- a/pkgs/by-name/sw/swaylock-plugin/package.nix
+++ b/pkgs/by-name/sw/swaylock-plugin/package.nix
@@ -23,12 +23,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swaylock-plugin";
-  version = "1.8.6";
+  version = "1.8.7";
   src = fetchFromGitHub {
     owner = "mstoeckl";
     repo = "swaylock-plugin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JSFxWpSUt6ekX/owk9I6CdGBTF6F1pOTtFAls7kZrsc=";
+    hash = "sha256-JWZ8aZeS8XXjRPhwyJXptwdMU2y/uFG1KlZh+v92/0c=";
   };
 
   strictDeps = true;

From 79ad95192bb2f7a0a2d167857c1ca0c99a080815 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 22:54:05 +0000
Subject: [PATCH 0622/1386] werf: 2.73.0 -> 2.73.1

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 08ec0c59694a..235d16de3e2a 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.73.0";
+  version = "2.73.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4YLJv5YDJUaoQlyljK4e8ilhCU67K7jJiDkFm7sYwxo=";
+    hash = "sha256-LqFZA8QCQxoEh49f+EHxYdPhFUbqUYnGeDVd/X+hODU=";
   };
 
   proxyVendor = true;

From 62893ad18a2f1e1e255542d8b562d5d28ccb3674 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 14 Jul 2026 18:36:06 -0400
Subject: [PATCH 0623/1386] vector: 0.56.0 -> 0.57.0

Changelog: https://github.com/vectordotdev/vector/releases/tag/v0.57.0
---
 pkgs/by-name/ve/vector/package.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 2a378fde56ab..6231748f2359 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -28,16 +28,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vector";
-  version = "0.56.0";
+  version = "0.57.0";
 
   src = fetchFromGitHub {
     owner = "vectordotdev";
     repo = "vector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ge3epfB8xErF+2I1jW3OvHS+mHnGSSU6vOz2v/sSMW4=";
+    hash = "sha256-x4yfC/qAMRM7X19usonsp8GSJHwIsn0zoX0owLn2EXs=";
   };
 
-  cargoHash = "sha256-iwd6GCbI3PiM1ksAxDEZglueGWYCkEbJ3N76wn13TPY=";
+  cargoHash = "sha256-H26tUF+i/79t7W2BVjh2bVRCGZK8rgazHzlTF4L2jyA=";
 
   nativeBuildInputs = [
     pkg-config
@@ -86,12 +86,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
   };
 
-  # https://github.com/vectordotdev/vector/pull/25406
-  postPatch = ''
-    substituteInPlace lib/vector-config/src/schema/visitors/merge.rs \
-      --replace-fail 'destination.merge(source);' 'Mergeable::merge(destination, source);'
-  '';
-
   doCheck = true;
   checkType = "debug";
 

From f697e9047e900ab646d284e8b073ca1dc71ae1b5 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Tue, 14 Jul 2026 22:57:19 +0000
Subject: [PATCH 0624/1386] souffle: substituteInPlace replace with
 replace-fail

Per #356002
---
 pkgs/by-name/so/souffle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix
index c222f3864ee8..23b1935b68a0 100644
--- a/pkgs/by-name/so/souffle/package.nix
+++ b/pkgs/by-name/so/souffle/package.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     substituteInPlace "$out/bin/souffle-compile.py" \
-        --replace "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \
+        --replace-fail "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \
                   "-I${ncurses.dev}/include -I${zlib.dev}/include -I${sqlite.dev}/include -I${libffi.dev}/include -I$out/include"
   '';
 

From 6790da7e7c58f5cf2ca653a4457db7ecb67d4bea Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 00:58:44 +0200
Subject: [PATCH 0625/1386] python3Packages.contexttimer: fix version scheme

---
 pkgs/development/python-modules/contexttimer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix
index 556a77575a11..637d6426be15 100644
--- a/pkgs/development/python-modules/contexttimer/default.nix
+++ b/pkgs/development/python-modules/contexttimer/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage {
   pname = "contexttimer";
-  version = "unstable-2024-09-05";
+  version = "0.3.3-unstable-2024-09-05";
   pyproject = true;
 
   src = fetchFromGitHub {

From 6fdc3268f5add4067c2969eaf3bed9d64a4d3457 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 23:01:01 +0000
Subject: [PATCH 0626/1386] prmt: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix
index e239a4d931e9..6181c6ab74b3 100644
--- a/pkgs/by-name/pr/prmt/package.nix
+++ b/pkgs/by-name/pr/prmt/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prmt";
-  version = "0.6.0";
+  version = "0.7.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     repo = "prmt";
     owner = "3axap4eHko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pLxWArZzGU1vjS2DOJ6PyrhYC2XbkAD5SfiFjHTaQfI=";
+    hash = "sha256-5UgHnQl/kfeJm3EHATmcWF4V7C/rhaGnpDa6Ym41Ns4=";
   };
 
-  cargoHash = "sha256-hmtKmnSnSGgivY+dmC4WlMuCJGTVM6GI5k0pZcfzYso=";
+  cargoHash = "sha256-TQHe0FJomKZMSrt/VEhsbVNdxhvYmi/1vQxp4vxtH1U=";
 
   # Fail to run in sandbox environment
   checkFlags = map (t: "--skip=${t}") [

From cd496692a3b57016022b5a83e5d1b218085dc3c7 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 01:02:34 +0200
Subject: [PATCH 0627/1386] python3Packages.june-analytics-python: fix version
 scheme

---
 .../python-modules/june-analytics-python/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/june-analytics-python/default.nix b/pkgs/development/python-modules/june-analytics-python/default.nix
index 11866121c9bb..37d0a4c204c4 100644
--- a/pkgs/development/python-modules/june-analytics-python/default.nix
+++ b/pkgs/development/python-modules/june-analytics-python/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage {
   pname = "june-analytics-python";
-  version = "unstable-2022-07-26";
+  version = "2.3.0-unstable-2022-07-26";
   pyproject = true;
 
   src = fetchFromGitHub {

From 03d7d3daae70da06fc0091fc41c8df60e9645fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Jul 2026 01:03:29 +0200
Subject: [PATCH 0628/1386] 
 home-assistant-custom-lovelace-modules.horizon-card: 1.4.2 -> 1.4.5

Changelog: https://github.com/rejuvenate/lovelace-horizon-card/releases/tag/v1.4.3
Changelog: https://github.com/rejuvenate/lovelace-horizon-card/releases/tag/v1.4.4
Changelog: https://github.com/rejuvenate/lovelace-horizon-card/releases/tag/v1.4.5
Diff: https://github.com/rejuvenate/lovelace-horizon-card/compare/v1.4.2...v1.4.5
---
 .../horizon-card/missing-hashes.json          | 49 +++++++++++++++++++
 .../horizon-card/package.nix                  | 10 ++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/missing-hashes.json

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/missing-hashes.json b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/missing-hashes.json
new file mode 100644
index 000000000000..b06dcea4ea52
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/missing-hashes.json
@@ -0,0 +1,49 @@
+{
+  "@rollup/rollup-android-arm-eabi@npm:4.62.2": "6dac547c55fb598364b28fce22e8bf6de991db264bf66a65b90e8facf4c46a665b68a950c77cb535c751bb2790356f022036adfd09300e400f93899164ced5ff",
+  "@rollup/rollup-android-arm64@npm:4.62.2": "4fcdc881d21ef3e3f58abe7d8d2c78bf38b4a84d98544ee853d9c28ce104bafc11db1a2aadf02334e185a6d99508b3a4922a6141d6b1316024325839ba82ae7d",
+  "@rollup/rollup-darwin-arm64@npm:4.62.2": "713a202e98108899ef1937fe8388d162efe3dded54a2247c82a3f7e9c8fc6420ce5acefd5e14af13ade67d6d6384abd4fe44a489ebd50615d66ccc6e3c727576",
+  "@rollup/rollup-darwin-x64@npm:4.62.2": "66901dd27b80cc5340bd8256174e720aa67cf0a77fc80b29471aa15b40e51f871aa9d034d7cb6244fc535f0529153d26d743291bd84cd1a21596f60a1092f11b",
+  "@rollup/rollup-freebsd-arm64@npm:4.62.2": "956a53e844ce86cd87617e0327ab49e44587904b7e5b88210b7a989b963a32ade4e9f012e9cb16a72387c9ed65920f97f82dad21df498d8ed276eb4adb4adf29",
+  "@rollup/rollup-freebsd-x64@npm:4.62.2": "596fba4be4e192335fe6ddc81d4758e2eb2a93b30811d9ea57f2b29920f1179661ecc88114a8d22d264964bea36014b336762ccafb6edea17967a53ff956552c",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.62.2": "ae8e1596256c55a5afd37c38406dcd055db6f5cb1b4bac0c437d049b294ca7afbdf07e32cc53fee466f7dd4ae8850fc5c5aa98bfbeb1094174bd74df63b0d8b7",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.62.2": "ba26316840f0cf0bff410ebd25c2b63e3aba5a0ca18f31b0a40e21233d5128bf7e88c540d90b2f1746dd6bbd8f98cb5c32d4707f2d8933c1828e2ea1d12953f4",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.62.2": "111ef1516bbc537720b5c8b7cbd216cddce05c66e4df054746486e274ad32037b0e3a63ca2619af98c39c7313d6de2cbbe8a8a277815fa9f5f7311df62347f1a",
+  "@rollup/rollup-linux-arm64-musl@npm:4.62.2": "0f6b0b645dc4b4f65cc012eb9e7c65b9f098a559e58d71ad0d13e171d401dc7a5185a21986880dba66eeb78484fff49b59d3c44786fdaeee255d1ba2b302b678",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.62.2": "cbccb721e1fe8706d46af6e9507058207c57b8a9ed0c0be9f6518dd322b316d16d7e281e49d612b8fcf61d147d03269ea2e69a65fbe75292c8e08945aab1f323",
+  "@rollup/rollup-linux-loong64-musl@npm:4.62.2": "9f49d8a556a0e918b94f293829f4e18633c9f344703f6d85873a28bafcd64e2921ba4842c2369ce53f7be3f5d706a51ac9ba9c402a52f0d4a654682575ff126e",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.62.2": "fc465b8fe05ec29949d0292a5fc0b3a31660e06aea3025ba660b1da649b0e8b71d3acab92f87c0a3702a56bebec596e85aec686c9893c122db113c01558adfea",
+  "@rollup/rollup-linux-ppc64-musl@npm:4.62.2": "51dd2838225feba9a13b9f1544d57c6bc2bb045dfca8f35e02587bfaa83a7a822beb8a2150399e0b9af377187c96ce783fd9b349b4566ca085d61f328123b153",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.62.2": "ccf46a13f575dbded52f34a6d9b918f30ceed1c326ddabc80dfbafba233351b7a5ebc9837f75c005e94dc38be3c99330a498dd2fb4e663205a5ce430b983a805",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.62.2": "4e3cac14eb0625989d73750514174b93122925785e8cfca616334b5d5159a66fbe83202ee35b11030b7948daabc4f0fdc7150fcadda496cfd90dcce34b890065",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.62.2": "427ae75b2f5ebb50fc5de5e8e9ecda8b45efc3bc5116774a0e787b652c0e5626f1938f845fe2859984de99cc2c056df24e22de7335c11127e0bc03db4878f9f5",
+  "@rollup/rollup-linux-x64-gnu@npm:4.62.2": "ca4f60679adeafc13074ebbf01d7ccb7df73403b508c5789d076556ebf27160015617e8659924ee5f6c75696022afdc23fb907c87cd04ed5a2f2963e3147d8fb",
+  "@rollup/rollup-linux-x64-musl@npm:4.62.2": "aaf530bdff3d5b46fe9871e66210d408bd2d2faa3270a3373205b579ba12821973cc36979082a2a9b284fc32b12aee9f7f2ed6cece8b0f3e15f03cedee22b34c",
+  "@rollup/rollup-openbsd-x64@npm:4.62.2": "d6649b412aeb50b3f408a60795296fb197863e85dfb709858477e66802b8b4ee3bccc82b6fdf5b4d2f7f3f9c6b8269c063f8e876adba72d5b50fefd5ee67c78b",
+  "@rollup/rollup-openharmony-arm64@npm:4.62.2": "79474b5887dcbe10f6d33dce17ecdb17cc909bfcc5815423af23344ec881c40cd77cee84a221235f3de0a26c7bbfac0d827b2942f9d2ae1bab5d97c17555b667",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.62.2": "7b5e48905eb92a01528b231fd14c4b67335d93afe5ed45abf3ad68df11d7925b741c5cb9139f54f20a2154249a2b3a6c73d0e949095f2f7aebd9619187e094b4",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.62.2": "62559be5b67705a05429e4e5d7a46a0671c9c2009188d21983575399c3643400f041d5837c3e557976255556df9000209cdc8c86d8281775c0ee733cfbaadc1d",
+  "@rollup/rollup-win32-x64-gnu@npm:4.62.2": "247f4934585e9b82ecea1412be572da85050cd40b29c1bb3c710293da5641aa3e3bbca30de9750b2a12bb62fedd5125409b00e102df5772b37fb48bbcffcf5e1",
+  "@rollup/rollup-win32-x64-msvc@npm:4.62.2": "9297aad16d1abd63819c7604c6c02a3e968b188f7f15ab784cac3d0a3723a25f6fbd558b0c41663aed6a9a9ab0f356ab57978d6b009149bed7c601a4d82fbf1e",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.12.2": "78d31e85fbbb97d43947e0dab41409de1345d1f9eb5a40b3a291ec05c50de1414a0022ec91c9934330d196f9338106bc49ca837715e9eae8c229dc30c2421984",
+  "@unrs/resolver-binding-android-arm64@npm:1.12.2": "f8ef84285392f922833e60ae781fce0e0d606ddb7d9f7b673b1046ae7e341dd1f5cda5baa7e0ed41ebaa7d1125f46a52058a942e66a936609363627fb6ba1d06",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.12.2": "608dbb1a2a3ea564d50e12634c77cd2fa245790f3ab0682dd55cefd9458bab6297bc5afe6528028e2072381e07f4b65a6ede6466c9dbf70aecd9d8d03bf0ce58",
+  "@unrs/resolver-binding-darwin-x64@npm:1.12.2": "eca4288f053800dd40036ff23f2cc138e4e48058f72893e7a41af2a37927ae4a497476afda16c32d82e88979b643f68da4bda7d4e17cd53faf56de0d28ccf032",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.12.2": "1b6a38ef89c642f85c86d6fdbc93074562b4db8f486ba3f623ef3e108949f7ee62b5e237054560e71acbe1d661915747c74824f0d79eecc3f08526bdd103efc5",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.12.2": "94e87415c3e335595ee9f73ed7fb7ba03878e84515f656a72d039806a23801749406172e886bce06d6ad2af4fa49aa328f96608b5bf1fa345a96f5b4b6b0c63d",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.12.2": "3270d2c551fb3364db42a1ea1d215c226923904957ea793a4e10f8fae7609446581714e1c624ffe22d59af8309d0ebe50fc5b3c2388c502215e354dd7a50bc86",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.12.2": "28008225537106ba502ff38eaf140edd1eb96f6a5c580cb608f66f13454c588511686118894d507aa4f8311d35a68f44e0e28a31be51d5ace82cd899a5023f7f",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.12.2": "f904329e483fd29a69f9ce45b240b39cb9dcb0eed85ca730ea47b029ffe0f45d366a69f0ede28a9fa310e9c8ebd714f90e0de041a685801727a85ae73c0e2977",
+  "@unrs/resolver-binding-linux-loong64-gnu@npm:1.12.2": "a70e01e9a1661b379710e12cb7a1bf66e47b0bacfeb28ec98d41446e3e622a22d7bafcc7a79bcfdba232d02ef4fa6d6d70023782fc0429b8e69d5fb2a45b851e",
+  "@unrs/resolver-binding-linux-loong64-musl@npm:1.12.2": "7d479e515449b9ee3e315ed752f742f43d73308ab173e625fdca46b5c5f74db4c934fda1d71471b1160ac6899c095ca9e9b77934755130900bc49288c7b094c6",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.12.2": "27fca56c2ba1c3e83186a5e5fb25294acfec8236ec87ebe92ca558047483d0c54760cf8571e0680081abfa395e8fcde177bd40eb1c86ec71cce08e6cf339f801",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.12.2": "b72c979acfedfb9f3dfe4127754d8e385a4358eb1277372b253be82e30b14723e6b0125cca298027c2a5cadda79a58259c7ba99466e2a85ae2b44537549f0b29",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.12.2": "ebd42e17022db356ed79aa9ef654b4943704abb7493d341c20f97aad14ac95d0dc754dcfa7d44309a41215963178aa5e7ab3853c4873847d02cdc931e392dc0d",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.12.2": "4d3b19693df4864087791b815cfee10bbfe81078744fd9f69c07b2420053828264b541ac66c4d5665be866dfda9f365d6fe65664c77208e79467cee3624ed6ab",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.12.2": "290e0c59a96cc7e940fd203828027953c6bf5f946bc2961526fae68a839d41595bf0232d31271d54cb2c2427f2eefa12dbbe06d5fc294f289d471b8ee481fd99",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.12.2": "c466cc2f1687acc8aebf6e34b83bb32c18d0a3c15321724c1547f9543ba4ad89282c2fdb44afe878ff4061e5321dbd760ba0161b06a17cead498209a8e7cbbd1",
+  "@unrs/resolver-binding-openharmony-arm64@npm:1.12.2": "87aaeb0aa1a62cc4dc1cbe5f1cf05902870eda80bb10f0dae65dd341dbad782dd5fb79430cc4a5140e4d0b4ced6828310bc97a28527fa89243f736c7685b3b38",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.12.2": "b9ecd9336f631c1664589e0a354e71b3747ec4d7efba1382967e10cc56750aeac8a12db133d3992286de9fbbd1c26df581651a52c4e597f33b21b3eb2fcc634a",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.12.2": "ba009d8326e6712b539fb7357eb5fbdbfff55d100c06f65c0af5880f3928a1707f3cf7ac8d55eb75adb5ae6811de77eff7cd50c8f8b59bd48766b1137fadc33e",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.12.2": "467322fec2622b9b89ccd744bc66cab7931e15d44b933f972238b034d4f3cf1b4aa7584a74f865bfd2a87201ce401fadbcd0ecf0670e76ca5f14feb148db3475",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.12.2": "4fb01c3d900099b0a4a8367c4d6084b7ac493746682a6284c713d188eee628c7fba856e46a893f50c012b5c7ad6bcc7d49dc3c97fb7ae14dc49bfbaa0ccbdf35"
+}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
index 31f42e9f4f6f..615335c38064 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "horizon-card";
-  version = "1.4.2";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "rejuvenate";
     repo = "lovelace-horizon-card";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ja4r8x9sNH6W7LoH//zfXDlQb9W7KYFz4Y9UBoqt19s=";
+    hash = "sha256-3HYAo5BRnWmI8OWrWmA1V1ctPC1zlcFLAFuSfsDhtjo=";
   };
 
   patches = [
@@ -27,9 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     yarn-berry.yarnBerryConfigHook
   ];
 
+  # nix run nixpkgs#yarn-berry_4.yarn-berry-fetcher missing-hashes yarn.lock
+  missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry.fetchYarnBerryDeps {
-    inherit (finalAttrs) src patches;
-    hash = "sha256-Ztb69kAGYteVevzzFOx+62LI2i4iQakI4Fwqb6G2vuM=";
+    inherit (finalAttrs) src missingHashes patches;
+    hash = "sha256-WrBUsho7GZI/Un2zvhqZ970psDeAiESiBGJikgX3E5Q=";
   };
 
   buildPhase = ''

From dfb5bfc106a571e6e42ddd62004726d70fda3c8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 23:09:32 +0000
Subject: [PATCH 0629/1386] cargo-feature-combinations: 0.2.3 -> 0.3.0

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

diff --git a/pkgs/by-name/ca/cargo-feature-combinations/package.nix b/pkgs/by-name/ca/cargo-feature-combinations/package.nix
index d7d52def6bcc..29d9742b1000 100644
--- a/pkgs/by-name/ca/cargo-feature-combinations/package.nix
+++ b/pkgs/by-name/ca/cargo-feature-combinations/package.nix
@@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "cargo-feature-combinations";
-  version = "0.2.3";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "romnn";
     repo = "cargo-feature-combinations";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5QQrWdq1jTGUCnzZkzJ2WzJRpxhRtaZMLpgCIktaiPc=";
+    hash = "sha256-PneHMWX7IRoX4oSm8iePeI+pEPs8n3F2PW06ZWKDFcc=";
   };
 
-  cargoHash = "sha256-PMZGYxdB9cbWLVtvfRtWsRqVwJWayPbrdhpKvxmq3dM=";
+  cargoHash = "sha256-DCfO2N6ml1a1P2hFs3gxRE9k+WYv8eqMzwL+cionwYE=";
 
   passthru.updateScript = nix-update-script { };
 

From ec61956ca4aba69004cba0c2cd5e5b50abb1f478 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 23:20:01 +0000
Subject: [PATCH 0630/1386] terraform-providers.cloudflare_cloudflare: 5.21.1
 -> 5.22.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a79d0db56d6c..6a3745c66d63 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -209,13 +209,13 @@
     "vendorHash": "sha256-rCWeetM6nhNb1I1PmB66E5K1ku9ODRqN87MU9y6W/dc="
   },
   "cloudflare_cloudflare": {
-    "hash": "sha256-SHEK/NJrs1ZkyDc8jSnb39dT/wX7ixSsHc//cwhTfz8=",
+    "hash": "sha256-qy/bW3CnsSXoiCLPW+LVuBb7OQLhxIpCDNTyAdjU5rM=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v5.21.1",
+    "rev": "v5.22.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-YLgIcohvOYBVt/GOkiqxdJVThhcphG2l8Lha1MwU9L4="
+    "vendorHash": "sha256-IwklxMtQ6pOO/066SKx298ANoh0i/DiGtgqamenMi+s="
   },
   "cloudfoundry-community_cloudfoundry": {
     "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",

From 20b827a4eae64135fb303711a3233da00ac9c84d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 23:20:07 +0000
Subject: [PATCH 0631/1386] vscode-extensions.vscjava.vscode-gradle: 3.17.3 ->
 3.18.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index de3ec7a5475f..09a50608f682 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5118,8 +5118,8 @@ let
         mktplcRef = {
           name = "vscode-gradle";
           publisher = "vscjava";
-          version = "3.17.3";
-          hash = "sha256-heFcGOe10r7y23xyFc/nFKk/nsrX4wc5fT9e4GKGhW0=";
+          version = "3.18.0";
+          hash = "sha256-ybMejIJER9HHVh1z+tazgvQ0UIa8eKoJBb7JOLU1Kpw=";
         };
 
         meta = {

From f422204173cf7485ca325cd48e97af47dc30a1cf Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 01:22:41 +0200
Subject: [PATCH 0632/1386] python3Packages.qtile: update meta.homepage

---
 pkgs/development/python-modules/qtile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index 3dfedfa3eb98..37510d043d82 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -209,7 +209,7 @@ buildPythonPackage (finalAttrs: {
   '';
 
   meta = {
-    homepage = "http://www.qtile.org/";
+    homepage = "https://qtile.org/";
     license = lib.licenses.mit;
     description = "Small, flexible, scriptable tiling window manager written in Python";
     changelog = "https://github.com/qtile/qtile/blob/v${finalAttrs.version}/CHANGELOG";

From e0a2fcdc771fb00eaec3dbed1bc52ab27380f055 Mon Sep 17 00:00:00 2001
From: Connor Grady <connor.grady@gmail.com>
Date: Thu, 9 Jul 2026 11:52:05 -0500
Subject: [PATCH 0633/1386] bazarr: package from source

---
 pkgs/by-name/ba/bazarr/package.nix | 120 ++++++++++++++++++-----------
 1 file changed, 77 insertions(+), 43 deletions(-)

diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix
index d6186b59ea8a..3b531409b618 100644
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -1,78 +1,112 @@
 {
-  stdenv,
   lib,
-  fetchzip,
-  makeWrapper,
-  python3,
-  unar,
+  stdenv,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  nodejs,
+  npmHooks,
+  dart-sass,
+  makeBinaryWrapper,
+  python313,
   ffmpeg,
+  unar,
   nixosTests,
+  nix-update-script,
 }:
-
 let
-  runtimeProgDeps = [
-    ffmpeg
-    unar
-  ];
+  python = python313.withPackages (ps: [
+    ps.lxml
+    ps.numpy
+    ps.pillow
+    ps.psycopg2
+    ps.setuptools
+    ps.webrtcvad
+  ]);
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bazarr";
   version = "1.6.0";
 
-  src = fetchzip {
-    url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    hash = "sha256-LRcc2wg5u260yl3A7rRwBfldl6WOyvF2T9NKGTKabfw=";
-    stripRoot = false;
+  src = fetchFromGitHub {
+    owner = "morpheus65535";
+    repo = "bazarr";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-r3H0JEcGYzQOTHVR/zONmtOIF+LnJd+qn2pcAj8vdOA=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  npmRoot = "frontend";
+  npmDeps = fetchNpmDeps {
+    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+    inherit (finalAttrs) src;
+    sourceRoot = "${finalAttrs.src.name}/frontend";
+    hash = "sha256-cb++eqVtKZer9B1rwJ9WR4mZImnASeFU2MojgXAPWf4=";
+  };
 
-  buildInputs = [
-    (python3.withPackages (ps: [
-      ps.lxml
-      ps.numpy
-      ps.gevent
-      ps.gevent-websocket
-      ps.pillow
-      ps.setuptools
-      ps.psycopg2
-      ps.webrtcvad
-    ]))
-  ]
-  ++ runtimeProgDeps;
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+    dart-sass
+    makeBinaryWrapper
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    pushd frontend
+    # sass-embedded's bundled Dart compiler won't run in the sandbox; use nixpkgs' dart-sass.
+    # https://github.com/sass/embedded-host-node/issues/334
+    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+      --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];'
+    npm run build
+    popd
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out"/{bin,share/${pname}}
-    cp -r * "$out/share/${pname}"
+    mkdir -p $out/share/bazarr/frontend
+    cp -r bazarr bazarr.py custom_libs libs migrations $out/share/bazarr/
+    cp -r frontend/build $out/share/bazarr/frontend/build
 
-    # Add missing shebang and execute perms so that patchShebangs can do its
-    # thing.
-    sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py"
-    chmod +x "$out/share/${pname}/bazarr.py"
+    printf '%s' "${finalAttrs.version}" > $out/share/bazarr/VERSION
 
-    makeWrapper "$out/share/${pname}/bazarr.py" \
-        "$out/bin/bazarr" \
-        --suffix PATH : ${lib.makeBinPath runtimeProgDeps}
+    printf '%s' "${
+      lib.generators.toKeyValue { } {
+        updatemethod = "External";
+        updatemethodmessage = "Bazarr is managed by Nix. Update it through your system configuration.";
+        packageversion = finalAttrs.version;
+        packageauthor = "nixpkgs";
+      }
+    }" > $out/share/bazarr/package_info
+
+    makeWrapper ${lib.getExe python} $out/bin/bazarr \
+      --add-flags $out/share/bazarr/bazarr.py \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          ffmpeg
+          unar
+        ]
+      }
 
     runHook postInstall
   '';
 
-  passthru.tests = {
-    smoke-test = nixosTests.bazarr;
+  passthru = {
+    tests.smoke-test = nixosTests.bazarr;
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "Subtitle manager for Sonarr and Radarr";
     homepage = "https://www.bazarr.media/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    changelog = "https://github.com/morpheus65535/bazarr/releases/tag/v${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       connor-grady
       diogotcorreia
     ];
     mainProgram = "bazarr";
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.unix;
   };
-}
+})

From 58a662aa1d05a91f943eb8f070154419e52152c9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 15 Jul 2026 01:38:33 +0200
Subject: [PATCH 0634/1386] lasuite-drive: fix build

v0.19.0 introduced a new dependency that was not added to the nix expression
---
 pkgs/by-name/la/lasuite-drive/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/la/lasuite-drive/package.nix b/pkgs/by-name/la/lasuite-drive/package.nix
index 9023f462b61f..24953084a2b8 100644
--- a/pkgs/by-name/la/lasuite-drive/package.nix
+++ b/pkgs/by-name/la/lasuite-drive/package.nix
@@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       sentry-sdk
       url-normalize
       whitenoise
+      zipstream-ng
     ]
     ++ celery.optional-dependencies.redis
     ++ django-storages.optional-dependencies.s3;

From 5ad8a520cf3bddbb2195ae279d88679b477fd22b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 23:51:27 +0000
Subject: [PATCH 0635/1386] rgrc: 0.6.13 -> 0.6.14

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

diff --git a/pkgs/by-name/rg/rgrc/package.nix b/pkgs/by-name/rg/rgrc/package.nix
index e95e47c58883..a2e6b0765a30 100644
--- a/pkgs/by-name/rg/rgrc/package.nix
+++ b/pkgs/by-name/rg/rgrc/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rgrc";
-  version = "0.6.13";
+  version = "0.6.14";
 
   src = fetchFromGitHub {
     owner = "lazywalker";
     repo = "rgrc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MZ3+dgq78QcroHJ0eL7kUuI+wZm6QaTCgA4CrcO5iCQ=";
+    hash = "sha256-DEsxdqX9kAK/TqmP8PMOLQE4ij0+8mkoK/QapbXikss=";
   };
 
-  cargoHash = "sha256-DB3J3fTesC8Eg/GqWLYKIiE8FoNjGs9i1LgNx4klvsw=";
+  cargoHash = "sha256-OLDMaHwrDO4Q4V0hVIbXmkTiBowpGoZc/xOISwS25Nc=";
 
   buildFeatures = [ "embed-configs" ];
   nativeBuildInputs = [ installShellFiles ];

From 33b973294b6a82ba71ab0fefbff6d274e97d014f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 23:58:07 +0000
Subject: [PATCH 0636/1386] uutils-procps: 0.0.1-unstable-2026-07-03 ->
 0.0.1-unstable-2026-07-10

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

diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix
index 4e5210441e66..f01fc6f23252 100644
--- a/pkgs/by-name/uu/uutils-procps/package.nix
+++ b/pkgs/by-name/uu/uutils-procps/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-procps";
-  version = "0.0.1-unstable-2026-07-03";
+  version = "0.0.1-unstable-2026-07-10";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "procps";
-    rev = "84ad4732d48373cbdd09722afc06bb58b76e0855";
-    hash = "sha256-l47J/6M+15uzR/Vh3zHbnsSL5ZgrayqXDzHyjLQbIC8=";
+    rev = "43414458b44617824ef44a0c5791839c3ab98f28";
+    hash = "sha256-Eh8fzCsBIaOmz7Apm0HrBCx446s0ZHjCDQ9FlM2b/gQ=";
   };
 
-  cargoHash = "sha256-GMKu/iTB8oWLMwmNdlGzf7WZsTg7TOdz+GacTB4kK80=";
+  cargoHash = "sha256-yffq2oZ53eNiey/u6kUbXeir0UJZ9LqCm/ysO86qwe0=";
 
   cargoBuildFlags = [ "--workspace" ];
 

From 3e9375cf6817868384d378b1ce8776e04d2cb195 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:00:30 +0000
Subject: [PATCH 0637/1386] neowall: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix
index a962a297ce4f..01d6fc39bea6 100644
--- a/pkgs/by-name/ne/neowall/package.nix
+++ b/pkgs/by-name/ne/neowall/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neowall";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "1ay1";
     repo = "neowall";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NntwAm4LmGEcAJEp9W+y0mosn+jZXwatTp4ftMqcpSo=";
+    hash = "sha256-XK3A/B37R5mQWzdiMwwDkSHMC87sHXDvtOXvnaGCuJ0=";
   };
 
   nativeBuildInputs = [

From a6db2ab41c8c9beb5a4d3760d422682441314668 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:05:53 +0000
Subject: [PATCH 0638/1386] dcp: 0.25.2 -> 0.25.5

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

diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix
index 6dffa4736f19..89a9bd5850ea 100644
--- a/pkgs/by-name/dc/dcp/package.nix
+++ b/pkgs/by-name/dc/dcp/package.nix
@@ -15,13 +15,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dcp";
-  version = "0.25.2";
+  version = "0.25.5";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "dcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-afQa5arDC9GD0jzzKBSc+zHrNmHpn91HdcWDeFzpbzQ=";
+    hash = "sha256-umcrTAPWAInbjdZYhY0xEbI7heGwr+8FGMI7BIWSdD0=";
   };
 
   vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw=";

From a925f8264add29e808ff539ab64c68d5698304d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:08:09 +0000
Subject: [PATCH 0639/1386] markdownlint-cli: 0.49.0 -> 0.49.1

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

diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix
index 12d9eb3175d7..edaa8a8c37e8 100644
--- a/pkgs/by-name/ma/markdownlint-cli/package.nix
+++ b/pkgs/by-name/ma/markdownlint-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "markdownlint-cli";
-  version = "0.49.0";
+  version = "0.49.1";
 
   src = fetchFromGitHub {
     owner = "igorshubovych";
     repo = "markdownlint-cli";
     rev = "v${version}";
-    hash = "sha256-Se8Dw3pFGUiAMchbX4gH56aIMtvSg6wxGYecqRK1UAA=";
+    hash = "sha256-+zR/A7cp85ggX8MwidRzIPQ54Su4SyGOQtWy9c6fdk8=";
   };
 
-  npmDepsHash = "sha256-CrffManYnidN0XgRmTBaBpu4skCMXubbfz91Q4sGh80=";
+  npmDepsHash = "sha256-UMaE1ZAha8D8v387YlVn47AEu6YwNop1yh80gd1Gwh4=";
 
   dontNpmBuild = true;
 

From 0f603bb65ba116d52f1d8a33c4c4b33ed6413462 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:22:33 +0000
Subject: [PATCH 0640/1386] python3Packages.starlette-admin: 0.16.1 -> 0.17.0

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

diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix
index 500a940a2139..4e943633c6c8 100644
--- a/pkgs/development/python-modules/starlette-admin/default.nix
+++ b/pkgs/development/python-modules/starlette-admin/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "starlette-admin";
-  version = "0.16.1";
+  version = "0.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "starlette-admin";
     tag = version;
-    hash = "sha256-K6FHC7nzOjRh7O47QHveMPwspfvPChHzB6Tpyfsx02U=";
+    hash = "sha256-1hLBGFECucEv1pHDGtk5GXUKUmWWetA72dnn7ayHA4U=";
   };
 
   patches = [

From 67aa48f9df3f364c1777cc0867b1c4736ff706a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:23:44 +0000
Subject: [PATCH 0641/1386] python3Packages.wassima: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix
index b39234226445..270fe5121bd6 100644
--- a/pkgs/development/python-modules/wassima/default.nix
+++ b/pkgs/development/python-modules/wassima/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "wassima";
-  version = "2.1.1";
+  version = "2.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "wassima";
     tag = finalAttrs.version;
-    hash = "sha256-uH8UBsdqnPbGyQX/Tn5Ct3vcbfLEyUC8pDSCM4PwWZg=";
+    hash = "sha256-19y1dohS1WikfxRGOrgIqwdfBdGe7MDo9MTSXnNjfWA=";
   };
 
   build-system = [ hatchling ];

From 72cda5d985e5ad32b2a02471122d884c8702c791 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:31:48 +0000
Subject: [PATCH 0642/1386] qpwgraph: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/by-name/qp/qpwgraph/package.nix b/pkgs/by-name/qp/qpwgraph/package.nix
index c11000e8c3cb..54bb292c8227 100644
--- a/pkgs/by-name/qp/qpwgraph/package.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-mCsjNkQw4yalwZvkMzEmK/NVviVZCLxkROtaNrgEAUo=";
+    sha256 = "sha256-xzAnZG9tPeVKgOBIX0PdB6bWlK49nMLZWpfDJpnjP4o=";
   };
 
   nativeBuildInputs = [

From d0c42e333b0d609dec55e1d6321adb862cd0b2c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:35:17 +0000
Subject: [PATCH 0643/1386] clap: 1.2.9 -> 1.2.10

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

diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix
index 1f99982f11ba..5007bb7e0e1f 100644
--- a/pkgs/by-name/cl/clap/package.nix
+++ b/pkgs/by-name/cl/clap/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clap";
-  version = "1.2.9";
+  version = "1.2.10";
 
   src = fetchFromGitHub {
     owner = "free-audio";
     repo = "clap";
     rev = finalAttrs.version;
-    hash = "sha256-iQRy4+FNT2oun2pkl89A/bPZyv2R0YyF35IhkIwA1B0=";
+    hash = "sha256-87vmpcfi2+bWZ0GFU91Qd52WddeuHTIDAdz9fc4ciJc=";
   };
 
   postPatch = ''

From 56f3f2d8129820220578c47601c58ca211735f75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:35:44 +0000
Subject: [PATCH 0644/1386] release-plz: 0.3.159 -> 0.3.160

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

diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index dd33a852967a..d9d333fa1e36 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "release-plz";
-  version = "0.3.159";
+  version = "0.3.160";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${finalAttrs.version}";
-    hash = "sha256-p0KzeGM1erpdD3akoUHCnIw6lPzjfxBcESTB0bHwWoo=";
+    hash = "sha256-rPYRYAp5grTgASFHKGBdOcO0TvbP7iD+GgL0ZLmHhos=";
   };
 
-  cargoHash = "sha256-tiDDniYO7nXeXMLCT2EJhP6Ii9SUJ3cRJZHZTo0rtak=";
+  cargoHash = "sha256-m6gX/Tu3WCMzkXhWZ19bM9PL7lQ6Xg1R90/ptuswI1s=";
 
   nativeBuildInputs = [
     installShellFiles

From d4e6c3485e1a7db1dbd23c68aea2490cc1de0e42 Mon Sep 17 00:00:00 2001
From: Tomasz Feliksik <tomasz.feliksik@gmail.com>
Date: Wed, 15 Jul 2026 02:46:09 +0200
Subject: [PATCH 0645/1386] jedi-language-server: 0.46.0 -> 0.47.0

0.47.0 switched its build backend from poetry-core to hatchling; update
build-system to match. Upstream also relaxed the jedi bound to <0.21,
which nixpkgs' jedi 0.20.0 and pygls 2.1.1 satisfy.

Assisted-by: Claude Opus 4.8 (via Claude Code)
---
 .../python-modules/jedi-language-server/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index ee63c0a81d29..67906be1a8f5 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  poetry-core,
+  hatchling,
 
   # dependencies
   docstring-to-markdown,
@@ -23,18 +23,18 @@
 
 buildPythonPackage rec {
   pname = "jedi-language-server";
-  version = "0.46.0";
+  version = "0.47.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pappasam";
     repo = "jedi-language-server";
     tag = "v${version}";
-    hash = "sha256-8B/FYktdWtZvB8Us6zQ3gvx1MxJTzP2xyj1VhnM+Viw=";
+    hash = "sha256-UXFIVj2g/s669vgS9uLH+5qFjNFoIFhS5S6XDbzRYwU=";
   };
 
   build-system = [
-    poetry-core
+    hatchling
   ];
 
   pythonRelaxDeps = [

From 156726a0f261840884a21726ab1b8ff9174938ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:54:20 +0000
Subject: [PATCH 0646/1386] vscode-extensions.mongodb.mongodb-vscode: 1.16.0 ->
 1.16.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
index dc8ca7283294..67df81e6ddf4 100644
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "mongodb-vscode";
     publisher = "mongodb";
-    version = "1.16.0";
-    hash = "sha256-cnKYDrExL3yDJkEofWPglzMa50KDMgKQxsM5zK1RaBs=";
+    version = "1.16.1";
+    hash = "sha256-UIxXrJpH/Ix4Ev6veumcT/9h1SgZgEXHjnwkOH9ch44=";
   };
 
   meta = {

From ac8397ea4d7d8397b572b5cd667bc977be9c1c3b Mon Sep 17 00:00:00 2001
From: Eman Resu <elevenaka11@gmail.com>
Date: Tue, 14 Jul 2026 21:01:31 -0400
Subject: [PATCH 0647/1386] CI/owners: remove llakala from lib/systems and
 lib/licenses

---
 ci/OWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index e6e3bb388348..01571baa6d09 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -41,7 +41,7 @@
 /lib/meta.nix               @alyssais @NixOS/stdenv @llakala
 /lib/meta-types.nix         @infinisil @adisbladis @NixOS/stdenv @llakala
 /lib/source-types.nix       @alyssais @NixOS/stdenv @llakala
-/lib/systems                @alyssais @NixOS/stdenv @llakala
+/lib/systems                @alyssais @NixOS/stdenv
 ## Libraries / Module system
 /lib/modules.nix            @infinisil @roberth @hsjobeki @llakala
 /lib/types.nix              @infinisil @roberth @hsjobeki @llakala
@@ -260,7 +260,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/jetbrains @leona-ya @theCapypara
 
 # Licenses
-/lib/licenses @alyssais @emilazy @jopejoe1 @llakala
+/lib/licenses @alyssais @emilazy @jopejoe1
 
 # Qt
 /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000

From 294553f5b3478f4e1c9fa1b8a7b066a438b74800 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:30:35 +0000
Subject: [PATCH 0648/1386] cilium-cli: 0.19.5 -> 0.19.6

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

diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix
index b67cbfcd9337..727f3a838167 100644
--- a/pkgs/by-name/ci/cilium-cli/package.nix
+++ b/pkgs/by-name/ci/cilium-cli/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cilium-cli";
-  version = "0.19.5";
+  version = "0.19.6";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "cilium-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2MxIqKuuzSEzmhdmWqYxinHKzlP7io7Tw6Ini2Sl3wQ=";
+    hash = "sha256-2Yj0CvhF848oeLTnonk+ItBkNqN+RZekCQjcfr6ZYUM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From dbf297a04a864166bc0d13d051ddb9b7943121a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:33:44 +0000
Subject: [PATCH 0649/1386] libretro.opera: 0-unstable-2026-06-28 ->
 0-unstable-2026-07-13

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

diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix
index b1c2a0b39b02..3f84f95bdedf 100644
--- a/pkgs/applications/emulators/libretro/cores/opera.nix
+++ b/pkgs/applications/emulators/libretro/cores/opera.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "opera";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-07-13";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "opera-libretro";
-    rev = "340f9e9014c292fc47a8844a871a71dafe072b6d";
-    hash = "sha256-geBK8RIlaRcWn4CDzVl3pjK0WOFQcMZl7zFMXE2oZNo=";
+    rev = "1edda8a2a6c6b9ae259d5c7cd7d54dcba9ee7e32";
+    hash = "sha256-dc7xRjFxfSL2q9u1N0QH2j+oPbRGng2Z3U3J484lXiU=";
   };
 
   makefile = "Makefile";

From c4161e4e2d9a541f8a160754d2432a5ab61f823b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:38:52 +0000
Subject: [PATCH 0650/1386] telemt: 3.4.22 -> 3.4.23

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

diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix
index 25ef48a3b92d..7124583f7dfb 100644
--- a/pkgs/by-name/te/telemt/package.nix
+++ b/pkgs/by-name/te/telemt/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "telemt";
-  version = "3.4.22";
+  version = "3.4.23";
 
   src = fetchFromGitHub {
     owner = "telemt";
     repo = "telemt";
     tag = version;
-    hash = "sha256-LTWdeYLOZpq6bde5LhK9pCcGN+n1MenP8rmpuoHNOM8=";
+    hash = "sha256-8rKEMQPgIrvtLoM+LcSoXiYaMmCtb4OObnDUYagy+Ak=";
   };
 
-  cargoHash = "sha256-QnL0GqFppIS2Q51o7IS/RKho4Fja/fyLX2S4yIn4zaA=";
+  cargoHash = "sha256-wjw+FE1yQ+zc2Ta3h7B3Wtejf6bGobstTKDCjFphU+M=";
 
   checkFlags = [
     # flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths

From 3a2943be0248df7ae5ecdbad1a0221966f2b6218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:48:51 +0000
Subject: [PATCH 0651/1386] python3Packages.pylint-odoo: 10.0.4 -> 10.0.7

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

diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix
index 91c5333074b8..70fb7baf2daa 100644
--- a/pkgs/development/python-modules/pylint-odoo/default.nix
+++ b/pkgs/development/python-modules/pylint-odoo/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "pylint-odoo";
-  version = "10.0.4";
+  version = "10.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OCA";
     repo = "pylint-odoo";
     tag = "v${version}";
-    hash = "sha256-OVltvmSEsL7F46LlTqJ8PH9BO4iYlFWKFTLv5AcmaVU=";
+    hash = "sha256-xwtIaZTQcS/Q96r3nLeIT3e8B5Z4zpipA56GwIIBLLA=";
   };
 
   pythonRelaxDeps = [

From 7a4dc3ee51fc19b6caf5b9fa38eeae0d461dab73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:49:33 +0000
Subject: [PATCH 0652/1386] starlark: 0-unstable-2026-06-30 ->
 0-unstable-2026-07-08

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

diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 12a09fc2acc4..38dcbfc170ce 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2026-06-30";
+  version = "0-unstable-2026-07-08";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "529d8e869a14da46efe75b7e904a6183dd26ae29";
-    hash = "sha256-/DTLgF5S0lzftLVF2XTk0k5auuGBWnZqjN092i0eOKA=";
+    rev = "5395d018f003e2a08bfbca6dcb2562acee700f62";
+    hash = "sha256-g/f0g11vC9ScBuVYt/PRGSCyJApjq2m1hsFqUNUsZg4=";
   };
 
   vendorHash = "sha256-Ejw5f5ulEcLHm4WYKatwA7FZ9lfdqZTOE3SdkaK6jYE=";

From 064a1797835e5291cb68a3f2341a4cb5a88e88cf Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 14 Jul 2026 20:09:30 -0600
Subject: [PATCH 0653/1386] qt5.qtmacextras: fix build

---
 pkgs/development/libraries/qt-5/modules/qtmacextras.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 38fc7d0caae1..d54096a0ea31 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
@@ -2,11 +2,17 @@
   lib,
   qtModule,
   qtbase,
+  llvmPackages,
 }:
 
 qtModule {
   pname = "qtmacextras";
   propagatedBuildInputs = [ qtbase ];
+
+  # TODO: Remove once #536365 reaches this branch
+  nativeBuildInputs = [ llvmPackages.lld ];
+  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
+
   meta = {
     maintainers = [ ];
     platforms = lib.platforms.darwin;

From 9cb314857cde3a31ccb255e3ea4727c7eac994d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 02:17:58 +0000
Subject: [PATCH 0654/1386] copilot-language-server: 1.517.0 -> 1.521.0

---
 pkgs/by-name/co/copilot-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 851e409fad4b..a0ceea32ff63 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.517.0";
+  version = "1.521.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-BzvUARAI8DOEYHPMavJdtSkr+ZCj/E+mM9wQtmEGyjY=";
+    hash = "sha256-uHt22/756jxh34HhIbMEu3nGebbTF1325ylWuKzZzEI=";
     stripRoot = false;
   };
 

From 9beaf3dd7426af2b9b1bb5c2695893dee6b5c749 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 02:33:54 +0000
Subject: [PATCH 0655/1386] os-agent: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/by-name/os/os-agent/package.nix b/pkgs/by-name/os/os-agent/package.nix
index a776018160ba..be83d942b6d1 100644
--- a/pkgs/by-name/os/os-agent/package.nix
+++ b/pkgs/by-name/os/os-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "os-agent";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "home-assistant";
     repo = "os-agent";
     tag = finalAttrs.version;
-    hash = "sha256-Bc/EXVjq0tTxCslKB9zszu10htq/xPgJ5zaiCZ9CHAw=";
+    hash = "sha256-jO7TE4lBqyxUYcy3ZsZAFO98orGJ6hTM97+G/ueawNg=";
   };
 
-  vendorHash = "sha256-PXl/1CW6hQhGFWZDiRo4DNvnaN3CfEIz/fx0a+UVEpo=";
+  vendorHash = "sha256-WC251fHO3XRICP7q7RdHCTnf8WfqNKnueCp36uEtrIg=";
 
   ldFlags = [
     "-X main.version="

From 83f15b24e49b5f3f47650b3891771c18feb3d7e5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 16:44:46 +0100
Subject: [PATCH 0656/1386] ut1999: drop `x86_64-darwin` support

---
 pkgs/by-name/ut/ut1999/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix
index b70cbb0c3689..2dcf26039efc 100644
--- a/pkgs/by-name/ut/ut1999/package.nix
+++ b/pkgs/by-name/ut/ut1999/package.nix
@@ -23,7 +23,7 @@
 
 let
   version = "469e";
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-Linux-amd64.tar.bz2";
       hash = "sha256-CMgGqjchsZcARaoVitkAUTKdmC6KmjZhFTkA6cy/aww=";
@@ -36,12 +36,10 @@ let
       url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-Linux-x86.tar.bz2";
       hash = "sha256-y9bYAW77MOOYJ1elgsaIUygDch7B7HOPwor5s+FdPBQ=";
     };
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-macOS.dmg";
       hash = "sha256-trOh9GLktwLfDuz5DWY+8fhHzDaq3KHsbdNSeNCR+g0=";
     };
-    # fat binary
-    aarch64-darwin = x86_64-darwin;
   };
   # This upload of the game is officially sanctioned by OldUnreal (who has received permission from Epic Games to link to archive.org) and the UT99.org community
   # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99). The first ISO contains the base game.
@@ -77,12 +75,11 @@ let
         cp -r System Sounds Textures maps $out
       '';
   systemDir =
-    rec {
+    {
       x86_64-linux = "System64";
       aarch64-linux = "SystemARM64";
       i686-linux = "System";
-      x86_64-darwin = "System";
-      aarch64-darwin = x86_64-darwin;
+      aarch64-darwin = "System";
     }
     .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 in

From fbe878cc86497d6e6be9ec66b8a7afceeae66fee Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:17:31 +0000
Subject: [PATCH 0657/1386] appflowy: drop `x86_64-darwin` support

---
 pkgs/by-name/ap/appflowy/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index fb368880b132..fd19b3534667 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -24,16 +24,15 @@
 
 let
   dist =
-    rec {
+    {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
         hash = "sha256-A8JUYzEMQH1sEKYrKZ84QZAgYbz0OvpHa3t9RIUVE9c=";
       };
-      x86_64-darwin = {
+      aarch64-darwin = {
         urlSuffix = "macos-universal.zip";
         hash = "sha256-LSNvFL1ud/FkzNSGk17ZqN2debnqsjlVDHd4NBjTds0=";
       };
-      aarch64-darwin = x86_64-darwin;
     }
     ."${stdenvNoCC.hostPlatform.system}"
       or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}");

From 521a3c38e24fb9181d853f536170c93f27dbfafa Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:17:49 +0000
Subject: [PATCH 0658/1386] harmonoid: drop `x86_64-darwin` support

---
 pkgs/by-name/ha/harmonoid/package.nix | 11 ++++-------
 pkgs/by-name/ha/harmonoid/update.sh   |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix
index be44011022dd..9a78f84bcded 100644
--- a/pkgs/by-name/ha/harmonoid/package.nix
+++ b/pkgs/by-name/ha/harmonoid/package.nix
@@ -19,20 +19,18 @@ let
   version = "0.3.22";
   url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}";
   url =
-    rec {
+    {
       x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz";
       aarch64-linux = "${url_base}/harmonoid-linux-aarch64.tar.gz";
-      x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg";
-      aarch64-darwin = x86_64-darwin;
+      aarch64-darwin = "${url_base}/harmonoid-macos-universal.dmg";
     }
     .${stdenv.hostPlatform.system}
       or (throw "${stdenv.hostPlatform.system} is an unsupported platform");
   hash =
-    rec {
+    {
       x86_64-linux = "sha256-+fEx30uu0rZiORrtE00xG2piJzpFbfxSZw3OjrhLJyg=";
       aarch64-linux = "sha256-jXN5i+LudsODNZUzb5SXClqgQxYzanrbZCqB8X0pJRQ=";
-      x86_64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w=";
-      aarch64-darwin = x86_64-darwin;
+      aarch64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w=";
     }
     .${stdenv.hostPlatform.system};
 in
@@ -95,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     license = {
diff --git a/pkgs/by-name/ha/harmonoid/update.sh b/pkgs/by-name/ha/harmonoid/update.sh
index 3b60cd92159c..b1879fc4425d 100755
--- a/pkgs/by-name/ha/harmonoid/update.sh
+++ b/pkgs/by-name/ha/harmonoid/update.sh
@@ -17,4 +17,4 @@ macos_hash=$(nix-hash --to-sri --type sha256 "$macos_hash")
 
 update-source-version harmonoid "$version" "$linux64_hash" --system=x86_64-linux --ignore-same-version
 update-source-version harmonoid "$version" "$linux_aarch_hash" --system=aarch64-linux --ignore-same-version
-update-source-version harmonoid "$version" "$macos_hash" --system=x86_64-darwin --ignore-same-version
+update-source-version harmonoid "$version" "$macos_hash" --system=aarch64-darwin --ignore-same-version

From 51422db6ef8321636d41e1ab5d4dbc00ea1f761d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:18:10 +0000
Subject: [PATCH 0659/1386] immersed: drop `x86_64-darwin` support

---
 pkgs/by-name/im/immersed/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix
index 38ed8ab5fd60..dd97389eea7d 100644
--- a/pkgs/by-name/im/immersed/package.nix
+++ b/pkgs/by-name/im/immersed/package.nix
@@ -9,7 +9,7 @@ let
   pname = "immersed";
   version = "11.0.0";
 
-  sources = lib.mapAttrs (_: fetchurl) rec {
+  sources = lib.mapAttrs (_: fetchurl) {
     x86_64-linux = {
       url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-x86_64.AppImage";
       hash = "sha256-GbckZ/WK+7/PFQvTfUwwePtufPKVwIwSPh+Bo/cG7ko=";
@@ -18,11 +18,10 @@ let
       url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-aarch64.AppImage";
       hash = "sha256-3BokV30y6QRjE94K7JQ6iIuQw1t+h3BKZY+nEFGTVHI=";
     };
-    x86_64-darwin = {
+    aarch64-darwin = {
       url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed.dmg";
       hash = "sha256-L5nrkchXD1NIQCknYHVhBWbVJVkkHvKaDjuk9qiY340=";
     };
-    aarch64-darwin = x86_64-darwin;
   };
 
   src = sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");

From 7ab820a6398a5c54731ddf08366ab81b235707c2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:18:26 +0000
Subject: [PATCH 0660/1386] ookla-speedtest: drop `x86_64-darwin` support

---
 pkgs/by-name/oo/ookla-speedtest/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oo/ookla-speedtest/package.nix b/pkgs/by-name/oo/ookla-speedtest/package.nix
index ca3019ec8232..630338789e91 100644
--- a/pkgs/by-name/oo/ookla-speedtest/package.nix
+++ b/pkgs/by-name/oo/ookla-speedtest/package.nix
@@ -10,7 +10,7 @@ let
   pname = "ookla-speedtest";
   version = "1.2.0";
 
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz";
       sha256 = "sha256-VpBZbFT/m+1j+jcy+BigXbwtsZrTbtaPIcpfZNXP7rc=";
@@ -27,11 +27,10 @@ let
       url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-armhf.tgz";
       sha256 = "sha256-5F/N672KGFVTU1Uz3QMtaxC8jGTu5BObEUe5wJg10I0=";
     };
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://install.speedtest.net/app/cli/${pname}-${version}-macosx-universal.tgz";
       sha256 = "sha256-yfgZIUnryI+GmZmM7Ksc4UQUQEWQfs5vU89Qh39N5m8=";
     };
-    aarch64-darwin = x86_64-darwin;
   };
 in
 

From 7fb2d061dac1169ef2af753ef52f8019d5ede96e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 16:44:46 +0100
Subject: [PATCH 0661/1386] obsidian: drop `x86_64-darwin` support

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

diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix
index ba5471ecedf0..97ac4d8ed740 100644
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@@ -33,12 +33,11 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
 
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
       hash = "sha256-/L4IsRHZwf2wm5wIlSsG4cgpxiFj66JYTEtOyFm+B50=";
@@ -49,12 +48,10 @@ let
       hash = "sha256-a8hye/27bXMdWvmgb1HW3nBhxoyQjIrotDqe03miAmA=";
     };
 
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.dmg";
       hash = "sha256-O4XBO0zlVRLobhcKfNKklOLbaVrIiMBgHhU8uFt3iBs=";
     };
-
-    aarch64-darwin = x86_64-darwin;
   };
 
   src =

From 16c2510653fcb661a99be87ff2a01a7aeb195703 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:09:41 +0100
Subject: [PATCH 0662/1386] wire-desktop: drop `x86_64-darwin` support

---
 pkgs/by-name/wi/wire-desktop/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index b6663db4acbf..498720bbc790 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -27,7 +27,7 @@ let
         hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
       };
     };
-    x86_64-darwin = rec {
+    aarch64-darwin = rec {
       version = "3.42.5489";
       src = fetchFromGitHub {
         owner = "wireapp";
@@ -37,7 +37,6 @@ let
       };
     };
     aarch64-linux = x86_64-linux;
-    aarch64-darwin = x86_64-darwin;
   };
   web-config = fetchFromGitHub {
     owner = "wireapp";
@@ -193,7 +192,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };

From d4dfed7be328ce1fb8894bba42b82028c3142ef9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:10:06 +0100
Subject: [PATCH 0663/1386] discord: drop `x86_64-darwin` support

---
 .../networking/instant-messengers/discord/default.nix         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ebbbddb8dbed..4bedf5ef87fe 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -35,7 +35,7 @@ let
         self = discord-development;
       };
     };
-    x86_64-darwin = {
+    aarch64-darwin = {
       discord = rec {
         branch = "stable";
         binaryName = desktopName;
@@ -62,7 +62,6 @@ let
       };
     };
 
-    aarch64-darwin = x86_64-darwin;
     default = x86_64-linux; # Used for unsupported platforms, so we can return *something* there.
   };
 
@@ -81,7 +80,6 @@ let
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From 94322c0633d2a1f641bdbd5286dabddd61f81c47 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 16:44:46 +0100
Subject: [PATCH 0664/1386] sdrplay: drop `x86_64-darwin` support

---
 pkgs/by-name/sd/sdrplay/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/sd/sdrplay/package.nix b/pkgs/by-name/sd/sdrplay/package.nix
index 93a762cb0058..5644e1bf5ede 100644
--- a/pkgs/by-name/sd/sdrplay/package.nix
+++ b/pkgs/by-name/sd/sdrplay/package.nix
@@ -14,13 +14,12 @@ let
       hash = "sha256-CTcyv10Xz9G2LqHh4qOW9tKBEcB+rztE2R7xJIU4QBQ=";
     };
 
-    x86_64-darwin = {
+    aarch64-darwin = {
       url = "https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.1.pkg";
       hash = "sha256-XRSM7aH653XS0t9bP89G3uJ7YiLiU1xMBjwvLqL3rMM=";
     };
 
     aarch64-linux = x86_64-linux;
-    aarch64-darwin = x86_64-darwin;
   };
 
   platforms = lib.attrNames sources;

From c1ad8d3b278c368d6ecea30e921f467054982837 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:28:55 +0000
Subject: [PATCH 0665/1386] breitbandmessung: drop `x86_64-darwin` support

---
 pkgs/by-name/br/breitbandmessung/package.nix | 9 +++------
 pkgs/by-name/br/breitbandmessung/sources.nix | 2 +-
 pkgs/by-name/br/breitbandmessung/update.sh   | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix
index 9b8e37db0735..a696d13904a1 100644
--- a/pkgs/by-name/br/breitbandmessung/package.nix
+++ b/pkgs/by-name/br/breitbandmessung/package.nix
@@ -18,7 +18,7 @@ let
   sources = import ./sources.nix;
 
   systemArgs =
-    rec {
+    {
       x86_64-linux = {
         src = fetchurl sources.x86_64-linux;
 
@@ -57,8 +57,8 @@ let
         '';
       };
 
-      x86_64-darwin = {
-        src = fetchurl sources.x86_64-darwin;
+      aarch64-darwin = {
+        src = fetchurl sources.aarch64-darwin;
 
         nativeBuildInputs = [ undmg ];
 
@@ -74,8 +74,6 @@ let
           runHook postInstall
         '';
       };
-
-      aarch64-darwin = x86_64-darwin;
     }
     .${system} or {
       src = throw "Unsupported system: ${system}";
@@ -97,7 +95,6 @@ stdenv.mkDerivation (
       maintainers = with lib.maintainers; [ b4dm4n ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix
index cb27fc7b61c6..48d21c728e1a 100644
--- a/pkgs/by-name/br/breitbandmessung/sources.nix
+++ b/pkgs/by-name/br/breitbandmessung/sources.nix
@@ -4,7 +4,7 @@
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-linux.deb";
     sha256 = "sha256-kNuR+zcKEdZ9p0HEajmFQ3TIUz1z2Ao098QNCK6x5lg=";
   };
-  x86_64-darwin = {
+  aarch64-darwin = {
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-mac.dmg";
     sha256 = "sha256-pKI4Kg4ngXYzyZnzmlijIxmzoCKshdQao1v9JWaAV50=";
   };
diff --git a/pkgs/by-name/br/breitbandmessung/update.sh b/pkgs/by-name/br/breitbandmessung/update.sh
index da982adf933b..88dc7b6e2b36 100755
--- a/pkgs/by-name/br/breitbandmessung/update.sh
+++ b/pkgs/by-name/br/breitbandmessung/update.sh
@@ -20,7 +20,7 @@ if [[ $current != $latest ]]; then
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-linux.deb";
     sha256 = "${linux_hash}";
   };
-  x86_64-darwin = {
+  aarch64-darwin = {
     url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-mac.dmg";
     sha256 = "${darwin_hash}";
   };

From 314c46a23289806398d35d60fe6b6ec7c39c83a2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:20:18 +0000
Subject: [PATCH 0666/1386] sauce-connect: drop `x86_64-darwin` support

---
 pkgs/by-name/sa/sauce-connect/package.nix | 3 +--
 pkgs/by-name/sa/sauce-connect/update.sh   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/sauce-connect/package.nix b/pkgs/by-name/sa/sauce-connect/package.nix
index d2b6114a21f3..c40048785f35 100644
--- a/pkgs/by-name/sa/sauce-connect/package.nix
+++ b/pkgs/by-name/sa/sauce-connect/package.nix
@@ -21,11 +21,10 @@ stdenv.mkDerivation rec {
         url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.aarch64.tar.gz";
         hash = "sha256-3fUB0KLFEmSzRlYSZhJ3VP4QJC/S1R2Iyk3+o82sNRg=";
       };
-      x86_64-darwin = fetchurl {
+      aarch64-darwin = fetchurl {
         url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_darwin.all.zip";
         hash = "sha256-nSmDenuel+L4HKhDEHMirGwKj0A7plIXAqf+T7Agc3A=";
       };
-      aarch64-darwin = passthru.sources.x86_64-darwin;
     };
     updateScript = ./update.sh;
   };
diff --git a/pkgs/by-name/sa/sauce-connect/update.sh b/pkgs/by-name/sa/sauce-connect/update.sh
index 38ab992a3eb3..79a8afb7059d 100755
--- a/pkgs/by-name/sa/sauce-connect/update.sh
+++ b/pkgs/by-name/sa/sauce-connect/update.sh
@@ -19,7 +19,7 @@ all_versions=$(jq --exit-status --raw-output \
     '.all_downloads | to_entries[] | select(.value | has("linux") and has("osx")) | .key' \
     <<< "$response")
 latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1)
-for platform in x86_64-linux aarch64-linux x86_64-darwin; do
+for platform in x86_64-linux aarch64-linux aarch64-darwin; do
     update-source-version sauce-connect "$latest_version" \
         --ignore-same-version \
         --source-key="passthru.sources.$platform"

From fd2217a22deec94f1a8e31e373711b908e2f9ce2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:13:29 +0100
Subject: [PATCH 0667/1386] bcompare: drop `x86_64-darwin` support

---
 pkgs/by-name/bc/bcompare/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix
index a55448023ecc..906a9d87def9 100644
--- a/pkgs/by-name/bc/bcompare/package.nix
+++ b/pkgs/by-name/bc/bcompare/package.nix
@@ -25,12 +25,10 @@ let
       sha256 = "sha256-CCSRNGWIYVKAoQVVJ8McDUtc45nK0S4CdamcT5uVlQM=";
     };
 
-    x86_64-darwin = fetchurl {
+    aarch64-darwin = fetchurl {
       url = "https://www.scootersoftware.com/files/BCompareOSX-${version}.zip";
       sha256 = "sha256-R+G2Zlr074i2W4GaEDweK0c0q8tnzjs6M0N106WVAlg=";
     };
-
-    aarch64-darwin = srcs.x86_64-darwin;
   };
 
   src = srcs.${stdenv.hostPlatform.system} or throwSystem;

From 58a7504830df3d406e679d0d40fa6c232e6a047a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:29:21 +0000
Subject: [PATCH 0668/1386] notion-app: drop `x86_64-darwin` support

---
 pkgs/by-name/no/notion-app/package.nix       |  5 +---
 pkgs/by-name/no/notion-app/source.json       |  5 ++++
 pkgs/by-name/no/notion-app/sources.json      | 12 ---------
 pkgs/by-name/no/notion-app/update/update.mjs | 27 ++++++--------------
 4 files changed, 14 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/by-name/no/notion-app/source.json
 delete mode 100644 pkgs/by-name/no/notion-app/sources.json

diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix
index e99f9bb0fa1e..767bda0e3b33 100644
--- a/pkgs/by-name/no/notion-app/package.nix
+++ b/pkgs/by-name/no/notion-app/package.nix
@@ -5,9 +5,7 @@
   unzip,
 }:
 let
-  info =
-    (lib.importJSON ./sources.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin"
-      or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}");
+  info = lib.importJSON ./source.json;
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "notion-app";
@@ -37,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       pradyuman
     ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/no/notion-app/source.json b/pkgs/by-name/no/notion-app/source.json
new file mode 100644
index 000000000000..8d095dc524f7
--- /dev/null
+++ b/pkgs/by-name/no/notion-app/source.json
@@ -0,0 +1,5 @@
+{
+  "version": "7.25.1",
+  "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip",
+  "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A=="
+}
diff --git a/pkgs/by-name/no/notion-app/sources.json b/pkgs/by-name/no/notion-app/sources.json
deleted file mode 100644
index 61b33e14609e..000000000000
--- a/pkgs/by-name/no/notion-app/sources.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "x86_64-darwin": {
-    "version": "7.25.1",
-    "url": "https://desktop-release.notion-static.com/Notion-7.25.1.zip",
-    "hash": "sha512-HBhe2onWY44JbMVIfiLglyNDk1tqepwCerqbgUuI56mstBlg+B0KuepTl+plJODoTVtRasmrg/WRBw+ESWpEeg=="
-  },
-  "aarch64-darwin": {
-    "version": "7.25.1",
-    "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip",
-    "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A=="
-  }
-}
diff --git a/pkgs/by-name/no/notion-app/update/update.mjs b/pkgs/by-name/no/notion-app/update/update.mjs
index a4d56e8ff3d8..c6a7e3e4baf9 100755
--- a/pkgs/by-name/no/notion-app/update/update.mjs
+++ b/pkgs/by-name/no/notion-app/update/update.mjs
@@ -23,15 +23,10 @@ const __dirname = import.meta.dirname;
   hash: `sha512-${string}`;
 }} Info */
 
-/** @typedef {{
-  "x86_64-darwin": Info;
-  "aarch64-darwin": Info;
-}} InfoMap */
-
 const BASE_URL = "https://desktop-release.notion-static.com/";
 /**
  *
- * @param {"latest-mac.yml" | "arm64-mac.yml"} liveCheckFile
+ * @param {"arm64-mac.yml"} liveCheckFile
  * @returns {Promise<Info>}
  */
 async function getInfo(liveCheckFile) {
@@ -57,26 +52,20 @@ async function getInfo(liveCheckFile) {
 }
 
 async function main() {
-  const filePath = path.join(__dirname, "../sources.json");
-  /** @type {InfoMap} */
+  const filePath = path.join(__dirname, "../source.json");
+  /** @type {Info} */
   const oldInfo = JSON.parse(
     await fsPromises.readFile(filePath, { encoding: "utf-8" })
   );
-  /** @type {InfoMap} */
-  const info = {
-    "x86_64-darwin": await getInfo("latest-mac.yml"),
-    "aarch64-darwin": await getInfo("arm64-mac.yml"),
-  };
+  /** @type {Info} */
+  const info = await getInfo("arm64-mac.yml");
   if (JSON.stringify(oldInfo) === JSON.stringify(info)) {
     console.log("[update] No updates found");
     return;
   }
-  const platforms = /** @type {const} */ (["x86_64-darwin", "aarch64-darwin"]);
-  for (const platform of platforms) {
-    console.log(
-      `[update] Updating Notion ${platform} ${oldInfo[platform].version} -> ${info[platform].version}`
-    );
-  }
+  console.log(
+    `[update] Updating Notion ${oldInfo.version} -> ${info.version}`
+  );
   await fsPromises.writeFile(
     filePath,
     JSON.stringify(info, null, 2) + "\n",

From 4793cf6ba4e35720f3a01da2b5a38ac3e1151566 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Wed, 15 Jul 2026 10:44:02 +0800
Subject: [PATCH 0669/1386] aube: 1.26.0 -> 1.27.0

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

diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix
index acac055e65eb..2d507db55606 100644
--- a/pkgs/by-name/au/aube/package.nix
+++ b/pkgs/by-name/au/aube/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "aube";
-  version = "1.26.0";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "aube";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bQDDLgO5dG9kMF9VDnHGwuMZjWrbNT5Ia90rJrERDaE=";
+    hash = "sha256-lnW5ZLcdkpt662wDSj5YsnL7wILkJw3xoBs+3n7XWGY=";
   };
 
-  cargoHash = "sha256-L9UiSO9UL8kBOebFXrZqbIJ/V4tobl1NYAdlktmX2lY=";
+  cargoHash = "sha256-Ox3l2VqtHfrAICTj7CL99EL5dXF43snPu7/X1ZFYceM=";
 
   nativeBuildInputs = [ cmake ]; # libz-ng-sys
 
@@ -33,6 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   checkFlags = [
     # failed on x86_64-linux
     "--skip=http::ticket_cache::tests::max_per_host_evicts_oldest"
+    "--skip=http::ticket_cache::tests::invalidate_removes_all_for_host"
+    # require network access
+    "--skip=http::ticket_cache::tests::roundtrip_persists_across_open"
   ];
 
   __darwinAllowLocalNetworking = true;
@@ -44,6 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
 
+  strictDeps = true;
   __structuredAttrs = true;
 
   meta = {

From fdb820602ba46f2f08019e0629c65073675b32e3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:30:58 +0100
Subject: [PATCH 0670/1386] treewide: drop simple `x86_64-darwin` mentions

To reproduce:

    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: nix-x86_64-darwin
          language: nix
          rule:
            any:
              - pattern: "\"x86_64-darwin\""
                kind: list_expression > string_expression
              - pattern:
                  context: "{ \"x86_64-darwin\" = $EXPR; }"
                  selector: binding
              - pattern:
                  context: "{ x86_64-darwin = $EXPR; }"
                  selector: binding
          fix:
            template: ""
        ' pkgs
    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: json-first-x86_64-darwin
          language: json
          rule:
            kind: object > pair:nth-child(1)
            has:
              pattern: "\"x86_64-darwin\""
              field: key
          fix:
            template: ""
            expandEnd: { regex: "," }
        ' pkgs
    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: json-x86_64-darwin
          language: json
          rule:
            kind: object > pair
            has:
              pattern: "\"x86_64-darwin\""
              field: key
          fix:
            template: ""
            expandStart: { regex: "," }
        ' pkgs
    $ git restore pkgs/by-name/om/omnix/package.nix
    $ git diff --name-only -z \
        | nix shell nixpkgs/3b32825de172d0bc85664f495edb096b10862524#gnused \
            -c xargs -0 sed -i '/^$/N; /^\n\? \+$/d'
    $ treefmt
---
 .../manual-packages/copilot/package.nix       |   1 -
 .../editors/jetbrains/ides/clion.nix          |   4 -
 .../editors/jetbrains/ides/datagrip.nix       |   4 -
 .../editors/jetbrains/ides/dataspell.nix      |   4 -
 .../editors/jetbrains/ides/gateway.nix        |   4 -
 .../editors/jetbrains/ides/goland.nix         |   4 -
 .../editors/jetbrains/ides/idea.nix           |   4 -
 .../editors/jetbrains/ides/mps.nix            |   4 -
 .../editors/jetbrains/ides/phpstorm.nix       |   4 -
 .../editors/jetbrains/ides/pycharm.nix        |   4 -
 .../editors/jetbrains/ides/rider.nix          |   4 -
 .../editors/jetbrains/ides/ruby-mine.nix      |   4 -
 .../editors/jetbrains/ides/rust-rover.nix     |   4 -
 .../editors/jetbrains/ides/webstorm.nix       |   4 -
 .../editors/jetbrains/updater/updateInfo.json |  13 --
 .../non-generated/windsurf-nvim/default.nix   |   2 -
 .../extensions/charliermarsh.ruff/default.nix |   5 -
 .../extensions/continue.continue/default.nix  |   5 -
 .../editors/vscode/extensions/default.nix     |   5 -
 .../extensions/docker.docker/default.nix      |   4 -
 .../elijah-potter.harper/default.nix          |   1 -
 .../extensions/kilocode.kilo-code/default.nix |   5 -
 .../ms-dotnettools.csdevkit/default.nix       |   5 -
 .../ms-dotnettools.csharp/default.nix         |   5 -
 .../extensions/ms-python.python/default.nix   |   4 -
 .../ms-vscode.vscode-speech/default.nix       |   5 -
 .../extensions/redhat.vscode-xml/default.nix  |   5 -
 .../extensions/sourcery.sourcery/default.nix  |   4 -
 .../tekumara.typos-vscode/default.nix         |   5 -
 .../extensions/tombi-toml.tombi/default.nix   |   4 -
 .../extensions/visualjj.visualjj/default.nix  |   5 -
 pkgs/applications/editors/vscode/generic.nix  |   1 -
 pkgs/applications/editors/vscode/vscode.nix   |   3 -
 pkgs/applications/editors/vscode/vscodium.nix |   3 -
 pkgs/applications/emulators/wine/packages.nix |   2 -
 .../applications/misc/sweethome3d/default.nix |   1 -
 .../browsers/firefox-bin/default.nix          |   1 -
 .../cluster/docker-machine/hyperkit.nix       |   2 +-
 .../networking/cluster/hadoop/default.nix     |   3 -
 .../instant-messengers/ripcord/darwin.nix     |   2 +-
 .../mailreaders/thunderbird-bin/default.nix   |   1 -
 .../office/libreoffice/darwin/default.nix     |   8 -
 .../chemistry/quantum-espresso/default.nix    |   1 -
 pkgs/applications/video/mplayer/default.nix   |   1 -
 pkgs/by-name/_0/_010editor/package.nix        |   6 -
 pkgs/by-name/_1/_1password-cli/package.nix    |   3 +-
 pkgs/by-name/_1/_1password-gui/package.nix    |   1 -
 pkgs/by-name/ac/acli/sources.json             |   4 -
 pkgs/by-name/ae/aemu/package.nix              |   1 -
 pkgs/by-name/af/affine-bin/package.nix        |   1 -
 pkgs/by-name/af/affine/package.nix            |   1 -
 .../ag/age-plugin-openpgp-card/package.nix    |   1 -
 pkgs/by-name/ai/airbuddy/package.nix          |   1 -
 pkgs/by-name/al/aldente/package.nix           |   1 -
 pkgs/by-name/am/amp-cli/package.nix           |   2 -
 pkgs/by-name/an/android-cli/package.nix       |   5 -
 pkgs/by-name/an/anki-bin/package.nix          |   1 -
 pkgs/by-name/an/antigravity-cli/package.nix   |   4 -
 pkgs/by-name/an/antigravity/information.json  |   4 -
 pkgs/by-name/an/antigravity/package.nix       |   1 -
 pkgs/by-name/an/anytype-heart/package.nix     |   2 -
 pkgs/by-name/an/anytype/package.nix           |   1 -
 pkgs/by-name/ap/appfire-cli/package.nix       |   1 -
 pkgs/by-name/at/atuin-desktop/package.nix     |   1 -
 .../az/azure-functions-core-tools/package.nix |   1 -
 .../az/azure-static-sites-client/package.nix  |   1 -
 pkgs/by-name/ba/bazel_8/examples.nix          |   3 -
 pkgs/by-name/ba/bazel_9/examples.nix          |   3 -
 pkgs/by-name/be/beekeeper-studio/package.nix  |   3 -
 pkgs/by-name/bi/bitwarden-desktop/package.nix |   1 -
 pkgs/by-name/bl/blackfire/package.nix         |   5 -
 pkgs/by-name/bl/blackfire/php-probe.nix       |  11 --
 pkgs/by-name/bl/blast-bin/package.nix         |   5 -
 pkgs/by-name/bl/blastem/package.nix           |   1 -
 pkgs/by-name/bl/bleep/package.nix             |   3 -
 pkgs/by-name/bl/blender/package.nix           |   1 -
 pkgs/by-name/bl/bloop/package.nix             |   1 -
 pkgs/by-name/bo/boundary/package.nix          |   2 -
 pkgs/by-name/bo/box-cli/sources.json          |   4 -
 pkgs/by-name/br/brave/make-brave.nix          |   1 -
 pkgs/by-name/br/brave/package.nix             |   4 -
 pkgs/by-name/br/brioche/librusty_v8.nix       |   1 -
 pkgs/by-name/br/brioche/package.nix           |   1 -
 .../bs/bs-manager/depotdownloader/default.nix |   1 -
 pkgs/by-name/bu/buck2/hashes.json             |   4 -
 pkgs/by-name/bu/buck2/package.nix             |   2 -
 pkgs/by-name/bu/bulloak/package.nix           |   4 -
 pkgs/by-name/bu/bun/package.nix               |   5 -
 pkgs/by-name/c3/c3c/package.nix               |   1 -
 pkgs/by-name/ca/caffeine/package.nix          |   1 -
 pkgs/by-name/ca/caido-cli/package.nix         |   5 -
 pkgs/by-name/ca/caido-desktop/package.nix     |   5 -
 pkgs/by-name/ce/cernlib/package.nix           |   1 -
 pkgs/by-name/ch/chalk/package.nix             |   3 -
 pkgs/by-name/ch/cheesecutter/package.nix      |   1 -
 pkgs/by-name/ch/chez/package.nix              |   1 -
 pkgs/by-name/cl/clouddrive2/package.nix       |   2 -
 pkgs/by-name/cl/cloudflare-warp/package.nix   |   4 +-
 pkgs/by-name/co/coconutbattery/package.nix    |   1 -
 pkgs/by-name/co/code-cursor/sources.json      |   4 -
 pkgs/by-name/co/code-server/package.nix       |   2 -
 pkgs/by-name/co/codegraph/package.nix         |   5 -
 pkgs/by-name/co/codeium/package.nix           |   3 -
 pkgs/by-name/co/coder/package.nix             |   4 -
 pkgs/by-name/co/codex-acp/librusty_v8.nix     |   1 -
 pkgs/by-name/co/codex/librusty_v8.nix         |   1 -
 pkgs/by-name/co/confluent-cli/package.nix     |   2 -
 .../co/copilot-language-server/package.nix    |   1 -
 .../cp/cpp-ipfs-http-client/package.nix       |   1 -
 pkgs/by-name/cr/crates-lsp/package.nix        |   1 -
 pkgs/by-name/cr/crates-tui/package.nix        |   1 -
 pkgs/by-name/cu/cursor-cli/package.nix        |   4 -
 pkgs/by-name/cy/cypress/package.nix           |   4 -
 pkgs/by-name/db/dbeaver-bin/package.nix       |   2 -
 pkgs/by-name/db/dbgate/package.nix            |   5 -
 pkgs/by-name/de/debase/package.nix            |   1 -
 pkgs/by-name/de/deno/package.nix              |   1 -
 pkgs/by-name/de/depotdownloader/package.nix   |   1 -
 pkgs/by-name/di/discord-gamesdk/package.nix   |   1 -
 pkgs/by-name/di/disk-inventory-x/package.nix  |   2 +-
 pkgs/by-name/dm/dmd/binary.nix                |   1 -
 pkgs/by-name/dm/dmd/generic.nix               |   1 -
 pkgs/by-name/du/dub/package.nix               |   1 -
 pkgs/by-name/dx/dxmt/package.nix              |   2 +-
 pkgs/by-name/dx/dxvk/package.nix              |   1 -
 pkgs/by-name/el/electron-mail/package.nix     |   5 -
 .../er/erlang-language-platform/package.nix   |   1 -
 pkgs/by-name/ev/eventstore/package.nix        |   1 -
 pkgs/by-name/fa/fasmg/package.nix             |   4 -
 pkgs/by-name/fe/fermyon-spin/package.nix      |   2 -
 pkgs/by-name/fi/filen-cli/package.nix         |   2 -
 .../fl/floorp-bin-unwrapped/sources.json      |   4 -
 pkgs/by-name/fl/flywheel-cli/package.nix      |   3 -
 pkgs/by-name/fm/fmodex/package.nix            |   1 -
 pkgs/by-name/fr/freelens-bin/package.nix      |   4 -
 pkgs/by-name/fx/fx-cast-bridge/package.nix    |   1 -
 pkgs/by-name/ga/gauge/plugins/go/data.json    |   4 -
 pkgs/by-name/ga/gauge/plugins/go/default.nix  |   1 -
 .../ga/gauge/plugins/html-report/data.json    |   4 -
 .../ga/gauge/plugins/html-report/default.nix  |   1 -
 pkgs/by-name/ga/gauge/plugins/java/data.json  |   4 -
 .../by-name/ga/gauge/plugins/java/default.nix |   1 -
 .../ga/gauge/plugins/make-gauge-plugin.nix    |   1 -
 pkgs/by-name/ga/gauge/plugins/ruby/data.json  |   4 -
 .../by-name/ga/gauge/plugins/ruby/default.nix |   1 -
 .../ga/gauge/plugins/screenshot/data.json     |   4 -
 .../ga/gauge/plugins/screenshot/default.nix   |   1 -
 .../ga/gauge/plugins/xml-report/data.json     |   4 -
 .../ga/gauge/plugins/xml-report/default.nix   |   1 -
 .../gc/gcc-arm-embedded-13/package.nix        |   3 -
 pkgs/by-name/ge/geogram/package.nix           |   1 -
 pkgs/by-name/gh/ghdl/package.nix              |   1 -
 pkgs/by-name/gi/gitaly/package.nix            |   2 +-
 .../by-name/gi/github-copilot-cli/package.nix |   1 -
 .../github-copilot-intellij-agent/package.nix |   1 -
 pkgs/by-name/gi/github-runner/package.nix     |   1 -
 pkgs/by-name/gi/gitkraken/package.nix         |   5 -
 pkgs/by-name/gk/gk-cli/package.nix            |   5 -
 .../by-name/go/golden-cheetah-bin/package.nix |   1 -
 .../go/google-app-engine-go-sdk/package.nix   |   1 -
 pkgs/by-name/go/google-cloud-sdk/data.nix     |   4 -
 pkgs/by-name/go/goose-cli/librusty_v8.nix     |   1 -
 pkgs/by-name/gr/grafana/package.nix           |   1 -
 pkgs/by-name/gr/graphite-cli/package.nix      |   3 -
 pkgs/by-name/gr/grok-build/package.nix        |   2 -
 pkgs/by-name/ha/hamrs/package.nix             |   1 -
 pkgs/by-name/ha/handy/package.nix             |   2 +-
 pkgs/by-name/ha/hashlink/package.nix          |   1 -
 pkgs/by-name/ho/hoppscotch/package.nix        |   5 -
 pkgs/by-name/hy/hyperscan/package.nix         |   1 -
 pkgs/by-name/ib/ibmcloud-cli/package.nix      |   1 -
 pkgs/by-name/il/iloader/package.nix           |   1 -
 pkgs/by-name/in/insomnia/package.nix          |   5 -
 pkgs/by-name/io/iozone/package.nix            |   1 -
 pkgs/by-name/is/isabelle/package.nix          |   1 -
 pkgs/by-name/it/iterm2/package.nix            |   1 -
 pkgs/by-name/iv/iverilog/package.nix          |   1 -
 pkgs/by-name/ja/jai/package.nix               |   1 -
 pkgs/by-name/jd/jdiskreport/package.nix       |   1 -
 pkgs/by-name/je/jellyfin-desktop/package.nix  |   1 -
 pkgs/by-name/je/jetbrains-toolbox/package.nix |   2 -
 pkgs/by-name/ju/jugglinglab/package.nix       |   1 -
 pkgs/by-name/ju/julec/package.nix             |   1 -
 pkgs/by-name/kd/kdigger/package.nix           |   1 -
 pkgs/by-name/ke/keeweb/package.nix            |   4 -
 .../ke/keyboard-layout-editor/package.nix     |   1 -
 .../default.nix                               |   1 -
 .../default.nix                               |   1 -
 pkgs/by-name/ke/keymapp/package.nix           |   1 -
 pkgs/by-name/ki/kilo/package.nix              |   2 -
 pkgs/by-name/ki/kiro-cli/package.nix          |   2 -
 pkgs/by-name/ki/kiro/package.nix              |   1 -
 pkgs/by-name/ki/kiro/sources.json             |   4 -
 pkgs/by-name/la/ladybird/package.nix          |   1 -
 pkgs/by-name/ld/ldc/bootstrap.nix             |   1 -
 pkgs/by-name/ld/ldc/package.nix               |   1 -
 .../le/legends-of-equestria/package.nix       |   4 -
 pkgs/by-name/le/lens/package.nix              |   4 -
 pkgs/by-name/li/libfrida-core/package.nix     |   4 -
 pkgs/by-name/li/libwhereami/package.nix       |   1 -
 pkgs/by-name/lo/localsend/package.nix         |   1 -
 pkgs/by-name/lu/luau-lsp/package.nix          |   1 -
 pkgs/by-name/lu/lunar/package.nix             |   1 -
 pkgs/by-name/lv/lvtk/package.nix              |   1 -
 pkgs/by-name/ma/mactracker/package.nix        |   1 -
 pkgs/by-name/ma/mailspring/mailcore2.nix      |   1 -
 pkgs/by-name/ma/mailspring/mailsync.nix       |   1 -
 pkgs/by-name/ma/mailspring/package.nix        |   2 -
 pkgs/by-name/ma/marktext/package.nix          |   1 -
 pkgs/by-name/ma/mas/package.nix               |   5 -
 pkgs/by-name/me/meetingbar/package.nix        |   1 -
 pkgs/by-name/me/meilisearch/package.nix       |   1 -
 pkgs/by-name/me/meteor/package.nix            |   4 -
 pkgs/by-name/mi/micropython/package.nix       |   1 -
 pkgs/by-name/mi/mill/package.nix              |   3 -
 pkgs/by-name/mi/mirrord/manifest.json         |   4 -
 pkgs/by-name/mi/mirth/package.nix             |   1 -
 pkgs/by-name/mk/mkl/package.nix               |   1 -
 pkgs/by-name/ml/mlkit/package.nix             |   1 -
 pkgs/by-name/mo/mongocxx/package.nix          |   2 +-
 pkgs/by-name/mo/mongodb-ce/package.nix        |   4 -
 pkgs/by-name/mo/mongodb-compass/package.nix   |   3 -
 pkgs/by-name/mo/monodraw/package.nix          |   1 -
 pkgs/by-name/mp/mprime/package.nix            |   3 -
 pkgs/by-name/ms/msgraph-cli/package.nix       |   1 -
 pkgs/by-name/mv/mvnd/package.nix              |   1 -
 pkgs/by-name/my/mystmd/package.nix            |   1 -
 pkgs/by-name/ne/nesting/package.nix           |   1 -
 pkgs/by-name/no/nosql-workbench/package.nix   |   5 -
 pkgs/by-name/no/notesnook/package.nix         |   3 -
 pkgs/by-name/nu/nuxmv/package.nix             |   1 -
 pkgs/by-name/oa/oakctl/package.nix            |   5 -
 pkgs/by-name/ob/objection/package.nix         |   4 -
 pkgs/by-name/oc/ocis_5-bin/package.nix        |   1 -
 pkgs/by-name/od/odpic/package.nix             |   1 -
 pkgs/by-name/om/ombi/package.nix              |   2 -
 pkgs/by-name/oo/ooklaserver/package.nix       |   1 -
 pkgs/by-name/op/openmvg/package.nix           |   1 -
 pkgs/by-name/op/openutau/package.nix          |   1 -
 pkgs/by-name/op/openvscode-server/package.nix |   2 -
 pkgs/by-name/op/openxray/package.nix          |   1 -
 .../or/oracle-instantclient/package.nix       |  12 --
 pkgs/by-name/or/orbstack/package.nix          |   4 -
 pkgs/by-name/os/osu-lazer-bin/package.nix     |   6 -
 pkgs/by-name/ov/ovftool/package.nix           |   5 -
 pkgs/by-name/p4/p4d/package.nix               |   4 -
 pkgs/by-name/p4/p4v/package.nix               |   3 +-
 .../pa/packer/extra/mk-packer-plugin.nix      |   1 -
 pkgs/by-name/pa/paperlib/package.nix          |   5 -
 pkgs/by-name/pa/patchcil/package.nix          |   1 -
 pkgs/by-name/pc/pcsx2-bin/package.nix         |   2 +-
 pkgs/by-name/pd/pdfium-binaries/package.nix   |   4 -
 pkgs/by-name/pe/pear-desktop/package.nix      |   1 -
 pkgs/by-name/pg/pgsql-tools/package.nix       |   4 -
 pkgs/by-name/ph/phoenixd/package.nix          |   3 -
 pkgs/by-name/pi/picat/package.nix             |   2 -
 pkgs/by-name/pi/pinokio/package.nix           |   5 -
 pkgs/by-name/pi/pixieditor/package.nix        |   1 -
 pkgs/by-name/pl/platformsh/package.nix        |   1 -
 pkgs/by-name/pl/plezy/package.nix             |   1 -
 pkgs/by-name/pn/pngout/package.nix            |   3 -
 pkgs/by-name/po/ponyc/package.nix             |   1 -
 pkgs/by-name/po/postman/package.nix           |   3 -
 pkgs/by-name/po/powershell/package.nix        |   4 -
 .../pr/protoc-gen-grpc-java/package.nix       |   1 -
 pkgs/by-name/pr/proton-pass-cli/package.nix   |   4 -
 pkgs/by-name/pr/proton-pass/package.nix       |   1 -
 pkgs/by-name/pr/proton-vpn/darwin.nix         |   1 -
 .../by-name/pr/protonmail-desktop/package.nix |   4 -
 pkgs/by-name/ps/psc-package/package.nix       |   1 -
 pkgs/by-name/pu/pulumi-bin/data.nix           | 158 ------------------
 pkgs/by-name/pv/pvs-studio/package.nix        |   3 -
 pkgs/by-name/qf/qFlipper/package.nix          |   1 -
 pkgs/by-name/qq/qq/package.nix                |   1 -
 pkgs/by-name/qq/qq/sources.nix                |   1 -
 pkgs/by-name/ra/rapidapi/package.nix          |   1 -
 pkgs/by-name/ra/rar/package.nix               |   4 -
 pkgs/by-name/ra/raycast/package.nix           |   6 -
 pkgs/by-name/re/readarr/package.nix           |   2 -
 .../re/reaper-reapack-extension/darwin.nix    |   1 -
 .../re/reaper-reapack-extension/package.nix   |   1 -
 .../re/reaper-sws-extension/darwin.nix        |   1 -
 .../re/reaper-sws-extension/package.nix       |   1 -
 pkgs/by-name/re/reaper/package.nix            |   1 -
 pkgs/by-name/ro/roam-research/common.nix      |   4 -
 pkgs/by-name/ro/roam-research/darwin.nix      |   1 -
 pkgs/by-name/ro/rosenpass/package.nix         |   1 -
 pkgs/by-name/ro/router/librusty_v8.nix        |   1 -
 pkgs/by-name/rp/rpiboot/package.nix           |   1 -
 pkgs/by-name/ru/rutabaga_gfx/package.nix      |   1 -
 pkgs/by-name/sa/saw-tools/sources.nix         |   4 -
 pkgs/by-name/sc/scala-cli/sources.json        |   4 -
 pkgs/by-name/sc/scilab-bin/package.nix        |   5 -
 pkgs/by-name/se/segger-jlink/source.nix       |   6 -
 pkgs/by-name/sh/sharpsat-td/package.nix       |   1 -
 pkgs/by-name/si/signal-desktop/package.nix    |   1 -
 pkgs/by-name/si/simulide/package.nix          |   1 -
 pkgs/by-name/si/siyuan/package.nix            |   1 -
 pkgs/by-name/sk/sketchybar/package.nix        |   1 -
 pkgs/by-name/sl/slack/package.nix             |   1 -
 pkgs/by-name/sl/slack/sources.nix             |   7 -
 pkgs/by-name/sl/sleek-todo/package.nix        |   5 -
 pkgs/by-name/sn/snipaste/package.nix          |   1 -
 pkgs/by-name/sn/snipaste/sources.nix          |   1 -
 pkgs/by-name/so/soapysdrplay/package.nix      |   1 -
 pkgs/by-name/so/sourcery/package.nix          |   4 -
 pkgs/by-name/sp/spacedrive/package.nix        |   5 -
 pkgs/by-name/sp/spacetimedb/librusty_v8.nix   |   1 -
 pkgs/by-name/sp/speakeasy-cli/package.nix     |   4 -
 pkgs/by-name/sp/spotify/package.nix           |   1 -
 pkgs/by-name/sp/spotube/package.nix           |   4 -
 pkgs/by-name/sp/sprite/package.nix            |   1 -
 pkgs/by-name/sq/sqlpkg-cli/package.nix        |   2 +-
 pkgs/by-name/st/stash/package.nix             |   1 -
 pkgs/by-name/st/steamcmd/package.nix          |   5 -
 pkgs/by-name/st/stockfish/package.nix         |   1 -
 pkgs/by-name/st/stripe-cli/package.nix        |   1 -
 pkgs/by-name/su/subler/package.nix            |   1 -
 pkgs/by-name/su/subread/package.nix           |   1 -
 pkgs/by-name/su/sunshine/package.nix          |   2 -
 pkgs/by-name/su/sunvox/package.nix            |   1 -
 pkgs/by-name/sw/swiftlint/sources.json        |   4 -
 pkgs/by-name/sw/swt/package.nix               |   2 -
 pkgs/by-name/sy/synapse-admin/package.nix     |   1 -
 .../sy/synology-drive-client/package.nix      |   1 -
 .../by-name/sy/sysdig-cli-scanner/package.nix |   1 -
 .../sysdig-cli-scanner.versions.nix           |   5 -
 pkgs/by-name/ta/tabnine/sources.json          |   4 -
 pkgs/by-name/ta/tailwindcss_3/package.nix     |   2 -
 pkgs/by-name/ta/tailwindcss_4/package.nix     |   2 -
 pkgs/by-name/td/tdarr/package.nix             |   1 -
 pkgs/by-name/te/teams/package.nix             |   1 -
 pkgs/by-name/te/tetrio-desktop/package.nix    |   4 -
 pkgs/by-name/th/the-unarchiver/package.nix    |   1 -
 pkgs/by-name/ti/tidal/package.nix             |   1 -
 pkgs/by-name/ti/tideways-cli/package.nix      |   4 -
 pkgs/by-name/ti/tidgi/package.nix             |   5 -
 pkgs/by-name/ti/tika/package.nix              |   1 -
 .../to/tokenspeed-triton-llvm/package.nix     |   1 -
 pkgs/by-name/tr/transgui/package.nix          |   1 -
 pkgs/by-name/tr/trilium-desktop/package.nix   |   2 -
 pkgs/by-name/tt/ttl2c/package.nix             |   1 -
 pkgs/by-name/tu/turingplus/bootstrap.nix      |   5 -
 pkgs/by-name/tu/turingplus/package.nix        |   1 -
 pkgs/by-name/ty/typesense/sources.json        |   4 -
 pkgs/by-name/ud/udig/package.nix              |   4 -
 pkgs/by-name/un/unison-ucm/package.nix        |   5 -
 pkgs/by-name/up/upbound/sources-main.json     |   9 -
 pkgs/by-name/up/upbound/sources-stable.json   |   9 -
 pkgs/by-name/up/upscayl/package.nix           |   3 +-
 pkgs/by-name/up/upsun/package.nix             |   1 -
 pkgs/by-name/ur/urbit/package.nix             |   2 -
 pkgs/by-name/va/vault-bin/package.nix         |   3 -
 pkgs/by-name/ve/verifast/package.nix          |   4 -
 pkgs/by-name/ve/vesktop/package.nix           |   1 -
 pkgs/by-name/ve/vesta-viewer/package.nix      |   2 -
 pkgs/by-name/vg/vgmtrans/package.nix          |   1 -
 pkgs/by-name/vk/vk-messenger/package.nix      |   5 -
 pkgs/by-name/vo/voicevox-core/onnxruntime.nix |   4 -
 pkgs/by-name/vo/volatility2-bin/package.nix   |   3 -
 pkgs/by-name/wa/waveterm/package.nix          |   3 -
 pkgs/by-name/we/weasis/package.nix            |   1 -
 pkgs/by-name/we/wechat/package.nix            |   2 -
 pkgs/by-name/wh/whisparr/package.nix          |   2 -
 pkgs/by-name/wk/wkhtmltopdf/package.nix       |   1 -
 pkgs/by-name/wp/wpsoffice-cn/package.nix      |   1 -
 pkgs/by-name/wp/wpsoffice-cn/sources.nix      |   4 -
 pkgs/by-name/ya/yaak/package.nix              |   2 -
 pkgs/by-name/ya/yandex-cloud/package.nix      |   1 -
 pkgs/by-name/ya/yandex-cloud/sources.json     |   4 -
 pkgs/by-name/zb/zbctl/package.nix             |   1 -
 pkgs/by-name/zo/zoom-us/package.nix           |   4 -
 pkgs/by-name/zr/zrok/package.nix              |   3 -
 pkgs/development/compilers/ccl/default.nix    |   6 -
 pkgs/development/compilers/clasp/default.nix  |   1 -
 .../development/compilers/crystal/default.nix |   2 -
 pkgs/development/compilers/dart/default.nix   |   3 -
 pkgs/development/compilers/dotnet/default.nix |   1 -
 .../compilers/dotnet/source/vmr.nix           |   1 -
 .../elm/packages/lamdera/default.nix          |   2 -
 pkgs/development/compilers/fbc/mac-bin.nix    |   2 +-
 .../flutter/artifacts/fetch-artifacts.nix     |   1 -
 .../compilers/flutter/engine/package.nix      |   1 -
 .../development/compilers/flutter/flutter.nix |   1 -
 .../compilers/flutter/versions/3_29/data.json |   9 -
 .../compilers/flutter/versions/3_32/data.json |   9 -
 .../compilers/flutter/versions/3_35/data.json |   9 -
 .../compilers/flutter/versions/3_38/data.json |   9 -
 .../compilers/flutter/versions/3_41/data.json |   9 -
 .../compilers/flutter/versions/3_44/data.json |   9 -
 .../compilers/ghc/9.0.2-binary.nix            |  23 ---
 .../compilers/ghc/9.8.4-binary.nix            |  22 ---
 .../compilers/gnat-bootstrap/default.nix      |  22 ---
 .../graalvm/graalvm-oracle/hashes.nix         |   4 -
 pkgs/development/compilers/julia/default.nix  |   3 -
 .../compilers/julia/generic-bin.nix           |   5 -
 pkgs/development/compilers/kotlin/native.nix  |   1 -
 pkgs/development/compilers/mlton/meta.nix     |   1 -
 .../purescript/purescript/default.nix         |   5 -
 pkgs/development/compilers/rust/binary.nix    |   1 -
 pkgs/development/compilers/sbcl/default.nix   |   1 -
 pkgs/development/compilers/smlnj/default.nix  |   1 -
 pkgs/development/compilers/zulu/11.nix        |   9 -
 pkgs/development/compilers/zulu/17.nix        |   9 -
 pkgs/development/compilers/zulu/21.nix        |   9 -
 pkgs/development/compilers/zulu/25.nix        |   9 -
 pkgs/development/compilers/zulu/8.nix         |   9 -
 .../coq-modules/compcert/default.nix          |   1 -
 pkgs/development/interpreters/janet/jpm.nix   |   1 -
 .../interpreters/python/default.nix           |   3 -
 .../interpreters/python/pypy/default.nix      |   1 -
 .../interpreters/python/pypy/prebuilt.nix     |   1 -
 .../interpreters/python/pypy/prebuilt_2_7.nix |   1 -
 .../libraries/audio/libbass/default.nix       |   4 -
 .../development/libraries/openssl/default.nix |   1 -
 .../qt-6/modules/qtwebengine/default.nix      |   1 -
 .../astronomy/indilib/indi-3rdparty.nix       |   4 -
 .../science/math/openblas/default.nix         |   9 -
 .../libraries/unixODBCDrivers/default.nix     |   2 -
 .../androidenv/compose-android-packages.nix   |   2 -
 .../php-packages/relay/default.nix            |   1 -
 .../python-modules/asyncinotify/default.nix   |   1 -
 .../clarifai-protocol/default.nix             |   1 -
 .../python-modules/debugpy/default.nix        |   2 -
 .../python-modules/frida-python/default.nix   |   5 -
 .../python-modules/gurobipy/default.nix       |   3 +-
 .../python-modules/hyperscan/default.nix      |   1 -
 .../development/python-modules/jaxlib/bin.nix |   1 -
 .../python-modules/kaleido/default.nix        |   5 -
 .../python-modules/paddleocr/default.nix      |   1 -
 .../python-modules/paddlex/default.nix        |   1 -
 .../python-modules/pcodec/default.nix         |   1 -
 .../python-modules/pyscf/default.nix          |   1 -
 .../python-modules/pysdl3/default.nix         |   1 -
 .../python-modules/scalene/default.nix        |   1 -
 .../python-modules/semgrep/common.nix         |   4 -
 .../python-modules/tensorflow/bin.nix         |   2 +-
 .../python-modules/tensorflow/default.nix     |   1 -
 .../python-modules/ultralytics/default.nix    |   1 -
 .../unstructured-inference/default.nix        |   1 -
 .../vl-convert-python/librusty_v8.nix         |   1 -
 .../python-modules/vllm/default.nix           |   1 -
 .../tools/build-managers/gradle/default.nix   |   1 -
 .../tools/electron/binary/generic.nix         |   2 -
 .../tools/electron/binary/info.json           |   4 -
 .../tools/electron/chromedriver/generic.nix   |   2 -
 .../tools/electron/chromedriver/info.json     |   4 -
 pkgs/development/tools/godot/common.nix       |   1 -
 pkgs/development/tools/infisical/default.nix  |   2 -
 pkgs/development/tools/infisical/hashes.json  |   2 +-
 pkgs/development/tools/misc/premake/5.nix     |   1 -
 .../tools/selenium/chromedriver/binary.nix    |   4 -
 .../web/playwright/browser-downloads.nix      |   5 -
 .../playwright/chromium-headless-shell.nix    |   2 -
 pkgs/development/web/playwright/chromium.nix  |   2 -
 pkgs/development/web/playwright/ffmpeg.nix    |   1 -
 pkgs/development/web/playwright/firefox.nix   |   2 -
 pkgs/development/web/playwright/webkit.nix    |   2 -
 pkgs/games/dwarf-fortress/game.nix            |   1 -
 .../grafana-clickhouse-datasource/default.nix |   1 -
 .../grafana-github-datasource/default.nix     |   1 -
 .../default.nix                               |   1 -
 .../grafana-mqtt-datasource/default.nix       |   1 -
 .../grafana-opensearch-datasource/default.nix |   1 -
 .../grafana/plugins/grafana-plugin.nix        |   1 -
 .../marcusolsson-csv-datasource/default.nix   |   1 -
 pkgs/servers/search/elasticsearch/7.x.nix     |   1 -
 pkgs/tools/misc/logstash/7.x.nix              |   2 -
 pkgs/tools/misc/tdarr/common.nix              |   2 -
 pkgs/tools/security/ghidra/build.nix          |   1 -
 pkgs/tools/security/ghidra/default.nix        |   1 -
 .../ghidra/extensions/kaiju/default.nix       |   2 -
 472 files changed, 17 insertions(+), 1391 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index b1a6b0e4fd70..1115f32c61d0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -47,7 +47,6 @@ melpaBuild (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
       "x86_64-windows"
     ];
diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix
index 063d2c752ad2..547e4878df21 100644
--- a/pkgs/applications/editors/jetbrains/ides/clion.nix
+++ b/pkgs/applications/editors/jetbrains/ides/clion.nix
@@ -28,10 +28,6 @@ let
       url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.tar.gz";
       hash = "sha256-I6IKQng4lNtRlQIq08K5bueqgKI/q1awX4EuRnyAnOk=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.dmg";
-      hash = "sha256-AJt+K1zv4eyjdzubUeFGwB9mqzvOeb3ffA2k0MajPBs=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.dmg";
       hash = "sha256-i3stX7dyRgSOJkFTMD9/hkw6e2mGNqn13S7X/vJ66RQ=";
diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
index dfe4ed7f7d3f..81c7b8d92a09 100644
--- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix
+++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.tar.gz";
       hash = "sha256-G+tinD/+qM5HVR4u2E0cNXtdVsbwgK8/PdZ3ic6hf4M=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3.dmg";
-      hash = "sha256-vW2LEonl0D9S0VxbeJX4jRrwhELGBwlOXwiHslvh06E=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.dmg";
       hash = "sha256-Kyt3fYPXzwTVxPFVKd+atiHWb/i7gjGahz1MJ4iXxy8=";
diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
index 18dd09b48cf9..a9435844c443 100644
--- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix
+++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
@@ -21,10 +21,6 @@ let
       url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.tar.gz";
       hash = "sha256-SSmIPF0pDMolxeXL21UaHMbZdtYbChWVxTKZOsPhH+I=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/dataspell-2026.1.2.dmg";
-      hash = "sha256-2qzwzGMYuy1qEuTprxwNa5gOPgCZq2MadSKN8FT8w8c=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.dmg";
       hash = "sha256-MGWufS0nlswdqhACNQWtlXJwfPiYw8wUx7olIxPS15k=";
diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix
index 56370da57946..28f722fed168 100644
--- a/pkgs/applications/editors/jetbrains/ides/gateway.nix
+++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.tar.gz";
       hash = "sha256-CSe04BBo4jS1cIhu4NfZqaSHMaNue2eFUPa+1gOxuoo=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3.dmg";
-      hash = "sha256-WKwIP19y5EKO98JgEm468ofaRp/JO5z8lqNhtpsH4tY=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.dmg";
       hash = "sha256-AHY/lY0ARkW0VoSgy0t7LLNXA965PLooWBSWxBKBV5M=";
diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix
index 692e2ba49fc8..b19fd343d896 100644
--- a/pkgs/applications/editors/jetbrains/ides/goland.nix
+++ b/pkgs/applications/editors/jetbrains/ides/goland.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.tar.gz";
       hash = "sha256-7s98kY08aKjdRGQLDkffeVhgj1FWurLmTTYmtb5Qx6c=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.4.dmg";
-      hash = "sha256-RbvcLpLVyeL4B1DJ2/9Ub/6Cz6fJGXMPCHsJ705GsAo=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.dmg";
       hash = "sha256-y7mEke0z0MvQs+kMtrmrq7EeAtJUbgo6sGZrOB0MraM=";
diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix
index e77c6a800f61..3367506afa51 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea.nix
+++ b/pkgs/applications/editors/jetbrains/ides/idea.nix
@@ -22,10 +22,6 @@ let
       url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.tar.gz";
       hash = "sha256-MDZFuLrUxcCIc0Zhi4QhgKPeU7Pgs9oJ/FxQH1n3gBM=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.dmg";
-      hash = "sha256-8K+LiewiINP4S9eqV0kGWtfy2Ff/zvBwX89iX7mYZ78=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.dmg";
       hash = "sha256-XIBK/+Lxaz9dX+Lxl7HXsl+Z3Z7GBzSuDxNssb/4A2s=";
diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/applications/editors/jetbrains/ides/mps.nix
index 52e18be29bcd..691bd0f94179 100644
--- a/pkgs/applications/editors/jetbrains/ides/mps.nix
+++ b/pkgs/applications/editors/jetbrains/ides/mps.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz";
       hash = "sha256-xAI+UrTheCTWHSdoI4YZvhTlrlc121M+OVFkfzd7a3k=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg";
-      hash = "sha256-whYAjKkF79mrknHflZnvOOy2bLosYUguelZDSuPt3uY=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg";
       hash = "sha256-3HnEHOhRRI9IYjBhc5FO7h5j4jBBDtZTVkmO/S1fBEQ=";
diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index be56d33d23bc..b76837caa81b 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.tar.gz";
       hash = "sha256-T9q3/nxv/AA6y7CHWtOhUibR7bnKN8OZmfN3NWYTsIQ=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.dmg";
-      hash = "sha256-W7EwYu7S3hs1564tXq8H1Uok/Gwx/8QJO4brUGOfFY4=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.dmg";
       hash = "sha256-XGcfEWHHeLugvkT/WlQDsVRN33F46b1PCNhINQitqSY=";
diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
index 4f418ef23a3b..452f73600373 100644
--- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
@@ -20,10 +20,6 @@ let
       url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.tar.gz";
       hash = "sha256-71FbYpN0seJ5k/yZA7aoXgU4W/N1BhjtKl7W7Hic9UE=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.4.dmg";
-      hash = "sha256-Q5hTcYoNUzmAxwcsXJNS4medQjFKWc/Sgkybt4PQPfg=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.dmg";
       hash = "sha256-qxSgp8r4S0KXjCCTIoAiEZFCn3uBE/0pWLLA6td0Fq0=";
diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index c962306f3389..d787cbecf590 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -31,10 +31,6 @@ let
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.tar.gz";
       hash = "sha256-GXmyBrqxUpwK4djjwllvK+pnfktDrDHpLJKoe4D2xFo=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.dmg";
-      hash = "sha256-GfQ5WpKunJ+JhE1VcArm3UxZ5udCbfnS1Kw3D4gZorA=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.dmg";
       hash = "sha256-cfwT22BN1jzKZzrZHMQqYFJPGuRwta/sqoOJOp+PfBE=";
diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
index b4ab8c0b34c4..b99a31ccb041 100644
--- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
+++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.tar.gz";
       hash = "sha256-oSu19pkGVWt31vWBdAffSZsu4QzsUznVbUSwDy98nug=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.dmg";
-      hash = "sha256-BLo2weIJK8gQAcMtAiETM7FMdhw9aoFIGh5Yqjv3k7s=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.dmg";
       hash = "sha256-4wEnwcPRtwp0wxePUMiLow6sMxirwndRMdmJL8LBh9k=";
diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
index 3f82ae6aea2e..6e4312187c31 100644
--- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
@@ -25,10 +25,6 @@ let
       url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.tar.gz";
       hash = "sha256-KpF3jCnLKCEeEXkBdB8ZsPPqP9FOVRTwRV/FQLKyh1Q=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.dmg";
-      hash = "sha256-2BwgAD0xF9IxRJh+gW4vLzBW13rFQSzQPbEwdmQGvLU=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.dmg";
       hash = "sha256-Hly4NBv9mg/RMmxCM6m9w5eS/CQ7ycxp7V2VQZwyGQE=";
diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
index 0e35c48c293b..6e28014f825b 100644
--- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
@@ -19,10 +19,6 @@ let
       url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.tar.gz";
       hash = "sha256-f9KenMq1gtldzpBraSBwOb/186WQwh1ps5Ypj5JoOU0=";
     };
-    x86_64-darwin = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4.dmg";
-      hash = "sha256-SGdo6WYMCcCBuZUjvURcMTbJUqhZ4MzFlSLg6Zjr84I=";
-    };
     aarch64-darwin = {
       url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.dmg";
       hash = "sha256-ZYen6Ew0GYbBAmuGCDACPBsygxZ6sT787o6gqF9DJzw=";
diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
index a64e1af94fcd..41f9f5b8ddd1 100644
--- a/pkgs/applications/editors/jetbrains/updater/updateInfo.json
+++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
@@ -4,7 +4,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg"
     }
   },
@@ -13,7 +12,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg"
     }
   },
@@ -22,7 +20,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg"
     }
   },
@@ -31,7 +28,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg"
     }
   },
@@ -40,7 +36,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/go/goland-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg"
     }
   },
@@ -49,7 +44,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg"
     }
   },
@@ -62,7 +56,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg"
     }
   },
@@ -71,7 +64,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg"
     }
   },
@@ -80,7 +72,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/python/pycharm-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg"
     }
   },
@@ -93,7 +84,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg"
     }
   },
@@ -102,7 +92,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg"
     }
   },
@@ -111,7 +100,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg"
     }
   },
@@ -120,7 +108,6 @@
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "x86_64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
       "aarch64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg"
     }
   }
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix
index ca8b0fec8b1c..077bff37e046 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix
@@ -14,7 +14,6 @@ let
   codeiumHashes = {
     x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM=";
     aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4=";
-    x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE=";
     aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48=";
   };
 
@@ -30,7 +29,6 @@ let
           {
             x86_64-linux = "linux_x64";
             aarch64-linux = "linux_arm";
-            x86_64-darwin = "macos_x64";
             aarch64-darwin = "macos_arm";
           }
           .${system} or throwSystem;
diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
index d083d33635b7..2128bad3a243 100644
--- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
@@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-lhDt8XEF90y4pj8RLUZgfZNmHkV1XlmHsYuT6sGJMRc=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-SqFRn5FVQ+LcpmYT7/AIdIKTOxbapaKvPi+I360dVW8=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-iuYVCG4YWPFI8o4GmuNjkbXvzJsAre0gSSEWq6CUk2E=";
@@ -57,7 +53,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ lib.maintainers.azd325 ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
index 96c4d7441c5f..330c30ad87dd 100644
--- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
@@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-4GiTNT+UPdTth9VDhHTXfqhQ5gM6vfLAaU5Cy3VMTCI=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-XJfDXWYpxYV5YHIBINqNJdyVho7Xd9OGMu11WE0LENM=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-QngCharrjiDKrY7RgWtKzIJxjXazuRvpuHVUAxknWfA=";
@@ -44,7 +40,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     maintainers = with lib.maintainers; [ flacks ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
     ];
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index de3ec7a5475f..5af2c5353f82 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3190,10 +3190,6 @@ let
                 arch = "linux-x64";
                 hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso=";
               };
-              "x86_64-darwin" = {
-                arch = "darwin-x64";
-                hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE=";
-              };
               "aarch64-linux" = {
                 arch = "linux-arm64";
                 hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM=";
@@ -3224,7 +3220,6 @@ let
           maintainers = [ lib.maintainers.magnouvean ];
           platforms = [
             "x86_64-linux"
-            "x86_64-darwin"
             "aarch64-darwin"
             "aarch64-linux"
           ];
diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
index 70523c30c6d4..2abc84aba7d9 100644
--- a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
@@ -10,10 +10,6 @@ let
       hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg=";
       arch = "linux-x64";
     };
-    x86_64-darwin = {
-      hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8=";
-      arch = "darwin-x64";
-    };
     aarch64-linux = {
       hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc=";
       arch = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
index b470cd4ca50f..64bb5e1086ce 100644
--- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
@@ -45,7 +45,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
index e8d4b1b9ce98..2fa4097929c3 100644
--- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
@@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-uPmJyEq7X6uJzE1M5Xywax1mrnTcg6jOb9MlpKZ0WRk=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-oEVt3VbRUPD4tfQs0EU7RX6671fCJiMi38wF+76RzZI=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-b46f0f99rjBivewC9jUbAFiKK+DS1XKv+AynUlKHliw=";
@@ -52,7 +48,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index af7fd5daef40..96eeea294b2d 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -22,10 +22,6 @@ let
         arch = "linux-arm64";
         hash = "sha256-1zz9xrMALIOXzMpArWSwO12WmRE+0ldbIwUFH1G2GQI=";
       };
-      x86_64-darwin = {
-        arch = "darwin-x64";
-        hash = "sha256-3PoSbp8M2X4bhSQyxvNC7jtNDVNEuEKeYRZQMFOmbtQ=";
-      };
       aarch64-darwin = {
         arch = "darwin-arm64";
         hash = "sha256-F4CsyiX46SpjilJNV+qYps1JAw09pVruLmW+muN9/B4=";
@@ -138,7 +134,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index b0bb0e750ec8..abd222def11d 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -24,10 +24,6 @@ let
         arch = "linux-arm64";
         hash = "sha256-EV3745OXbwrRmc8P5e13DZbomyJGcYQUF07WflRWU1Q=";
       };
-      x86_64-darwin = {
-        arch = "darwin-x64";
-        hash = "sha256-i2cALeaSXfwIdfXNeWfND99nFYIiOFwsxbqU7/Effx8=";
-      };
       aarch64-darwin = {
         arch = "darwin-arm64";
         hash = "sha256-KCIkjBmYZPiuFmQ3/aDycARYIHPyDTmMkoGcuG5DQX8=";
@@ -159,7 +155,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
index a934f7a21db6..4c95c0174df3 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -18,10 +18,6 @@ let
       hash = "sha256-HQfmDV6rJX6l1pGybe8//2QrTSwE+rlEJOi4/iW69lY=";
       arch = "linux-x64";
     };
-    x86_64-darwin = {
-      hash = "sha256-tAZyt2fwB/GOhffY5lhHJTmbXG8UloynPtjoMtWRHok=";
-      arch = "darwin-x64";
-    };
     aarch64-linux = {
       hash = "sha256-v7fatW/LMJ8CeSRrE/5b7dLqOrhNhwzUySUxtAMuBUE=";
       arch = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix
index a92f471d2f06..4399094441b1 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix
@@ -16,10 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-dZwOBehoYEqaYskvcPB55IKnG1CMToioyUJXlndqorA=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-b6LobvVngC0TFuWTC9JBQrECkoX7ewLNCpCROkXHk20=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-/EaOfoubfq1ufwB7TTQ2hqmh1ZJiZ1+B6QeYu3MoFPI=";
@@ -68,7 +64,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     license = lib.licenses.unfree;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
index 4e311914bc7a..1df127e0fd59 100644
--- a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
@@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-cP/oFn19CZ/G3kjdHNZGqXvoDE1qUtg6xrg/2MO14Lo=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-wtk8SasxXEQ3pCJpVTWR8wcY/bNaIZmImbAtrFWYWOo=";
-        };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
           hash = "sha256-XYdwVoDqK+88ZYUm6APyamFNx6XlYjy0R4CIhSMuRmU=";
@@ -42,7 +38,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
index dba6740771e6..305f1123a1b8 100644
--- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
@@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       arch = "linux-x64";
       hash = "sha256-Oz4Buraof4yXIxGeKXIsDkvEQQ0Gzf/b5mdses1nHlo=";
     };
-    "x86_64-darwin" = {
-      arch = "darwin-x64";
-      hash = "sha256-Iqe4KZXQHenKAypXK/qzG2BCXbk2cZ0i/0xhWhlfQxo=";
-    };
     "aarch64-darwin" = {
       arch = "darwin-arm64";
       hash = "sha256-vMDB5zmdBNt3R5AkeuCYhxzW/rSGwM+wtU5K4v3ZU/U=";
diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
index 6d5b83c7e2d6..f7aafb38d63a 100644
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@@ -20,10 +20,6 @@ let
         arch = "linux-arm64";
         hash = "sha256-Z3cRojI4mCCS2t3aLojgImULQOobq5liDwoeHuzKEhY=";
       };
-      x86_64-darwin = {
-        arch = "darwin-x64";
-        hash = "sha256-Th0cseTJk+CD3BO/99t0VMD7zcF6nxAfmHFhfN8j5sw=";
-      };
       aarch64-darwin = {
         arch = "darwin-arm64";
         hash = "sha256-rHgMl71YCs9ea0nFnx+E2U8isL4zQzIvvE9tgxM7IiA=";
@@ -66,7 +62,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ ];
   };
diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
index 66e9fbc2eb18..c29133655ef5 100644
--- a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
@@ -10,10 +10,6 @@ let
       hash = "sha256-DWrKvjWpUYvyqgZCShqwBKw33MHW31cxb4ERV65O+uc=";
       arch = "linux-x64";
     };
-    x86_64-darwin = {
-      hash = "sha256-CYDutYtU0+AAn6PYO/EQ/Suv8BNuMtvePpFdKRtiqAs=";
-      arch = "darwin-x64";
-    };
     aarch64-linux = {
       hash = "sha256-iFHeZiTubXA/t2Gib9hP42d7yjq/WRyywp+l8VhGfmo=";
       arch = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index eb1b67a6132b..f07054e2fd07 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
           arch = "linux-x64";
           hash = "sha256-htZGjy7ZnQLGZUncokGaGHyLpvPM5jzWUvCdnfN1vbM=";
         };
-        "x86_64-darwin" = {
-          arch = "darwin-x64";
-          hash = "sha256-OFdrXunh63xBZW/HwDDjj17TTiOLGY1Enb6ARxNc4bI=";
-        };
         "aarch64-linux" = {
           arch = "linux-arm64";
           hash = "sha256-rgeNJbl6G2yKAWYW7NarQwVLmd3oZ4YTOVeCUat6ZqQ=";
@@ -56,7 +52,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ sandarukasa ];
   };
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 652b2fab1896..4bfc6969b048 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -429,7 +429,6 @@ stdenv.mkDerivation (
           # see https://www.npmjs.com/package/@vscode/ripgrep-universal?activeTab=code
           ripgrepSystem =
             {
-              x86_64-darwin = "darwin-x64";
               aarch64-darwin = "darwin-arm64";
               armv7l-linux = "linux-arm";
               aarch64-linux = "linux-arm64";
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 89ed737e0c43..480d02b1b232 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -24,7 +24,6 @@ let
   plat =
     {
       x86_64-linux = "linux-x64";
-      x86_64-darwin = "darwin";
       aarch64-linux = "linux-arm64";
       aarch64-darwin = "darwin-arm64";
       armv7l-linux = "linux-armhf";
@@ -36,7 +35,6 @@ let
   hash =
     {
       x86_64-linux = "sha256-4G+zZ5HJuvdJXUt9wPWqqCVOfRpgpe5D5sfevAXJYrU=";
-      x86_64-darwin = "sha256-+o+UZwmJMeGyf2n1VZcm0zl4dzuC/0UBV5jyUANKsEQ=";
       aarch64-linux = "sha256-UEkpGlTV/KZ8Qcw/OBOCNDQHblD7gHHloSzM62FvDnw=";
       aarch64-darwin = "sha256-IHu9EwW9/oS2FTr/mB7ugMss5Pku3IyslqFYr4riZyk=";
       armv7l-linux = "sha256-Rfp2H6L7bXXhdxf2yphW9YXDGW1+Ea0nKdyTFS8Y/tU=";
@@ -128,7 +126,6 @@ buildVscode {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "armv7l-linux"
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index af9fa5cc4eba..f78790955fcd 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,7 +15,6 @@ let
   plat =
     {
       x86_64-linux = "linux-x64";
-      x86_64-darwin = "darwin-x64";
       aarch64-linux = "linux-arm64";
       aarch64-darwin = "darwin-arm64";
       armv7l-linux = "linux-armhf";
@@ -28,7 +27,6 @@ let
   hash =
     {
       x86_64-linux = "sha256-LJsGc11MH6zlcJNfSWjTWPn2Jp9dkjeBPQuCXH1woUM=";
-      x86_64-darwin = "sha256-bC7AfH2eKmmsWIOHifNGKD/kVQCYyuMfU3SUil0DXkM=";
       aarch64-linux = "sha256-mT5dvw8GOZ0GnZaKRS/TAzQDEEYDOgcj6w6lNLy5kQ0=";
       aarch64-darwin = "sha256-c8K17XKpRG1ji2mUfoyg2+cRF+qc1KVMYVkaQoUIz7Y=";
       armv7l-linux = "sha256-91ZHhEUDVoDiRBLwMHVLhzKmb9gWcPBUsVRZVLhCA4M=";
@@ -88,7 +86,6 @@ buildVscode rec {
     mainProgram = "codium";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
       "armv7l-linux"
diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix
index c548d3c1a72e..918046b464da 100644
--- a/pkgs/applications/emulators/wine/packages.nix
+++ b/pkgs/applications/emulators/wine/packages.nix
@@ -84,7 +84,6 @@ in
         if pkgs.stdenv.hostPlatform.isAarch64 then [ "--enable-archs=aarch64" ] else [ "--enable-win64" ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-linux"
       ];
       mainProgram = "wine";
@@ -145,7 +144,6 @@ in
           [ "--enable-archs=x86_64,i386" ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-linux"
       ];
       mainProgram = "wine";
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 17291bdc2cce..f0a220d8733d 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -29,7 +29,6 @@ let
     ];
     platforms = [
       "i686-linux"
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 947166188ad2..80174bc67d6e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -41,7 +41,6 @@ let
     aarch64-linux = "linux-aarch64";
     # bundles are universal and can be re-used for both darwin architectures
     aarch64-darwin = "mac";
-    x86_64-darwin = "mac";
   };
 
   arch = mozillaPlatforms.${stdenv.hostPlatform.system};
diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
index 2e430baa0706..2264b15eb947 100644
--- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
@@ -30,6 +30,6 @@ buildGoModule rec {
     description = "HyperKit driver for docker-machine";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ atkinschang ];
-    platforms = [ "x86_64-darwin" ];
+    platforms = [ ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index e592740d8129..11e899ebe285 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -26,7 +26,6 @@
 
 assert lib.elem stdenv.system [
   "x86_64-linux"
-  "x86_64-darwin"
   "aarch64-linux"
   "aarch64-darwin"
 ];
@@ -178,7 +177,6 @@ in
         srcHash = "sha256-AkZjpHk57S3pYiZambxgRHR7PD51HSI4H1HHW9ICah4=";
         variant = "lean";
       };
-      x86_64-darwin = x86_64-linux;
       aarch64-linux = {
         version = "3.4.0";
         hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8=";
@@ -199,7 +197,6 @@ in
         hash = "sha256-9RlQWcDUECrap//xf3sqhd+Qa8tuGZSHFjGfmXhkGgQ=";
         srcHash = "sha256-4OEsVhBNV9CJ+PN4FgCduUCVA9/el5yezSCZ6ko3+bU=";
       };
-      x86_64-darwin = x86_64-linux;
       aarch64-linux = x86_64-linux // {
         hash = "sha256-5Lv2uA72BJEva5v2yncyPe5gKNCNOPNsoHffVt6KXQ0=";
       };
diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix
index a346ebd7b0de..030234b95fb5 100644
--- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix
@@ -33,6 +33,6 @@ stdenvNoCC.mkDerivation rec {
     # See: https://cancel.fm/ripcord/shareware-redistribution/
     license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [ mikroskeem ];
-    platforms = [ "x86_64-darwin" ];
+    platforms = [ ];
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index c6ce7747558d..601ead626005 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -41,7 +41,6 @@ let
     x86_64-linux = "linux-x86_64";
     # bundles are universal and can be re-used for both darwin architectures
     aarch64-darwin = "mac";
-    x86_64-darwin = "mac";
   };
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix
index 5a36fda68a8b..a2fdd448cdec 100644
--- a/pkgs/applications/office/libreoffice/darwin/default.nix
+++ b/pkgs/applications/office/libreoffice/darwin/default.nix
@@ -18,13 +18,6 @@ let
       url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
       sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1";
     };
-
-    x86_64-darwin = rec {
-      arch = "x86_64";
-      archSuffix = "x86-64";
-      url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
-      sha256 = "f92ba40fdada173232fe929bf77973a1ffcccec55ae7971957a6de84d33f0f1e";
-    };
   };
 in
 stdenvNoCC.mkDerivation {
@@ -78,7 +71,6 @@ stdenvNoCC.mkDerivation {
     maintainers = with lib.maintainers; [ tricktron ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 37c0a8133d1d..2e5bd1ebe4db 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -134,7 +134,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ lib.maintainers.costrouc ];
   };
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index ad384520cefe..94a25f22f33c 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -300,7 +300,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
     ];
diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix
index a74d0473c291..198f52aaea37 100644
--- a/pkgs/by-name/_0/_010editor/package.nix
+++ b/pkgs/by-name/_0/_010editor/package.nix
@@ -91,11 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-M1D2Bmi45sYiB0Ci+0X0AxyIeR+On60xt4jP1Jsy5tA=";
     };
 
-    x86_64-darwin = fetchurl {
-      url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg";
-      hash = "sha256-vsI0VgcJGleJTQ5C1JaiCkELfWfwgFhyCx+6j5mldIk=";
-    };
-
     aarch64-darwin = fetchurl {
       url = "https://download.sweetscape.com/010EditorMacARM64Installer${finalAttrs.version}.dmg";
       hash = "sha256-+yU5JdPNS2BfiZLsBLyyC+ieVNqbIWba3teBlTIDWtk=";
@@ -124,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ eljamm ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index f9c70c26f423..6595b170e8e3 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -25,14 +25,13 @@ let
 
   pname = "1password-cli";
   version = "2.34.1";
-  sources = rec {
+  sources = {
     aarch64-linux = fetch "linux_arm64" "sha256-uEukRq71eeayvNguD9XepvP1Br5AkE2Ag/Chv2idf4A=" "zip";
     i686-linux = fetch "linux_386" "sha256-p/F3YZLJnlimrVE2qxTHvIB4m47kuwhoCWTC40VIvMs=" "zip";
     x86_64-linux = fetch "linux_amd64" "sha256-oAABMlwwv5X91TT6FK2aPpg+e2CvmHT1rqIVRTjQNCQ=" "zip";
     aarch64-darwin =
       fetch "apple_universal" "sha256-vp1Y1M6DUanx1CAVhLrqgBovwws6Y/5jOgnwTZE8Hhc="
         "pkg";
-    x86_64-darwin = aarch64-darwin;
   };
   platforms = builtins.attrNames sources;
   mainProgram = "op";
diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix
index 2b569843f718..260e1ad7ecf2 100644
--- a/pkgs/by-name/_1/_1password-gui/package.nix
+++ b/pkgs/by-name/_1/_1password-gui/package.nix
@@ -37,7 +37,6 @@ let
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json
index e35f6351094d..861fa1f4dfe4 100644
--- a/pkgs/by-name/ac/acli/sources.json
+++ b/pkgs/by-name/ac/acli/sources.json
@@ -9,10 +9,6 @@
       "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_arm64.tar.gz",
       "sha256": "1a9e86d0b46a62a8f1992c1ef98b3af7e9a9ee3f76d0efa215fe1f2d1b2fd139"
     },
-    "x86_64-darwin": {
-      "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_amd64.tar.gz",
-      "sha256": "993fd692700d602fd1e3cff7f1d29f70e44a2ebb8056fbb93bdc8aed1e5cbbd4"
-    },
     "x86_64-linux": {
       "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_amd64.tar.gz",
       "sha256": "de9e0a60a556e4119428b9072f6ca787e75b9f9a538aa71ebcc8084deb8ca1a6"
diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix
index 1db8ebbad7b3..f7e3d10209c7 100644
--- a/pkgs/by-name/ae/aemu/package.nix
+++ b/pkgs/by-name/ae/aemu/package.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix
index 804f31d6339e..f2e33e1c83e4 100644
--- a/pkgs/by-name/af/affine-bin/package.nix
+++ b/pkgs/by-name/af/affine-bin/package.nix
@@ -48,7 +48,6 @@ stdenvNoCC.mkDerivation (
         ];
         platforms = [
           "aarch64-darwin"
-          "x86_64-darwin"
           "x86_64-linux"
         ];
         sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index 9c5fb55b894e..43b532795f8c 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.fromSource ];
diff --git a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix
index f1b49b82d9fe..5c8cfad15f1f 100644
--- a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix
+++ b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "age-plugin-openpgp-card";
diff --git a/pkgs/by-name/ai/airbuddy/package.nix b/pkgs/by-name/ai/airbuddy/package.nix
index 50c5a10791af..a20169b03656 100644
--- a/pkgs/by-name/ai/airbuddy/package.nix
+++ b/pkgs/by-name/ai/airbuddy/package.nix
@@ -47,7 +47,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix
index 6d41225a7fde..aae7dc51b192 100644
--- a/pkgs/by-name/al/aldente/package.nix
+++ b/pkgs/by-name/al/aldente/package.nix
@@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 93411a575544..ef38328ce8b4 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -20,7 +20,6 @@ let
     # supported x86_64 CPUs instead of depending on the build user's CPU flags.
     x86_64-linux = "linux-x64-baseline";
     aarch64-linux = "linux-arm64";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
@@ -80,7 +79,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           {
             x86_64-linux = "sha256-KNXCbNhY7njmGQlv3NxBmkIDciVVZlXl9JedBerdrZM=";
             aarch64-linux = "sha256-HJf1Ikmai/h/Y2HybYcKxRhx5VhiyoPaubocCkoxF3s=";
-            x86_64-darwin = "sha256-X8yl1GF6PseC1mSrMsQDmpXInKr4GD7cgHqhD/p6l4o=";
             aarch64-darwin = "sha256-agoKx8pXQf1HGUwsfqpgeZBubwhnPG+xqIfu3Y+AK2Y=";
           }
           .${system'};
diff --git a/pkgs/by-name/an/android-cli/package.nix b/pkgs/by-name/an/android-cli/package.nix
index 2e289159937b..95dd81c5cea8 100644
--- a/pkgs/by-name/an/android-cli/package.nix
+++ b/pkgs/by-name/an/android-cli/package.nix
@@ -14,10 +14,6 @@ let
       url = "https://dl.google.com/android/cli/${version}/linux_x86_64/android-cli";
       hash = "sha256-TmwLwLKqnMCxWwtX8m50KflmisfeG3PjZsBs7z9vccU=";
     };
-    x86_64-darwin = {
-      url = "https://dl.google.com/android/cli/${version}/darwin_x86_64/android-cli";
-      hash = "sha256-ThBobULyevoKlp/22tdUqnBBccX6FbPDNrSwwuK4wnw=";
-    };
     aarch64-darwin = {
       url = "https://dl.google.com/android/cli/${version}/darwin_arm64/android-cli";
       hash = "sha256-E3PC0Ivf6MoYRQu56dSD/49LI8DJZhXL27/o6daH0Sg=";
@@ -75,7 +71,6 @@ stdenv.mkDerivation {
     teams = with teams; [ android ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "android";
diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix
index d3f7622c0820..22846bba8568 100644
--- a/pkgs/by-name/an/anki-bin/package.nix
+++ b/pkgs/by-name/an/anki-bin/package.nix
@@ -69,7 +69,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix
index 496b0c4e2731..455485d6a4bb 100644
--- a/pkgs/by-name/an/antigravity-cli/package.nix
+++ b/pkgs/by-name/an/antigravity-cli/package.nix
@@ -25,10 +25,6 @@ let
       url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz";
       hash = "sha256-U/cwihF/cP5+7KSmkAToI5yOoYydguR5ZrKQMytpuCk=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-x64/cli_mac_x64.tar.gz";
-      hash = "sha256-A8YjMmFUiHKxdlR+OpOPQGKC+68z/83vtjw1yiJGt6g=";
-    };
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json
index 79cbe4f69f9a..2073ecc8798e 100644
--- a/pkgs/by-name/an/antigravity/information.json
+++ b/pkgs/by-name/an/antigravity/information.json
@@ -10,10 +10,6 @@
       "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz",
       "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1"
     },
-    "x86_64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip",
-      "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357"
-    },
     "aarch64-darwin": {
       "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip",
       "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8"
diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity/package.nix
index a0d5cd05a137..165e5a2c4889 100644
--- a/pkgs/by-name/an/antigravity/package.nix
+++ b/pkgs/by-name/an/antigravity/package.nix
@@ -66,7 +66,6 @@ buildVscode {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 5b11214a178c..c03e7d4ff88e 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -15,7 +15,6 @@ let
       # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3
       x86_64-linux = "linux-amd64-musl";
       aarch64-linux = "linux-arm64-musl";
-      x86_64-darwin = "darwin-amd64";
       aarch64-darwin = "darwin-arm64";
     }
     .${stdenv.hostPlatform.system}
@@ -89,7 +88,6 @@ buildGoModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index e6f428405645..69b330717963 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -231,7 +231,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix
index a4519d548f3d..3514e508ffa3 100644
--- a/pkgs/by-name/ap/appfire-cli/package.nix
+++ b/pkgs/by-name/ap/appfire-cli/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     shellNames = {
       "x86_64-linux" = "bin/shell-linux-amd64";
       "aarch64-linux" = "bin/shell-linux-arm64";
-      "x86_64-darwin" = "bin/shell-macos-amd64";
       "aarch64-darwin" = "bin/shell-macos-arm64";
     };
     # versionCheckHook cannot be used because appfire-cli requires $HOME to be set
diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix
index 8c314c465018..a375364af645 100644
--- a/pkgs/by-name/at/atuin-desktop/package.nix
+++ b/pkgs/by-name/at/atuin-desktop/package.nix
@@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       {
         aarch64-darwin = "sha256-YbjDAa2KG8U0ODqIYc5h7iNr5px+6+iforDrPomOVDo=";
         aarch64-linux = "sha256-JoUPAfBF4xdQxtx+J/VNpYomBACNsL7Wes0XXuGByGk=";
-        x86_64-darwin = "sha256-YzxQyZPfcQci8QsGEDRTcc2A9tmvem3cHkv/OBFlWDQ=";
         x86_64-linux = "sha256-w8fMS6f+F+23EtMjjl0RsHMm6b5jOXSwUDAc21vqLAg=";
       }
       .${stdenv.hostPlatform.system}
diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix
index 27eaa122b9c4..f37cc27ae3d8 100644
--- a/pkgs/by-name/az/azure-functions-core-tools/package.nix
+++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix
@@ -66,7 +66,6 @@ buildDotnetModule {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/az/azure-static-sites-client/package.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix
index eec2fbc63e62..c007204348f1 100644
--- a/pkgs/by-name/az/azure-static-sites-client/package.nix
+++ b/pkgs/by-name/az/azure-static-sites-client/package.nix
@@ -24,7 +24,6 @@ let
     };
   sources = {
     "x86_64-linux" = fetchBinary "linux-x64";
-    "x86_64-darwin" = fetchBinary "osx-x64";
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix
index 596600749b4b..38cc4da6ff97 100644
--- a/pkgs/by-name/ba/bazel_8/examples.nix
+++ b/pkgs/by-name/ba/bazel_8/examples.nix
@@ -49,7 +49,6 @@ in
         {
           aarch64-darwin = "sha256-FwHsg9P65Eu/n8PV7UW90bvBNG+U67zizRy6Krk32Yg=";
           aarch64-linux = "sha256-W8h2tCIauGnEvPpXje19bZUE/izHaCQ0Wj4nMaP3nkc=";
-          x86_64-darwin = "sha256-XIrGRmYDDRN3Kkt1dFWex1bPRMeIHAR+XWLqB/PpOAM=";
           x86_64-linux = "sha256-VBckTQAK5qeyi2ublk+Dcga5O5XZg3bfHR6Yaw6vSp0=";
         }
         .${stdenv.hostPlatform.system};
@@ -79,7 +78,6 @@ in
         {
           aarch64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
           aarch64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
-          x86_64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
           x86_64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8=";
         }
         .${stdenv.hostPlatform.system};
@@ -110,7 +108,6 @@ in
         {
           aarch64-darwin = "sha256-50cAS1okGT1Mq3+TNLk2dk6OdBOAF2LdcskcYuVNOSY=";
           aarch64-linux = "sha256-2Oia7+2nzLrWeo/bK/5L7du5Y30DY+S0jit6e1ixJXw=";
-          x86_64-darwin = "sha256-+vgvj3ABm+vvXT7U7JxjuzIMwVAiUh1gcWZnFNzcmY0=";
           x86_64-linux = "sha256-kBnSlFRfYsotZTRMrTNhk8/106+BLzwuU6MIRXlD1jE=";
         }
         .${stdenv.hostPlatform.system};
diff --git a/pkgs/by-name/ba/bazel_9/examples.nix b/pkgs/by-name/ba/bazel_9/examples.nix
index 27f848282eb4..97b262d983b5 100644
--- a/pkgs/by-name/ba/bazel_9/examples.nix
+++ b/pkgs/by-name/ba/bazel_9/examples.nix
@@ -64,7 +64,6 @@ in
         {
           aarch64-darwin = "sha256-Jth981+r20azC/CqoWN3LK5USm8zUIpL9Xt88+TcL1o=";
           aarch64-linux = "sha256-4E/QCSOXTN/dW65xz/n47tXW0PlHUOP1UP+TwJfMueI=";
-          x86_64-darwin = "sha256-t4JP4o3O9C9BehidQPVu4EATnUZodhFh1/ctITxD6JA=";
           x86_64-linux = "sha256-HzgFpbEBZ8efA5pwUsGZjt9bKiAXslB17OZQcm3cspc=";
         }
         .${stdenv.hostPlatform.system};
@@ -102,7 +101,6 @@ in
         {
           aarch64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
           aarch64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
-          x86_64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
           x86_64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
         }
         .${stdenv.hostPlatform.system};
@@ -141,7 +139,6 @@ in
         {
           aarch64-darwin = "sha256-uUl7PpR3jAKvj6VWspPE3IR4Gr/V2VrBv1MlTzOIZJs=";
           aarch64-linux = "sha256-uhcIwDk8NAZDBynzxWk+0fLP/2XadKQRl5BlFPjf4/8=";
-          x86_64-darwin = "sha256-vi3+/ps+dhDjqYHxWSnWOXhh1jWJWwb5ifUUhN4vxrg=";
           x86_64-linux = "sha256-YURF8Zjueq3BN5GfEx5L+C4hGmr5qfJc7OngqZ17384=";
         }
         .${stdenv.hostPlatform.system};
diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix
index c5da0de573aa..d905565eec37 100644
--- a/pkgs/by-name/be/beekeeper-studio/package.nix
+++ b/pkgs/by-name/be/beekeeper-studio/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
       asset = selectSystem {
         x86_64-linux = "beekeeper-studio_${finalAttrs.version}_amd64.deb";
         aarch64-linux = "beekeeper-studio_${finalAttrs.version}_arm64.deb";
-        x86_64-darwin = "Beekeeper-Studio-${finalAttrs.version}-mac.zip";
         aarch64-darwin = "Beekeeper-Studio-${finalAttrs.version}-arm64-mac.zip";
       };
     in
@@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = selectSystem {
         x86_64-linux = "sha256-e5y7uBzdbDSUQKpxRjho+2kU3wx23spdSv1PwmJ30gA=";
         aarch64-linux = "sha256-iuZDeSYljiSRUqtLIA1BcrRaYoqg9dnlbRDLsetVkMQ=";
-        x86_64-darwin = "sha256-7iW40NPAU4C+gDZb7YmGFmTOnmg5V/yb9+6EW6MlyXU=";
         aarch64-darwin = "sha256-Jnm4Vfm9+6dXmjnI5gYpYW1g7Anl9xhIKXbQA2SGUDE=";
       };
     };
@@ -158,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 305fcc575591..00fe90cf9a4d 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -246,7 +246,6 @@ buildNpmPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "bitwarden";
diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix
index 0205b58df2db..22d6d990aef6 100644
--- a/pkgs/by-name/bl/blackfire/package.nix
+++ b/pkgs/by-name/bl/blackfire/package.nix
@@ -74,10 +74,6 @@ stdenv.mkDerivation rec {
         url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
         hash = "sha256-Ofs9raAtx/duS8dXWfvjKGzhJr3j9+gkH8lP/VLfnkE=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
-        hash = "sha256-+rMiD/vFFIA8dR3quUnpr8uDNTdvnXyYjT8brgiOxBI=";
-      };
     };
 
     updateScript = writeShellScript "update-blackfire" ''
@@ -112,7 +108,6 @@ stdenv.mkDerivation rec {
       "x86_64-linux"
       "aarch64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 51181437257b..a85e267b8278 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -59,16 +59,6 @@ let
         "8.5" = "sha256-GpvF7cgcTXLguwQCj0vOwtn7EbUQYqolzt7JPr8RtCM=";
       };
     };
-    "x86_64-darwin" = {
-      system = "amd64";
-      hash = {
-        "8.1" = "sha256-bRoTC959irVHSTbMmBEQPw2O5ecoMj4zJK+a5AT1i7M=";
-        "8.2" = "sha256-6DGh0Ajlxt6L7acen3171gfyUajmb9k6fAY+h56BZCI=";
-        "8.3" = "sha256-KhZ5KD+9lCC+4bSVZPfkvWpWgRmOZ9iL87NfQ/YMWzw=";
-        "8.4" = "sha256-DRU0I60T9ZvIHYU82qbHFmEQwn3Vrp/MGmhiKzOm3og=";
-        "8.5" = "sha256-LrGek8mg9tBhccLGBKeokKsiYSxitxE+MP9sya3H4aY=";
-      };
-    };
   };
 
   makeSource =
@@ -166,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/bl/blast-bin/package.nix b/pkgs/by-name/bl/blast-bin/package.nix
index 7436773c178f..a6a5151ac050 100644
--- a/pkgs/by-name/bl/blast-bin/package.nix
+++ b/pkgs/by-name/bl/blast-bin/package.nix
@@ -26,10 +26,6 @@ let
       url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz";
       hash = "sha256-1EeiMu08R9Glq8qRky4OTT5lQPLJcM7iaqUrmUOS4MI=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz";
-      hash = "sha256-fu4edyD12q8G452ckrEl2Qct5+uB9JnABd7bCLkyMkw=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-macosx.tar.gz";
       hash = "sha256-6NpPNLBCHaBRscLZ5fjh5Dv3bjjPk2Gh2+L7xEtiJNs=";
@@ -72,7 +68,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix
index 2881fe114b73..b58c6bb6101a 100644
--- a/pkgs/by-name/bl/blastem/package.nix
+++ b/pkgs/by-name/bl/blastem/package.nix
@@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix
index 2ed661c7138e..3aa0a27072e9 100644
--- a/pkgs/by-name/bl/bleep/package.nix
+++ b/pkgs/by-name/bl/bleep/package.nix
@@ -12,14 +12,12 @@ let
   platform =
     {
       x86_64-linux = "x86_64-pc-linux";
-      x86_64-darwin = "x86_64-apple-darwin";
       aarch64-darwin = "arm64-apple-darwin";
     }
     ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
   hash =
     {
       x86_64-linux = "sha256-SGV0fEuwmGwpqmD42a+x0fIK50RWSHEYDesH4obgRhg=";
-      x86_64-darwin = "sha256-fOeYUchUE1Jj4xSrYjljEUpGrW8cvev7d/qywc81vFo=";
       aarch64-darwin = "sha256-qL0hjEdfkN62NDvhlzVgW4TYWv0IReo2Fo5eVhUaOrI=";
     }
     ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
@@ -73,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "bleep";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ kristianan ];
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index c4d80135ebf5..ff7db4ee1495 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -453,7 +453,6 @@ stdenv'.mkDerivation (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix
index 65dbf840fb6e..0fb6d58c68c8 100644
--- a/pkgs/by-name/bl/bloop/package.nix
+++ b/pkgs/by-name/bl/bloop/package.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation rec {
     mainProgram = "bloop";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/bo/boundary/package.nix b/pkgs/by-name/bo/boundary/package.nix
index 6645a16a3ccd..c0c2ead360fc 100644
--- a/pkgs/by-name/bo/boundary/package.nix
+++ b/pkgs/by-name/bo/boundary/package.nix
@@ -15,13 +15,11 @@ stdenv.mkDerivation rec {
       suffix = selectSystem {
         x86_64-linux = "linux_amd64";
         aarch64-linux = "linux_arm64";
-        x86_64-darwin = "darwin_amd64";
         aarch64-darwin = "darwin_arm64";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-S5wt4Wy2SfO+36YwxQo86vnSIv4I0tMdfXro3i2qS6k=";
         aarch64-linux = "sha256-bu+tYL5uHs67JG1MxCUDIQ9xwYxArbz/FElN0QCXNU4=";
-        x86_64-darwin = "sha256-sRPq9+JnKYD5+0JVqhfGpCflHZgFdsrPprJqfxuAlpI=";
         aarch64-darwin = "sha256-PEaxwEKCidLvDbMSfXZ2ehWOwblLjzU+yy9Qq9tavtw=";
       };
     in
diff --git a/pkgs/by-name/bo/box-cli/sources.json b/pkgs/by-name/bo/box-cli/sources.json
index 10c07df913c5..5b805dbf81e9 100644
--- a/pkgs/by-name/bo/box-cli/sources.json
+++ b/pkgs/by-name/bo/box-cli/sources.json
@@ -10,10 +10,6 @@
       "filename": "box-linux-arm64",
       "hash": "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q="
     },
-    "x86_64-darwin": {
-      "filename": "box-darwin-x64",
-      "hash": "sha256-QI+ecq0O4dkKqdIvkONcYdXsS+EQLFIU35ulKGNSCRE="
-    },
     "aarch64-darwin": {
       "filename": "box-darwin-arm64",
       "hash": "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0="
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 497820c9f4cf..fd018d50a3d5 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -307,7 +307,6 @@ stdenv.mkDerivation {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     mainProgram = "brave";
   };
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index f42a60bd89b2..a63f06c2ddf4 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -18,10 +18,6 @@ let
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
       hash = "sha256-65qGzjXZfY5eTWbxTA9R3jN2F0CdkXnHXGVfw3spujo=";
     };
-    x86_64-darwin = {
-      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-XPKKB/X8w5Neuxeluc5OFZVN1thqZ0Cf/pFTP4GY2/o=";
-    };
   };
 
   archive =
diff --git a/pkgs/by-name/br/brioche/librusty_v8.nix b/pkgs/by-name/br/brioche/librusty_v8.nix
index 00cbd562c0ae..a15d2d5b2e14 100644
--- a/pkgs/by-name/br/brioche/librusty_v8.nix
+++ b/pkgs/by-name/br/brioche/librusty_v8.nix
@@ -7,7 +7,6 @@ fetchLibrustyV8 {
     # NOTE; Follows supported platforms of package (see meta.platforms attribute)!
     x86_64-linux = "167yh6wabn154axrylam4p76n5a411rqjdgaza4dwsfc5cg2zvv2";
     aarch64-linux = "1lmpqndmv9lyzsca1sx4prw76fsnk63cr1i15jdmk764j3zyyki6";
-    x86_64-darwin = "1zdlwgq3kgd931ppd9afvqkn45vg8gjsz6k8jb2vnbwzf03grsv0";
     aarch64-darwin = "0hm2wdkd5palsxdw0r9y5365gdww7f37g5z9260sa639211lipp4";
   };
 }
diff --git a/pkgs/by-name/br/brioche/package.nix b/pkgs/by-name/br/brioche/package.nix
index 8b589de649a8..526d752ba59f 100644
--- a/pkgs/by-name/br/brioche/package.nix
+++ b/pkgs/by-name/br/brioche/package.nix
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix
index 8e8112ce33d7..a093c2041d3a 100644
--- a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix
+++ b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix
@@ -27,7 +27,6 @@ buildDotnetModule {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "DepotDownloader";
diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json
index 1f897e49538a..5738dd882710 100644
--- a/pkgs/by-name/bu/buck2/hashes.json
+++ b/pkgs/by-name/bu/buck2/hashes.json
@@ -7,10 +7,6 @@
     "buck2": "sha256-IqDsyQ7Omy7QujT85oKrWwyirG7gwfupdxzvRoMRmQs=",
     "rust-project": "sha256-iFSko4FTvAVlKUxJE/6FzR6H7V2SryRfEi7nRhfyhxQ="
   },
-  "x86_64-darwin": {
-    "buck2": "sha256-G/xarAld9dXanZl7Ivcuoer3YsytmFXWED44u2U4q8g=",
-    "rust-project": "sha256-jbvvqPI7+qpONhk8UZfSiFpMGCGWRr85BocA58d+C7Y="
-  },
   "aarch64-linux": {
     "buck2": "sha256-VKV1vltATu3tAPmMiifba7MV9kNFH754FDda6i8cQrU=",
     "rust-project": "sha256-oqxHdbNzQn1KHObboAd4/LTbilIJgLqMiWCgHLaPFrc="
diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix
index 9cb994ba84f0..175d05aadc14 100644
--- a/pkgs/by-name/bu/buck2/package.nix
+++ b/pkgs/by-name/bu/buck2/package.nix
@@ -47,7 +47,6 @@ let
   # NOTE (aseipp): must be synchronized with update.nu!
   platform-suffix =
     {
-      x86_64-darwin = "x86_64-apple-darwin";
       aarch64-darwin = "aarch64-apple-darwin";
       x86_64-linux = "x86_64-unknown-linux-gnu";
       aarch64-linux = "aarch64-unknown-linux-gnu";
@@ -150,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix
index 39bd57007466..863802b9fa05 100644
--- a/pkgs/by-name/bu/bulloak/package.nix
+++ b/pkgs/by-name/bu/bulloak/package.nix
@@ -15,10 +15,6 @@ let
       url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/linux-amd64/list.json";
       hash = "sha256-H6D6XbIw5sDZlbc2c51vIMRmOqs2nDIcaNzCaOvnLsw=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/macosx-amd64/list.json";
-      hash = "sha256-A3A6gtNb129tD5KC0tCXvlzQ11t5SrNrX8tQeq73+mY=";
-    };
     aarch64-linux = fetchurl {
       url = "https://raw.githubusercontent.com/nikitastupin/solc/99b5867237b37952d372e0dab400d6788feda315/linux/aarch64/list.json";
       hash = "sha256-u6WRAcnR9mN9ERfFdLOxxSc9ASQIQvmS8uG+Z4H6OAU=";
diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 928ec621b10e..b901985b3808 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   sourceRoot =
     {
       aarch64-darwin = "bun-darwin-aarch64";
-      x86_64-darwin = "bun-darwin-x64-baseline";
     }
     .${stdenvNoCC.hostPlatform.system} or null;
 
@@ -87,10 +86,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip";
         hash = "sha256-cLrkGzkIsKEg4eWMXIrzDnSvrjuNEbDT/djnh937SyI=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip";
-        hash = "sha256-qYumpIDyL9qbNDYmuQak4mqlNhi/hdK8WSjs8rpF8O0=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip";
         hash = "sha256-ecB3H6i5LDOq5B4VoODTB+qZ0OLwAxfHHGxTI3p44lo=";
diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 806cd0c3f6ab..761b7d9bd695 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -59,7 +59,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   doCheck =
     lib.elem llvmPackages.stdenv.system [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ]
     && checks;
diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix
index 36a4aaa70e15..d832921c5d40 100644
--- a/pkgs/by-name/ca/caffeine/package.nix
+++ b/pkgs/by-name/ca/caffeine/package.nix
@@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ca/caido-cli/package.nix b/pkgs/by-name/ca/caido-cli/package.nix
index 4dd939bb2417..bf9c1a9fb4ae 100644
--- a/pkgs/by-name/ca/caido-cli/package.nix
+++ b/pkgs/by-name/ca/caido-cli/package.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-aarch64.tar.gz";
         hash = "sha256-d1xzF0N6emShCQpotFiQEj1wV3hdt1DK7R+6Smlxrmg=";
       };
-      x86_64-darwin = {
-        url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-x86_64.zip";
-        hash = "sha256-xh6kaYPJ7dwDHM1CkDzxYBHM4cKUex+XPXceqvQgWX4=";
-      };
       aarch64-darwin = {
         url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-aarch64.zip";
         hash = "sha256-FwbKLEwjiFzZWdBS6RgsDtc/EkI9AT2CBGwdmgEdDnw=";
@@ -62,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix
index 3f9c146862d0..cedb8a7c3e42 100644
--- a/pkgs/by-name/ca/caido-desktop/package.nix
+++ b/pkgs/by-name/ca/caido-desktop/package.nix
@@ -20,10 +20,6 @@ let
       url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
       hash = "sha256-B7dw9uoG++AqT264ZlyHxGpv68fH5SlYzDKUaIM8c14=";
     };
-    x86_64-darwin = {
-      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
-      hash = "sha256-0VCLjl0Lpe+4Mgnrp6X8ApJWjAjuhkaZOxQ4P3C8MSM=";
-    };
     aarch64-darwin = {
       url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
       hash = "sha256-GmpMnaGR7gYz1RvSO5xj9AA3xU1mn2IBInakmVkuG7A=";
@@ -49,7 +45,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix
index 0dc50aa77f9b..e029773d7c89 100644
--- a/pkgs/by-name/ce/cernlib/package.nix
+++ b/pkgs/by-name/ce/cernlib/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ veprbl ];
     license = lib.licenses.gpl2;
diff --git a/pkgs/by-name/ch/chalk/package.nix b/pkgs/by-name/ch/chalk/package.nix
index fb794b4b81e9..3411c52109ca 100644
--- a/pkgs/by-name/ch/chalk/package.nix
+++ b/pkgs/by-name/ch/chalk/package.nix
@@ -9,13 +9,11 @@ let
   chalkVersion = "1.34.9";
   chalkPathPiecesByNixSystem = {
     "aarch64-darwin" = "Darwin/aarch64";
-    "x86_64-darwin" = "Darwin/x86_64";
     "aarch64-linux" = "Linux/aarch64";
     "x86_64-linux" = "Linux/x86_64";
   };
   chalkHashByNixSystem = {
     "aarch64-darwin" = "sha256-owDGsT/2tU1Y3JKWAQkYNG18dOxXIST/3bfjXJf1gXU=";
-    "x86_64-darwin" = "sha256-lCRYekUmXFW6V/zvbvWCqzxr0bbpvQwk1wgWtAYuPuQ=";
     "aarch64-linux" = "sha256-uvhjhLbVBGB5SNFbfgtpaeLULFnEm3x8fN9ffyJzSSM=";
     "x86_64-linux" = "sha256-lC5SwvZzYJqomRrK42roSQr4/GZScM2VdgiQ9DOSkHQ=";
   };
@@ -47,7 +45,6 @@ stdenv.mkDerivation {
     mainProgram = "chalk";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/ch/cheesecutter/package.nix b/pkgs/by-name/ch/cheesecutter/package.nix
index 88b64568da1d..fc363f829648 100644
--- a/pkgs/by-name/ch/cheesecutter/package.nix
+++ b/pkgs/by-name/ch/cheesecutter/package.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ OPNA2608 ];
     mainProgram = "ccutter";
diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index 7551fc866a9e..645746d78052 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -23,7 +23,6 @@ let
       "x86_64-linux" = "ta6le";
       "x86-linux" = "ti3le";
       "aarch64-linux" = "tarm64le";
-      "x86_64-darwin" = "ta6osx";
       "aarch64-darwin" = "tarm64osx";
       "x86_64-windows" = "ta6nt";
       "aarch64-windows" = "tarm64nt";
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 3d92141714e2..8eb9b9a0c30e 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
       {
         x86_64-linux = "sha256-X5WAnHyXdAkWrN/AbkDE0eNH4mwdPcZ0Cs5Q21KB6/w=";
         aarch64-linux = "sha256-somHyDBG94pGQB+IZd404H1tX0X2qC8LeIcXeihU6yA=";
-        x86_64-darwin = "sha256-O28IQTelQSZj9P4ETYaeQfxvN5Etxed4ZwvfJB4vBM8=";
         aarch64-darwin = "sha256-GaL2bCwQdtI3bq2wkwza1OEHFvhppdZpUIq3QRQ0vN8=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
@@ -58,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index fca8a5bc535e..809f6f028740 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -27,7 +27,7 @@
 
 let
   version = "2026.3.846.0";
-  sources = rec {
+  sources = {
     x86_64-linux = fetchurl {
       url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}_amd64.deb";
       hash = "sha256-1SKTK0QW+3CcqBLqHbIsPny/6ekyjZe9qRcjYOMnR58=";
@@ -40,7 +40,6 @@ let
       url = "https://downloads.cloudflareclient.com/v1/download/macos/version/${version}";
       hash = "sha256-cDmoM0nIYYQyurJeeiVSX0IWJdIY0pVLmjIae5mEXI4=";
     };
-    x86_64-darwin = aarch64-darwin;
   };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -222,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix
index 687f839e3d81..a0240542cb9d 100644
--- a/pkgs/by-name/co/coconutbattery/package.nix
+++ b/pkgs/by-name/co/coconutbattery/package.nix
@@ -36,7 +36,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 11bed61cd65f..d9bb6464be94 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -10,10 +10,6 @@
       "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/linux/arm64/Cursor-3.11.19-aarch64.AppImage",
       "hash": "sha256-lFAK6xTIA3d0kmjybDYsMTYZhDbr/xasDG/NuZmE83Y="
     },
-    "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-gM0FOE9dTet5Fp7PG0DHsHSXb5fLohuNiiEt1J2wbSE="
-    },
     "aarch64-darwin": {
       "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/arm64/Cursor-darwin-arm64.dmg",
       "hash": "sha256-WQ2OfTaGqELWTfjgU4n5tgfgTHQSA06RxERa6pkdukU="
diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix
index 87c5dd768006..469afda541e2 100644
--- a/pkgs/by-name/co/code-server/package.nix
+++ b/pkgs/by-name/co/code-server/package.nix
@@ -62,7 +62,6 @@ let
     {
       x86_64-linux = "linux-x64";
       aarch64-linux = "linux-arm64";
-      x86_64-darwin = "darwin-x64";
       aarch64-darwin = "darwin-arm64";
     }
     .${system};
@@ -356,7 +355,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
     mainProgram = "code-server";
   };
diff --git a/pkgs/by-name/co/codegraph/package.nix b/pkgs/by-name/co/codegraph/package.nix
index 21642fdc283d..7f068105e424 100644
--- a/pkgs/by-name/co/codegraph/package.nix
+++ b/pkgs/by-name/co/codegraph/package.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     {
       "aarch64-darwin" = "codegraph-darwin-arm64";
       "aarch64-linux" = "codegraph-linux-arm64";
-      "x86_64-darwin" = "codegraph-darwin-x64";
       "x86_64-linux" = "codegraph-linux-x64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -82,10 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-arm64.tar.gz";
         hash = "sha256-DWLF6yci+NGdIPehvZdEReGNUpTLWb4Ragw9Vc6HWR8=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-darwin-x64.tar.gz";
-        hash = "sha256-Q2+WlDz9km6m0KhFTxiDPSElTV/Zs9IkMXsUJhMt75U=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-x64.tar.gz";
         hash = "sha256-+1hf9QGNb6qkbSgrYfT2ibx5Z+2KG0Z6XFVt187ZtUI=";
diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix
index 1de6073e6d26..31b4c65bbf5f 100644
--- a/pkgs/by-name/co/codeium/package.nix
+++ b/pkgs/by-name/co/codeium/package.nix
@@ -15,7 +15,6 @@ let
     {
       x86_64-linux = "linux_x64";
       aarch64-linux = "linux_arm";
-      x86_64-darwin = "macos_x64";
       aarch64-darwin = "macos_arm";
 
     }
@@ -25,7 +24,6 @@ let
     {
       x86_64-linux = "sha256-hx5q0JRwvmE63uOpht7+6d7/jCLeknrj2RwiiMkBllc=";
       aarch64-linux = "sha256-r0gGxwhVkQ5MLTmcrBCJpKfsizAJLJYPw1VdfiHJ3i8=";
-      x86_64-darwin = "sha256-LI+qp82dorbZCyibCVwx04tiCoRz3SkT1kUyAFlKWys=";
       aarch64-darwin = "sha256-c0BDLK1ilDOdNYbOqzFNoJFeBUlWI7/+z7HaosM/D4o=";
     }
     .${system} or throwSystem;
@@ -84,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-darwin"
       "aarch64-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index d953252e0a3b..db0fc4b16120 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -18,7 +18,6 @@ let
       version = "2.33.11";
       hash = {
         x86_64-linux = "sha256-NY9xyLc6Pr1wWPnr4fLo6t+7B7Gin/BlTH3tdxQk30k=";
-        x86_64-darwin = "sha256-yEHu+ekyZSUd66L9sR8ihVLFnDe9N/kFKLGHOFfx9es=";
         aarch64-linux = "sha256-Wc9hhotJKcb1fdjfh9pWxVs/e4YpBua1PyAhMRJbUAY=";
         aarch64-darwin = "sha256-7A6BxOg4A3Ua5SXjnh5gtG/LE94iGuRQPe/S9UjX/oc=";
       };
@@ -27,7 +26,6 @@ let
       version = "2.34.5";
       hash = {
         x86_64-linux = "sha256-B0roCJqTu6o89nHbVA3b9eHKj/VmJ9i1j4blF1I76yU=";
-        x86_64-darwin = "sha256-+7QhdfwFqh9SZBJOgOqS0Y49dUsWM6PC0/oBhfuAkfM=";
         aarch64-linux = "sha256-UDyEhBAlvgSHWLPtbNXHj6X2gle1Y3fjQLSKHzwc/XI=";
         aarch64-darwin = "sha256-VhliikNdqi7AauYlKQvMroEjR3jZZnhNw0HTtJFw5zg=";
       };
@@ -46,7 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           {
             x86_64-linux = "linux_amd64";
             aarch64-linux = "linux_arm64";
-            x86_64-darwin = "darwin_amd64";
             aarch64-darwin = "darwin_arm64";
           }
           .${system};
@@ -55,7 +52,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           {
             x86_64-linux = "tar.gz";
             aarch64-linux = "tar.gz";
-            x86_64-darwin = "zip";
             aarch64-darwin = "zip";
           }
           .${system};
diff --git a/pkgs/by-name/co/codex-acp/librusty_v8.nix b/pkgs/by-name/co/codex-acp/librusty_v8.nix
index c2f00c5fe62e..58ee83b3833e 100644
--- a/pkgs/by-name/co/codex-acp/librusty_v8.nix
+++ b/pkgs/by-name/co/codex-acp/librusty_v8.nix
@@ -12,7 +12,6 @@ fetchurl {
     {
       x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM=";
       aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng=";
-      x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c=";
       aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo=";
     }
     .${stdenv.hostPlatform.system}
diff --git a/pkgs/by-name/co/codex/librusty_v8.nix b/pkgs/by-name/co/codex/librusty_v8.nix
index 213a3174cee3..9b38127fc5f6 100644
--- a/pkgs/by-name/co/codex/librusty_v8.nix
+++ b/pkgs/by-name/co/codex/librusty_v8.nix
@@ -6,7 +6,6 @@ fetchLibrustyV8 {
   shas = {
     x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM=";
     aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng=";
-    x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c=";
     aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo=";
   };
 }
diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix
index 4e3d2fabc11d..8ae7ef9ed628 100644
--- a/pkgs/by-name/co/confluent-cli/package.nix
+++ b/pkgs/by-name/co/confluent-cli/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
       system = selectSystem {
         x86_64-linux = "linux_amd64";
         aarch64-linux = "linux_arm64";
-        x86_64-darwin = "darwin_amd64";
         aarch64-darwin = "darwin_arm64";
       };
     in
@@ -28,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = selectSystem {
         x86_64-linux = "sha256-52zPTIuJOS+MMG1+pA+f0HI7VvBHLsRnSq5zWorHsiQ=";
         aarch64-linux = "sha256-hdhMSZR593rcjch4EVdRshC72aTp1c3dTQBlLCDMsVg=";
-        x86_64-darwin = "sha256-ybzj3fv+7Wdix9ez7cARazhpkxMGi/EO8NbpneWGN4I=";
         aarch64-darwin = "sha256-YOVGl47XOvvHDtm2/VzzLOeFCA6sw8BuDHQWZgzNNtE=";
       };
     };
diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 851e409fad4b..074893d6e62d 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -58,7 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
index 0dae81d299c6..5b46ca14a230 100644
--- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
+++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
     license = lib.licenses.mit;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     # The last successful Darwin Hydra build was in 2023
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix
index c297cebaf644..bf41babb8ea4 100644
--- a/pkgs/by-name/cr/crates-lsp/package.nix
+++ b/pkgs/by-name/cr/crates-lsp/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-windows"
     ];
     maintainers = with lib.maintainers; [ steveej ];
diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix
index f601887ddc7f..b5c7145a24a0 100644
--- a/pkgs/by-name/cr/crates-tui/package.nix
+++ b/pkgs/by-name/cr/crates-tui/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-windows"
     ];
     maintainers = with lib.maintainers; [ pluiedev ];
diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 8d3f8946c574..195956b2ed5e 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -17,10 +17,6 @@ let
       url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/arm64/agent-cli-package.tar.gz";
       hash = "sha256-WcMurHV8Pm/2Y1HvNJGZYqjgt3OzHwn5oW5W27egueE=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-5J2SA5AoyOxT9Ng58MnyCFtNllQCYhbO5MQZaONwgsk=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/arm64/agent-cli-package.tar.gz";
       hash = "sha256-UO8SRA6depwO9SNhvYl9uOy9Dp625vHVNiyfxtmq3c4=";
diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix
index 11170463fc34..8673e221f023 100644
--- a/pkgs/by-name/cy/cypress/package.nix
+++ b/pkgs/by-name/cy/cypress/package.nix
@@ -29,10 +29,6 @@ let
       platform = "darwin-arm64";
       hash = "sha256-8qvMsC+tRKK12jC2r1A54kS/PZ6q+sErvLvTkse6Kn4=";
     };
-    x86_64-darwin = {
-      platform = "darwin-x64";
-      hash = "sha256-cCLJloLcuCDgTEiMMJKY6rYiPPhZfFfqXFP5NAMhw4Q=";
-    };
   };
   inherit (stdenv.hostPlatform) system;
   binary =
diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index cb4cf4679e46..6627d34277af 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -28,13 +28,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       suffix = selectSystem {
         x86_64-linux = "linux-x86_64.tar.gz";
         aarch64-linux = "linux-aarch64.tar.gz";
-        x86_64-darwin = "macos-x86_64.dmg";
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-atbQ00lq589FlNem85NgzTKGyhTRpFII8OSfVfYQuD0=";
         aarch64-linux = "sha256-Sde0q31hXMqX2oxfhgj5EcpeUYYFZJy61usaJVpZkLM=";
-        x86_64-darwin = "sha256-EmTHuzEc4beM52hC2T7poZ1SOKa9kO2Rp3NnctlsBYo=";
         aarch64-darwin = "sha256-PwuFwEE+aBEG/ykwNrEBl20yfrade8BdUUHdLJGBkwc=";
       };
     in
diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix
index aba4e08601d0..8a8c8d042914 100644
--- a/pkgs/by-name/db/dbgate/package.nix
+++ b/pkgs/by-name/db/dbgate/package.nix
@@ -20,10 +20,6 @@ let
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
           hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
-          hash = "sha256-pTE8Na078B2njCrpuN0xt75PkjwepXnuhphB8Qqcsls=";
-        };
         aarch64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
           hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps=";
@@ -42,7 +38,6 @@ let
     mainProgram = "dbgate";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
index 5afb703d27a7..424d38460dc5 100644
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
     platforms = [
       # Only these systems are supported by Makefile
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 01096528ff05..284eb950d8d2 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -295,7 +295,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/de/depotdownloader/package.nix b/pkgs/by-name/de/depotdownloader/package.nix
index 43768226ed97..108ef26ed1f5 100644
--- a/pkgs/by-name/de/depotdownloader/package.nix
+++ b/pkgs/by-name/de/depotdownloader/package.nix
@@ -32,7 +32,6 @@ buildDotnetModule rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "DepotDownloader";
diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix
index 8f9fff09dd6e..4163284b8099 100644
--- a/pkgs/by-name/di/discord-gamesdk/package.nix
+++ b/pkgs/by-name/di/discord-gamesdk/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "x86_64-windows"
     ];
diff --git a/pkgs/by-name/di/disk-inventory-x/package.nix b/pkgs/by-name/di/disk-inventory-x/package.nix
index 86d35df055f6..6721aa766ff2 100644
--- a/pkgs/by-name/di/disk-inventory-x/package.nix
+++ b/pkgs/by-name/di/disk-inventory-x/package.nix
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ emilytrau ];
-    platforms = [ "x86_64-darwin" ];
+    platforms = [ ];
   };
 })
diff --git a/pkgs/by-name/dm/dmd/binary.nix b/pkgs/by-name/dm/dmd/binary.nix
index 395468f59ac5..fec299c9976d 100644
--- a/pkgs/by-name/dm/dmd/binary.nix
+++ b/pkgs/by-name/dm/dmd/binary.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation {
     maintainers = [ lib.maintainers.lionello ];
     homepage = "https://dlang.org/";
     platforms = [
-      "x86_64-darwin"
       "i686-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix
index 971addbeaf51..4408faabee09 100644
--- a/pkgs/by-name/dm/dmd/generic.nix
+++ b/pkgs/by-name/dm/dmd/generic.nix
@@ -242,7 +242,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
     ];
     # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64
     # clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
diff --git a/pkgs/by-name/du/dub/package.nix b/pkgs/by-name/du/dub/package.nix
index 457af1c63539..27e2de5e22f9 100644
--- a/pkgs/by-name/du/dub/package.nix
+++ b/pkgs/by-name/du/dub/package.nix
@@ -163,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/dx/dxmt/package.nix b/pkgs/by-name/dx/dxmt/package.nix
index 2545292cb01b..37cea9f27d7a 100644
--- a/pkgs/by-name/dx/dxmt/package.nix
+++ b/pkgs/by-name/dx/dxmt/package.nix
@@ -126,7 +126,7 @@ symlinkJoin {
       maintainers
       license
       ;
-    platforms = [ "x86_64-darwin" ];
+    platforms = [ ];
     hydraPlatforms = [ ];
   };
 }
diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix
index 144bfe33609b..f4af351b33c1 100644
--- a/pkgs/by-name/dx/dxvk/package.nix
+++ b/pkgs/by-name/dx/dxvk/package.nix
@@ -84,7 +84,6 @@ stdenvNoCC.mkDerivation (
       maintainers = [ lib.maintainers.reckenrode ];
       license = lib.licenses.zlib;
       platforms = [
-        "x86_64-darwin"
         "i686-linux"
         "x86_64-linux"
       ];
diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index 335241bfcf75..965e6ad8746d 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -21,10 +21,6 @@ let
       url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg";
       hash = "sha256-V32Wi0oCU9dLfzqxg3OdseiILX7wPiBGNz7KuG0vlZY=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg";
-      hash = "sha256-I1UvFMSdAwkqgkhn+mkBGslA8v+VTajO/Za0lJ5uYZ8=";
-    };
   };
 
   src = sources.${stdenvNoCC.hostPlatform.system};
@@ -45,7 +41,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}";
   };
diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix
index 6288fddca42a..89109ff74a3d 100644
--- a/pkgs/by-name/er/erlang-language-platform/package.nix
+++ b/pkgs/by-name/er/erlang-language-platform/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ offsetcyan ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/ev/eventstore/package.nix b/pkgs/by-name/ev/eventstore/package.nix
index 156cc0d5983d..9b7b80e40dbf 100644
--- a/pkgs/by-name/ev/eventstore/package.nix
+++ b/pkgs/by-name/ev/eventstore/package.nix
@@ -82,7 +82,6 @@ buildDotnetModule rec {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     inherit mainProgram;
   };
diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix
index dec77f1f04d4..1ea5b4b1977b 100644
--- a/pkgs/by-name/fa/fasmg/package.nix
+++ b/pkgs/by-name/fa/fasmg/package.nix
@@ -32,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
             bin = "fasmg.x64";
             asm = "source/linux/x64/fasmg.asm";
           };
-          x86_64-darwin = {
-            bin = "source/macos/x64/fasmg";
-            asm = "source/macos/x64/fasmg.asm";
-          };
           x86-linux = {
             bin = "fasmg";
             asm = "source/linux/fasmg.asm";
diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
index 44a7f6761d0c..3354659377e0 100644
--- a/pkgs/by-name/fe/fermyon-spin/package.nix
+++ b/pkgs/by-name/fe/fermyon-spin/package.nix
@@ -14,7 +14,6 @@ let
     {
       x86_64-linux = "linux-amd64";
       aarch64-linux = "linux-aarch64";
-      x86_64-darwin = "macos-amd64";
       aarch64-darwin = "macos-aarch64";
     }
     .${system} or (throw "Unsupported system: ${system}");
@@ -22,7 +21,6 @@ let
   packageHashes = {
     x86_64-linux = "sha256-eVI8/JNCTVVbNJPH6gfg+0guH9mXLymoO+oLp9dkvwA=";
     aarch64-linux = "sha256-84ESEqr07JxqcxxRWrUFKmS+Uvws3RsVtC9EgXqCqdw=";
-    x86_64-darwin = "sha256-X/Hl/vIsepm/jf6srSYim6Ucy3TN0XQgdOluep6Ohrw=";
     aarch64-darwin = "sha256-0WpDjZJhw/jB55G5IUdgvwOaYlqRCY5itk5sVjogYn4=";
   };
 
diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix
index d4202deff945..f49e06e0318c 100644
--- a/pkgs/by-name/fi/filen-cli/package.nix
+++ b/pkgs/by-name/fi/filen-cli/package.nix
@@ -59,7 +59,6 @@ let
       {
         aarch64-darwin = "sha256-+nTCiCEXsEz7YqRZkHlP3CWL7e7OPdds33BTwfqTL5c=";
         aarch64-linux = "sha256-uvL498mHFXwoZpeCwsup4Iyh4l5buVnqLRBMyGVRIlA=";
-        x86_64-darwin = "sha256-5nEB6JQLmHasxcIReoiLLLRdSiaT1CRAmGFVyqdd+VY=";
         x86_64-linux = "sha256-Ky+ewpdd5nKvRzXwEAUgT7P/OW3v6fdb2r6SGxZ/JEc=";
       }
       .${stdenv.hostPlatform.system}
@@ -143,7 +142,6 @@ stdenv.mkDerivation {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
index 47abcca624ef..c10dfd437b94 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
@@ -12,10 +12,6 @@
     "aarch64-darwin": {
       "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg",
       "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b"
-    },
-    "x86_64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg",
-      "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b"
     }
   }
 }
diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix
index dfc2a3b68421..b134fa032be8 100644
--- a/pkgs/by-name/fl/flywheel-cli/package.nix
+++ b/pkgs/by-name/fl/flywheel-cli/package.nix
@@ -11,14 +11,12 @@ let
 
   os =
     {
-      x86_64-darwin = "darwin";
       x86_64-linux = "linux";
     }
     .${system} or throwSystem;
 
   sha256 =
     {
-      x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo=";
       x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78=";
     }
     .${system} or throwSystem;
@@ -52,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rbreslow ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/fm/fmodex/package.nix b/pkgs/by-name/fm/fmodex/package.nix
index 36d0e24d9250..702efa275e19 100644
--- a/pkgs/by-name/fm/fmodex/package.nix
+++ b/pkgs/by-name/fm/fmodex/package.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ lib.maintainers.lassulus ];
   };
diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix
index adc3239312c1..25aea7c42f28 100644
--- a/pkgs/by-name/fr/freelens-bin/package.nix
+++ b/pkgs/by-name/fr/freelens-bin/package.nix
@@ -27,10 +27,6 @@ let
       url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage";
       hash = "sha256-Pw6RPa6T9jN7XAfOqj6lDFzTqhwOT1DgK35cANyBAOE=";
     };
-    x86_64-darwin = {
-      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg";
-      hash = "sha256-6qn/3Zly7nvj9XxihUdmkguLWw0a7Y321Xv7EnJzjkc=";
-    };
     aarch64-darwin = {
       url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg";
       hash = "sha256-ARIvUMkkdUK5O6xdplXJ/JkPdezO/16HvO2P21W6y8I=";
diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix
index b5276379abc0..1acb35b25238 100644
--- a/pkgs/by-name/fx/fx-cast-bridge/package.nix
+++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix
@@ -72,7 +72,6 @@ buildNpmPackage rec {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ]; # aarch64-linux wasn't support in upstream according to README
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "fx_cast_bridge";
diff --git a/pkgs/by-name/ga/gauge/plugins/go/data.json b/pkgs/by-name/ga/gauge/plugins/go/data.json
index b4c9904bbea4..6a423125a65c 100644
--- a/pkgs/by-name/ga/gauge/plugins/go/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/go/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.arm64.zip",
     "hash": "sha256-tMo3+gQPnldCARm0WB7UYSMwaVpz90N2BiTzmvIFTg0="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.x86_64.zip",
-    "hash": "sha256-zfrEDRyflvvp4Hf2+42RL+5ooY0iBU0bkO2caOAGp74="
-  },
   "x86_64-linux": {
     "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-linux.x86_64.zip",
     "hash": "sha256-JEHjk51vYCFAcj9xant2vBU3BZI0krYbfZk9ALjdIs0="
diff --git a/pkgs/by-name/ga/gauge/plugins/go/default.nix b/pkgs/by-name/ga/gauge/plugins/go/default.nix
index 09b89bb82f7d..a766b71a0117 100644
--- a/pkgs/by-name/ga/gauge/plugins/go/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/go/default.nix
@@ -17,7 +17,6 @@ makeGaugePlugin {
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/data.json b/pkgs/by-name/ga/gauge/plugins/html-report/data.json
index c307371ca4fd..8e797b972857 100644
--- a/pkgs/by-name/ga/gauge/plugins/html-report/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/html-report/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.arm64.zip",
     "hash": "sha256-30RW9I9QTGncnwNTj0/rLlVCQ1wo8oJ2Q0gchHk+ioM="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.x86_64.zip",
-    "hash": "sha256-6dC1gObS4msHr+KyKZufDpDQ9MgAIfqUPSIW7jWewtU="
-  },
   "aarch64-linux": {
     "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-linux.arm64.zip",
     "hash": "sha256-sayeQCuoJbeDWK7s/86ApMhzxHhxsyBB4D9QCMxJ/p8="
diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix
index 4d07f023de9b..c41c1add4ba2 100644
--- a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix
@@ -17,7 +17,6 @@ makeGaugePlugin {
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/ga/gauge/plugins/java/data.json b/pkgs/by-name/ga/gauge/plugins/java/data.json
index 1c0861f5cdb6..ef7944717914 100644
--- a/pkgs/by-name/ga/gauge/plugins/java/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/java/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.arm64.zip",
     "hash": "sha256-vN0FqYT/73+OPGIYEsPwB+eSQ6n5SrFwlHfFybBDpEo="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.x86_64.zip",
-    "hash": "sha256-loKFJzvFshMY206t1z01d4q5jTxKtB0o7nmN4qFWDDQ="
-  },
   "aarch64-linux": {
     "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-linux.arm64.zip",
     "hash": "sha256-z6nclV/gUDR/jTA4DKaP1HVwuM3U3IVljbYzrlGF15A="
diff --git a/pkgs/by-name/ga/gauge/plugins/java/default.nix b/pkgs/by-name/ga/gauge/plugins/java/default.nix
index 95843d20f914..662d80a47c24 100644
--- a/pkgs/by-name/ga/gauge/plugins/java/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/java/default.nix
@@ -22,7 +22,6 @@ makeGaugePlugin {
     ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix
index 36025ca24492..e720d8694304 100644
--- a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix
+++ b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix
@@ -37,7 +37,6 @@ let
     ;
   # Upstream uses a different naming scheme for platforms
   systemMap = {
-    "x86_64-darwin" = "darwin.x86_64";
     "aarch64-darwin" = "darwin.arm64";
     "aarch64-linux" = "linux.arm64";
     "x86_64-linux" = "linux.x86_64";
diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/data.json b/pkgs/by-name/ga/gauge/plugins/ruby/data.json
index 3fb1653b0465..219525a8b9ff 100644
--- a/pkgs/by-name/ga/gauge/plugins/ruby/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/ruby/data.json
@@ -4,10 +4,6 @@
     "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.arm64.zip",
     "hash": "sha256-s0/hTqVP4Pa1yk474TYUF1dbXy+NbrtJjwBxRXShXqQ="
   },
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.x86_64.zip",
-    "hash": "sha256-NNPIR6ZueZ3coavMM9AeqC+O/I/xcfnEo8KTiQivvQs="
-  },
   "aarch64-linux": {
     "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-linux.arm64.zip",
     "hash": "sha256-vd3KZ1Lc2F81xknc6+tPNxLjZWD8oCMBsCAuw2iJURw="
diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix
index 3754cd9f617a..17d1976f0de1 100644
--- a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix
@@ -17,7 +17,6 @@ makeGaugePlugin {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json
index dd06efc09a7a..f0a50c659b92 100644
--- a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json
@@ -1,9 +1,5 @@
 {
   "version": "0.3.2",
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.x86_64.zip",
-    "hash": "sha256-0qOdBQv6TCiwHizvbb47Sj0aUcMtID4qQ3v5D3XGkXg="
-  },
   "aarch64-darwin": {
     "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.arm64.zip",
     "hash": "sha256-hsFevOBgKbUIMpNcEyv/2A/agIuInIjLTdhmg0C54pQ="
diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix
index b769266051a3..c6572efbc623 100644
--- a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix
@@ -16,7 +16,6 @@ makeGaugePlugin {
     maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json
index d3b3daf86634..10db9f0700d3 100644
--- a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json
+++ b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json
@@ -1,9 +1,5 @@
 {
   "version": "0.5.2",
-  "x86_64-darwin": {
-    "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.x86_64.zip",
-    "hash": "sha256-YVH9Eh9EVDdJp8F/PXMz4egVpo8ULJmvWjWHH4iH2iI="
-  },
   "aarch64-darwin": {
     "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.arm64.zip",
     "hash": "sha256-UW3Axcti8r9dEfiupj2r+mcLGpFBwYQf/7mDNyynReE="
diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix
index 4335ff94fc35..6ebfc058ee1f 100644
--- a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix
@@ -16,7 +16,6 @@ makeGaugePlugin {
     maintainers = [ ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
index 7ca004b43a97..d598c14c8ce1 100644
--- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
+++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
     {
       aarch64-darwin = "darwin-arm64";
       aarch64-linux = "aarch64";
-      x86_64-darwin = "darwin-x86_64";
       x86_64-linux = "x86_64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
       {
         aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4";
         aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764";
-        x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794";
         x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -104,7 +102,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix
index 87f89e888151..6aae896f16fc 100644
--- a/pkgs/by-name/ge/geogram/package.nix
+++ b/pkgs/by-name/ge/geogram/package.nix
@@ -101,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ tmarkus ];
diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix
index 3f843bafb4da..b56327e67e8b 100644
--- a/pkgs/by-name/gh/ghdl/package.nix
+++ b/pkgs/by-name/gh/ghdl/package.nix
@@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ]
     ++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ]
     ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ];
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index ceb96f569302..2158bd9241a5 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -98,7 +98,7 @@ buildGoModule (
     meta = {
       homepage = "https://gitlab.com/gitlab-org/gitaly";
       description = "Git RPC service for handling all the git calls made by GitLab";
-      platforms = lib.platforms.linux ++ [ "x86_64-darwin" ];
+      platforms = lib.platforms.linux ++ [ ];
       teams = [ lib.teams.gitlab ];
       license = lib.licenses.mit;
     };
diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
index 7bf30b233a2a..300fb5ba4bdf 100644
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ b/pkgs/by-name/gi/github-copilot-cli/package.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
index 626d1836645d..0748ab05d59d 100644
--- a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
+++ b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
@@ -88,7 +88,6 @@ stdenv.mkDerivation rec {
     mainProgram = "copilot-agent";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index d88a6d2583be..e8d0ede191e6 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -378,7 +378,6 @@ buildDotnetModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 2d42936b67ca..ddc70a42368d 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -66,11 +66,6 @@ let
       hash = "sha256-CX/NxvLrxia92vSIjWXzIiBdTfhZ8TW7a5g1hEt+Y/k=";
     };
 
-    x86_64-darwin = fetchzip {
-      url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-B4vFDrDy3s/d5MyGOP3pv/pGpUfpJFhvI8EWSqJhiyg=";
-    };
-
     aarch64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
       hash = "sha256-JEgqJ6smqDG/2KFApRSYTuL1Ch1sIkhGDMjqVsgQUmc=";
diff --git a/pkgs/by-name/gk/gk-cli/package.nix b/pkgs/by-name/gk/gk-cli/package.nix
index cce70ae497fe..58cd2315a577 100644
--- a/pkgs/by-name/gk/gk-cli/package.nix
+++ b/pkgs/by-name/gk/gk-cli/package.nix
@@ -85,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
           hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU=";
           stripRoot = false;
         };
-        x86_64-darwin = fetchzip {
-          url = "${base_url}darwin_amd64.zip";
-          hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4=";
-          stripRoot = false;
-        };
         aarch64-windows = fetchzip {
           url = "${base_url}windows_arm64.zip";
           hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E=";
diff --git a/pkgs/by-name/go/golden-cheetah-bin/package.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix
index 43468179bff4..c3b8399f43da 100644
--- a/pkgs/by-name/go/golden-cheetah-bin/package.nix
+++ b/pkgs/by-name/go/golden-cheetah-bin/package.nix
@@ -12,7 +12,6 @@ let
     description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
index 6cea608e8941..16ef0b8e1665 100644
--- a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
+++ b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ lufia ];
   };
diff --git a/pkgs/by-name/go/google-cloud-sdk/data.nix b/pkgs/by-name/go/google-cloud-sdk/data.nix
index 5f38c0ca139b..48f65e093eed 100644
--- a/pkgs/by-name/go/google-cloud-sdk/data.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/data.nix
@@ -7,10 +7,6 @@
       url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-x86_64.tar.gz";
       sha256 = "1qx246cy1mcngky4gcg65lzzw64anab9hqpmp6v7dqfqfld64p5k";
     };
-    x86_64-darwin = {
-      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-darwin-x86_64.tar.gz";
-      sha256 = "1gk6rrj8p30zraw3n2ajy50vnd5v724s5bnhnilnml03is7ssamd";
-    };
     aarch64-linux = {
       url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-arm.tar.gz";
       sha256 = "085ykvz0y6madak8aak4bh0qyafqyiflmck0nkcb4xv6kmw6s3fa";
diff --git a/pkgs/by-name/go/goose-cli/librusty_v8.nix b/pkgs/by-name/go/goose-cli/librusty_v8.nix
index 3ace8f706ca8..0baf70969fb7 100644
--- a/pkgs/by-name/go/goose-cli/librusty_v8.nix
+++ b/pkgs/by-name/go/goose-cli/librusty_v8.nix
@@ -6,7 +6,6 @@ fetchLibrustyV8 {
   shas = {
     x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE=";
     aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY=";
-    x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho=";
     aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k=";
   };
 }
diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix
index 478bec0247dc..2fdf5e419e2d 100644
--- a/pkgs/by-name/gr/grafana/package.nix
+++ b/pkgs/by-name/gr/grafana/package.nix
@@ -167,7 +167,6 @@ buildGoModule (finalAttrs: {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
       "riscv64-linux"
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index af2cc83f569d..242a2b4c91c8 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -16,7 +16,6 @@ let
   suffix = selectSystem {
     x86_64-linux = "linux-x64";
     aarch64-linux = "linux-arm64";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
@@ -33,7 +32,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
@@ -64,7 +62,6 @@ let
       hash = selectSystem {
         x86_64-linux = "sha256-YnG3iw35ZEyGbB9vGdcnj0qkvUfyLuaIEB5l09hkRck=";
         aarch64-linux = "sha256-Z4yY26hXf8++TX5tJcqufsAULTn9oUL90d9tDZj5d/k=";
-        x86_64-darwin = "sha256-oV0tanuk2dzB62uChni9CJtSw3eFECQi3aMBc+ZV7Do=";
         aarch64-darwin = "sha256-6eogi8fMOD5IgRyEdPRxdDa17WytB1JwTpKRzyyhQ2Q=";
       };
     };
diff --git a/pkgs/by-name/gr/grok-build/package.nix b/pkgs/by-name/gr/grok-build/package.nix
index 41384599d35e..8237c9a09f71 100644
--- a/pkgs/by-name/gr/grok-build/package.nix
+++ b/pkgs/by-name/gr/grok-build/package.nix
@@ -17,7 +17,6 @@ let
   platform = {
     x86_64-linux = "linux-x86_64";
     aarch64-linux = "linux-aarch64";
-    x86_64-darwin = "macos-x86_64";
     aarch64-darwin = "macos-aarch64";
   };
 
@@ -29,7 +28,6 @@ let
         {
           x86_64-linux = "sha256-Tgc407VVDzyEK8CuafRogVxjKcAIoRDQwnppTcNAETU=";
           aarch64-linux = "sha256-7a4g6SoKM/7ewao0iPPjgI2MTKISj8jzE/vYGOPpX18=";
-          x86_64-darwin = "sha256-8xDJT3lft4OY97M4cxF00Uq6IpqJWJXlyHlpr78/ypU=";
           aarch64-darwin = "sha256-Kpe6Z1vZkqqbmB4ug3dkYNlPRptRDAuO/ii1DSNtdnw=";
         }
         .${system};
diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix
index f5efef779242..197c41291142 100644
--- a/pkgs/by-name/ha/hamrs/package.nix
+++ b/pkgs/by-name/ha/hamrs/package.nix
@@ -21,7 +21,6 @@ let
       "x86_64-linux"
       "i686-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     mainProgram = "hamrs";
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix
index edb67c0a0dbe..d7253a3314a1 100644
--- a/pkgs/by-name/ha/handy/package.nix
+++ b/pkgs/by-name/ha/handy/package.nix
@@ -281,6 +281,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       philocalyst
     ];
     platforms = with lib.platforms; linux ++ darwin;
-    badPlatforms = [ "x86_64-darwin" ]; # We weren't able to get hashes here
+    badPlatforms = [ ]; # We weren't able to get hashes here
   };
 })
diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix
index 27f7118cd6c2..a116f0677d4d 100644
--- a/pkgs/by-name/ha/hashlink/package.nix
+++ b/pkgs/by-name/ha/hashlink/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.mit;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [
       iblech
diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix
index e45ed21adc28..ddbfdba315b7 100644
--- a/pkgs/by-name/ho/hoppscotch/package.nix
+++ b/pkgs/by-name/ho/hoppscotch/package.nix
@@ -17,10 +17,6 @@ let
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
           hash = "sha256-RnLMpXkDAk89T5ogNiVz8zMMdLtXTlAg5nu+sjyczEk=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
-          hash = "sha256-dBjwElYc3+TpAbho/8p946VtEDlCVDsfCSidQUKVC/U=";
-        };
         x86_64-linux = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
           hash = "sha256-irPI613Y1l0j5F+Nzm9v/JXsiJY35D8dQpmMcPMYvmU=";
@@ -46,7 +42,6 @@ let
     mainProgram = "hoppscotch";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index 41fe9c8ac965..d32212804412 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ avnik ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     license = lib.licenses.bsd3;
   };
diff --git a/pkgs/by-name/ib/ibmcloud-cli/package.nix b/pkgs/by-name/ib/ibmcloud-cli/package.nix
index 8042e9afd4a0..d4048cfd7ef4 100644
--- a/pkgs/by-name/ib/ibmcloud-cli/package.nix
+++ b/pkgs/by-name/ib/ibmcloud-cli/package.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz";
     hash =
       {
-        "x86_64-darwin" = "sha256-/sekaJxa8+inOBsHucyPE3yWM+Z+64jArGwCht8Corc=";
         "aarch64-darwin" = "sha256-JrTFbufKjX9uUwUcfxCDjqbZx6drgSmqn0F/xtce/mE=";
         "x86_64-linux" = "sha256-Zu6XFQeD9Dlny6cex7X6P428MiQftwn9RR4QL3H/0AU=";
         "aarch64-linux" = "sha256-pfHhAszhbbLKkJnwP94dCaDZNFTLr+2tnO3aHxOch+U=";
diff --git a/pkgs/by-name/il/iloader/package.nix b/pkgs/by-name/il/iloader/package.nix
index 6d6b87d5ad00..2caf94bfb38e 100644
--- a/pkgs/by-name/il/iloader/package.nix
+++ b/pkgs/by-name/il/iloader/package.nix
@@ -123,7 +123,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix
index 002582e024f1..1292d46639cc 100644
--- a/pkgs/by-name/in/insomnia/package.nix
+++ b/pkgs/by-name/in/insomnia/package.nix
@@ -16,10 +16,6 @@ let
           url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
           hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
-          hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4=";
-        };
         x86_64-linux = {
           url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage";
           hash = "sha256-PlcKBQnkmgU/SsLRKX7ohrGHm7B4hK9FMkplwlbFolI=";
@@ -36,7 +32,6 @@ let
     platforms = [
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [
       markus1189
diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix
index d0a31d286279..3285519e5a18 100644
--- a/pkgs/by-name/io/iozone/package.nix
+++ b/pkgs/by-name/io/iozone/package.nix
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index a971e357825d..1a5f04256fab 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -356,7 +356,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix
index 330cb67f2afb..346b13595625 100644
--- a/pkgs/by-name/it/iterm2/package.nix
+++ b/pkgs/by-name/it/iterm2/package.nix
@@ -52,7 +52,6 @@ stdenvNoCC.mkDerivation rec {
       emaiax
     ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix
index c32744a4d55d..55a852bdf73b 100644
--- a/pkgs/by-name/iv/iverilog/package.nix
+++ b/pkgs/by-name/iv/iverilog/package.nix
@@ -96,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
     badPlatforms = [
       # Several tests fail with:
       # ==> Failed - running iverilog.
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index 2849b1e6c65d..80eb1815a571 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -32,7 +32,6 @@ let
     maintainers = with lib.maintainers; [ samestep ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/jd/jdiskreport/package.nix b/pkgs/by-name/jd/jdiskreport/package.nix
index 5c89565d2a7e..c1766867a0ab 100644
--- a/pkgs/by-name/jd/jdiskreport/package.nix
+++ b/pkgs/by-name/jd/jdiskreport/package.nix
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.unfreeRedistributable; # TODO freedist, libs under BSD-3
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ kylesferrazza ];
     mainProgram = "jdiskreport";
diff --git a/pkgs/by-name/je/jellyfin-desktop/package.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix
index 4a2c0f1251aa..3d571881d290 100644
--- a/pkgs/by-name/je/jellyfin-desktop/package.nix
+++ b/pkgs/by-name/je/jellyfin-desktop/package.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [
       jojosch
diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index 13f6daa12ee5..39b4e819df0d 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -27,7 +27,6 @@ let
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     mainProgram = "jetbrains-toolbox";
   };
@@ -60,7 +59,6 @@ let
       hash = selectSystem {
         x86_64-linux = "sha256-GhrN3oGdNqE4cYJmSAeRATk2yS6AVF6z+/VIb7ttoJc=";
         aarch64-linux = "sha256-vI0niFirdAnYKF7+1+ACD31i86PgpPXUfKPkHttusRo=";
-        x86_64-darwin = "sha256-E58+mSFTptDE0Vb2xpfFgDOQrAB9LHi1pR+Hd7TlSYQ=";
         aarch64-darwin = "sha256-islydrfr1j2OlC3wyzGss+NlzjcyrMydYSv6fjFf4D0=";
       };
     in
diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix
index b27ef7717856..1841aefd1dcb 100644
--- a/pkgs/by-name/ju/jugglinglab/package.nix
+++ b/pkgs/by-name/ju/jugglinglab/package.nix
@@ -13,7 +13,6 @@ let
     {
       "x86_64-linux" = "linux-x86-64";
       "aarch64-linux" = "linux-aarch64";
-      "x86_64-darwin" = "darwin-x86-64";
       "aarch64-darwin" = "darwin-aarch64";
     }
     .${stdenv.system} or null;
diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix
index bad43ba7d257..1204eb46cc68 100644
--- a/pkgs/by-name/ju/julec/package.nix
+++ b/pkgs/by-name/ju/julec/package.nix
@@ -116,7 +116,6 @@ clangStdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "julec";
diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix
index 32f3d9e98857..3d4473fde6db 100644
--- a/pkgs/by-name/kd/kdigger/package.nix
+++ b/pkgs/by-name/kd/kdigger/package.nix
@@ -74,7 +74,6 @@ buildGoModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix
index 50229cc3c924..e83b9b6863fa 100644
--- a/pkgs/by-name/ke/keeweb/package.nix
+++ b/pkgs/by-name/ke/keeweb/package.nix
@@ -36,10 +36,6 @@ let
       url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb";
       hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
-      hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg";
       hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4=";
diff --git a/pkgs/by-name/ke/keyboard-layout-editor/package.nix b/pkgs/by-name/ke/keyboard-layout-editor/package.nix
index 3c59c1790a13..a504ee36ba37 100644
--- a/pkgs/by-name/ke/keyboard-layout-editor/package.nix
+++ b/pkgs/by-name/ke/keyboard-layout-editor/package.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix
index e456b5f6a83a..20253474f3e0 100644
--- a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix
+++ b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix
@@ -19,7 +19,6 @@ maven.buildMavenPackage rec {
     let
       mvnHashes = {
         "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI=";
-        "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro=";
         "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs=";
         "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A=";
       };
diff --git a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix
index 5a2f0bb9afa7..cbbc5e58a903 100644
--- a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix
+++ b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix
@@ -19,7 +19,6 @@ maven.buildMavenPackage rec {
     let
       mvnHashes = {
         "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI=";
-        "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro=";
         "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs=";
         "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A=";
       };
diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix
index 0b9c11e485df..ca95ba677ca6 100644
--- a/pkgs/by-name/ke/keymapp/package.nix
+++ b/pkgs/by-name/ke/keymapp/package.nix
@@ -21,7 +21,6 @@ let
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.dmg";
       hash = "sha256-H6xRau7pWuSF5Aa6lblwi/Lg5KxC+HM3rtUMjX+hEE8=";
     };
-    x86_64-darwin = aarch64-darwin;
     aarch64-linux = {
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
       hash = "sha256-qHvHCDzWRhuhDg2kuU8kmikQDXElQtVEmPAelHz4aPo=";
diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix
index 15dd55fab2e2..0da0230bd7c3 100644
--- a/pkgs/by-name/ki/kilo/package.nix
+++ b/pkgs/by-name/ki/kilo/package.nix
@@ -190,11 +190,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     badPlatforms = [
       # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon.
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix
index 46b9a508e063..bdb2b27bd3c6 100644
--- a/pkgs/by-name/ki/kiro-cli/package.nix
+++ b/pkgs/by-name/ki/kiro-cli/package.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
         hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ=";
       };
-      x86_64-darwin = darwinDmg;
       aarch64-darwin = darwinDmg;
     }
     .${system} or (throw "Unsupported system: ${system}");
@@ -98,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 60d81bd99c69..1a866bbd3d06 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -58,7 +58,6 @@ in
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "kiro";
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index 08221c497282..3bbebcea1ec8 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -3,10 +3,6 @@
     "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.333/tar/kiro-ide-0.12.333-stable-linux-x64.tar.gz",
     "hash": "sha256-EEj0hz3fxPtesifXuFb0DQfFHaYgOQ1wgkaqcNMeX84="
   },
-  "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-x64.dmg",
-    "hash": "sha256-5oPK6JGrY+0+i/VnvRlSM/5XQJkq3pPsUB1IaoruJzw="
-  },
   "aarch64-darwin": {
     "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-arm64.dmg",
     "hash": "sha256-Wu5dpXzth/TTly3k019ln/cHl3ZgtS8PenGTzwR5b6Y="
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 5e8f45e08a92..f64b20b0cc17 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -216,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "Ladybird";
diff --git a/pkgs/by-name/ld/ldc/bootstrap.nix b/pkgs/by-name/ld/ldc/bootstrap.nix
index 734797cd5c2a..4c73b83d707b 100644
--- a/pkgs/by-name/ld/ldc/bootstrap.nix
+++ b/pkgs/by-name/ld/ldc/bootstrap.nix
@@ -72,7 +72,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ lionello ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix
index e57382a52b6a..e0bd2ad39ae2 100644
--- a/pkgs/by-name/ld/ldc/package.nix
+++ b/pkgs/by-name/ld/ldc/package.nix
@@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix
index 4c1b58e89594..65539a30db33 100644
--- a/pkgs/by-name/le/legends-of-equestria/package.nix
+++ b/pkgs/by-name/le/legends-of-equestria/package.nix
@@ -52,10 +52,6 @@ let
       url = "https://mega.nz/file/QmBXXDiC#XoG19N2_uBIHVKDNId5mE4cod9q29iPkYOfGDgAX_Oo";
       outputHash = "IdcowkU2k2grg133jTf3EOENATCCige64BMYXtFupRE=";
     };
-    x86_64-darwin = {
-      url = "https://mega.nz/file/Uy4WzbCL#5tCRmmrizaIdilo2iYLSVkoSSNDleyQ8ZNYYT5hJsR4";
-      outputHash = "D/2G7w89Z4JTP0TEjnlBKI7XCBx2LBurXZcEp0gW+JA=";
-    };
     aarch64-darwin = {
       url = "https://mega.nz/file/xr4AHIrb#pD5wDIiYys2my4_59UWiYoqBpdyUQHf_CalPZe7hpME";
       outputHash = "PpDUFnobznB5FHYSF+m9S3RcNIdi7eWyxxDHRdS+zlY=";
diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix
index dd955dbe67de..8c06617539c8 100644
--- a/pkgs/by-name/le/lens/package.nix
+++ b/pkgs/by-name/le/lens/package.nix
@@ -15,10 +15,6 @@ let
       url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage";
       hash = "sha512-P9PrtbGKaHNlzZsm10ovkYCBBfQpVWBgcVsYLETMwINP2bzrIIK5HVbkbcTEUsxK90L7MQmFwpAssojW0b9G5Q==";
     };
-    x86_64-darwin = {
-      url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg";
-      hash = "sha512-I/i9s7O3jT+eNqqUu6B+rB+YbegKhAsZwHlc3mp2wNWW9YDilQbzKrhF9Fq2dSz2WKVZUscBtSGtXCuiPcFXzw==";
-    };
     aarch64-darwin = {
       url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg";
       hash = "sha512-eCE3w7NlYrHiexCirH2wFN0nOO3qAt5acbldXbDMVIrG94tbgM8Y5ZO8/YIUN45XbotYtKW8/Nw+WsrTp6DPBg==";
diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix
index df551379428b..7a0515460c24 100644
--- a/pkgs/by-name/li/libfrida-core/package.nix
+++ b/pkgs/by-name/li/libfrida-core/package.nix
@@ -35,10 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz";
         hash = "sha256-ryGe+T9GP3CitQMZHwco0d5tNoyXQ9TUwRG2D5E+Hp0=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-x86_64.tar.xz";
-        hash = "sha256-x76PBEkQ7j1nIHucxV/BCmmOfRhiJUiCXGQk/Iw7KTE=";
-      };
       aarch64-darwin = fetchurl {
         url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz";
         hash = "sha256-CmOkZ+/w/Vh6V5lJ8jzXU5ZLi0FWXXXIFgPLdb+nu88=";
diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix
index e77179f3066d..6c03202f9e7e 100644
--- a/pkgs/by-name/li/libwhereami/package.nix
+++ b/pkgs/by-name/li/libwhereami/package.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ]; # fails on aarch64
   };
 
diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index 0db8997810e4..e7337d1034a6 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -132,7 +132,6 @@ let
       mainProgram = "localsend";
       sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
       platforms = [
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 0caaceacf2d0..149392825566 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
     badPlatforms = [
       # Could not find a package configuration file provided by "Protobuf"
       # It is unclear why this is only happening on x86_64-darwin
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/lu/lunar/package.nix b/pkgs/by-name/lu/lunar/package.nix
index d14faf6a0b11..8e1647755a0c 100644
--- a/pkgs/by-name/lu/lunar/package.nix
+++ b/pkgs/by-name/lu/lunar/package.nix
@@ -40,7 +40,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix
index 7e0b9f8ff379..f84dd1bac181 100644
--- a/pkgs/by-name/lv/lvtk/package.nix
+++ b/pkgs/by-name/lv/lvtk/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ bot-wxt1221 ];
     platforms = lib.platforms.unix;
     badPlatforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index 6ed1c53b5007..f6b9a4a30bad 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -72,7 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ma/mailspring/mailcore2.nix b/pkgs/by-name/ma/mailspring/mailcore2.nix
index aa5c4e4f5ba9..c3dccc1d0bc4 100644
--- a/pkgs/by-name/ma/mailspring/mailcore2.nix
+++ b/pkgs/by-name/ma/mailspring/mailcore2.nix
@@ -99,7 +99,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/mailspring/mailsync.nix b/pkgs/by-name/ma/mailspring/mailsync.nix
index cd112e3b4740..6f77d031ec29 100644
--- a/pkgs/by-name/ma/mailspring/mailsync.nix
+++ b/pkgs/by-name/ma/mailspring/mailsync.nix
@@ -131,7 +131,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix
index fecb9bd4c470..d084abef9230 100644
--- a/pkgs/by-name/ma/mailspring/package.nix
+++ b/pkgs/by-name/ma/mailspring/package.nix
@@ -56,7 +56,6 @@ let
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
@@ -154,7 +153,6 @@ buildNpmPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix
index 6f3503763737..db7d839c5b44 100644
--- a/pkgs/by-name/ma/marktext/package.nix
+++ b/pkgs/by-name/ma/marktext/package.nix
@@ -173,7 +173,6 @@ stdenv.mkDerivation (finalAttrs: {
       bot-wxt1221
     ];
     badPlatforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix
index 1822215e189d..fc07f3ad0c03 100644
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -20,10 +20,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-$ARCH.pkg
       sources =
         {
-          x86_64-darwin = {
-            arch = "x86_64";
-            hash = "sha256-m8od4ftuoZyeC517fIUkkCDJ7WWp1DTC70CJai8zlfk=";
-          };
           aarch64-darwin = {
             arch = "arm64";
             hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U=";
@@ -85,7 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       zachcoyle
     ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/me/meetingbar/package.nix b/pkgs/by-name/me/meetingbar/package.nix
index 1038adb66296..c8b656d24b24 100644
--- a/pkgs/by-name/me/meetingbar/package.nix
+++ b/pkgs/by-name/me/meetingbar/package.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index 6f4876cfbf5b..e257bfba31b3 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/me/meteor/package.nix b/pkgs/by-name/me/meteor/package.nix
index 59f7148ad3f8..499113461bd7 100644
--- a/pkgs/by-name/me/meteor/package.nix
+++ b/pkgs/by-name/me/meteor/package.nix
@@ -20,10 +20,6 @@ let
       url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
       hash = "sha256-tzzRN9UAH7+BM3fs76U5H20vD0LGMpdrMDDiJtchgEg=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz";
-      hash = "sha256-Z9Had9hscEjxHch19KCYUTqN4OikYLfz1tqEpyxw2Y8=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.arm64.tar.gz";
       hash = "sha256-AT7njZTgf/WTHlvLEbF3dXKNoqyqHy8KloBQ4gsbPuM=";
diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix
index bb7745fd2849..38df77b5a981 100644
--- a/pkgs/by-name/mi/micropython/package.nix
+++ b/pkgs/by-name/mi/micropython/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
           "armv6l-linux" = "Linux";
           "riscv64-linux" = "Linux";
           "powerpc64le-linux" = "Linux";
-          "x86_64-darwin" = "Darwin";
           "aarch64-darwin" = "Darwin";
         }
         .${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name
diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index 3f95a76c87fd..47155656b736 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -16,7 +16,6 @@
 let
   suffixMap = {
     aarch64-darwin = "native-mac-aarch64";
-    x86_64-darwin = "native-mac-amd64";
     aarch64-linux = "native-linux-aarch64";
     x86_64-linux = "native-linux-amd64";
   };
@@ -33,7 +32,6 @@ stdenvNoCC.mkDerivation rec {
     sha256 =
       {
         aarch64-darwin = "sha256-UiooqMbxceUepk4uJV8ZSL1o4VLeTZgWs3URQFXFmQs=";
-        x86_64-darwin = "sha256-EvIH0GHrdFtE5m6WqHAu7XDJn/8rElpmSxLrdCx5CKY=";
         aarch64-linux = "sha256-Az/NCaFVrKANJvgIHx9QlW/fPyFVc4XiJ6BZr4ahfxk=";
         x86_64-linux = "sha256-YhygFs8+ffOgoOSpggrYQ+xS19q8koYbN9UnozlLTPY=";
       }
@@ -118,7 +116,6 @@ stdenvNoCC.mkDerivation rec {
       "x86_64-linux"
       "aarch64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index c761bc6d5cf4..6e1c8d36235e 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -12,10 +12,6 @@
     "aarch64-darwin": {
       "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal",
       "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc="
-    },
-    "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal",
-      "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc="
     }
   }
 }
diff --git a/pkgs/by-name/mi/mirth/package.nix b/pkgs/by-name/mi/mirth/package.nix
index 4aa8dfd1eab4..031fb321fd92 100644
--- a/pkgs/by-name/mi/mirth/package.nix
+++ b/pkgs/by-name/mi/mirth/package.nix
@@ -107,7 +107,6 @@ stdenv.mkDerivation {
       "aarch64-windows"
       "i686-linux"
       "i686-windows"
-      "x86_64-darwin"
       "x86_64-linux"
       "x86_64-windows"
     ];
diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix
index f9e1dda4e7ab..c2df26331271 100644
--- a/pkgs/by-name/mk/mkl/package.nix
+++ b/pkgs/by-name/mk/mkl/package.nix
@@ -210,7 +210,6 @@ stdenvNoCC.mkDerivation (
       license = lib.licenses.issl;
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
       ];
     };
   }
diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix
index 62b090e74a19..d845f8d4696a 100644
--- a/pkgs/by-name/ml/mlkit/package.nix
+++ b/pkgs/by-name/ml/mlkit/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/melsman/mlkit/blob/v${finalAttrs.version}/NEWS.md";
     license = lib.licenses.gpl2Plus;
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     maintainers = with lib.maintainers; [ athas ];
diff --git a/pkgs/by-name/mo/mongocxx/package.nix b/pkgs/by-name/mo/mongocxx/package.nix
index 911ec75b40ad..2b8177ca41b2 100644
--- a/pkgs/by-name/mo/mongocxx/package.nix
+++ b/pkgs/by-name/mo/mongocxx/package.nix
@@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
       "libbsoncxx"
     ];
     platforms = lib.platforms.all;
-    badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14
+    badPlatforms = [ ]; # needs sdk >= 10.14
   };
 })
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index 5a7fe772b5e5..97a400cdfa3f 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -66,10 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz";
         hash = "sha256-5AX8pb1jInbQTuE0RqpqqcRXon6wKwdvoDCNDF70krE=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz";
-        hash = "sha256-BLIFrmToU8tFHdjAD+0q827cyeDHoYiXwtsds6e7NMA=";
-      };
       "aarch64-darwin" = fetchurl {
         url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz";
         hash = "sha256-M3/x/d2rVKUmIZBQ9hVuT6W9ajZy/Ut5+8aDeXF+HwY=";
diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index dc7104f0b485..a1789c333cfc 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -62,13 +62,11 @@ let
     url = "https://downloads.mongodb.com/compass/${
       selectSystem {
         x86_64-linux = "mongodb-compass_${version}_amd64.deb";
-        x86_64-darwin = "mongodb-compass-${version}-darwin-x64.zip";
         aarch64-darwin = "mongodb-compass-${version}-darwin-arm64.zip";
       }
     }";
     hash = selectSystem {
       x86_64-linux = "sha256-faD8sIbnho5urBWE0btcmD7tXT8eQCNyJYzpIyI+bA4=";
-      x86_64-darwin = "sha256-Ddue3jSvQecBjxQlyh/+ujrF9NheZ9PS0Dq7J08SJr8=";
       aarch64-darwin = "sha256-HGOJPYC4+CgLQQ3BNUTNZUln5oqPkC8ewHft99LCZQ8=";
     };
   };
@@ -197,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/mo/monodraw/package.nix b/pkgs/by-name/mo/monodraw/package.nix
index 3a80b9f382bf..386fe0127ef7 100644
--- a/pkgs/by-name/mo/monodraw/package.nix
+++ b/pkgs/by-name/mo/monodraw/package.nix
@@ -69,7 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/mp/mprime/package.nix b/pkgs/by-name/mp/mprime/package.nix
index e3ac811c35e9..e059e845eff1 100644
--- a/pkgs/by-name/mp/mprime/package.nix
+++ b/pkgs/by-name/mp/mprime/package.nix
@@ -15,7 +15,6 @@ let
     {
       x86_64-linux = "linux64";
       i686-linux = "linux";
-      x86_64-darwin = "macosx64";
     }
     ."${stdenv.hostPlatform.system}" or throwSystem;
 
@@ -23,7 +22,6 @@ let
     {
       x86_64-linux = "make64";
       i686-linux = "makefile";
-      x86_64-darwin = "makemac";
     }
     ."${stdenv.hostPlatform.system}" or throwSystem;
 
@@ -111,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ dstremur ];
     mainProgram = "mprime";
diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix
index 6c166bf6f684..2878fc43cb20 100644
--- a/pkgs/by-name/ms/msgraph-cli/package.nix
+++ b/pkgs/by-name/ms/msgraph-cli/package.nix
@@ -34,7 +34,6 @@ buildDotnetModule rec {
     maintainers = with lib.maintainers; [ nazarewk ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 86da716dcc62..5249dbb8c8fd 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -15,7 +15,6 @@ let
   platformMap = {
     aarch64-darwin = "darwin-aarch64";
     aarch64-linux = "linux-aarch64";
-    x86_64-darwin = "darwin-amd64";
     x86_64-linux = "linux-amd64";
   };
 in
diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix
index 99e17b03767c..403f118c7c89 100644
--- a/pkgs/by-name/my/mystmd/package.nix
+++ b/pkgs/by-name/my/mystmd/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
       {
         x86_64-linux = "sha256-4EQkvsoji9M4VCrdwyHm+ncd4XFjgAf34Kt+YeM3qjs=";
         aarch64-linux = "sha256-xm4T1BL3AyRsYOERz4LhG4ZJQkSMzspoA+l60OND3E0=";
-        x86_64-darwin = "sha256-L+zY9O5ridMvZEhGH0R56P3XiDlYF3UrFZwmOYlqxYY=";
         aarch64-darwin = "sha256-ZUx+jF7IcEbUCnUUeW0uOFgEpO9UIJpP3/VpUJ5ulAM=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/ne/nesting/package.nix b/pkgs/by-name/ne/nesting/package.nix
index 207268ba9f20..b011c3d10118 100644
--- a/pkgs/by-name/ne/nesting/package.nix
+++ b/pkgs/by-name/ne/nesting/package.nix
@@ -55,7 +55,6 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [ commiterate ];
     badPlatforms = [
       # Only supports AArch64 for Darwin.
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix
index f79d7c92c358..6964f8bf667a 100644
--- a/pkgs/by-name/no/nosql-workbench/package.nix
+++ b/pkgs/by-name/no/nosql-workbench/package.nix
@@ -13,10 +13,6 @@ let
   src =
     fetchurl
       {
-        x86_64-darwin = {
-          url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg";
-          hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ=";
-        };
         aarch64-darwin = {
           url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg";
           hash = "sha256-U6Gea89/cXY9Fd6JAWrUtf7Q4VfEXDPzbjCQcHMRjiE=";
@@ -36,7 +32,6 @@ let
     maintainers = with lib.maintainers; [ DataHearth ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
index e388c4407c13..a963443c55a6 100644
--- a/pkgs/by-name/no/notesnook/package.nix
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -18,7 +18,6 @@ let
     {
       x86_64-linux = "linux_x86_64.AppImage";
       aarch64-linux = "linux_arm64.AppImage";
-      x86_64-darwin = "mac_x64.dmg";
       aarch64-darwin = "mac_arm64.dmg";
     }
     .${system} or throwSystem;
@@ -29,7 +28,6 @@ let
       {
         x86_64-linux = "sha256-NmhV+x5HrKBO7BX1bJyjChKQF/j38kQqJ3x0amSXzGU=";
         aarch64-linux = "sha256-IU4hF/ol4pyh+ABTri2aqwqaB+cfrHLtsF7wrqE+wEY=";
-        x86_64-darwin = "sha256-YhJvkKreWUReEgs4R9lWV0/cx3d0hrjKTHZn0hDsp3k=";
         aarch64-darwin = "sha256-9CTGpCPJY6sq6JWDpoCTyOTt/vtCazDaoDzFFUzR9zg=";
       }
       .${system} or throwSystem;
@@ -57,7 +55,6 @@ let
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "notesnook";
diff --git a/pkgs/by-name/nu/nuxmv/package.nix b/pkgs/by-name/nu/nuxmv/package.nix
index 5896cbb0edf8..561fa8c2b09d 100644
--- a/pkgs/by-name/nu/nuxmv/package.nix
+++ b/pkgs/by-name/nu/nuxmv/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ siraben ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/oa/oakctl/package.nix b/pkgs/by-name/oa/oakctl/package.nix
index ae194502129f..3d1f56e53502 100644
--- a/pkgs/by-name/oa/oakctl/package.nix
+++ b/pkgs/by-name/oa/oakctl/package.nix
@@ -26,10 +26,6 @@ let
       url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_arm64/oakctl";
       hash = "sha256-tJl9OKhaY9dIxkN+tsbQ3isyAfFPSDOqkgLgDDaRaSg=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_x86_64/oakctl";
-      hash = "sha256-xjmMqECqZ+ukXAPRKoJ1m1y7ABMIltw9u236q9k56/o=";
-    };
   };
 
   src =
@@ -73,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "oakctl";
diff --git a/pkgs/by-name/ob/objection/package.nix b/pkgs/by-name/ob/objection/package.nix
index 08b5f65a2bc6..3090b7d979ad 100644
--- a/pkgs/by-name/ob/objection/package.nix
+++ b/pkgs/by-name/ob/objection/package.nix
@@ -42,10 +42,6 @@ let
       fridaArch = "linux-ia32";
       fridaHash = "sha256-vLwf+EwWNDLznda8J+xVqp8XmuivdZ0VKgISR9YoQR0=";
     };
-    x86_64-darwin = {
-      fridaArch = "darwin-x64";
-      fridaHash = "sha256-raODa/EHRpMYNwFK9gxTXWrxnx1G1IbKTKV1343MTm8=";
-    };
     aarch64-darwin = {
       fridaArch = "darwin-arm64";
       fridaHash = "sha256-mR6HM9rmRmXhWqXA0GC4Xkdj9KVSthhtvMAzijE+j5c=";
diff --git a/pkgs/by-name/oc/ocis_5-bin/package.nix b/pkgs/by-name/oc/ocis_5-bin/package.nix
index 47ff4aace7e7..2453d3df8c00 100644
--- a/pkgs/by-name/oc/ocis_5-bin/package.nix
+++ b/pkgs/by-name/oc/ocis_5-bin/package.nix
@@ -12,7 +12,6 @@ let
       x86_64-linux = "amd64";
       aarch64-linux = "arm64";
       armv7l-linux = "arm";
-      x86_64-darwin = "amd64";
       aarch64-darwin = "arm64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix
index b65b3058466e..807171475992 100644
--- a/pkgs/by-name/od/odpic/package.nix
+++ b/pkgs/by-name/od/odpic/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
     hydraPlatforms = [ ];
   };
diff --git a/pkgs/by-name/om/ombi/package.nix b/pkgs/by-name/om/ombi/package.nix
index 6e8d8d8cd40f..b21ac3e7e702 100644
--- a/pkgs/by-name/om/ombi/package.nix
+++ b/pkgs/by-name/om/ombi/package.nix
@@ -18,7 +18,6 @@ let
     {
       x86_64-linux = "x64";
       aarch64-linux = "arm64";
-      x86_64-darwin = "x64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
@@ -89,7 +88,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
     mainProgram = "Ombi";
   };
diff --git a/pkgs/by-name/oo/ooklaserver/package.nix b/pkgs/by-name/oo/ooklaserver/package.nix
index dcf20a3fedb2..34c3fc8e0949 100644
--- a/pkgs/by-name/oo/ooklaserver/package.nix
+++ b/pkgs/by-name/oo/ooklaserver/package.nix
@@ -9,7 +9,6 @@ let
     "x86_64-linux" = "OoklaServer-linux-x86_64-static-musl.zip";
     "aarch64-linux" = "OoklaServer-linux-aarch64-static-musl.zip";
     # Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64]
-    "x86_64-darwin" = "OoklaServer-macosx.zip";
     "aarch64-darwin" = "OoklaServer-macosx.zip";
     "x86_64-windows" = "OoklaServer-windows64.zip";
     "i686-windows" = "OoklaServer-windows32.zip";
diff --git a/pkgs/by-name/op/openmvg/package.nix b/pkgs/by-name/op/openmvg/package.nix
index 82d6951ad55f..5203c5dfbdbb 100644
--- a/pkgs/by-name/op/openmvg/package.nix
+++ b/pkgs/by-name/op/openmvg/package.nix
@@ -95,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
     badPlatforms = [
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [
       mdaiter
diff --git a/pkgs/by-name/op/openutau/package.nix b/pkgs/by-name/op/openutau/package.nix
index c6cd7004a650..43b6809d64ed 100644
--- a/pkgs/by-name/op/openutau/package.nix
+++ b/pkgs/by-name/op/openutau/package.nix
@@ -110,7 +110,6 @@ buildDotnetModule rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "OpenUtau";
diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix
index 9ab14172e520..856519dfbe52 100644
--- a/pkgs/by-name/op/openvscode-server/package.nix
+++ b/pkgs/by-name/op/openvscode-server/package.nix
@@ -32,7 +32,6 @@ let
     {
       x86_64-linux = "linux-x64";
       aarch64-linux = "linux-arm64";
-      x86_64-darwin = "darwin-x64";
       aarch64-darwin = "darwin-arm64";
     }
     .${system} or (throw "Unsupported system ${system}");
@@ -247,7 +246,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "openvscode-server";
diff --git a/pkgs/by-name/op/openxray/package.nix b/pkgs/by-name/op/openxray/package.nix
index 2881f39126ca..e8aac8d9b55a 100644
--- a/pkgs/by-name/op/openxray/package.nix
+++ b/pkgs/by-name/op/openxray/package.nix
@@ -96,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix
index 6cd1c5d2829a..ebf46278030e 100644
--- a/pkgs/by-name/or/oracle-instantclient/package.nix
+++ b/pkgs/by-name/or/oracle-instantclient/package.nix
@@ -33,7 +33,6 @@ let
     {
       x86_64-linux = "21.10.0.0.0";
       aarch64-linux = "19.10.0.0.0";
-      x86_64-darwin = "19.8.0.0.0";
       aarch64-darwin = "23.3.0.23.09";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -42,7 +41,6 @@ let
     {
       x86_64-linux = "2110000";
       aarch64-linux = "191000";
-      x86_64-darwin = "198000";
       aarch64-darwin = "233023";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -64,13 +62,6 @@ let
         tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M=";
         odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms=";
       };
-      x86_64-darwin = {
-        basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc=";
-        sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw=";
-        sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk=";
-        tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU=";
-        odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY=";
-      };
       aarch64-darwin = {
         basic = "sha256-G83bWDhw9wwjLVee24oy/VhJcCik7/GtKOzgOXuo1/4=";
         sdk = "sha256-PerfzgietrnAkbH9IT7XpmaFuyJkPHx0vl4FCtjPzLs=";
@@ -96,7 +87,6 @@ let
     {
       x86_64-linux = "linux.x64";
       aarch64-linux = "linux.arm64";
-      x86_64-darwin = "macos.x64";
       aarch64-darwin = "macos.arm64";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -105,7 +95,6 @@ let
     {
       x86_64-linux = "linux";
       aarch64-linux = "linux";
-      x86_64-darwin = "mac";
       aarch64-darwin = "mac";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
@@ -199,7 +188,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ dylanmtaylor ];
diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix
index a307199fa416..0f8fa3730fb9 100644
--- a/pkgs/by-name/or/orbstack/package.nix
+++ b/pkgs/by-name/or/orbstack/package.nix
@@ -13,10 +13,6 @@ let
       arch = "arm64";
       hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU=";
     };
-    x86_64-darwin = {
-      arch = "amd64";
-      hash = "sha256-8woVgREEpJT+IGaVsash/PruEuye+8uhKaADTrtoMZs=";
-    };
   };
   sources = lib.mapAttrs (
     system:
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index f2751bd4e951..f45fcc84c347 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -19,11 +19,6 @@ let
         hash = "sha256-XwfNO38dDaUmu/3AEgRwV0VW6JrAUCxWD6Wt0Ew23Eo=";
         stripRoot = false;
       };
-      x86_64-darwin = fetchzip {
-        url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-Crj40NkKasqc2JF1LeJwOlnCzHxsPiKG77SKTo8DS/8=";
-        stripRoot = false;
-      };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
         hash = "sha256-KyA5UCvb9epk7jRtdG5wl0LzKc6/D2rkw5EJQxIaihw=";
@@ -48,7 +43,6 @@ let
     mainProgram = "osu!";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index 7dee55070560..a910a409b709 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -99,11 +99,6 @@ let
       fileName = "VMware-ovftool-${version}-lin.x86_64.zip";
       hash = "sha256-LIOXCiEswBJirbds47nFKvOW+tg0D/cay3SeM+hsjjM=";
     };
-    "x86_64-darwin" = rec {
-      version = "5.1.0-25410048";
-      fileName = "VMware-ovftool-${version}-mac.x64.zip";
-      hash = "sha256-gDSraL+B3As+QxT2GlAmL8KjsIelxAd2e4iSRaXOTtI=";
-    };
   };
 
   ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
diff --git a/pkgs/by-name/p4/p4d/package.nix b/pkgs/by-name/p4/p4d/package.nix
index 27d1fa46381c..c87592b00b38 100644
--- a/pkgs/by-name/p4/p4d/package.nix
+++ b/pkgs/by-name/p4/p4d/package.nix
@@ -12,10 +12,6 @@ let
       url = "https://web.archive.org/web/20231109221336id_/https://ftp.perforce.com/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz";
       sha256 = "b68c4907cf9258ab47102e8f0e489c11d528a8f614bfa45e3a2fa198639e2362";
     };
-    "x86_64-darwin" = fetchurl {
-      url = "https://web.archive.org/web/20231109221937id_/https://ftp.perforce.com/perforce/r23.1/bin.macosx1015x86_64/helix-core-server.tgz";
-      sha256 = "fcbf09787ffc29f7237839711447bf19a37ae18a8a7e19b2d30deb3715ae2c11";
-    };
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/p4/p4v/package.nix b/pkgs/by-name/p4/p4v/package.nix
index 5192bb10b033..9e6d58e391fd 100644
--- a/pkgs/by-name/p4/p4v/package.nix
+++ b/pkgs/by-name/p4/p4v/package.nix
@@ -8,7 +8,7 @@
 
 let
   # Upstream replaces minor versions, so use archived URLs.
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://web.archive.org/web/20260414052921/https://filehost.perforce.com/perforce/r26.1/bin.linux26x86_64/p4v.tgz";
       sha256 = "sha256-89Xz9dxAeLGOOr90K0CdlxjrfIf9vUmyZV3tzWspWdQ=";
@@ -18,7 +18,6 @@ let
       sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY=";
     };
     # this is universal
-    x86_64-darwin = aarch64-darwin;
   };
 
   mkDerivation =
diff --git a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix
index b5a8cf71711e..3fa737b75554 100644
--- a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix
+++ b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix
@@ -1,7 +1,6 @@
 let
   platformSuffix = {
     x86_64-linux = "linux_amd64";
-    x86_64-darwin = "darwin_amd64";
     aarch64-linux = "linux_arm64";
     aarch64-darwin = "darwin_arm64";
   };
diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix
index 3bc6c94decdb..e8fdb2226fc2 100644
--- a/pkgs/by-name/pa/paperlib/package.nix
+++ b/pkgs/by-name/pa/paperlib/package.nix
@@ -16,10 +16,6 @@ let
           url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}_arm.dmg";
           hash = "sha256-KNMPUeCNtODHzMJhCwI4SJPRfa87RmAe6CRRazgRZCQ=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg";
-          hash = "sha256-5QwF0+7Y4LzReHCj8yZrAJDAZVyY0ANC5gjAxdaVRkU=";
-        };
         x86_64-linux = {
           url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.AppImage";
           hash = "sha256-uBYhiUL4YWwnLLPvXMoXjlQqlqFep/OpwwnmPx7s5dY=";
@@ -38,7 +34,6 @@ let
     maintainers = with lib.maintainers; [ ByteSudoer ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     mainProgram = "paperlib";
diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix
index 4f019dfe4516..e883ed4b80dc 100644
--- a/pkgs/by-name/pa/patchcil/package.nix
+++ b/pkgs/by-name/pa/patchcil/package.nix
@@ -67,7 +67,6 @@ buildDotnetModule rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "x86_64-windows"
       "i686-windows"
diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index 7310b25301d5..a3348ec1c803 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       lgpl3Plus
     ];
     maintainers = with lib.maintainers; [ matteopacini ];
-    platforms = [ "x86_64-darwin" ];
+    platforms = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })
diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix
index 316f8410f10d..a605af9f7c2e 100644
--- a/pkgs/by-name/pd/pdfium-binaries/package.nix
+++ b/pkgs/by-name/pd/pdfium-binaries/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
       system = selectSystem {
         x86_64-linux = "linux-x64";
         aarch64-linux = "linux-arm64";
-        x86_64-darwin = "mac-x64";
         aarch64-darwin = "mac-arm64";
       };
     in
@@ -29,14 +28,12 @@ stdenv.mkDerivation (finalAttrs: {
           selectSystem {
             x86_64-linux = "sha256-I3JTNnqXpDHwl+sOS/AlPj4znG2OFIqRxtJNhXD+w6I=";
             aarch64-linux = "sha256-PBkwxcjsqeEElNC+V74h4P1e508IB/zXjGoQuwK6Krk=";
-            x86_64-darwin = "sha256-aumdSND6Lefr6GgmWBSX4pQhZj8jJIABi6VJSqKNin8=";
             aarch64-darwin = "sha256-DpoPHGaFkjfOa3tXItYLeJpTLfRXOrjlN/+eyPEcgOQ=";
           }
         else
           selectSystem {
             x86_64-linux = "sha256-0VaBPO4angdRqerquTjqizZWvGxrRP8k7DZXLw8Yqaw=";
             aarch64-linux = "sha256-h7JJxmCg9GIaVMajNZb+AeClIeX8w9XWM2RYqGhPoUY=";
-            x86_64-darwin = "sha256-1Or4cuxvx13Z70kIj7Q1DM1hg/bW5SPAGEDEtnBU6YI=";
             aarch64-darwin = "sha256-rJqrpCo+5bzqyUsRubGOsBZ8orV1dSuXfjADFJmxBOw=";
           };
       stripRoot = false;
@@ -70,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix
index 06fa70cc0950..e011c3e4a230 100644
--- a/pkgs/by-name/pe/pear-desktop/package.nix
+++ b/pkgs/by-name/pe/pear-desktop/package.nix
@@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix
index e8ac7a04be46..8a1675a76b8a 100644
--- a/pkgs/by-name/pg/pgsql-tools/package.nix
+++ b/pkgs/by-name/pg/pgsql-tools/package.nix
@@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
           url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-arm64.tar.gz";
           hash = "sha256-rD8jymGdM1RDGDbrKu6E7xoWtSMRNuc2ngCmR+sHgQI=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-x86.tar.gz";
-          hash = "sha256-KLl7HPChurzB6QYV6AqAP3g1J3VKl61+we3opzJQwG0=";
-        };
         aarch64-darwin = {
           url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-arm64.tar.gz";
           hash = "sha256-tpabEKB1kqse7D58FsP/9jywk+vgAAvptL9MadwxWg8=";
diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix
index ae8392392e5c..9e6357913b2a 100644
--- a/pkgs/by-name/ph/phoenixd/package.nix
+++ b/pkgs/by-name/ph/phoenixd/package.nix
@@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
         attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
       suffix = selectSystem {
         aarch64-darwin = "macos-arm64";
-        x86_64-darwin = "macos-x64";
         x86_64-linux = "linux-x64";
         aarch64-linux = "linux-arm64";
       };
@@ -29,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
       hash = selectSystem {
         aarch64-darwin = "sha256-eVrwJGjXZNl9e2QGtVVEHjptCMPQgGaxljDEqr7LE7s=";
-        x86_64-darwin = "sha256-vHu+9GwN0jWvjH/bKceZHDPRidVLFLzzMen2Zc+L1ck=";
         x86_64-linux = "sha256-n/yvAisqpnbHs3XV0sHq0sUpq0+mqXmG+3LXRNmrLpI=";
         aarch64-linux = "sha256-mfhLpPXFvkO0mz4okdOXALIk8MR2CQQ8mZ6aI+QgNZs=";
       };
@@ -63,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/pi/picat/package.nix b/pkgs/by-name/pi/picat/package.nix
index 9686bb196c47..511899f77f0d 100644
--- a/pkgs/by-name/pi/picat/package.nix
+++ b/pkgs/by-name/pi/picat/package.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation {
       x86_64-linux = "linux64";
       aarch64-linux = "linux64";
       x86_64-cygwin = "cygwin64";
-      x86_64-darwin = "mac64";
       aarch64-darwin = "mac64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -69,7 +68,6 @@ stdenv.mkDerivation {
       "x86_64-linux"
       "aarch64-linux"
       "x86_64-cygwin"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/pi/pinokio/package.nix b/pkgs/by-name/pi/pinokio/package.nix
index 94491c396b06..37925159de60 100644
--- a/pkgs/by-name/pi/pinokio/package.nix
+++ b/pkgs/by-name/pi/pinokio/package.nix
@@ -11,10 +11,6 @@ let
   src =
     fetchurl
       {
-        x86_64-darwin = {
-          url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.dmg";
-          hash = "sha256-Il5zaVWu4icSsKmMjU9u1/Mih34fd+xNpF1nkFAFFGo=";
-        };
         x86_64-linux = {
           url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.AppImage";
           hash = "sha256-/E/IAOUgxH9RWpE2/vLlQy92LOgwpHF79K/1XEtSpXI=";
@@ -30,7 +26,6 @@ let
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ByteSudoer ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     mainProgram = "pinokio";
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
index 7153f6efc502..bbfd9eac45ef 100644
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -182,7 +182,6 @@ buildDotnetModule (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix
index 2f6d7c0a4b9a..5558fe7ed7e4 100644
--- a/pkgs/by-name/pl/platformsh/package.nix
+++ b/pkgs/by-name/pl/platformsh/package.nix
@@ -70,7 +70,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix
index 17ef30c364d1..2b289563e176 100644
--- a/pkgs/by-name/pl/plezy/package.nix
+++ b/pkgs/by-name/pl/plezy/package.nix
@@ -58,7 +58,6 @@ let
       BatteredBunny
     ];
     platforms = lib.platforms.linux ++ [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin (
diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix
index c257ea350a83..29fa25fd74ce 100644
--- a/pkgs/by-name/pn/pngout/package.nix
+++ b/pkgs/by-name/pn/pngout/package.nix
@@ -22,9 +22,6 @@ let
       folder = "i686";
       ld-linux = "ld-linux.so.2";
     };
-    x86_64-darwin = {
-      folder = ".";
-    };
     x86_64-linux = {
       folder = "amd64";
       ld-linux = "ld-linux-x86-64.so.2";
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index 3d01332e124f..56d979f892f7 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -199,7 +199,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix
index 7a4d0162dd2f..5f62e19b473f 100644
--- a/pkgs/by-name/po/postman/package.nix
+++ b/pkgs/by-name/po/postman/package.nix
@@ -19,7 +19,6 @@ let
       system = selectSystem {
         aarch64-darwin = "osx_arm64";
         aarch64-linux = "linuxarm64";
-        x86_64-darwin = "osx_64";
         x86_64-linux = "linux64";
       };
     in
@@ -29,7 +28,6 @@ let
       hash = selectSystem {
         aarch64-darwin = "sha256-rZLqbcX5ZRNeDUyEWcsLWMr3KXsnXRKBRmLZKMH9gIs=";
         aarch64-linux = "sha256-sMJohqgY8DrC7DLgU9AQofLWMhebznAJSLFe5D65c4M=";
-        x86_64-darwin = "sha256-Bit/M3Z+3bJsGSWdCDp9xK9RnxH6bptI0eMqt28dwHQ=";
         x86_64-linux = "sha256-PsTFM5UwX104G8YIwAy1OY4EgNhspupkPJ53y3qwGUc=";
       };
     };
@@ -66,7 +64,6 @@ let
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index b7c267790d9e..b8611e6701a3 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -102,10 +102,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
         hash = "sha256-ehSjheyn3FvtwciqPYt2X0Sa2jCqvleFqf0zEmbrBi0=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
-        hash = "sha256-8CBzpEJRWHeqWo82H1WGaAAQDEG2Zc+2SIO3fbuglBI=";
-      };
       x86_64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
         hash = "sha256-hW0HZdIzI3f516Sup279/eTeUURudzjd4t/aQdup4qc=";
diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
index a988d9bcc4e0..43589f649163 100644
--- a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
       "powerpc64le-linux"
       "s390x-linux"
       # Darwin
-      "x86_64-darwin"
       "aarch64-darwin"
       # Windows
       "x86_64-windows"
diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index 857d02899a24..7d48c6754153 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -63,10 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
         hash = "sha256-NdBabzetuIJEbu81Rfg3hUVEw8BJ2A3Who/i08/qwMs=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
-        hash = "sha256-K6vfr0ut8cQo1mrNeEN35akxLIo1sftt6hnn6wUa6Dk=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
         hash = "sha256-cYjwKnweeahg9xZq0sNPei5slhJltwZ34nBPIW3Rdtk=";
diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index b0d22a8e6cbc..e0a50c92611f 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -22,7 +22,6 @@ let
         url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg";
         hash = "sha256-CwdiHEqKnk+ELoavs1p6ND48e2rvEFBqbXQs79ihQ4M=";
       };
-      "x86_64-darwin" = passthru.sources."aarch64-darwin";
     };
     updateScript = writeShellScript "update-proton-pass" ''
       set -o errexit
diff --git a/pkgs/by-name/pr/proton-vpn/darwin.nix b/pkgs/by-name/pr/proton-vpn/darwin.nix
index f688f1d78e1f..ed7e2cb3dded 100644
--- a/pkgs/by-name/pr/proton-vpn/darwin.nix
+++ b/pkgs/by-name/pr/proton-vpn/darwin.nix
@@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = meta // {
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 3b9df20572d8..c8374c4714ce 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -28,10 +28,6 @@ stdenv.mkDerivation {
         url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
         hash = darwinHash;
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
-        hash = darwinHash;
-      };
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix
index 63fcd8c03328..e369775298c0 100644
--- a/pkgs/by-name/ps/psc-package/package.nix
+++ b/pkgs/by-name/ps/psc-package/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix
index 2a4b004ea6d4..f944e90eabde 100644
--- a/pkgs/by-name/pu/pulumi-bin/data.nix
+++ b/pkgs/by-name/pu/pulumi-bin/data.nix
@@ -161,164 +161,6 @@
         sha256 = "14qsnjafhd8ppachxr7j9541p5rbf1cakqlr7mra86fli1r49z9p";
       }
     ];
-    x86_64-darwin = [
-      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-darwin-x64.tar.gz";
-        sha256 = "0j730hkbhvb3qrxqg26brvwy3g1pmf1z22q5si4jj0ipsxg638ca";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-darwin-amd64.tar.gz";
-        sha256 = "0fdpnggk551z63580d6vky3sm51ihhvg05ikg8p2vq0d8axji164";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.4.0-darwin-amd64.tar.gz";
-        sha256 = "13jmk6hf5d4v98hdrb1p5h6606mpkrm4v1ypcmvpjzcsal0psqjc";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.104.0-darwin-amd64.tar.gz";
-        sha256 = "070c1yqx79r8fd1dw4b14h5rgzbb2wkh15wgy2dqdknp2558h47m";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-darwin-amd64.tar.gz";
-        sha256 = "02ynw60l8rz7ri5fnwlpm6qmsj2f266y7gmm01yia3l84xmj0rx6";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-darwin-amd64.tar.gz";
-        sha256 = "16qx8g6zp7vdic86pzwrd4i8rvyrjjwdhylww7b5a4sfy3vwacg9";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-darwin-amd64.tar.gz";
-        sha256 = "1q96gdbpaax397v7pd300c4zi27xxhhxw1vhsdpxir1gl1yabzas";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-amd64.tar.gz";
-        sha256 = "1yql4aacwb6am3q9zldazmss262z19hvfp3jcysw7jskbsqa3gr5";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-amd64.tar.gz";
-        sha256 = "16h5brr42f9fhhpwplxl0h2iqa0h5h11dj6vg024p3sgqb2p5qxx";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-amd64.tar.gz";
-        sha256 = "044zrb629jsqvigdmqz9dx53cnhjvksxdf6rg2pw6v3ajxzbz80y";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-amd64.tar.gz";
-        sha256 = "0s81lkz7bzi5z9jzgllvnf5gsvyvnc6fhdgm5xiggca5pg7a48xv";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-darwin-amd64.tar.gz";
-        sha256 = "028nbjydy61zks5brpk5bhn2b1ah3w0w4f279gg04h0adc0lyvfp";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-darwin-amd64.tar.gz";
-        sha256 = "0hyxdmmhaihvsmqlfmrid388l0z130w5yl24rkjvzgxg28v11zbh";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-darwin-amd64.tar.gz";
-        sha256 = "0k24h0d6hlr4fvbm100w2fkbf25wpj05q12j7wqid1vk77m4icza";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-darwin-amd64.tar.gz";
-        sha256 = "1g5ygb3mv58mbfb2a53042s87iw3m1gf1i1qyqb3qclmqqaymi7x";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
-        sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-darwin-amd64.tar.gz";
-        sha256 = "0cpj6dcjrvqz5x9b4m084cqbz9mlhl7x74j0z4s7pjg1k4s0cyw6";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-darwin-amd64.tar.gz";
-        sha256 = "13hcvn3njrr2iraq12gf9rr6ym7m1whq82vvbbs4z973knmrmn56";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-amd64.tar.gz";
-        sha256 = "1avxgva74gcvsnc82k9vp9xskr8ddxjnbqryfbxw0mvsgp6iby0g";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.0.0-darwin-amd64.tar.gz";
-        sha256 = "1wcf9sd4hqabn4ycwjbmhylic2cd3nsgs7xqz49l691alv97m1yi";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz";
-        sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.0-darwin-amd64.tar.gz";
-        sha256 = "1dabrwwl9qn316r2c5ldmv9a8ddlm7gfkkgbaj2jspk4qswgbxfr";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-darwin-amd64.tar.gz";
-        sha256 = "09jhjsgg5sa1a78zak21wxhi3pjml9sl3y1vh59qb0dlq2hp9whd";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-darwin-amd64.tar.gz";
-        sha256 = "1dgx29v753hprw1cql4hkz2m7gc1a14p2wx5qrbxcf971z2lir17";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-amd64.tar.gz";
-        sha256 = "1phwjh9y6grc1mcppxim6q7v3wj02pdy2lj464y3v4ydy6xdw7ha";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-darwin-amd64.tar.gz";
-        sha256 = "0bf9m8gczh1a5b8b2xc7w98z5swd3a9r2dbd6b40g18kyc29mwjf";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-darwin-amd64.tar.gz";
-        sha256 = "0a0zs556yx2cskym7w9xfv88wfscvxip0nwzib6i8cf901732xq7";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-darwin-amd64.tar.gz";
-        sha256 = "09kly1i1p9jw939k1pr51w3ja9ixh53hyv40dm6xb6fkxcpbj1q6";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-darwin-amd64.tar.gz";
-        sha256 = "1qrl998hs6iyvc35kas97dalr2bdrzb63k08i3bgaplj8f0p6pqy";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-darwin-amd64.tar.gz";
-        sha256 = "1c49701g8r3565hvf55xjgbsc5hgh8rxmbsz86dp4lffsj2748sx";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-darwin-amd64.tar.gz";
-        sha256 = "1zbgpbp7kxll9jmrhf009l4kc7amz7mvgxwj18rcrbf2q118v9pc";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz";
-        sha256 = "1jpcyp3lqiz4aab331x7shhqxzp4m6nz68vhkyqksvdplzr9rj44";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-amd64.tar.gz";
-        sha256 = "0piwpxykabjczmd4jzzvl3fnn6g8gis02glmch2fshplgdanj7yy";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-amd64.tar.gz";
-        sha256 = "1hm2lbph6i0g2hl8z0cykv55yyqmzyk52wbzzr1snj5lpygrnwc8";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-darwin-amd64.tar.gz";
-        sha256 = "01vysx2nl7lm5s2398sx80b3mxmjl6kcxpnspiwyvcw8h9vp2g9s";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-darwin-amd64.tar.gz";
-        sha256 = "03gblpxr9y4c1k5zd0j50q045rvq9r8k3s619rp8clnxz23khk59";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.17.0-darwin-amd64.tar.gz";
-        sha256 = "1w0xj0bsmpjm56yafajpqin6aljyj2x6wk5n9z8a76gvwh6c5awn";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-darwin-amd64.tar.gz";
-        sha256 = "00xk2mz37n2szb7yswcifgrcanqdlbxqcah04a4b7d4b09d3rwz3";
-      }
-      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
-        sha256 = "11wm9c125154brisncm9cgb41nbjl9q9h4bq6z0ym8v681qq0fc4";
-      }
-    ];
     aarch64-linux = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-linux-arm64.tar.gz";
diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix
index 9a2fa2f2fb81..03e9c5c2b494 100644
--- a/pkgs/by-name/pv/pvs-studio/package.nix
+++ b/pkgs/by-name/pv/pvs-studio/package.nix
@@ -25,12 +25,10 @@ stdenv.mkDerivation rec {
     fetchzip {
       url = selectSystem {
         aarch64-darwin = "https://web.archive.org/web/20260131193428/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.zip";
-        x86_64-darwin = "https://web.archive.org/web/20260131193142/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.zip";
         x86_64-linux = "https://web.archive.org/web/20260131192910/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz";
       };
       hash = selectSystem {
         aarch64-darwin = "sha256-ExJldpqwD9dqGtY/QQ2i3qiNXSyR6exhYKIrwgdQrtQ=";
-        x86_64-darwin = "sha256-zKwUVDoi9yWCD0gooeDslTwzQ/9N17OkMqwkAL0EQe8=";
         x86_64-linux = "sha256-c7+Zvo+cHtGtdaHi+3w7Vjluo7uQ2CfptCO8RkVm7wU=";
       };
     };
@@ -73,7 +71,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.unfreeRedistributable;
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/qf/qFlipper/package.nix b/pkgs/by-name/qf/qFlipper/package.nix
index a9d2156d07f9..9a82d06de575 100644
--- a/pkgs/by-name/qf/qFlipper/package.nix
+++ b/pkgs/by-name/qf/qFlipper/package.nix
@@ -94,7 +94,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ cab404 ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
     ]; # qtbase doesn't build yet on aarch64-darwin
   };
diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index 71e592b1d694..fe372117e064 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -47,7 +47,6 @@ let
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     license = lib.licenses.unfree;
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 069b9861e72e..563fb6bc5ad9 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -12,7 +12,6 @@ let
 in
 {
   aarch64-darwin = any-darwin;
-  x86_64-darwin = any-darwin;
   aarch64-linux = {
     version = "3.2.29-2026-05-28";
     src = fetchurl {
diff --git a/pkgs/by-name/ra/rapidapi/package.nix b/pkgs/by-name/ra/rapidapi/package.nix
index 9b5bdc7c5348..119b5a422927 100644
--- a/pkgs/by-name/ra/rapidapi/package.nix
+++ b/pkgs/by-name/ra/rapidapi/package.nix
@@ -74,7 +74,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix
index cf563ccd3586..e415d4c17ac3 100644
--- a/pkgs/by-name/ra/rar/package.nix
+++ b/pkgs/by-name/ra/rar/package.nix
@@ -20,10 +20,6 @@ let
       url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz";
       hash = "sha256-aLOTwAB1jUd/3kPJVf91QvEvdvP16HzdqSMVL8eRvU0=";
     };
-    x86_64-darwin = {
-      url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-2h+zw9d0gTbJs2m2g9V0s3LLHtBJpjSoH4XZORg0bY8=";
-    };
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
index 8ab35d586a2f..aa90edbbf9bd 100644
--- a/pkgs/by-name/ra/raycast/package.nix
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -21,11 +21,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
         hash = "sha256-muX6PPanjU+ElCQhIfo7Y7cChbTO8Q/gH12ULvBK43s=";
       };
-      x86_64-darwin = fetchurl {
-        name = "Raycast.dmg";
-        url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-E8VGFydX5GXE3graZUSzN0S2JGbBXM/LD+DLm9waAus=";
-      };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
 
@@ -85,7 +80,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix
index 5f2874bd8c3c..78a0bd08d1e2 100644
--- a/pkgs/by-name/re/readarr/package.nix
+++ b/pkgs/by-name/re/readarr/package.nix
@@ -19,7 +19,6 @@ let
     {
       x86_64-linux = "x64";
       aarch64-linux = "arm64";
-      x86_64-darwin = "x64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
@@ -80,7 +79,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
index d44bf2c324bb..3f643cbed2a4 100644
--- a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
+++ b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
@@ -20,7 +20,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-${arch}.dylib";
     hash =
       {
-        x86_64-darwin = "sha256-slLzjIWpEzOn4GAcRwb6WdJSVExuQK0cVgHgd7qM4oE=";
         aarch64-darwin = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4=";
       }
       .${stdenvNoCC.hostPlatform.system};
diff --git a/pkgs/by-name/re/reaper-reapack-extension/package.nix b/pkgs/by-name/re/reaper-reapack-extension/package.nix
index 1f5bafa0574c..1c40ddc28e9c 100644
--- a/pkgs/by-name/re/reaper-reapack-extension/package.nix
+++ b/pkgs/by-name/re/reaper-reapack-extension/package.nix
@@ -20,7 +20,6 @@ callPackage p {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
index 3011ad5e7ee6..9ad9d3679f6c 100644
--- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
@@ -23,7 +23,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib";
         hash =
           {
-            x86_64-darwin = "sha256-c0enRIXFN+dMDdxTQ3hFv0almTF0dfrSHILNigJp2Js=";
             aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo=";
           }
           .${stdenvNoCC.hostPlatform.system};
diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix
index f4f2a33aadee..1c4d22bf271f 100644
--- a/pkgs/by-name/re/reaper-sws-extension/package.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/package.nix
@@ -22,7 +22,6 @@ callPackage p {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix
index 3363d1e1d760..dd34c1d76d44 100644
--- a/pkgs/by-name/re/reaper/package.nix
+++ b/pkgs/by-name/re/reaper/package.nix
@@ -148,7 +148,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/ro/roam-research/common.nix b/pkgs/by-name/ro/roam-research/common.nix
index 97095a8eadea..d284c83ee5aa 100644
--- a/pkgs/by-name/ro/roam-research/common.nix
+++ b/pkgs/by-name/ro/roam-research/common.nix
@@ -6,10 +6,6 @@ in
 {
   inherit pname version;
   sources = {
-    x86_64-darwin = fetchurl {
-      url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg";
-      hash = "sha256-c7h+ZvR1LtHhOr63xQcRxXC00on2Ob0XfRyS2HU3Qkg=";
-    };
     aarch64-darwin = fetchurl {
       url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg";
       hash = "sha256-fPtJAKfh65/dEryi0kdg+1hLfdvzBU87uS0y6eaaVy4=";
diff --git a/pkgs/by-name/ro/roam-research/darwin.nix b/pkgs/by-name/ro/roam-research/darwin.nix
index b11afb88e8f4..00603c518486 100644
--- a/pkgs/by-name/ro/roam-research/darwin.nix
+++ b/pkgs/by-name/ro/roam-research/darwin.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "roam-research";
diff --git a/pkgs/by-name/ro/rosenpass/package.nix b/pkgs/by-name/ro/rosenpass/package.nix
index e0fe37b334f0..dbbb4cea5f77 100644
--- a/pkgs/by-name/ro/rosenpass/package.nix
+++ b/pkgs/by-name/ro/rosenpass/package.nix
@@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     mainProgram = "rosenpass";
diff --git a/pkgs/by-name/ro/router/librusty_v8.nix b/pkgs/by-name/ro/router/librusty_v8.nix
index 46c17dfd01c6..063fbb7f95a8 100644
--- a/pkgs/by-name/ro/router/librusty_v8.nix
+++ b/pkgs/by-name/ro/router/librusty_v8.nix
@@ -22,7 +22,6 @@ fetch_librusty_v8 {
   shas = {
     x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A=";
     aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0=";
-    x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ=";
     aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM=";
   };
 }
diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix
index 767cc479f12d..ab25daf1743a 100644
--- a/pkgs/by-name/rp/rpiboot/package.nix
+++ b/pkgs/by-name/rp/rpiboot/package.nix
@@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
       "armv7l-linux"
       "armv6l-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
index 5caaa90d1ed4..3f02cfa6c39a 100644
--- a/pkgs/by-name/ru/rutabaga_gfx/package.nix
+++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
       "armv6l-linux"
       "armv7a-linux"
       "armv7l-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
   };
diff --git a/pkgs/by-name/sa/saw-tools/sources.nix b/pkgs/by-name/sa/saw-tools/sources.nix
index 5f17154d628c..41b753252c81 100644
--- a/pkgs/by-name/sa/saw-tools/sources.nix
+++ b/pkgs/by-name/sa/saw-tools/sources.nix
@@ -5,10 +5,6 @@
     url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-ARM64-with-solvers.tar.gz";
     hash = "sha256-1mURJfcnIRhuLrG1Gf4SRXmTzLbztBBRQGcXFFiAWWU=";
   };
-  x86_64-darwin = {
-    url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-intel-X64-with-solvers.tar.gz";
-    hash = "sha256-f3NofLPR6tarcZg/EjtCv1mSxz5O4nTKeOEoTPeGgf8=";
-  };
   x86_64-linux = {
     url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-ubuntu-22.04-X64-with-solvers.tar.gz";
     hash = "sha256-k9Qo93d0IXBRe7P+wU20LjFjM+LdHf6Z2S0Nybmh/4E=";
diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json
index fdaf6f63e512..98f82f24b34d 100644
--- a/pkgs/by-name/sc/scala-cli/sources.json
+++ b/pkgs/by-name/sc/scala-cli/sources.json
@@ -9,10 +9,6 @@
       "asset": "scala-cli-aarch64-pc-linux.gz",
       "sha256": "1ja02j2nqp4c0hhj102zrl8sdxxcivsijkacbs0qff4kzjdjyzp7"
     },
-    "x86_64-darwin": {
-      "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "0a478k2qknzsfw5fccz3fwq4sha789i2rdprpj5dj9717aj1ygpi"
-    },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
       "sha256": "1xih99h7dklf7i08m71r9dxrid1xwa0jvixncc177a42zwwkkcrp"
diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix
index 9371ace75235..f8372ca0abbb 100644
--- a/pkgs/by-name/sc/scilab-bin/package.nix
+++ b/pkgs/by-name/sc/scilab-bin/package.nix
@@ -27,10 +27,6 @@ let
       url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-accelerate-arm64.dmg";
       sha256 = "sha256-L4dxD8R8bY5nd+4oDs5Yk0LlNsFykLnAM+oN/O87SRI=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-x86_64.dmg";
-      sha256 = "sha256-tBeqzllMuogrGcJxGqEl2DdNXaiwok3yhzWSdlWY5Fc=";
-    };
     x86_64-linux = fetchurl {
       url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-x86_64.tar.gz";
       sha256 = "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk=";
@@ -44,7 +40,6 @@ let
     description = "Scientific software package for numerical computations (Matlab lookalike)";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/se/segger-jlink/source.nix b/pkgs/by-name/se/segger-jlink/source.nix
index 07887df66dab..2b3703a6fa6a 100644
--- a/pkgs/by-name/se/segger-jlink/source.nix
+++ b/pkgs/by-name/se/segger-jlink/source.nix
@@ -30,10 +30,4 @@
     ext = "pkg";
     hash = "sha256-wfK9cV2Ul3LGmqTwerS1+BR0BuhmCFZdXtWykwJqWCM=";
   };
-  x86_64-darwin = {
-    os = "MacOSX";
-    name = "x86_64";
-    ext = "pkg";
-    hash = "sha256-4xgulHc4AtGr2CV1NIX02N0y75k5s9AXgX6jK6hXW9s=";
-  };
 }
diff --git a/pkgs/by-name/sh/sharpsat-td/package.nix b/pkgs/by-name/sh/sharpsat-td/package.nix
index 6004c73a541a..f883f5b8acbb 100644
--- a/pkgs/by-name/sh/sharpsat-td/package.nix
+++ b/pkgs/by-name/sh/sharpsat-td/package.nix
@@ -91,7 +91,6 @@ stdenv.mkDerivation {
     # uses clhash, which is non-portable
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 003cf64b05bf..7fa96cde9803 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -339,7 +339,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix
index 6064a90e2e41..c111213f2356 100644
--- a/pkgs/by-name/si/simulide/package.nix
+++ b/pkgs/by-name/si/simulide/package.nix
@@ -177,7 +177,6 @@ stdenv.mkDerivation {
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 50f578ed3205..88adb201f72a 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -27,7 +27,6 @@ let
   platformIds = {
     "x86_64-linux" = "linux";
     "aarch64-linux" = "linux-arm64";
-    "x86_64-darwin" = "darwin";
     "aarch64-darwin" = "darwin-arm64";
   };
 
diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix
index 4d615ad3b9a8..8c622c8ea8ab 100644
--- a/pkgs/by-name/sk/sketchybar/package.nix
+++ b/pkgs/by-name/sk/sketchybar/package.nix
@@ -14,7 +14,6 @@ let
   target =
     {
       "aarch64-darwin" = "arm64";
-      "x86_64-darwin" = "x86";
     }
     .${system} or (throw "Unsupported system: ${system}");
 in
diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index cd229d837413..d347bd66ef14 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -26,7 +26,6 @@ let
       prince213
     ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix
index f8a69186d6e8..52cc93c4d730 100644
--- a/pkgs/by-name/sl/slack/sources.nix
+++ b/pkgs/by-name/sl/slack/sources.nix
@@ -9,13 +9,6 @@
       hash = "sha256-u5NppmmRyC+6HaPIcSSGOOdVRiZdT9GE1eHvad6rYdY=";
     };
   };
-  x86_64-darwin = {
-    version = "4.49.89";
-    src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.49.89/Slack-4.49.89-macOS.dmg";
-      hash = "sha256-eysKaQ1SXScsL0vji+32r/NgWN0eni62+LkB4svTHUE=";
-    };
-  };
   x86_64-linux = {
     version = "4.49.89";
     src = fetchurl {
diff --git a/pkgs/by-name/sl/sleek-todo/package.nix b/pkgs/by-name/sl/sleek-todo/package.nix
index 9962bb5fa571..70919ae938a5 100644
--- a/pkgs/by-name/sl/sleek-todo/package.nix
+++ b/pkgs/by-name/sl/sleek-todo/package.nix
@@ -15,10 +15,6 @@ let
   src =
     fetchurl
       {
-        x86_64-darwin = {
-          url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14-mac-x64.dmg";
-          hash = "sha256-f5mMSRa+gAoakOy9TSZeALqCylGLd0nUJIh8o+LWAro=";
-        };
         x86_64-linux = {
           url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14.AppImage";
           hash = "sha256-d2fLsCI7peuNBtjgHs1qumgPAF9eJeBYiIIffoSv9Jk=";
@@ -34,7 +30,6 @@ let
     mainProgram = "sleek-todo";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix
index cd2a8efd0ecf..e6486aca4d3d 100644
--- a/pkgs/by-name/sn/snipaste/package.nix
+++ b/pkgs/by-name/sn/snipaste/package.nix
@@ -31,7 +31,6 @@ let
     mainProgram = "snipaste";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/sn/snipaste/sources.nix b/pkgs/by-name/sn/snipaste/sources.nix
index fd43d746efdc..b3ed093ee007 100644
--- a/pkgs/by-name/sn/snipaste/sources.nix
+++ b/pkgs/by-name/sn/snipaste/sources.nix
@@ -12,7 +12,6 @@ let
 in
 {
   aarch64-darwin = any-darwin;
-  x86_64-darwin = any-darwin;
   x86_64-linux = {
     version = "2.11.3";
     src = fetchurl {
diff --git a/pkgs/by-name/so/soapysdrplay/package.nix b/pkgs/by-name/so/soapysdrplay/package.nix
index e30f18451336..9af47dddf8d7 100644
--- a/pkgs/by-name/so/soapysdrplay/package.nix
+++ b/pkgs/by-name/so/soapysdrplay/package.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix
index f3de616a6d4e..9f24c45258a1 100644
--- a/pkgs/by-name/so/sourcery/package.nix
+++ b/pkgs/by-name/so/sourcery/package.nix
@@ -30,10 +30,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
         platform = "manylinux1_x86_64";
         hash = "sha256-oUL7EVbfwgV1K1Rv0kzW5r1AXr167BCXwzntDgVyTc0=";
       };
-      "x86_64-darwin" = fetchWheel {
-        platform = "macosx_10_9_x86_64";
-        hash = "sha256-Ynn1BUBrmzRV2sL5ZGwOEQ/ccoV0edwFt4iiz9KN+k8=";
-      };
       "aarch64-darwin" = fetchWheel {
         platform = "macosx_11_0_arm64";
         hash = "sha256-iQNOSoAClAk2FMjAExfgsFHDXS56vwieePGDCYRRbgQ=";
diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix
index a1e86f16de7a..9abc044e017f 100644
--- a/pkgs/by-name/sp/spacedrive/package.nix
+++ b/pkgs/by-name/sp/spacedrive/package.nix
@@ -26,10 +26,6 @@ let
           url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg";
           hash = "sha256-0Bj6GjsxLUgLlycA33pXIvItoqFtatjJl2Z/ZwjnC0c=";
         };
-        x86_64-darwin = {
-          url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg";
-          hash = "sha256-E1XCGeWBe/oHHE3izMykT8wFrIGhNMvmxEieMrnSfZ8=";
-        };
         x86_64-linux = {
           url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.deb";
           hash = "sha256-MLCAHNLJ/9bdCBLBBssrpk98uvKTfHs9YGxmxJ11/oY=";
@@ -44,7 +40,6 @@ let
     changelog = "https://github.com/spacedriveapp/spacedrive/releases/tag/${version}";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     license = lib.licenses.agpl3Plus;
diff --git a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix
index c990394b5441..65e72c49d23e 100644
--- a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix
+++ b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix
@@ -6,7 +6,6 @@ fetchLibrustyV8 {
   shas = {
     x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE=";
     aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY=";
-    x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho=";
     aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k=";
   };
 }
diff --git a/pkgs/by-name/sp/speakeasy-cli/package.nix b/pkgs/by-name/sp/speakeasy-cli/package.nix
index 543f8df482a5..a1f2f2c0d13d 100644
--- a/pkgs/by-name/sp/speakeasy-cli/package.nix
+++ b/pkgs/by-name/sp/speakeasy-cli/package.nix
@@ -31,10 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     sources = {
-      "x86_64-darwin" = fetchurl {
-        url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_amd64.zip";
-        hash = "sha256-ZXTD4rZUTg7JBnoloHs0gysUHTmgxJotrP/70PYfAB8=";
-      };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_amd64.zip";
         hash = "sha256-8QEtlte0PtbCVZjvcBd16zJf3weVju5nsS+PrDCMMl8=";
diff --git a/pkgs/by-name/sp/spotify/package.nix b/pkgs/by-name/sp/spotify/package.nix
index 1a788cf71047..7f999fe4b3fa 100644
--- a/pkgs/by-name/sp/spotify/package.nix
+++ b/pkgs/by-name/sp/spotify/package.nix
@@ -19,7 +19,6 @@ let
     license = lib.licenses.unfree;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "spotify";
diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix
index 2cf5e96731a7..17f3c858c292 100644
--- a/pkgs/by-name/sp/spotube/package.nix
+++ b/pkgs/by-name/sp/spotube/package.nix
@@ -93,10 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
         suffix = "linux-x86_64.deb";
         hash = "sha256-FEb5mPmGOAMw4nnFJ0kC+ymg4zBdUXWjvIO0sGOS6M0=";
       };
-      "x86_64-darwin" = fetchArtifact {
-        suffix = "macos-universal.dmg";
-        hash = "sha256-J2J9/UQZAECvGmumqGzcRFA5kpakOmFpQKlK5oesCRM=";
-      };
       "aarch64-darwin" = fetchArtifact {
         suffix = "macos-universal.dmg";
         hash = "sha256-J2J9/UQZAECvGmumqGzcRFA5kpakOmFpQKlK5oesCRM=";
diff --git a/pkgs/by-name/sp/sprite/package.nix b/pkgs/by-name/sp/sprite/package.nix
index 6379d4ef9b81..9c8734cfcbf8 100644
--- a/pkgs/by-name/sp/sprite/package.nix
+++ b/pkgs/by-name/sp/sprite/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         aarch64-darwin = "sha256-0EbsXuNdSC9lfTR9lQFgGk9nYg200f+tZY8xcXmqTzc=";
-        x86_64-darwin = "sha256-IA3C42wheIATCBlAFVJbq0omjPZv+rQstthCwXDUm5w=";
         aarch64-linux = "sha256-4a7LrFWgxe5wUcPLMDvo2/HmpCnELkJSyr2nAA9RBwk=";
         x86_64-linux = "sha256-FfWZ9PFhorfbf8/YsdcFAnpA2QtA1LqAfQiGrc8sesQ=";
       }
diff --git a/pkgs/by-name/sq/sqlpkg-cli/package.nix b/pkgs/by-name/sq/sqlpkg-cli/package.nix
index 7a598186c372..830f5619cc2c 100644
--- a/pkgs/by-name/sq/sqlpkg-cli/package.nix
+++ b/pkgs/by-name/sq/sqlpkg-cli/package.nix
@@ -40,7 +40,7 @@ buildGoModule (finalAttrs: {
     platforms = lib.platforms.unix;
     badPlatforms = [
       "aarch64-linux" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: linux-arm64
-      "x86_64-darwin" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: darwin-amd64
+      # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: darwin-amd64
       "aarch64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH
     ];
   };
diff --git a/pkgs/by-name/st/stash/package.nix b/pkgs/by-name/st/stash/package.nix
index 566ebd51fa2f..1157c9ecbfa6 100644
--- a/pkgs/by-name/st/stash/package.nix
+++ b/pkgs/by-name/st/stash/package.nix
@@ -136,7 +136,6 @@ buildGoModule (
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };
diff --git a/pkgs/by-name/st/steamcmd/package.nix b/pkgs/by-name/st/steamcmd/package.nix
index e3448c0b65ea..3da5ea4e86d3 100644
--- a/pkgs/by-name/st/steamcmd/package.nix
+++ b/pkgs/by-name/st/steamcmd/package.nix
@@ -14,10 +14,6 @@ let
         "https://web.archive.org/web/20240521141411/https://steamcdn-a.akamaihd.net/client/installer/steamcmd_${platform}.tar.gz";
     in
     {
-      x86_64-darwin = fetchurl {
-        url = url "osx";
-        hash = "sha256-jswXyJiOWsrcx45jHEhJD3YVDy36ps+Ne0tnsJe9dTs=";
-      };
       x86_64-linux = fetchurl {
         url = url "linux";
         hash = "sha256-zr8ARr/QjPRdprwJSuR6o56/QVXl7eQTc7V5uPEHHnw=";
@@ -62,7 +58,6 @@ stdenvNoCC.mkDerivation {
     mainProgram = "steamcmd";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [ tadfisher ];
diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix
index 91045ea9dce5..06bba69c1a84 100644
--- a/pkgs/by-name/st/stockfish/package.nix
+++ b/pkgs/by-name/st/stockfish/package.nix
@@ -121,7 +121,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
       "armv7l-linux"
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 6b0915107681..8a2e679aa441 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -50,7 +50,6 @@ buildGoModule (finalAttrs: {
         # https://github.com/stripe/stripe-cli/blob/e3020d2e2df9c731b2f51df3aa53bf16383e863f/pkg/plugins/test_artifacts/plugins.toml
         !lib.lists.any (platform: lib.meta.platformMatch stdenv.hostPlatform platform) [
           "x86_64-linux"
-          "x86_64-darwin"
           "aarch64-darwin"
         ]
       )
diff --git a/pkgs/by-name/su/subler/package.nix b/pkgs/by-name/su/subler/package.nix
index b4e3928c6190..1d5719a2aa11 100644
--- a/pkgs/by-name/su/subler/package.nix
+++ b/pkgs/by-name/su/subler/package.nix
@@ -37,7 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix
index 2c1f057fb4a4..6199186e80ba 100644
--- a/pkgs/by-name/su/subread/package.nix
+++ b/pkgs/by-name/su/subread/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     homepage = "https://subread.sourceforge.net/";
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 871dbfd3fa1b..2216a713211c 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -74,7 +74,6 @@ let
     {
       x86_64-linux = "Linux-x86_64";
       aarch64-linux = "Linux-aarch64";
-      x86_64-darwin = "Darwin-x86_64";
       aarch64-darwin = "Darwin-arm64";
     }
     .${stdenv.hostPlatform.system}
@@ -89,7 +88,6 @@ let
       {
         x86_64-linux = "sha256-VT+4qP2FaizCoIBBbBkzbYw4YOvGhuBUoZxWL0IYVZo=";
         aarch64-linux = "sha256-X5v/GsJy8G3/LHW/8s0VAS0Vegr7JhZSqYotXL/s81o=";
-        x86_64-darwin = "sha256-rrOGahWwJikRfUn27Q4jVra2Q/MMSNitu0wS2UGKGWk=";
         aarch64-darwin = "sha256-xkfwLJgb7uz1H7mJrQFW79w2T/T/Zv7biXlvXz5UvXc=";
       }
       .${stdenv.hostPlatform.system};
diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index bbb1e3dfa9ab..166c9f892878 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -21,7 +21,6 @@ let
     "i686-linux" = "linux_x86";
     "aarch64-linux" = "linux_arm64";
     "armv7l-linux" = "arm_armhf_raspberry_pi";
-    "x86_64-darwin" = "macos";
     "aarch64-darwin" = "macos";
   };
   bindir =
diff --git a/pkgs/by-name/sw/swiftlint/sources.json b/pkgs/by-name/sw/swiftlint/sources.json
index 17f49c673677..0f813f8659d5 100644
--- a/pkgs/by-name/sw/swiftlint/sources.json
+++ b/pkgs/by-name/sw/swiftlint/sources.json
@@ -9,10 +9,6 @@
       "filename": "swiftlint_linux_amd64.zip",
       "hash": "sha256-eTBqNOXHzFWiIM0QjLuGHcrV8QE43N8mHiYkrosKSGs="
     },
-    "x86_64-darwin": {
-      "filename": "portable_swiftlint.zip",
-      "hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y="
-    },
     "aarch64-darwin": {
       "filename": "portable_swiftlint.zip",
       "hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y="
diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix
index db2f8ad1b41d..d4e6761718a8 100644
--- a/pkgs/by-name/sw/swt/package.nix
+++ b/pkgs/by-name/sw/swt/package.nix
@@ -30,8 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
     ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
     riscv64-linux.platform = "gtk-linux-riscv64";
     riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
-    x86_64-darwin.platform = "cocoa-macosx-x86_64";
-    x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI=";
     aarch64-darwin.platform = "cocoa-macosx-aarch64";
     aarch64-darwin.hash = "sha256-jvxmoRFGquYClPgMqWi2ylw26YiGSG5bONnM1PcjlTM=";
   };
diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix
index 0115d0533378..b65f92a92fae 100644
--- a/pkgs/by-name/sy/synapse-admin/package.nix
+++ b/pkgs/by-name/sy/synapse-admin/package.nix
@@ -140,7 +140,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix
index dae8f02f5720..dcf60705dc6a 100644
--- a/pkgs/by-name/sy/synology-drive-client/package.nix
+++ b/pkgs/by-name/sy/synology-drive-client/package.nix
@@ -34,7 +34,6 @@ let
     ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "synology-drive";
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/package.nix b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix
index c3881324572d..28c92d50722a 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/package.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index 70a131178040..119281813d92 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -11,11 +11,6 @@
     hash = "sha256-j8mbSn6fbzAc8cOsq8FGKtDEJvmc0gqjNXJrpQwyuCc=";
   };
 
-  x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-J19TcXnR4cnr5Lk8yJ7KuX25xk4YqryXonWXoKFHe60=";
-  };
-
   aarch64-darwin = {
     url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/arm64/sysdig-cli-scanner";
     hash = "sha256-WaWfY1QGIz6WxTF+QMk6iJHzM05h03soYadv4Kf/dNg=";
diff --git a/pkgs/by-name/ta/tabnine/sources.json b/pkgs/by-name/ta/tabnine/sources.json
index 8ebec98bfc54..47c98df25987 100644
--- a/pkgs/by-name/ta/tabnine/sources.json
+++ b/pkgs/by-name/ta/tabnine/sources.json
@@ -8,10 +8,6 @@
     "aarch64-darwin": {
       "name": "aarch64-apple-darwin",
       "hash": "sha256-8bwrbMQJkBMLgWt0n6R6uc+s6SxZr8JiGM+2ni5lgqY="
-    },
-    "x86_64-darwin": {
-      "name": "x86_64-apple-darwin",
-      "hash": "sha256-C0zePvocvgm8gP0C++7xJ5yb8MLb7kY/5HNsbEeZu6Q="
     }
   }
 }
diff --git a/pkgs/by-name/ta/tailwindcss_3/package.nix b/pkgs/by-name/ta/tailwindcss_3/package.nix
index 21d4a03103a3..4a427a63e1e9 100644
--- a/pkgs/by-name/ta/tailwindcss_3/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_3/package.nix
@@ -13,7 +13,6 @@ let
       aarch64-darwin = "macos-arm64";
       aarch64-linux = "linux-arm64";
       armv7l-linux = "linux-armv7";
-      x86_64-darwin = "macos-x64";
       x86_64-linux = "linux-x64";
     }
     .${system} or throwSystem;
@@ -23,7 +22,6 @@ let
       aarch64-darwin = "sha256-odDHmFdZrMygvxLlGsHcvw9s8v/7Yubg9i0JHEd6EKM=";
       aarch64-linux = "sha256-abE3i4EzGS19L+sSoRb6EtA1WU9Y2z7/IVh55K2M85s=";
       armv7l-linux = "sha256-cE59ka+6bh9jCImv0NfbNrRjTmKFEswUHVBKW+riiGA=";
-      x86_64-darwin = "sha256-bL2tdL53bAh/+l6aBXUSxUiY+f6IKNM2IhLf4y/JM6M=";
       x86_64-linux = "sha256-fST3+hkdIZO3jNX1pCpgk+FECVIZCFKfQtgLEf3h8dQ=";
     }
     .${system} or throwSystem;
diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 9fb6ab49e233..4851aada1613 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -15,7 +15,6 @@ let
     {
       aarch64-darwin = "macos-arm64";
       aarch64-linux = "linux-arm64";
-      x86_64-darwin = "macos-x64";
       x86_64-linux = "linux-x64";
     }
     .${system} or throwSystem;
@@ -24,7 +23,6 @@ let
     {
       aarch64-darwin = "sha256-uACwZZ3GS58D7eVmAkTZQV13fVc5riiJKAh3yje+dCo=";
       aarch64-linux = "sha256-OU3czCQCz6Or2X37pW81h3gaPW5s5m5lzq2hS+t2ZLg=";
-      x86_64-darwin = "sha256-zvjxEEceiJw8RAkFXPiv8zB29YoIGGew38ZTSykL+7A=";
       x86_64-linux = "sha256-UDbE+0Mo4LzbtgZccNislFLg1MlHETp4io+U/TkEJcE=";
     }
     .${system} or throwSystem;
diff --git a/pkgs/by-name/td/tdarr/package.nix b/pkgs/by-name/td/tdarr/package.nix
index 0ab94d1f4051..828baa3ebec9 100644
--- a/pkgs/by-name/td/tdarr/package.nix
+++ b/pkgs/by-name/td/tdarr/package.nix
@@ -28,7 +28,6 @@ symlinkJoin {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ mistyttm ];
diff --git a/pkgs/by-name/te/teams/package.nix b/pkgs/by-name/te/teams/package.nix
index 686d91d6f473..22bb6711d7e8 100644
--- a/pkgs/by-name/te/teams/package.nix
+++ b/pkgs/by-name/te/teams/package.nix
@@ -23,7 +23,6 @@ let
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ tricktron ];
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "teams";
diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix
index 2e29cae9eeb1..df6ddd4381e4 100644
--- a/pkgs/by-name/te/tetrio-desktop/package.nix
+++ b/pkgs/by-name/te/tetrio-desktop/package.nix
@@ -27,10 +27,6 @@ let
       url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup%20arm64.dmg";
       hash = "sha256-PbK9XEynpii35p6DQYiPbaRM4guPazWd5N4Dr2O4H24=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup%20x86.dmg";
-      hash = "sha256-I4Mj6YY7KwpLk2tZ02EdqUxnxSW/3vCM4J7YFzCLEuM=";
-    };
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/th/the-unarchiver/package.nix b/pkgs/by-name/th/the-unarchiver/package.nix
index 0cafcea1eddd..d09564aa7f43 100644
--- a/pkgs/by-name/th/the-unarchiver/package.nix
+++ b/pkgs/by-name/th/the-unarchiver/package.nix
@@ -34,7 +34,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ti/tidal/package.nix b/pkgs/by-name/ti/tidal/package.nix
index 8c511ca6f456..b1a394e6e37e 100644
--- a/pkgs/by-name/ti/tidal/package.nix
+++ b/pkgs/by-name/ti/tidal/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "tidal";
diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix
index f044e413e67a..64db702bdd24 100644
--- a/pkgs/by-name/ti/tideways-cli/package.nix
+++ b/pkgs/by-name/ti/tideways-cli/package.nix
@@ -44,10 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
         hash = "sha256-s74CnmEQ9RPki1af477tQFkrp6C9MwfehXTq2HPNAkk=";
       };
-      "x86_64-darwin" = fetchurl {
-        url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-hlF75uRbSqafZL6sK2Zctxxvy7VBxZQBgTI7tSugePc=";
-      };
       "aarch64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
         hash = "sha256-RTt5XKMJbYPea6pEPD72mITfUW41v584zrwT3rkEcQg=";
diff --git a/pkgs/by-name/ti/tidgi/package.nix b/pkgs/by-name/ti/tidgi/package.nix
index 25799d61b531..291abd95e9b4 100644
--- a/pkgs/by-name/ti/tidgi/package.nix
+++ b/pkgs/by-name/ti/tidgi/package.nix
@@ -15,10 +15,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   src =
     {
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-x64-${finalAttrs.version}.zip";
-        hash = "sha256-nxfnPz2oxsYUsT2Q9ADDxVq5xcJvkNDQTBX8EkGUF4g=";
-      };
       aarch64-darwin = fetchurl {
         url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-arm64-${finalAttrs.version}.zip";
         hash = "sha256-bSJFM67+KVECUqjwu1HYipn+zOps1ahNzM721yZL52c=";
@@ -70,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ klchen0112 ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix
index 6e152c46bc06..4ad36a1c560f 100644
--- a/pkgs/by-name/ti/tika/package.nix
+++ b/pkgs/by-name/ti/tika/package.nix
@@ -19,7 +19,6 @@ let
   mvnDepsHashes = {
     "x86_64-linux" = "sha256-ZlGOxVXU63AKzfWeOLGPa2l8v+Rv8Bzr4H/Er62cxk8=";
     "aarch64-linux" = "sha256-CrOYBEnp8cVpdF2PrpGQjmdYH8ZKupm9Jf1LVyNoObk=";
-    "x86_64-darwin" = "sha256-D1QkCTYep9RbNUaZPrnbgkR94cvQkX3xxxUxwyLIqx8=";
     "aarch64-darwin" = "sha256-zvvko6wSJoc2cgMLl7XVmypq0vVTirrIpJiEdypPlrU=";
   };
 
diff --git a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
index 9c039a344ef0..9e1c5874d2ae 100644
--- a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
+++ b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = with lib.platforms; aarch64 ++ x86;
     badPlatforms = [
       # clang++: error: clang frontend command failed with exit code 139
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix
index 2b5a6958a8ee..5427785190a3 100644
--- a/pkgs/by-name/tr/transgui/package.nix
+++ b/pkgs/by-name/tr/transgui/package.nix
@@ -115,7 +115,6 @@ stdenv.mkDerivation rec {
     mainProgram = "transgui";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
index aae19eff9656..822f813f1a50 100644
--- a/pkgs/by-name/tr/trilium-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -28,13 +28,11 @@ let
   # exposed like this for update.sh
   x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No=";
   aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4=";
-  x86_64-darwin.hash = "sha256-H6eJPJdj1rZt1pXRKBUVOJuIhmDHY5SexKkZ8ITARGQ=";
   aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY=";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.hash;
     aarch64-linux = linuxSource "arm64" aarch64-linux.hash;
-    x86_64-darwin = darwinSource "x64" x86_64-darwin.hash;
     aarch64-darwin = darwinSource "arm64" aarch64-darwin.hash;
   };
 
diff --git a/pkgs/by-name/tt/ttl2c/package.nix b/pkgs/by-name/tt/ttl2c/package.nix
index 1fe484a48645..6c908eb4c331 100644
--- a/pkgs/by-name/tt/ttl2c/package.nix
+++ b/pkgs/by-name/tt/ttl2c/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.unix;
     badPlatforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/tu/turingplus/bootstrap.nix b/pkgs/by-name/tu/turingplus/bootstrap.nix
index 5f4cf44bdb58..4fd794c841a1 100644
--- a/pkgs/by-name/tu/turingplus/bootstrap.nix
+++ b/pkgs/by-name/tu/turingplus/bootstrap.nix
@@ -13,10 +13,6 @@ let
       url = "https://github.com/CordyJ/Open-TuringPlus/releases/download/v6.2.1/opentplus-62-linux64.tar.gz";
       sha256 = "sha256-FoOlOcRWpStg4aerjr+FmcXXnwYftrqG1j4iZJ+4AzE=";
     };
-    "x86_64-darwin" = {
-      url = "https://github.com/CordyJ/Open-TuringPlus/releases/download/v6.2.1/opentplus-62-macos64.tar.gz";
-      sha256 = "sha256-8o1hIA74JPqZyjWfg4leC99z1+YMVhwFGME5qBf/BP0=";
-    };
   };
 
   redirects = [
@@ -81,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "tpc";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     homepage = "https://github.com/CordyJ/Open-TuringPlus";
     downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases";
diff --git a/pkgs/by-name/tu/turingplus/package.nix b/pkgs/by-name/tu/turingplus/package.nix
index 1f5fa93451bf..5c3aa1e5f79e 100644
--- a/pkgs/by-name/tu/turingplus/package.nix
+++ b/pkgs/by-name/tu/turingplus/package.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "tpc";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     homepage = "https://github.com/CordyJ/Open-TuringPlus";
     downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases";
diff --git a/pkgs/by-name/ty/typesense/sources.json b/pkgs/by-name/ty/typesense/sources.json
index 31bbf29f9a95..cb443f452229 100644
--- a/pkgs/by-name/ty/typesense/sources.json
+++ b/pkgs/by-name/ty/typesense/sources.json
@@ -9,10 +9,6 @@
       "arch": "linux-amd64",
       "hash": "sha256-BD0qE1dEVKVUPwO2fMO0SMXiwG9dD0RMnAzkVZitFKA="
     },
-    "x86_64-darwin": {
-      "arch": "darwin-amd64",
-      "hash": "sha256-9imHOPW8OkFczuNxXGn3bXFI49BIdUJ5GGh1mrvcMgE="
-    },
     "aarch64-darwin": {
       "arch": "darwin-arm64",
       "hash": "sha256-yAOR/bGYBQGp8Mllhh0yKyqmItd2+IfLib3W+lIHwr0="
diff --git a/pkgs/by-name/ud/udig/package.nix b/pkgs/by-name/ud/udig/package.nix
index 08ed305dd5fe..275c84436937 100644
--- a/pkgs/by-name/ud/udig/package.nix
+++ b/pkgs/by-name/ud/udig/package.nix
@@ -17,10 +17,6 @@ let
       url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip";
       hash = "sha256-ijuSWq1jSsB8K653bjcUdNwVGZscDaTuegBr01oNEg4=";
     };
-    x86_64-darwin = fetchurl {
-      url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip";
-      hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs=";
-    };
   };
   src =
     srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix
index 78d98f8ac058..8b671da11c74 100644
--- a/pkgs/by-name/un/unison-ucm/package.nix
+++ b/pkgs/by-name/un/unison-ucm/package.nix
@@ -22,10 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
         hash = "sha256-DBNZx90rLqeRrjAnscamI8sduIH966az+AfMpWzberk=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
-        hash = "sha256-ei/w82erwVf3oLbXcisBkPv2/k4gvwSxshTg7PWijhw=";
-      };
       aarch64-linux = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz";
         hash = "sha256-6XRr8IOwRhZlGFD9xb29cvqqYVjZFzSvh3S52Cq4HMo=";
@@ -85,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
       lib.maintainers.virusdave
     ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
       "aarch64-linux"
diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json
index e7ced7bbe649..eb233e0cf6c4 100644
--- a/pkgs/by-name/up/upbound/sources-main.json
+++ b/pkgs/by-name/up/upbound/sources-main.json
@@ -2,7 +2,6 @@
   "archMap": {
     "aarch64-darwin": "darwin_arm64",
     "aarch64-linux": "linux_arm64",
-    "x86_64-darwin": "darwin_amd64",
     "x86_64-linux": "linux_amd64"
   },
   "fetchurlAttrSet": {
@@ -15,10 +14,6 @@
         "hash": "sha256-deoM4C92EVDdLiTFdFBHYgUQ3UDzn1Lls5z/qL8Gwjs=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-j00COhV/TXMd285Me7je47qwRMLXTrH8wxaPrkRHy/s=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-3Cc34/LpcahZ8ADKVQOtAKvGNv5gC6mW9zFhHB9LqgA=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_amd64.tar.gz"
@@ -33,10 +28,6 @@
         "hash": "sha256-wbWLMrDG5oBk4vmkEY9S7ruAib7d1kY0J2s/YT8hSZA=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-2tl2itYBEA1hzAzrr0R6ArKLEkrL6MAvOdtAFNAhwbw=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-4vLU6etUqoH/bNZrAVfJyedMpmxdXz0XLQRlj4Ct/eE=",
         "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_amd64.tar.gz"
diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json
index b43015f58698..d9ae0996dd70 100644
--- a/pkgs/by-name/up/upbound/sources-stable.json
+++ b/pkgs/by-name/up/upbound/sources-stable.json
@@ -2,7 +2,6 @@
   "archMap": {
     "aarch64-darwin": "darwin_arm64",
     "aarch64-linux": "linux_arm64",
-    "x86_64-darwin": "darwin_amd64",
     "x86_64-linux": "linux_amd64"
   },
   "fetchurlAttrSet": {
@@ -15,10 +14,6 @@
         "hash": "sha256-qvZFOXKnj27h69/JPhqH5wu86nqAa/7pHZzzTxwSTcg=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-o7JMbBeCHAN0pqUzAGDHTuIzS+9QRLeQuQnDQU2aCLw=",
-        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-eU9GsVmJtQZ5T6YrnrvV3cNZPCBD29JCqDIhyLt37Hk=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_amd64.tar.gz"
@@ -33,10 +28,6 @@
         "hash": "sha256-XiGtOrWEfF8CQvsrutyiP2XXGaAft0WC02sqiXTOBqs=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_arm64.tar.gz"
       },
-      "x86_64-darwin": {
-        "hash": "sha256-kt2pvAJSDK91BrHD21HPX1+XnkeQaPfXPpr0Gwk6+8M=",
-        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_amd64.tar.gz"
-      },
       "x86_64-linux": {
         "hash": "sha256-17C2Igba/apKI4iTu8hIzlcI7PkXAAwM/eqoBeuWcpw=",
         "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_amd64.tar.gz"
diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix
index 9b12bf4a5245..6874e50bb4d2 100644
--- a/pkgs/by-name/up/upscayl/package.nix
+++ b/pkgs/by-name/up/upscayl/package.nix
@@ -8,7 +8,7 @@
 let
   pname = "upscayl";
   version = "2.15.0";
-  srcs = rec {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
       hash = "sha256-ZFlFfliby5nneepELc5gi6zaM5FrcBmohit8YlKqgik=";
@@ -17,7 +17,6 @@ let
       url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-mac.zip";
       hash = "sha256-gXqeRaNW0g7ZVkCSbxps9SqPMuVSzLTCGL5F3Om/iwo=";
     };
-    x86_64-darwin = aarch64-darwin;
   };
   meta = {
     description = "Free and Open Source AI Image Upscaler";
diff --git a/pkgs/by-name/up/upsun/package.nix b/pkgs/by-name/up/upsun/package.nix
index c86d1b24e37f..a6f9c48ed228 100644
--- a/pkgs/by-name/up/upsun/package.nix
+++ b/pkgs/by-name/up/upsun/package.nix
@@ -68,7 +68,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/ur/urbit/package.nix b/pkgs/by-name/ur/urbit/package.nix
index 897bec0e3243..f61ed2e4f259 100644
--- a/pkgs/by-name/ur/urbit/package.nix
+++ b/pkgs/by-name/ur/urbit/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
       {
         x86_64-linux = "1bm32airwqi6pkxlkd0hwrwd0gwm9x5y05dzgy27yxnbcrnyjcpk";
         aarch64-linux = "126hw995xipbx9kb4ml8kn6xwkwd96q90cbr3q143ya2wl1sabya";
-        x86_64-darwin = "07k8msx5wxyggi8x8hc97vimb6zbav7ficyq7m6jjaq1zf0vinqb";
         aarch64-darwin = "0dsapvlyfr2cb9c16b46bcnvq75by87ybys96zhf16k92z4rzrfv";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
@@ -42,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = [ lib.maintainers.matthew-levan ];
diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix
index 5401509c09f7..bde41b46ec79 100644
--- a/pkgs/by-name/va/vault-bin/package.nix
+++ b/pkgs/by-name/va/vault-bin/package.nix
@@ -16,14 +16,12 @@ stdenv.mkDerivation rec {
         x86_64-linux = "linux_amd64";
         aarch64-linux = "linux_arm64";
         i686-linux = "linux_386";
-        x86_64-darwin = "darwin_amd64";
         aarch64-darwin = "darwin_arm64";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-THVYezhV7TmChy8IKsE8Agx6ks4wFctuk+GevXhwRv8=";
         aarch64-linux = "sha256-Wmlpw9gzbdCvgCwf3Nh9JPjjmDKS2P0TNYaRvKqO4fg=";
         i686-linux = "sha256-Fdxq1r1G17kiCl7b9OBrWwkyo+VoKOvrUPf0p4wZlcs=";
-        x86_64-darwin = "sha256-tyQzmycXo4kSvo1X4afFU2aWuXyvyvw0mb81eiH3WjE=";
         aarch64-darwin = "sha256-+zor3j+7saG6AnuIlkJSAsCkMHYuhm0Abmt6TTu8bZI=";
       };
     in
@@ -70,7 +68,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
     ];
diff --git a/pkgs/by-name/ve/verifast/package.nix b/pkgs/by-name/ve/verifast/package.nix
index bf1db3540bd2..3f574610ed58 100644
--- a/pkgs/by-name/ve/verifast/package.nix
+++ b/pkgs/by-name/ve/verifast/package.nix
@@ -60,10 +60,6 @@ stdenv.mkDerivation (
         url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos-aarch.tar.gz";
         hash = "sha256-/UicTlA4lFRk3OBgcsiS8YtDGmb7R7d6zeVLZo49HV8=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos.tar.gz";
-        hash = "sha256-EVYPcnPsERfs2bqVQMbdR6TAv/ChQDrmCZNRl2Qs1Qw=";
-      };
     };
   in
   {
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index daddf229bc5a..eb1d9e2317e6 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -198,7 +198,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix
index ebf984923f23..71a53c730200 100644
--- a/pkgs/by-name/ve/vesta-viewer/package.nix
+++ b/pkgs/by-name/ve/vesta-viewer/package.nix
@@ -30,7 +30,6 @@ let
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     mainProgram = "VESTA";
@@ -115,7 +114,6 @@ stdenvNoCC.mkDerivation (
   }
   // {
     "x86_64-linux" = linuxArgs;
-    "x86_64-darwin" = darwinArgs;
   }
   .${stdenvNoCC.hostPlatform.system} or { }
 )
diff --git a/pkgs/by-name/vg/vgmtrans/package.nix b/pkgs/by-name/vg/vgmtrans/package.nix
index 1c372c637384..eef464cad792 100644
--- a/pkgs/by-name/vg/vgmtrans/package.nix
+++ b/pkgs/by-name/vg/vgmtrans/package.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     # See CMakePresets.json
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "x86_64-windows"
       "aarch64-windows"
diff --git a/pkgs/by-name/vk/vk-messenger/package.nix b/pkgs/by-name/vk/vk-messenger/package.nix
index 7dfd160d7656..3cccc25a4a8d 100644
--- a/pkgs/by-name/vk/vk-messenger/package.nix
+++ b/pkgs/by-name/vk/vk-messenger/package.nix
@@ -31,10 +31,6 @@ let
         url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
         sha256 = "spDw9cfDSlIuCwOqREsqXC19tx62TiAz9fjIS9lYjSQ=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://web.archive.org/web/20220302083827/https://desktop.userapi.com/mac/master/vk.dmg";
-        sha256 = "hxK8I9sF6njfCxSs1KBCHfnG81JGKUgHKAeFLtuCNe0=";
-      };
     }
     .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
@@ -47,7 +43,6 @@ let
     platforms = [
       "i686-linux"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
   };
 
diff --git a/pkgs/by-name/vo/voicevox-core/onnxruntime.nix b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix
index 86e3afabdf0a..8e1820f467c6 100644
--- a/pkgs/by-name/vo/voicevox-core/onnxruntime.nix
+++ b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix
@@ -43,10 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
         id = "linux-arm64";
         hash = "sha256-J27twAe2lDJPWbw1ws+QQXJOt4ZghDemSfCW7eo5Q6k=";
       };
-      "x86_64-darwin" = fetchArtifact {
-        id = "osx-x86_64";
-        hash = "sha256-We3IYCUtu39kzC63K9SykEpt98NfM9yAgkNbnxWlBd8=";
-      };
       "aarch64-darwin" = fetchArtifact {
         id = "osx-arm64";
         hash = "sha256-ltfqGSigoVSFSS03YhOH31D0CnkuKmgX1N9z7NGFcfI=";
diff --git a/pkgs/by-name/vo/volatility2-bin/package.nix b/pkgs/by-name/vo/volatility2-bin/package.nix
index facd93842e85..2e3ce9b38c5d 100644
--- a/pkgs/by-name/vo/volatility2-bin/package.nix
+++ b/pkgs/by-name/vo/volatility2-bin/package.nix
@@ -10,13 +10,11 @@ let
   suffix =
     {
       x86_64-linux = "lin64_standalone";
-      x86_64-darwin = "mac64_standalone";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
   hash =
     {
       x86_64-linux = "sha256-ucG6oR4gBRUjMmHRr9QNenc04ENvwLvyCzSAqIoAiwM=";
-      x86_64-darwin = "sha256-BObRSSGUra1y/oo3ZFfIGi2PdHDX2gZy315x7R9DQPk=";
     }
     .${stdenv.hostPlatform.system} or throwSystem;
 in
@@ -60,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Advanced memory forensics framework";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ ivyfanchiang ];
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 5fa0b5fc964e..ede934b2012c 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -44,7 +44,6 @@ let
       "aarch64-linux"
       "aarch64-darwin"
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     maintainers = [ ];
   };
@@ -129,14 +128,12 @@ let
     src =
       let
         arch = selectSystem {
-          x86_64-darwin = "x64";
           aarch64-darwin = "arm64";
         };
       in
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
         hash = selectSystem {
-          x86_64-darwin = "sha256-U22AVln0IhGrL41YUbJMi2agjfAs1N8Zd6msElpAXD8=";
           aarch64-darwin = "sha256-NY/KFFGgtrQr9YL32nudWeTIGNDjswelcOD1wo+Jh3s=";
         };
       };
diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index 22ac32255b97..a9811e0b040f 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -20,7 +20,6 @@ let
   platform = selectSystem {
     "x86_64-linux" = "linux-x86-64";
     "aarch64-linux" = "linux-aarch64";
-    "x86_64-darwin" = "macosx-x86-64";
     "aarch64-darwin" = "macosx-aarch64";
   };
 
diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 2e57b779d37b..95c75acd1da4 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -19,7 +19,6 @@ let
     mainProgram = "wechat";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
@@ -43,7 +42,6 @@ let
     in
     {
       aarch64-darwin = any-darwin;
-      x86_64-darwin = any-darwin;
       # use https://web.archive.org/save to archive the Linux versions
       # add `if_` at the end of timestamps to avoid toolbar insertion
       # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine
diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix
index 5fcd3f16b94d..4093bbf15f6c 100644
--- a/pkgs/by-name/wh/whisparr/package.nix
+++ b/pkgs/by-name/wh/whisparr/package.nix
@@ -23,7 +23,6 @@ let
     {
       aarch64-darwin = "arm64";
       aarch64-linux = "arm64";
-      x86_64-darwin = "x64";
       x86_64-linux = "x64";
     }
     ."${system}" or (throw "Unsupported system: ${system}");
@@ -86,7 +85,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "aarch64-darwin"
       "aarch64-linux"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix
index be0d0620fb47..9dd7399ef9eb 100644
--- a/pkgs/by-name/wk/wkhtmltopdf/package.nix
+++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix
@@ -122,7 +122,6 @@ stdenv.mkDerivation (
         kalbasit
       ];
       platforms = [
-        "x86_64-darwin"
         "x86_64-linux"
         "aarch64-linux"
       ];
diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix
index e88bedf6c021..9b36df74966d 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/package.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix
@@ -79,7 +79,6 @@ let
     homepage = "https://www.wps.cn";
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
index 5f86b3053a11..b3ee081764fd 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
@@ -7,10 +7,6 @@
     url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/26885/wps-office_12.1.2.26885.AK.preread.sw.Personal_715971_amd64.deb";
     hash = "sha256-VdpRSUZ6FYS0ttEoDLWrBMBhRTl0gQ+slnmzO9hmTlE=";
   };
-  x86_64-darwin = {
-    url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_x64.dmg";
-    hash = "sha256-pyjW1cUKX7RRFDQo2ik2L57fIwixLj0XqHMYTe4aE3g=";
-  };
   aarch64-darwin = {
     url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_arm64.dmg";
     hash = "sha256-vlT96ROqB/6Jt/x60Zeh6B4MtN2NGyn5PWv9pNafF/8=";
diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix
index 61e5b734b3ab..f5bab9ed69dc 100644
--- a/pkgs/by-name/ya/yaak/package.nix
+++ b/pkgs/by-name/ya/yaak/package.nix
@@ -104,7 +104,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       archPlatforms =
         {
           "aarch64-darwin" = "aarch64-apple-darwin";
-          "x86_64-darwin" = "x86_64-apple-darwin";
           "aarch64-linux" = "aarch64-unknown-linux-gnu";
           "x86_64-linux" = "x86_64-unknown-linux-gnu";
         }
@@ -150,7 +149,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/by-name/ya/yandex-cloud/package.nix b/pkgs/by-name/ya/yandex-cloud/package.nix
index 9a6f8919996c..41a1002af868 100644
--- a/pkgs/by-name/ya/yandex-cloud/package.nix
+++ b/pkgs/by-name/ya/yandex-cloud/package.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.tie ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
       # Built with GO386=sse2.
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index d6ff1cbd5b5c..952f4d110fe8 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -13,10 +13,6 @@
       "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/386/yc",
       "hash": "sha256-RQpyHlwy3bu9xdeLiqEuAt8WCAh6qafSaMXDGESkBEw="
     },
-    "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/darwin/amd64/yc",
-      "hash": "sha256-k1mhTX9VtaCWDCbwwYooAOcWRB/xbSq2V0hrApVXlKE="
-    },
     "x86_64-linux": {
       "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/amd64/yc",
       "hash": "sha256-gv+mlrW1uSoSzDFDAoZeQK9dr0HIhgUuvVpppuKUe24="
diff --git a/pkgs/by-name/zb/zbctl/package.nix b/pkgs/by-name/zb/zbctl/package.nix
index 4b6a5c6d3a6f..e2c1feee05b3 100644
--- a/pkgs/by-name/zb/zbctl/package.nix
+++ b/pkgs/by-name/zb/zbctl/package.nix
@@ -42,7 +42,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
     ];
     maintainers = with lib.maintainers; [ thetallestjj ];
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 654346309b00..bd573c080e3b 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -66,10 +66,6 @@ let
       name = "zoomusInstallerFull.pkg";
       hash = "sha256-HReyDktQ+EiHM857kgvzQD8tSHtSFYrAfv1YSTVFCLw=";
     };
-    x86_64-darwin = fetchurl {
-      url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-F7v+j4M6pQ3sIBW5rWoIQ0gdtgtTPlUiUe2ffcc5sd8=";
-    };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
       hash = "sha256-OxzJtNqV50C2kPonXylvyOL3/3ItChkpDw7KIOzDiPw=";
diff --git a/pkgs/by-name/zr/zrok/package.nix b/pkgs/by-name/zr/zrok/package.nix
index f39d3fc9f3dc..409324563b29 100644
--- a/pkgs/by-name/zr/zrok/package.nix
+++ b/pkgs/by-name/zr/zrok/package.nix
@@ -17,7 +17,6 @@ let
       x86_64-linux = "linux_amd64";
       aarch64-linux = "linux_arm64";
       armv7l-linux = "linux_armv7";
-      x86_64-darwin = "darwin_amd64";
       aarch64-darwin = "darwin_arm64";
     }
     .${system} or throwSystem;
@@ -27,7 +26,6 @@ let
       x86_64-linux = "sha256-H/KISDC58ILi6oZlLY2HdgJR9ksEt+VeJem4VIFhqcY=";
       aarch64-linux = "sha256-kfmMi2HeZG81CocOEK+n+UwfKz245Ya4C6iXT2L85pI=";
       armv7l-linux = "sha256-AZDoQOJMBB1k9r07URj5g8249Od5P039nf3BadzCbPY=";
-      x86_64-darwin = "sha256-B2LeP1hKxifxpGD7BS0Wgd0h+Cf4teFh8ldyqrFhteU=";
       aarch64-darwin = "sha256-c5vWvb8ZhGAnmlZB/kqErC6SEXClg6vNbJheAAmqV/E=";
     }
     .${system} or throwSystem;
@@ -76,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "armv7l-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 33bbba1bb930..8754458b76f8 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -30,12 +30,6 @@ let
       runtime = "armcl";
       kernel = "linuxarm";
     };
-    x86_64-darwin = {
-      arch = "darwinx86";
-      hash = "sha256-r+OhkU0b+QDgoZpZb0Xpc3V0yRq8GBKcNLt2IzeOSdE=";
-      runtime = "dx86cl64";
-      kernel = "darwinx8664";
-    };
     armv6l-linux = armv7l-linux;
   };
   cfg =
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index 96e0a0f79222..270b3f279703 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.lisp ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     homepage = "https://github.com/clasp-developers/clasp";
     mainProgram = "clasp";
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index a009f657643c..3c6d6f85fe69 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -37,7 +37,6 @@ let
   archs = {
     x86_64-linux = "linux-x86_64";
     i686-linux = "linux-i686";
-    x86_64-darwin = "darwin-universal";
     aarch64-darwin = "darwin-universal";
     aarch64-linux = "linux-aarch64";
   };
@@ -289,7 +288,6 @@ rec {
     sha256s = {
       x86_64-linux = "sha256-F0LjdV02U9G6B8ApHxClF/o5KvhxMNukSX7Z2CwSNIs=";
       aarch64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ=";
-      x86_64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ=";
       aarch64-linux = "sha256-AzFz+nrU/HJmCL1hbCKXf5ej/uypqV1GJPVLQ4J3778=";
     };
   };
diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix
index 5f8c5a1be82d..54b79b692c2e 100644
--- a/pkgs/development/compilers/dart/default.nix
+++ b/pkgs/development/compilers/dart/default.nix
@@ -21,13 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
       system = selectSystem {
         x86_64-linux = "linux-x64";
         aarch64-linux = "linux-arm64";
-        x86_64-darwin = "macos-x64";
         aarch64-darwin = "macos-arm64";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-KOR7RM8HXzZ3EEbAaLsNF0IBz5x2CHRK7RzCMgQpnC0=";
         aarch64-linux = "sha256-+CyD7OfRaAR1UN/UpmTkBxrHxIi923LcQxAsItfgtRg=";
-        x86_64-darwin = "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s=";
         aarch64-darwin = "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo=";
       };
     in
@@ -113,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 3eadb90bfa24..3b38f31d8e4e 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -39,7 +39,6 @@ makeScopeWithSplicing' {
       runtimeIdentifierMap = {
         "x86_64-linux" = "linux-x64";
         "aarch64-linux" = "linux-arm64";
-        "x86_64-darwin" = "osx-x64";
         "aarch64-darwin" = "osx-arm64";
         "x86_64-windows" = "win-x64";
         "i686-windows" = "win-x86";
diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix
index 84c6f24ae33a..c832c28abcb0 100644
--- a/pkgs/development/compilers/dotnet/source/vmr.nix
+++ b/pkgs/development/compilers/dotnet/source/vmr.nix
@@ -539,7 +539,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     # build deadlocks intermittently on rosetta
diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix
index cd074c316f07..ffde6b93c836 100644
--- a/pkgs/development/compilers/elm/packages/lamdera/default.nix
+++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix
@@ -10,7 +10,6 @@ let
   hashes = {
     "x86_64-linux" = "1i3mhm1swphkimm4dfdiyabxd6w3xni14cnlffz0da1p6a2x11v2";
     "aarch64-linux" = "0p7dxnnxh0nskbdaq5ldf33rqmbgj0ymhqdi89y3pk1yxjlk7bcf";
-    "x86_64-darwin" = "0mw5a28nlq0ra69q5fcl2spmvc88qrffzw7ngh5fdmdmvkd9f3wb";
     "aarch64-darwin" = "0j20i5g92h8zx6p3hzxdrh298dkipxxhyvp28asddrxbiscfca1b";
   };
 in
@@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     maintainers = with lib.maintainers; [ Zimmi48 ];
   };
diff --git a/pkgs/development/compilers/fbc/mac-bin.nix b/pkgs/development/compilers/fbc/mac-bin.nix
index 39e8cf5fd72b..13c95fe18aae 100644
--- a/pkgs/development/compilers/fbc/mac-bin.nix
+++ b/pkgs/development/compilers/fbc/mac-bin.nix
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.gpl2Plus; # runtime & graphics libraries are LGPLv2+ w/ static linking exception
     maintainers = with lib.maintainers; [ OPNA2608 ];
-    platforms = [ "x86_64-darwin" ];
+    platforms = [ ];
   };
 }
diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
index a425f8fce636..d2a3dd648160 100644
--- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -54,7 +54,6 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
       {
         "x86_64-linux" = "linux";
         "aarch64-linux" = "linux";
-        "x86_64-darwin" = "macos";
         "aarch64-darwin" = "macos";
       }
       .${systemPlatform};
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
index 7d79b09e8662..9c3fc0d2bb43 100644
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -383,7 +383,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 23ea9ab073cc..4f546902fd30 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -219,7 +219,6 @@ let
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
       mainProgram = "flutter";
diff --git a/pkgs/development/compilers/flutter/versions/3_29/data.json b/pkgs/development/compilers/flutter/versions/3_29/data.json
index a3c5323a3aef..4c6757f3bace 100644
--- a/pkgs/development/compilers/flutter/versions/3_29/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_29/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-ClgSWEu0+lLcPIlabVvBY197/c/kyio6Zoq3KppbW3Y=",
     "aarch64-linux": "sha256-NACnkq/pVMiWxfAt4+bkUjM0ZLwBWk5GQrbc9HGFE4k=",
-    "x86_64-darwin": "sha256-liZz9Bj1RFH7vmEpdMiJ9/h3Yut/o0qEBvydq8dGdKs=",
     "aarch64-darwin": "sha256-544u8sIlQudxjBCSZlnQESLsOOdWp5h4lVTaY9P+pRQ="
   },
   "flutterHash": "sha256-VWmKhxjerGKmw9fXhrRRVcKpUhefmJ2agRkIyWeAOO4=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=",
       "aarch64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI=",
-      "x86_64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=",
       "x86_64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
       "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
       "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
     },
     "ios": {
       "aarch64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
       "aarch64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
-      "x86_64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
       "x86_64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k="
     },
     "linux": {
       "aarch64-darwin": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=",
       "aarch64-linux": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=",
-      "x86_64-darwin": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8=",
       "x86_64-linux": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8="
     },
     "macos": {
       "aarch64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
       "aarch64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
-      "x86_64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
       "x86_64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE="
     },
     "universal": {
       "aarch64-darwin": "sha256-MxtHKccpQfurtKumtp00CRqB/riU5+wiHsuUh4sCXVY=",
       "aarch64-linux": "sha256-w2onIP0zkg8N/vsnC9DKCrG4iIUvRiBhbHvSJYzW/fQ=",
-      "x86_64-darwin": "sha256-vq4/tCBQQtmJarcnrrL+saCUKS/xCoFHmKAxBSn1edI=",
       "x86_64-linux": "sha256-TglGaiwmbxCYJ6bk1zJwhIYlPf3+VVTO5zCMpzyu/JY="
     },
     "web": {
       "aarch64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
       "aarch64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
-      "x86_64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
       "x86_64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q="
     },
     "windows": {
-      "x86_64-darwin": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY=",
       "x86_64-linux": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json
index 078a4c8a8d51..53b3a3840ba2 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_32/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-3eE40VMwrPFD502lIaz+CkD7mBnSI/WqJ3C4DVQ01Z4=",
     "aarch64-linux": "sha256-0GXCO00ar5532h+cXBEIe8BhGVKOuGuoPzr1M00muh4=",
-    "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=",
     "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c="
   },
   "flutterHash": "sha256-s5T16+cMmL2ustJQjwFbfS8G+/TJW/WCEF1IO4WgbXQ=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=",
       "aarch64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=",
-      "x86_64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=",
       "x86_64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
       "aarch64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
-      "x86_64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
       "x86_64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I="
     },
     "ios": {
       "aarch64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
       "aarch64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
-      "x86_64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
       "x86_64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY="
     },
     "linux": {
       "aarch64-darwin": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=",
       "aarch64-linux": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=",
-      "x86_64-darwin": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=",
       "x86_64-linux": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM="
     },
     "macos": {
       "aarch64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
       "aarch64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
-      "x86_64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
       "x86_64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg="
     },
     "universal": {
       "aarch64-darwin": "sha256-h4v8Pyw7VqFDWh+VCcz12bgd1o5FIb+cpomR0k570f4=",
       "aarch64-linux": "sha256-ZBDA3tS2GwnubeIuXhZ7Zxc75KNim5OCYkkn03KMYGs=",
-      "x86_64-darwin": "sha256-USoiNw8AUinCwMvrpOTmhSDq/TP1f0N9ZT8l8ZILzOo=",
       "x86_64-linux": "sha256-OfSxYyyaRxaUCDR8ZjTdIBQ3PFpRXoA1YHIIooXAKKY="
     },
     "web": {
       "aarch64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
       "aarch64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
-      "x86_64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
       "x86_64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50="
     },
     "windows": {
-      "x86_64-darwin": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=",
       "x86_64-linux": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json
index 6d04fcf6b864..8fb3d6bbd85e 100644
--- a/pkgs/development/compilers/flutter/versions/3_35/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_35/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-ZJcii2WBCE4PNt5+S2nH4hj+WoZuhRLFkzMlSZEa01Y=",
     "aarch64-linux": "sha256-EzNApYsHor1suB9dFgJuewMqa0v7cADKLUzLym5GLOY=",
-    "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=",
     "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw="
   },
   "flutterHash": "sha256-0GI3P11vys6JU+H5MXKznHTItOXZwap7bxHzgj6umc4=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
       "aarch64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=",
-      "x86_64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
       "x86_64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
       "aarch64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
-      "x86_64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
       "x86_64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM="
     },
     "ios": {
       "aarch64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
       "aarch64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
-      "x86_64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
       "x86_64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY="
     },
     "linux": {
       "aarch64-darwin": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
       "aarch64-linux": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
-      "x86_64-darwin": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=",
       "x86_64-linux": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA="
     },
     "macos": {
       "aarch64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
       "aarch64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
-      "x86_64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
       "x86_64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c="
     },
     "universal": {
       "aarch64-darwin": "sha256-oPUDsJxKbbWEH1XgxOFoBnVYJAjgeCBKIrYtBafWtWU=",
       "aarch64-linux": "sha256-ae6UH4K09lcl7UZzD/WKFxWUKEZQsLmizODs/RMKcis=",
-      "x86_64-darwin": "sha256-wxDWrT35CUIEQaKeIK0adr0oPfv6to60Z6R+8zrwhmU=",
       "x86_64-linux": "sha256-CxvOlq8nxeY5esRanl2N7oO4RFgBTwQcRdS7Pp/5tt8="
     },
     "web": {
       "aarch64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
       "aarch64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
-      "x86_64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
       "x86_64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o="
     },
     "windows": {
-      "x86_64-darwin": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=",
       "x86_64-linux": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json
index 88baf3ba0ece..0561fac74b8b 100644
--- a/pkgs/development/compilers/flutter/versions/3_38/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_38/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-Js8cesRAseVfa5CCQSmnJJVBYl+S7Zy7ax/vNbWMjQ0=",
     "aarch64-linux": "sha256-Ba7CCHPzor8H6ksrQUqDnx82i92OSE4qiihMaDKNexI=",
-    "x86_64-darwin": "sha256-btQavXZ3CVM0ByGlZJ5z2TUfXsPljY4iFeU1rgf4KQE=",
     "aarch64-darwin": "sha256-zmEK01ooqIKtVlw+7JlDAVvviFOcaqOrbGPkdirst6A="
   },
   "flutterHash": "sha256-dFVejSD3l2C6FM3/vimOId5Nklctv7ISO9uDhLTNf80=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=",
       "aarch64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g=",
-      "x86_64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=",
       "x86_64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
       "aarch64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
-      "x86_64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
       "x86_64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE="
     },
     "ios": {
       "aarch64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
       "aarch64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
-      "x86_64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
       "x86_64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI="
     },
     "linux": {
       "aarch64-darwin": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=",
       "aarch64-linux": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=",
-      "x86_64-darwin": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8=",
       "x86_64-linux": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8="
     },
     "macos": {
       "aarch64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
       "aarch64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
-      "x86_64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
       "x86_64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A="
     },
     "universal": {
       "aarch64-darwin": "sha256-viiNdnQKAaTO91yNwGrSwr5jT2Zm+38rLNCyb7N3faw=",
       "aarch64-linux": "sha256-u9qKNkrdxkIVP4+rn0vzDSY37twJ/TLV7nfX6IqRj+4=",
-      "x86_64-darwin": "sha256-ztUb0vhegvskVdXcIi6xQtfJdIZTCWQB8zfR0CTLD54=",
       "x86_64-linux": "sha256-Xlm/ds/m0nm2cAXszCxCCjMNDyyK4AcldrvnwYImxSE="
     },
     "web": {
       "aarch64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
       "aarch64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
-      "x86_64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
       "x86_64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw="
     },
     "windows": {
-      "x86_64-darwin": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0=",
       "x86_64-linux": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_41/data.json b/pkgs/development/compilers/flutter/versions/3_41/data.json
index aa923e2bdb7d..8bc39d31b938 100644
--- a/pkgs/development/compilers/flutter/versions/3_41/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_41/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-V/OrWsJIgwYLH/ErzaxHLtdlY+xzZOiPim1B5PDbB18=",
     "aarch64-linux": "sha256-UOmrpY+HF5Q4VHeKcwdOY6gMQgVDVdNeJzKgzAgkovs=",
-    "x86_64-darwin": "sha256-lN5qGAScNUAm9UIkRrMRz8lrUdttMW7rfKRv8UwLiqo=",
     "aarch64-darwin": "sha256-P9A96zsMeJepiWw/Xz3aSp/mPEOxQ2Tuko7G2zSL4Kw="
   },
   "flutterHash": "sha256-9kvhawYRdHRYtFHrFYQkO4t8i1f9UKshn2TsUJwu+Sk=",
@@ -26,47 +25,39 @@
     "android": {
       "aarch64-darwin": "sha256-HHjCSLo/fFqOv0T+dg0wqrjZV9c+5DDkCQthgsa18rU=",
       "aarch64-linux": "sha256-9UqlUjsT0FksR9pxOPFnzLG3FQyRhCOhEzKm8fHuqN4=",
-      "x86_64-darwin": "sha256-HHjCSLo/fFqOv0T+dg0wqrjZV9c+5DDkCQthgsa18rU=",
       "x86_64-linux": "sha256-9UqlUjsT0FksR9pxOPFnzLG3FQyRhCOhEzKm8fHuqN4="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=",
       "aarch64-linux": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=",
-      "x86_64-darwin": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=",
       "x86_64-linux": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw="
     },
     "ios": {
       "aarch64-darwin": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=",
       "aarch64-linux": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=",
-      "x86_64-darwin": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=",
       "x86_64-linux": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw="
     },
     "linux": {
       "aarch64-darwin": "sha256-/UwQlRd5vQvbP51kzNw/XrwyoPOmi+USRw9Sdx4aMUE=",
       "aarch64-linux": "sha256-/UwQlRd5vQvbP51kzNw/XrwyoPOmi+USRw9Sdx4aMUE=",
-      "x86_64-darwin": "sha256-6Vu3JczoFAY+mG4FXxDCE1caX3ngXwhDKpX4s5M5nOQ=",
       "x86_64-linux": "sha256-6Vu3JczoFAY+mG4FXxDCE1caX3ngXwhDKpX4s5M5nOQ="
     },
     "macos": {
       "aarch64-darwin": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=",
       "aarch64-linux": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=",
-      "x86_64-darwin": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=",
       "x86_64-linux": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis="
     },
     "universal": {
       "aarch64-darwin": "sha256-H552p//yX1kKgZCSGcyUtNVXb7sGCyYA44957MxAdjc=",
       "aarch64-linux": "sha256-5um826or7cL13JdeE40P2FE8LKBz9M/2obDaLfNdBhM=",
-      "x86_64-darwin": "sha256-xph1PMLnB1b/VRSqAUtDZSR+j8CfXOZKGXnFQXfMDK8=",
       "x86_64-linux": "sha256-vcmcSU9EvMwV8joEB2LdwiUDe9pjSHb1c6bKpJ1P8KU="
     },
     "web": {
       "aarch64-darwin": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=",
       "aarch64-linux": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=",
-      "x86_64-darwin": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=",
       "x86_64-linux": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE="
     },
     "windows": {
-      "x86_64-darwin": "sha256-PEV89ov1KC8CXIMupIm4Nk+pYn/WcMEq3xAPo0EQSUM=",
       "x86_64-linux": "sha256-PEV89ov1KC8CXIMupIm4Nk+pYn/WcMEq3xAPo0EQSUM="
     }
   },
diff --git a/pkgs/development/compilers/flutter/versions/3_44/data.json b/pkgs/development/compilers/flutter/versions/3_44/data.json
index 4ff30f347210..a8de805e4bb6 100644
--- a/pkgs/development/compilers/flutter/versions/3_44/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_44/data.json
@@ -18,7 +18,6 @@
   "dartHash": {
     "x86_64-linux": "sha256-KOR7RM8HXzZ3EEbAaLsNF0IBz5x2CHRK7RzCMgQpnC0=",
     "aarch64-linux": "sha256-+CyD7OfRaAR1UN/UpmTkBxrHxIi923LcQxAsItfgtRg=",
-    "x86_64-darwin": "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s=",
     "aarch64-darwin": "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo="
   },
   "flutterHash": "sha256-ohtjU+COfEqruLp2/RhJ/8Ssbp5OgPR9ont1HvkXGCY=",
@@ -26,49 +25,41 @@
     "android": {
       "aarch64-darwin": "sha256-+CxZcjk4JpqDQPaj9ifo8tmlSz1x4vra/QO32k7h2Lc=",
       "aarch64-linux": "sha256-y15KG7BW6OTAqTMXzmKHGvZlKYiVyJ92SCuASzdTpPo=",
-      "x86_64-darwin": "sha256-+CxZcjk4JpqDQPaj9ifo8tmlSz1x4vra/QO32k7h2Lc=",
       "x86_64-linux": "sha256-y15KG7BW6OTAqTMXzmKHGvZlKYiVyJ92SCuASzdTpPo="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=",
       "aarch64-linux": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=",
-      "x86_64-darwin": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=",
       "x86_64-linux": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4="
     },
     "ios": {
       "aarch64-darwin": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=",
       "aarch64-linux": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=",
-      "x86_64-darwin": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=",
       "x86_64-linux": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0="
     },
     "linux": {
       "aarch64-darwin": "sha256-lK50YsR5OtPSaQzo8nTbwAIY+45N4c+NQtZ6wvl0mR4=",
       "aarch64-linux": "sha256-lK50YsR5OtPSaQzo8nTbwAIY+45N4c+NQtZ6wvl0mR4=",
-      "x86_64-darwin": "sha256-fp9nlWsCoiFUNFoBm91fyIIcyfHWBNeZvip6IJOJlM8=",
       "x86_64-linux": "sha256-fp9nlWsCoiFUNFoBm91fyIIcyfHWBNeZvip6IJOJlM8="
     },
     "macos": {
       "aarch64-darwin": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=",
       "aarch64-linux": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=",
-      "x86_64-darwin": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=",
       "x86_64-linux": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM="
     },
     "universal": {
       "aarch64-darwin": "sha256-EsVOhzp9lk5mKbGfatRR90mI+vBUy48xsOp0pCjniW0=",
       "aarch64-linux": "sha256-Gsr4wH4zFf3DJWACtUBWt5YwftXgFMf7wtaazLMm3tc=",
-      "x86_64-darwin": "sha256-UR3SU3IpKWrOEBOUNeUDvCl04ap0PpAG4XsGhG0mQfQ=",
       "x86_64-linux": "sha256-IyfIP4DGU7SnPKwcnkWr4ePY2YAXcDOxNsergKrwbx0="
     },
     "web": {
       "aarch64-darwin": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=",
       "aarch64-linux": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=",
-      "x86_64-darwin": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=",
       "x86_64-linux": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ="
     },
     "windows": {
       "aarch64-darwin": "sha256-UGwi0jZNSkeRSxv5x//py236b6aUkvVDrATojt3eTR8=",
       "aarch64-linux": "sha256-UGwi0jZNSkeRSxv5x//py236b6aUkvVDrATojt3eTR8=",
-      "x86_64-darwin": "sha256-FdGT7vVxL2lSnaZ68chgJ379pdisIuM5FQOmysOCirY=",
       "x86_64-linux": "sha256-FdGT7vVxL2lSnaZ68chgJ379pdisIuM5FQOmysOCirY="
     }
   },
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index cc3eb43b8ac0..62ad743db4ca 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -116,29 +116,6 @@ let
           }
         ];
       };
-      x86_64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-          sha256 = "e1fe990eb987f5c4b03e0396f9c228a10da71769c8a2bc8fadbc1d3b10a0f53a";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-        isHadrian = true;
-      };
       aarch64-darwin = {
         variantSuffix = "";
         src = {
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index 7c2c75a3795f..90f7d1f56170 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -102,28 +102,6 @@ let
           }
         ];
       };
-      x86_64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-          sha256 = "de7baacfb1513ab0e4ccf8911045cceee84bc8a4e39b89bd975ed3135e5f7d96";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-      };
       aarch64-darwin = {
         variantSuffix = "";
         src = {
diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix
index 650bf5b37e40..9b7827e362a9 100644
--- a/pkgs/development/compilers/gnat-bootstrap/default.nix
+++ b/pkgs/development/compilers/gnat-bootstrap/default.nix
@@ -38,11 +38,6 @@ stdenv.mkDerivation (
           alireRevision = "2";
         }
         // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-DNHcHTIi7pw0rsVtpyGTyLVElq3IoO2YX/OkDbdeQyo=";
-            upstreamTriplet = "x86_64-apple-darwin21.6.0";
-          };
           x86_64-linux = {
             inherit url;
             hash = "sha256-DC95udGSzRDE22ON4UpekxTYWOSBeUdJvILbSFj6MFQ=";
@@ -60,11 +55,6 @@ stdenv.mkDerivation (
           alireRevision = "1";
         }
         // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-3YOnvuI6Qq7huQcqgFSz/o+ZgY2wNkKDqHIuzNz1MVY=";
-            upstreamTriplet = "x86_64-apple-darwin21.6.0";
-          };
           x86_64-linux = {
             inherit url;
             hash = "sha256-pH3IuOpCM9sY/ppTYcxBmgpsUiMrisIjmAa/rmmZXb4=";
@@ -86,12 +76,6 @@ stdenv.mkDerivation (
           gccVersion = "15.2.0";
         }
         // {
-          x86_64-darwin = {
-            alireRevision = "1";
-            inherit url;
-            hash = "sha256-1YTqWsLBwNH/GBAtF5CL/YZHQvfE/3PE0LlLJ9HmjAg=";
-            upstreamTriplet = "x86_64-apple-darwin22.6.0";
-          };
           x86_64-linux = {
             alireRevision = "1";
             inherit url;
@@ -117,11 +101,6 @@ stdenv.mkDerivation (
           alireRevision = "1";
         }
         // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-u/cYFKqWLTaFADTscDxnrkYSoemKrfKpNIZ8XPlTbLI=";
-            upstreamTriplet = "x86_64-apple-darwin24.6.0";
-          };
           x86_64-linux = {
             inherit url;
             hash = "sha256-5bKYPJnXDGa80BtAogLE82X0zTuYKdN2cKh503oMeic=";
@@ -289,7 +268,6 @@ stdenv.mkDerivation (
       ];
       platforms = [
         "x86_64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ]
       ++ lib.optionals (lib.versionAtLeast majorVersion "14") [
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index 68d54df3f6be..553206a50ba8 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -27,10 +27,6 @@
       hash = "sha256-tvPaziTPGWDseQIW9MhvANT0PfZOTotUj2OC8EiUcT8=";
       url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_linux-x64_bin.tar.gz";
     };
-    "x86_64-darwin" = {
-      hash = "sha256-PsrBRx8/qVpWxbdcZdueYKxFUfVu2gnrnaleYEnqd9c=";
-      url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_macos-x64_bin.tar.gz";
-    };
     "aarch64-darwin" = {
       hash = "sha256-TN/cbJOV9nc+/NGRtmBfG3yOG3irkAq1z/NHIKP+/8U=";
       url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_macos-aarch64_bin.tar.gz";
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index f07dec30a6b9..0d3654f74bd9 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -27,7 +27,6 @@ in
       sha256 = {
         x86_64-linux = "1grpvdzkh4b6mfdn1khbs1nz1b7q61rkzfip3q2x4330fjqwcjgv";
         aarch64-linux = "1cn62bmrgz344zsml80rqpmryp8hk6bdni3zhh43lpqf8a0aj11h";
-        x86_64-darwin = "0jzk0kl1jvnav8ccarpwzfvyyzibfhrhfj72s3q17kzxwhpgbimx";
         aarch64-darwin = "0nzh0zwjlagn4aglimyajmqv5m6qwdqz7lyjaszfxzyf1p0hcmxx";
       };
     }) { }
@@ -38,7 +37,6 @@ in
       sha256 = {
         x86_64-linux = "0dfy4wlrz6jbs7kd9r0bjk9d6sqgf4fakrxrnzwfl1bsdlsn6qxk";
         aarch64-linux = "0gk2zxkwz2yyg3im23jpgaxzixchyywm19nbh51szmniah31y1x2";
-        x86_64-darwin = "14nz5qf9raida260srcmh7p41xdylipx5n61nbx9sf12vcyrrd7p";
         aarch64-darwin = "1mrvycjlxs225sspdvvq4qbay1riyyjzqjs1d0xgqdkh6c6kv47d";
       };
     }) { }
@@ -49,7 +47,6 @@ in
       sha256 = {
         x86_64-linux = "16h77px97qpzfcf5lfrj8kj8baq6fs07sxjasbdsj8cly6zg7axv";
         aarch64-linux = "16a8gkaqzsxw5z8axdyp13qdlqxapg9q11csgxigs3xxayw976q2";
-        x86_64-darwin = "0b34hb93pyqj4yfljy4krzf182dkwmlj6wkf4j5c7fnn0v3bfw0s";
         aarch64-darwin = "0cbarn632dxn1x1zi68k31plimvrr4yizr5kcc4rvagdsbxq4z97";
       };
     }) { }
diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix
index 8e9673ed6cec..26f1728ccce2 100644
--- a/pkgs/development/compilers/julia/generic-bin.nix
+++ b/pkgs/development/compilers/julia/generic-bin.nix
@@ -73,10 +73,6 @@ stdenv.mkDerivation {
         url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
         sha256 = sha256.aarch64-linux;
       };
-      x86_64-darwin = fetchurl {
-        url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz";
-        sha256 = sha256.x86_64-darwin;
-      };
       aarch64-darwin = fetchurl {
         url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz";
         sha256 = sha256.aarch64-darwin;
@@ -151,7 +147,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "julia";
diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix
index aeb98f646f58..ea5ea5368aec 100644
--- a/pkgs/development/compilers/kotlin/native.nix
+++ b/pkgs/development/compilers/kotlin/native.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
       getArch =
         {
           "aarch64-darwin" = "macos-aarch64";
-          "x86_64-darwin" = "macos-x86_64";
           "x86_64-linux" = "linux-x86_64";
         }
         .${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix
index acfc311ead7a..da20c74428a7 100644
--- a/pkgs/development/compilers/mlton/meta.nix
+++ b/pkgs/development/compilers/mlton/meta.nix
@@ -19,7 +19,6 @@
     "i686-linux"
     "x86_64-linux"
     "aarch64-linux"
-    "x86_64-darwin"
     "aarch64-darwin"
   ];
 }
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index c3a3d41f63f9..a060945dd550 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -39,10 +39,6 @@ stdenv.mkDerivation rec {
           url = url + "linux-arm64.tar.gz";
           sha256 = "1ws5h337xq0l06zrs9010h6wj2hq5cqk5ikp9arq7hj7lxf43vn5";
         };
-        "x86_64-darwin" = fetchurl {
-          url = url + "macos.tar.gz";
-          sha256 = "178ix54k2yragcgn0j8z1cfa78s1qbh1bsx3v9jnngby8igr6yn3";
-        };
         "aarch64-darwin" = fetchurl {
           url = url + "macos-arm64.tar.gz";
           sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0";
@@ -90,7 +86,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     mainProgram = "purs";
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index 7bf77a6832a2..5e0e8a633ba2 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -79,7 +79,6 @@ rec {
       targetPlatformsWithHostTools = [
         # Platforms with host tools from
         # https://doc.rust-lang.org/nightly/rustc/platform-support.html
-        "x86_64-darwin"
         "aarch64-darwin"
         "i686-freebsd"
         "x86_64-freebsd"
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 73d3cc08df88..6748970eec43 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -319,7 +319,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.attrNames bootstrapBinaries ++ [
       # These aren’t bootstrapped using the binary distribution but compiled
       # using a separate (lisp) host
-      "x86_64-darwin"
       "x86_64-linux"
       "aarch64-darwin"
       "aarch64-linux"
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index c31d89f5b588..0882b425b7e0 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix
index c2cd6f3de104..1e52cceeab2d 100644
--- a/pkgs/development/compilers/zulu/11.nix
+++ b/pkgs/development/compilers/zulu/11.nix
@@ -30,15 +30,6 @@ callPackage ./common.nix (
             "sha256-j6ItLEU1W32zgfky+M2mD5WSmeKDYWfXnwzLOxRl8Ps=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-slk4EU7Zl0cW2y2JBiCJ8yGs5h+cK2f81tRCgBOq5uA="
-          else
-            "sha256-+3OC3mQOo2ucJG0OACk7IJtTvTwPn5WPbcG5cT9DAAc=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix
index fa68676e51b0..e90fa2f17bf7 100644
--- a/pkgs/development/compilers/zulu/17.nix
+++ b/pkgs/development/compilers/zulu/17.nix
@@ -30,15 +30,6 @@ callPackage ./common.nix (
             "sha256-wX1WV6ZzwM/AmenYA+0wSYSViU1zWf0QZNRjCT7ZhQs=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-3DHXEjYN9RXYD4sB/75/fATzPAwJmZv3D+PaSU8qrog="
-          else
-            "sha256-anuLI/JBnqHd5+6s4NWkzF2+e7yDqN2jXcZKoSJp0EE=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix
index 8ac8b68956a3..53651e64c312 100644
--- a/pkgs/development/compilers/zulu/21.nix
+++ b/pkgs/development/compilers/zulu/21.nix
@@ -32,15 +32,6 @@ callPackage ./common.nix (
             "sha256-zUvl6u1Q0rgUhd/iYOL6t+LJCoVL8Rt7+07raTZ1fEo=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-5/L0FqpL6488uwzimXh9G6Io2cCTnU1+8n/6E+CNDK8="
-          else
-            "sha256-kGmQy+WZcx48jshfem8uctSg+ewcwYtrUqFuHi/Fk00=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/25.nix b/pkgs/development/compilers/zulu/25.nix
index 02565164dc60..359e374ed355 100644
--- a/pkgs/development/compilers/zulu/25.nix
+++ b/pkgs/development/compilers/zulu/25.nix
@@ -32,15 +32,6 @@ callPackage ./common.nix (
             "sha256-JhDlxk35TO5ftZHXAYPFv4Uy2OHTlMdU6LoGdRvM6xs=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-jOSgISihoNoGa5x8kBUpudCQi7Vj3O3H3jOG3W3UujA="
-          else
-            "sha256-7MAFv3sSnANTeeDem+v9ZnvpMJj18eMpzUmMRnaRZ64=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index 8c34bd80dd05..7df788337edc 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -30,15 +30,6 @@ callPackage ./common.nix (
             "sha256-JPXoGDpS77WrzuK4FzsIhwibp0dvEbwVYDRkNTzE5Kg=";
       };
 
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-5r2/yl4xHjLpaakRZ/khICGxUaoKk1GDvPJ56pliIwc="
-          else
-            "sha256-URSyabiOPYmw1rLCivDJa1SJ80D7re2PoXYTsq3KGAw=";
-      };
-
       aarch64-darwin = {
         inherit zuluVersion jdkVersion;
         hash =
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index 0957c9fe52ce..33bcd8bc337a 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -18,7 +18,6 @@ let
   targets = {
     x86_64-linux = "x86_64-linux";
     aarch64-linux = "aarch64-linux";
-    x86_64-darwin = "x86_64-macos";
     aarch64-darwin = "aarch64-macos";
     riscv32-linux = "rv32-linux";
     riscv64-linux = "rv64-linux";
diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/development/interpreters/janet/jpm.nix
index be7b1ed40671..b28da4b06710 100644
--- a/pkgs/development/interpreters/janet/jpm.nix
+++ b/pkgs/development/interpreters/janet/jpm.nix
@@ -9,7 +9,6 @@ let
   platformFiles = {
     aarch64-darwin = "macos_config.janet";
     aarch64-linux = "linux_config.janet";
-    x86_64-darwin = "macos_config.janet";
     x86_64-linux = "linux_config.janet";
   };
 
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index cf84bbe2b86c..164d1e56bc2a 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -163,7 +163,6 @@
           aarch64-linux = "sha256-/onU/UrxP3bf5zFZdQA1GM8XZSDjzOwVRKiNF09QkQ4=";
           x86_64-linux = "sha256-04RFUIwurxTrs4DZwd7TIcXr6uMcfmaAAXPYPLjd9CM=";
           aarch64-darwin = "sha256-KHgOC5CK1ttLTglvQjcSS+eezJcxlG2EDZyHSetnp1k=";
-          x86_64-darwin = "sha256-a+KNRI2OZP/8WG2bCuTQkGSoPMrrW4BgxlHFzZrgaHg=";
         }
         .${stdenv.system};
       pythonVersion = "2.7";
@@ -183,7 +182,6 @@
           aarch64-linux = "sha256-ryeliRePERmOIkSrZcpRBjC6l8Ex18zEAh61vFjef1c=";
           x86_64-linux = "sha256-xzrCzCOArJIn/Sl0gr8qPheoBhi6Rtt1RNU1UVMh7B4=";
           aarch64-darwin = "sha256-PbigP8SWFkgBZGhE1/OxK6oK2zrZoLfLEkUhvC4WijY=";
-          x86_64-darwin = "sha256-LF5cKjOsiCVR1/KLmNGdSGuJlapQgkpztO3Mau7DXGM=";
         }
         .${stdenv.system};
       pythonVersion = "3.10";
@@ -203,7 +201,6 @@
           aarch64-linux = "sha256-EyB9v4HOJOltp2CxuGNie3e7ILH7TJUZHgKgtyOD33Q=";
           x86_64-linux = "sha256-kXfZ4LuRsF+SHGQssP9xoPNlO10ppC1A1qB4wVt1cg8=";
           aarch64-darwin = "sha256-dwTg1TAuU5INMtz+mv7rEENtTJQjPogwz2A6qVWoYcE=";
-          x86_64-darwin = "sha256-okOfnTDf2ulqXpEBx9xUqKaLVsnXMU6jmbCiXT6H67I=";
         }
         .${stdenv.system};
       pythonVersion = "3.11";
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index dc27dd608c2a..01af9e249839 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -398,7 +398,6 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     broken = optimizationLevel == "0"; # generates invalid code
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index 36246d0dbf68..6d5ce0fc11c9 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -63,7 +63,6 @@ let
     aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2";
     x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
     aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2";
-    x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2";
   };
 
 in
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
index 04d249224c90..ea547c5f8bac 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
@@ -63,7 +63,6 @@ let
     aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2";
     x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
     aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2";
-    x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2";
   };
 
 in
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 03cb3ae0db47..a5291d643e80 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -27,7 +27,6 @@ let
         x86_64-linux = "libs/x86_64/libbass.so";
         armv7l-linux = "libs/armhf/libbass.so";
         aarch64-linux = "libs/aarch64/libbass.so";
-        x86_64-darwin = "libbass.dylib";
         aarch64-darwin = "libbass.dylib";
       };
       url = {
@@ -52,7 +51,6 @@ let
         x86_64-linux = "libs/x86_64/libbass_fx.so";
         armv7l-linux = "libs/armhf/libbass_fx.so";
         aarch64-linux = "libs/aarch64/libbass_fx.so";
-        x86_64-darwin = "libbass_fx.dylib";
         aarch64-darwin = "libbass_fx.dylib";
       };
       url = {
@@ -80,7 +78,6 @@ let
         x86_64-linux = "libs/x86_64/libbassmidi.so";
         armv7l-linux = "libs/armhf/libbassmidi.so";
         aarch64-linux = "libs/aarch64/libbassmidi.so";
-        x86_64-darwin = "libbassmidi.dylib";
         aarch64-darwin = "libbassmidi.dylib";
       };
       url = {
@@ -105,7 +102,6 @@ let
         x86_64-linux = "libs/x86_64/libbassmix.so";
         armv7l-linux = "libs/armhf/libbassmix.so";
         aarch64-linux = "libs/aarch64/libbassmix.so";
-        x86_64-darwin = "libbassmix.dylib";
         aarch64-darwin = "libbassmix.dylib";
       };
       url = {
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 89b6496971c1..2bb188c0d669 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -145,7 +145,6 @@ let
           armv5tel-linux = "./Configure linux-armv4 -march=armv5te";
           armv6l-linux = "./Configure linux-armv4 -march=armv6";
           armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
-          x86_64-darwin = "./Configure darwin64-x86_64-cc";
           aarch64-darwin = "./Configure darwin64-arm64-cc";
           x86_64-linux = "./Configure linux-x86_64";
           x86_64-solaris = "./Configure solaris64-x86_64-gcc";
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 8facbea4362b..1fab79f3eaef 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -284,7 +284,6 @@ qtModule {
   meta = {
     description = "Web engine based on the Chromium web browser";
     platforms = [
-      "x86_64-darwin"
       "aarch64-darwin"
       "aarch64-linux"
       "armv7a-linux"
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index 6416a1428ff1..8601104423a2 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -177,7 +177,6 @@ let
         "armv6l-linux"
         "armv7l-linux"
         "aarch64-linux"
-        "x86_64-darwin"
       ];
     };
   };
@@ -198,7 +197,6 @@ let
         "x86_64-linux"
         "armv6l-linux"
         "armv7l-linux"
-        "x86_64-darwin"
       ];
     };
   };
@@ -451,7 +449,6 @@ let
         "armv6l-linux"
         "armv7l-linux"
         "aarch64-linux"
-        "x86_64-darwin"
       ];
     };
   };
@@ -538,7 +535,6 @@ let
         "armv6l-linux"
         "armv7l-linux"
         "aarch64-linux"
-        "x86_64-darwin"
       ];
     };
   };
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 97b7596b937c..d8fef6094276 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -87,15 +87,6 @@ let
       USE_OPENMP = true;
     };
 
-    x86_64-darwin = {
-      BINARY = 64;
-      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = setDynamicArch true;
-      NO_AVX512 = !enableAVX512;
-      USE_OPENMP = false;
-      MACOSX_DEPLOYMENT_TARGET = "10.7";
-    };
-
     x86_64-linux = {
       BINARY = 64;
       TARGET = setTarget "ATHLON";
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 2cc05aa87349..31b17ddb90c8 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -236,7 +236,6 @@
         {
           x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_amd64.deb";
           aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_arm64.deb";
-          x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-amd64.tar.gz";
           aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-arm64.tar.gz";
         }
         .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
@@ -244,7 +243,6 @@
         {
           x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52";
           aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a";
-          x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d";
           aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x";
         }
         .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 7a92939e33fb..6d854daf2331 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -167,7 +167,6 @@ let
   os =
     {
       x86_64-linux = "linux";
-      x86_64-darwin = "macosx";
       aarch64-linux = "linux";
       aarch64-darwin = "macosx";
     }
@@ -177,7 +176,6 @@ let
   arch =
     {
       x86_64-linux = "x64";
-      x86_64-darwin = "x64";
       aarch64-linux = "aarch64";
       aarch64-darwin = "aarch64";
     }
diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index de06abf98913..f6f257af3b44 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -220,7 +220,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix
index 93b913c23f41..1161fee3e85c 100644
--- a/pkgs/development/python-modules/asyncinotify/default.nix
+++ b/pkgs/development/python-modules/asyncinotify/default.nix
@@ -30,7 +30,6 @@ buildPythonPackage rec {
     badPlatforms = [
       # Unsupported and crashing on import in dlsym with symbol not found
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     description = "Module for inotify";
     homepage = "https://github.com/absperf/asyncinotify/";
diff --git a/pkgs/development/python-modules/clarifai-protocol/default.nix b/pkgs/development/python-modules/clarifai-protocol/default.nix
index d3036cb894ae..c8f9dc905823 100644
--- a/pkgs/development/python-modules/clarifai-protocol/default.nix
+++ b/pkgs/development/python-modules/clarifai-protocol/default.nix
@@ -15,7 +15,6 @@ let
     "aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64";
     "x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64";
     "aarch64-darwin" = "macosx_11_0_universal2";
-    "x86_64-darwin" = "macosx_11_0_universal2";
   };
 
   key =
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 74cd18a20174..17373e25ec6a 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -87,7 +87,6 @@ buildPythonPackage rec {
           "i686-linux" = "-shared -o attach_linux_x86.so";
           "aarch64-linux" = "-shared -o attach_linux_arm64.so";
           "riscv64-linux" = "-shared -o attach_linux_riscv64.so";
-          "x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
           "aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib";
         }
         .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -156,7 +155,6 @@ buildPythonPackage rec {
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
       "riscv64-linux"
     ];
diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix
index 54c58c43304f..b27adaa57ef1 100644
--- a/pkgs/development/python-modules/frida-python/default.nix
+++ b/pkgs/development/python-modules/frida-python/default.nix
@@ -20,10 +20,6 @@ let
         hash = "sha256-00gr7AWA0ynXmZrvNWphPWkkpeDOOqWIZMKe+jbeAFA=";
         platform = "manylinux2014_aarch64";
       };
-      x86_64-darwin = {
-        hash = "sha256-7d7jWTT5yueVBfIYSZoxCDHXcxjom9JP9nfzBJqxd8I=";
-        platform = "macosx_10_13_x86_64";
-      };
       aarch64-darwin = {
         hash = "sha256-AmTFwqjE2huyFwabx6gWdRnymy+pPVqBvlJWzQQb3H4=";
         platform = "macosx_11_0_arm64";
@@ -65,7 +61,6 @@ buildPythonPackage {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix
index ff9e30f2ef1f..7f6688a7ee19 100644
--- a/pkgs/development/python-modules/gurobipy/default.nix
+++ b/pkgs/development/python-modules/gurobipy/default.nix
@@ -9,11 +9,10 @@
 let
   format = "wheel";
   pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
-  platforms = rec {
+  platforms = {
     aarch64-darwin =
       if pyShortVersion == "cp314" then "macosx_10_15_universal2" else "macosx_10_13_universal2";
     aarch64-linux = "manylinux_2_26_aarch64";
-    x86_64-darwin = aarch64-darwin;
     x86_64-linux = "manylinux2014_x86_64.manylinux_2_17_x86_64";
   };
   platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index 5931a4ef227a..2d74a368bf31 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -59,7 +59,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/darvid/python-hyperscan/blob/${src.tag}/CHANGELOG.md";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
     ];
     license = lib.licenses.mit;
     maintainers = [ ];
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index 1dce7d1025ad..c4430ca12bb4 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -150,7 +150,6 @@ buildPythonPackage {
       # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4
       # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c
       # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))'
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix
index fcaf7d5adaac..5875c39af2ec 100644
--- a/pkgs/development/python-modules/kaleido/default.nix
+++ b/pkgs/development/python-modules/kaleido/default.nix
@@ -34,10 +34,6 @@ buildPythonPackage rec {
         url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-manylinux2014_aarch64.whl";
         hash = "sha256-hFgZhEyAgslGnZwX5CYh+/hcKyN++KhuyKhSf5i2USo=";
       };
-      x86_64-darwin = fetchurl {
-        url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_10_11_x86_64.whl";
-        hash = "sha256-ym9z5/8AquvyhD9z8dO6zeGTDvUEEJP+drg6FXhQSac=";
-      };
       aarch64-darwin = fetchurl {
         url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_11_0_arm64.whl";
         hash = "sha256-u5pdH3EDV9XUMu4kDvZlim0STD5hCTWBe0tC2px4fAU=";
@@ -98,7 +94,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/plotly/Kaleido/releases";
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-linux"
       "aarch64-darwin"
     ];
diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix
index fe4bfbff0f11..5768eba865f4 100644
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@@ -111,7 +111,6 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix
index 447ab23e545e..aa0f54ce56fb 100644
--- a/pkgs/development/python-modules/paddlex/default.nix
+++ b/pkgs/development/python-modules/paddlex/default.nix
@@ -79,7 +79,6 @@ buildPythonPackage (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix
index efa0a5bab919..2d579838f2ea 100644
--- a/pkgs/development/python-modules/pcodec/default.nix
+++ b/pkgs/development/python-modules/pcodec/default.nix
@@ -50,7 +50,6 @@ buildPythonPackage rec {
     ];
     badPlatforms = [
       # Illegal instruction: 4
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index 012d23f0dcfb..62db4dfa5c42 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -131,7 +131,6 @@ buildPythonPackage (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = [ lib.maintainers.sheepforce ];
diff --git a/pkgs/development/python-modules/pysdl3/default.nix b/pkgs/development/python-modules/pysdl3/default.nix
index 86d8d5d637a9..9819fb6d9bde 100644
--- a/pkgs/development/python-modules/pysdl3/default.nix
+++ b/pkgs/development/python-modules/pysdl3/default.nix
@@ -106,7 +106,6 @@ buildPythonPackage rec {
       "aarch64-windows"
       "x86_64-windows"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 }
diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index c1d583cd9bba..052860c7690c 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -141,7 +141,6 @@ buildPythonPackage (finalAttrs: {
       # On darwin, builds 1) assume aarch64 and 2) mistakenly compile one part as
       # x86 and the other as arm64 then tries to link them into a single binary
       # which fails.
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix
index cd5ff594de3c..e6343b7edba9 100644
--- a/pkgs/development/python-modules/semgrep/common.nix
+++ b/pkgs/development/python-modules/semgrep/common.nix
@@ -35,10 +35,6 @@ rec {
       platform = "manylinux_2_34_aarch64";
       hash = "sha256-N24E9xOyRO7pXopRs+gSQM2nwHE214GfcntcoH7H7Kk=";
     };
-    x86_64-darwin = {
-      platform = "macosx_10_14_x86_64";
-      hash = "sha256-O0kSaWou5GeoVo1UMP4J2m4RAQOQUqA+YG3PaOvjfAo=";
-    };
     aarch64-darwin = {
       platform = "macosx_11_0_arm64";
       hash = "sha256-AsKxA5Wmy3NEQJ0kS6ylE33d0W86e9F494aiIkwyrcA=";
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 4edddcbf0d99..c6f3ff11c804 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -240,7 +240,7 @@ buildPythonPackage (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     maintainers = [ ];
-    badPlatforms = [ "x86_64-darwin" ];
+    badPlatforms = [ ];
     # unsupported combination
     broken = stdenv.hostPlatform.isDarwin && cudaSupport;
   };
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index cdc0883ab92b..ddaa3a9a981f 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -526,7 +526,6 @@ let
               "sha256-ty5+51BwHWE1xR4/0WcWTp608NzSAS/iiyN+9zx7/wI="
             else
               "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk=";
-          x86_64-darwin = "sha256-gqb03kB0z2pZQ6m1fyRp1/Nbt8AVVHWpOJSeZNCLc4w=";
           aarch64-darwin = "sha256-WdgAaFZU+ePwWkVBhLzjlNT7ELfGHOTaMdafcAMD5yo=";
         }
         .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index 1c7ff6bfe8df..027e5a9639b9 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -141,7 +141,6 @@ buildPythonPackage (finalAttrs: {
     badPlatforms = [
       # Tests crash with:
       # Fatal Python error: Segmentation fault for x86_64 Darwin in tests/python.py
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix
index c177b301f2a1..b0818f002391 100644
--- a/pkgs/development/python-modules/unstructured-inference/default.nix
+++ b/pkgs/development/python-modules/unstructured-inference/default.nix
@@ -106,7 +106,6 @@ buildPythonPackage (finalAttrs: {
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = [
       "x86_64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
index 636b86d4c6e1..7a1c99a03f23 100644
--- a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
+++ b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix
@@ -24,7 +24,6 @@ fetch_librusty_v8 {
   shas = {
     x86_64-linux = "sha256-f7aDA74Jn2h4rp9sACGHX4DBbN6yevgWCEKdfI1fJDU=";
     aarch64-linux = "sha256-vuEP7in+A/PrBXSunRq1SC77dOuMiScsKcA712AuNuk=";
-    x86_64-darwin = "sha256-sNe2VCwZvy64jdbPwx7pZ91fFRv1xosOcGiAtSPbt8A=";
     aarch64-darwin = "sha256-GmwTJADMxArwOvRN/w5KVmWGc1+WfraBc/wWe7dxHMg=";
   };
 }
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 8bd0a566fe8a..7dde4420901f 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -602,7 +602,6 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
       # CMake Error at cmake/cpu_extension.cmake:78 (find_isa):
       # find_isa Function invoked with incorrect arguments for function named:
       # find_isa
-      "x86_64-darwin"
     ];
     knownVulnerabilities = [
       "CVE-2026-25960"
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index d4247b7a1329..749ab60242f5 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -115,7 +115,6 @@ let
         "aarch64-linux"
         "i686-windows"
         "x86_64-cygwin"
-        "x86_64-darwin"
         "x86_64-linux"
         "x86_64-windows"
       ],
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index a913a12d13b8..764689ce0a3e 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -53,7 +53,6 @@ let
     mainProgram = "electron";
     teams = [ lib.teams.electron ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "armv7l-linux"
       "aarch64-linux"
@@ -83,7 +82,6 @@ let
     x86_64-linux = "linux-x64";
     armv7l-linux = "linux-armv7l";
     aarch64-linux = "linux-arm64";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index a1d798116a09..3623ba531641 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -5,7 +5,6 @@
             "aarch64-linux": "8d01f0063ce2cc83a68b5c723db813c2bb8621ff63ba2ddec786a589baef7247",
             "armv7l-linux": "6e4d0d96b5ed98b9973868b8ea6234a5511cae866f15e586be7003a753b7afcc",
             "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "de5389b3a1a8803fa50e2a2c2a9a8816f1fd5d996ac66a217c04396109d42e6b",
             "x86_64-linux": "92e8b031fa5327c78a972279fd75fc8503fcd1773401809f4557e4de583eabd1"
         },
         "version": "39.8.10"
@@ -16,7 +15,6 @@
             "aarch64-linux": "1c6566cf63bed400a2b17b223c4657f199477a7389b2e540a76497d754cb2e78",
             "armv7l-linux": "be9dd6389e49aeb237647ccb3c7683059e98fbcc33b61ae0dc26f61d29f56a35",
             "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd",
-            "x86_64-darwin": "8f3ba9bdfa2e4a2f0681b74befe8ee40f916c590b8ee303f86d48932fe7c9f29",
             "x86_64-linux": "4664bf23f722c6580ba77af5beb5a2c2db31da83bedb9d402f4277d99fa57639"
         },
         "version": "40.10.5"
@@ -27,7 +25,6 @@
             "aarch64-linux": "a77dc2804fda466e704907befa6facd8e7c9d0342db319c742ebb58ebe99a9c5",
             "armv7l-linux": "b7ff0470b1efc424b96b81ecc3e7f353551bd1694bfbc75b307f319133f26258",
             "headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h",
-            "x86_64-darwin": "719ad75b073bc34ff3c03694703a896c6ffdc40976c76efd959dfde108798150",
             "x86_64-linux": "4b8eca04c7f96828e297d8b3b4d303727db9123ae69b86c6041418651b6c227f"
         },
         "version": "41.9.1"
@@ -38,7 +35,6 @@
             "aarch64-linux": "1575fa5cc64b3bf502d03632a915cdca4934e85d2b14fbf900752e8febfadd5c",
             "armv7l-linux": "861d1ad6e41f395aac18deb6c2b36dd203c6364b7d2f358d5241a1ffeabd96d5",
             "headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0",
-            "x86_64-darwin": "608f68cc8c5db54b7b3d853e3672a447bd7ad06d5b2caa9bc0a83d56479374fd",
             "x86_64-linux": "3a729b020acb04aefac2c9b4b29c65b37dd7126a14a04d1ef29acb256d3edbd1"
         },
         "version": "42.5.1"
diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix
index 1a1818235ee4..d3833152f588 100644
--- a/pkgs/development/tools/electron/chromedriver/generic.nix
+++ b/pkgs/development/tools/electron/chromedriver/generic.nix
@@ -32,7 +32,6 @@ let
     ];
     teams = [ lib.teams.electron ];
     platforms = [
-      "x86_64-darwin"
       "x86_64-linux"
       "armv7l-linux"
       "aarch64-linux"
@@ -52,7 +51,6 @@ let
     x86_64-linux = "linux-x64";
     aarch64-linux = "linux-arm64";
     armv7l-linux = "linux-armv7l";
-    x86_64-darwin = "darwin-x64";
     aarch64-darwin = "darwin-arm64";
   };
 
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 71c49c5380d8..e20b48423ffd 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -5,7 +5,6 @@
             "aarch64-linux": "c6fa8afa312dd4fa13ab4c34ea1a97481f8225cf78f3cc8bbe2dedf27fa0f2b0",
             "armv7l-linux": "68963e6ab1d9eae92776782f194a31c9c48db2371d6a4c70058b4495cc244d2b",
             "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "8e8c9feeec3416a79223fcdbd855c5df121567b341366d516ae6f7f15769498c",
             "x86_64-linux": "90dc451e7faad8e2efb4aa6a01e74195b607896a29f168f2f60a8eaf92af0e33"
         },
         "version": "39.8.10"
@@ -16,7 +15,6 @@
             "aarch64-linux": "1d9c9a5252ea3db9229ded8968ffe2c01a41e676cc18c5a4c87818de029c1442",
             "armv7l-linux": "5f893df0d9e16ad06ceb53df5ac833298da0ce03d7e63608fcb7f64bf95ec817",
             "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd",
-            "x86_64-darwin": "5f461d11062eb20dde58eab29c0c9d7ab293ead00129e365e8f1e45ead533ac8",
             "x86_64-linux": "6c3476f46d4a7581d74093fcb4c6a24a1b45a26a562443068b91063ba0a098dc"
         },
         "version": "40.10.5"
@@ -27,7 +25,6 @@
             "aarch64-linux": "bf33e3258036e2fff74795be213060858fdf37f2c61ddfe551289697d7d8b528",
             "armv7l-linux": "0e65fd875ce97a9bc9241bd7c3476bcdccd22b90da2bc9d5bff6282372c55efe",
             "headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h",
-            "x86_64-darwin": "d9b5d5c960caf575cdc26dd35edfbd8078198d8b9ba5dfd9653c3753187b5485",
             "x86_64-linux": "6060783bb08fc89cececf9731290b3f22b6ff847b2577f5cbd768ee8bb3fdee3"
         },
         "version": "41.9.1"
@@ -38,7 +35,6 @@
             "aarch64-linux": "859700b9cb1e98f70208baa92e431eb1d102bd27621a5a695aa7a75327e072e6",
             "armv7l-linux": "308bd2664d9797512e93f9b2ed17bf62fae9e12cd12ff6812b4493d388cd0904",
             "headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0",
-            "x86_64-darwin": "21db8529629a1a69fc5e2b6475d99c44985a78d49b7cc7aa314465d7568d78a6",
             "x86_64-linux": "e0db56b8781035a48aae7fefdac311abb8993a7f6e72009e7adfb70926565bf0"
         },
         "version": "42.5.1"
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index ac25ea3cfde6..d60418d343dc 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -793,7 +793,6 @@ let
           ++ lib.optional (!withMono) "i686-linux"
           # 4.3 doesn't compile on darwin, and 4.4 doesn't pass tests
           ++ lib.optionals (lib.versionAtLeast version "4.5") [
-            "x86_64-darwin"
             "aarch64-darwin"
           ];
           maintainers = with lib.maintainers; [
diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix
index a01989eade0d..61b58a958a9b 100644
--- a/pkgs/development/tools/infisical/default.nix
+++ b/pkgs/development/tools/infisical/default.nix
@@ -31,7 +31,6 @@ let
           # map the platform name to the golang toolchain suffix
           # NOTE: must be synchronized with update.sh!
           x86_64-linux = "linux_amd64";
-          x86_64-darwin = "darwin_amd64";
           aarch64-linux = "linux_arm64";
           aarch64-darwin = "darwin_arm64";
         }
@@ -90,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 })
diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json
index 2b543d4e4ee9..f4b015db3c1c 100644
--- a/pkgs/development/tools/infisical/hashes.json
+++ b/pkgs/development/tools/infisical/hashes.json
@@ -1,6 +1,6 @@
 { "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
 , "x86_64-linux": "sha256-/2fksPX6/hsz6hYGdn5iNah0LMR+avY0zf9UuNH8zAo="
-, "x86_64-darwin": "sha256-SQD0zqHl8eLBz8jsSf6tOqKSFimgrjAX+7M0o8yAEqo="
+
 , "aarch64-linux": "sha256-lrkyolCSgLQiet287Br0aGYCP/daaYzJAaqMvsqsbsw="
 , "aarch64-darwin": "sha256-pw06koxiY9gYvDw0b6tRTMy3BGYS36mxV0q8TWEA7vM="
 }
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index efa213aa0fde..b1e83f610786 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
   };
diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix
index 0a1ed753a8c9..84ab490d6dc9 100644
--- a/pkgs/development/tools/selenium/chromedriver/binary.nix
+++ b/pkgs/development/tools/selenium/chromedriver/binary.nix
@@ -14,10 +14,6 @@ let
 
   # See ./source.nix for Linux
   allSpecs = {
-    x86_64-darwin = {
-      system = "mac-x64";
-      hash = upstream-info.hash_darwin;
-    };
 
     aarch64-darwin = {
       system = "mac-arm64";
diff --git a/pkgs/development/web/playwright/browser-downloads.nix b/pkgs/development/web/playwright/browser-downloads.nix
index f399b582672f..280734257919 100644
--- a/pkgs/development/web/playwright/browser-downloads.nix
+++ b/pkgs/development/web/playwright/browser-downloads.nix
@@ -21,35 +21,30 @@ in
   chromium = {
     x86_64-linux = mk (cftUrl "linux64/chrome-linux64.zip") true;
     aarch64-linux = mk (registryUrl "chromium" "chromium-linux-arm64.zip") true;
-    x86_64-darwin = mk (cftUrl "mac-x64/chrome-mac-x64.zip") false;
     aarch64-darwin = mk (cftUrl "mac-arm64/chrome-mac-arm64.zip") false;
   };
 
   "chromium-headless-shell" = {
     x86_64-linux = mk (cftUrl "linux64/chrome-headless-shell-linux64.zip") false;
     aarch64-linux = mk (registryUrl "chromium" "chromium-headless-shell-linux-arm64.zip") false;
-    x86_64-darwin = mk (cftUrl "mac-x64/chrome-headless-shell-mac-x64.zip") false;
     aarch64-darwin = mk (cftUrl "mac-arm64/chrome-headless-shell-mac-arm64.zip") false;
   };
 
   firefox = {
     x86_64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04.zip") true;
     aarch64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04-arm64.zip") true;
-    x86_64-darwin = mk (registryUrl "firefox" "firefox-mac.zip") false;
     aarch64-darwin = mk (registryUrl "firefox" "firefox-mac-arm64.zip") false;
   };
 
   webkit = {
     x86_64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04.zip") false;
     aarch64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04-arm64.zip") false;
-    x86_64-darwin = mk (registryUrl "webkit" "webkit-mac-15.zip") false;
     aarch64-darwin = mk (registryUrl "webkit" "webkit-mac-15-arm64.zip") false;
   };
 
   ffmpeg = {
     x86_64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux.zip") false;
     aarch64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux-arm64.zip") false;
-    x86_64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac.zip") false;
     aarch64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac-arm64.zip") false;
   };
 }
diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix
index 9f2d0766d765..645d15fd5559 100644
--- a/pkgs/development/web/playwright/chromium-headless-shell.nix
+++ b/pkgs/development/web/playwright/chromium-headless-shell.nix
@@ -72,7 +72,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-eZXicAwu+9OFELVz+O/Lv6jEMTeLY6i+BZhY5RZ0+xA=";
         aarch64-darwin = "sha256-qWrMOreqTOFhmFBROlXIPXrM3wqNT7iJJwpelVFke6I=";
       }
       .${system} or throwSystem;
@@ -81,7 +80,6 @@ in
 {
   x86_64-linux = linux;
   aarch64-linux = linux;
-  x86_64-darwin = darwin;
   aarch64-darwin = darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix
index 89766a2db0be..4d92563b30a1 100644
--- a/pkgs/development/web/playwright/chromium.nix
+++ b/pkgs/development/web/playwright/chromium.nix
@@ -130,7 +130,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-LGnaeRgWq496mgoosN20ayiGmNyIFHMLM2Jl/lpALMg=";
         aarch64-darwin = "sha256-aJbvZQ1hY0FfDC+ZktfW2yNW3nwc0kh/P30+n/cmLf0=";
       }
       .${system} or throwSystem;
@@ -139,7 +138,6 @@ in
 {
   x86_64-linux = chromium-linux;
   aarch64-linux = chromium-linux;
-  x86_64-darwin = chromium-darwin;
   aarch64-darwin = chromium-darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/development/web/playwright/ffmpeg.nix b/pkgs/development/web/playwright/ffmpeg.nix
index f6ea2d06b130..1735e151f5eb 100644
--- a/pkgs/development/web/playwright/ffmpeg.nix
+++ b/pkgs/development/web/playwright/ffmpeg.nix
@@ -17,7 +17,6 @@ fetchzip {
     {
       x86_64-linux = "sha256-AWTiui+ccKHxsIaQSgc5gWCJT5gYwIWzAEqSuKgVqZU=";
       aarch64-linux = "sha256-1mOKO2lcnlwLsC6ob//xKnKrCOp94pw8X14uBxCdj0Q=";
-      x86_64-darwin = "sha256-zJ8BMzdneV6LlEt4I034l5u86dwW4UmO/UazWikpKV4=";
       aarch64-darwin = "sha256-ky10UQj+XPVGpaWAPvKd51C5brml0y9xQ6iKcrxAMRc=";
     }
     .${system} or throwSystem;
diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix
index 0451dfddbfa1..e757f9af593d 100644
--- a/pkgs/development/web/playwright/firefox.nix
+++ b/pkgs/development/web/playwright/firefox.nix
@@ -42,7 +42,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-nV+oV7Zp2rAWkMWAs//PnWCA0q2jzS5hjr5AEXuEoos=";
         aarch64-darwin = "sha256-Opwa5SbuAaXf2A+qrldHc6BkhRaOzzl0dy7R4vodG5w=";
       }
       .${system} or throwSystem;
@@ -51,7 +50,6 @@ in
 {
   x86_64-linux = firefox-linux;
   aarch64-linux = firefox-linux;
-  x86_64-darwin = firefox-darwin;
   aarch64-darwin = firefox-darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix
index 1981e2ed06b7..da2028c325b1 100644
--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -204,7 +204,6 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-FFWFWKHroNBeDw4KYDe4UeucaJzMyin0Ca/qxN2iaO0=";
         aarch64-darwin = "sha256-glVkYnthOFBPp1gZXTue9WwjP+oCgQpq6j9Mlm/bjmg=";
       }
       .${system} or throwSystem;
@@ -213,7 +212,6 @@ in
 {
   x86_64-linux = webkit-linux;
   aarch64-linux = webkit-linux;
-  x86_64-darwin = webkit-darwin;
   aarch64-darwin = webkit-darwin;
 }
 .${system} or throwSystem
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index eb3469b519ab..e5d52e9cb85a 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -37,7 +37,6 @@ let
   # Map Dwarf Fortress platform names to Nixpkgs platform names.
   platforms = {
     x86_64-linux = "linux";
-    x86_64-darwin = "darwin";
   };
 
   dfVersionTuple = splitVersion dfVersion;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
index 8e91d793346a..2880c6bbd9bd 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin rec {
   zipHash = {
     x86_64-linux = "sha256-fmYrMoLMFSA/bG7db7IhEKcgYAd3ukRTZOtT6h0bCbw=";
     aarch64-linux = "sha256-TTo85HkQrq6bbifAfG30BPVP72nqOYP9yaJ7INpBN1U=";
-    x86_64-darwin = "sha256-Evu/YUQS62y7E/efJeQOJEgsbL0212Bl1aFl4SzMUqM=";
     aarch64-darwin = "sha256-NC5yVkrnD1J1LiDbSnKwNZsUOCShgfSZy8FuDnXpZWs=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix
index c000c67d892e..d3523734f3cd 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-hKElyWX4fcQtF3eyYVRuaJjvNWY9CV2bNoNkFLeJQLc=";
     aarch64-linux = "sha256-+ygxJc+ovlqjcs68QD71JQepINTeauA41sKrJa6h8gc=";
-    x86_64-darwin = "sha256-ZrvBxCi6gyRFly0NtTPWUWzTbH3rp92Vy0C4n1hO/pA=";
     aarch64-darwin = "sha256-s4q+k1gbOBCeMDpkTpui0egOxzoBjbKoX63pwVqmY6A=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
index 757b77f9d928..42fd24fb0f3b 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-Y6UvMLw+bAg0HTKsc2FdpY+S4Zf7gpgIVdZDFgr+mog=";
     aarch64-linux = "sha256-feBfv07DrKdeJbeD0gnYoOhg1LG636cghVu1x8n9rCQ=";
-    x86_64-darwin = "sha256-nVbhhlfSkJwZ1PXzhYSz9pXxbcRyO32RoOPlV7OGAOk=";
     aarch64-darwin = "sha256-0iv1oUj6bLw7kUOwkW69rs+4NIetp+uEgJ7YULkKYLE=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
index 5d9224e525cb..7752eb8e3bb2 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-uJbG8C8ggvlZIRC++KVL/psU/a0s8PMsgTph2F7a+XE=";
     aarch64-linux = "sha256-UndB+T++ega5Gg4hIMXPP0zQyWed4s5DY8nu4J8QuUw=";
-    x86_64-darwin = "sha256-alrPXVaxjspRF2CzfBaK9J/0IllKHvm+O5FVEK9xubc=";
     aarch64-darwin = "sha256-qoc2DK7/7WhX0tJ0K/BLojZxbMm1A/1Ibv7EfrRB50Y=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
index bd1224ef6828..4c987ac2427e 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-IH1y3tbY++piN+Zlw9Jw2Z7c7pFcPQ7z/X3C0t3iAo8=";
     aarch64-linux = "sha256-3Zm3omgkdYwHe0/39QCR+iwqe0bURKLB1k1cDkUYiAc=";
-    x86_64-darwin = "sha256-UJB56s/JEacST6sWTLv8lKt0ecpO4IHqelV8Awf6Wq0=";
     aarch64-darwin = "sha256-QU+0jig8y/+7cshDTJ0J0LGGRVd1uJ5jtSyZcfDjx2k=";
   };
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
index 78672ba69c8a..9aa4fc50d80f 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
@@ -31,7 +31,6 @@ stdenvNoCC.mkDerivation (
             + {
               x86_64-linux = "?os=linux&arch=amd64";
               aarch64-linux = "?os=linux&arch=arm64";
-              x86_64-darwin = "?os=darwin&arch=amd64";
               aarch64-darwin = "?os=darwin&arch=arm64";
             }
             .${plat} or (throw "Unsupported system: ${plat}");
diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
index 372ab395cdd8..c4e8b6db3603 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
@@ -6,7 +6,6 @@ grafanaPlugin {
   zipHash = {
     x86_64-linux = "sha256-lG8kpRSPXYWPag4fBAPi9QU73hAawJ0kpFsmKVdZpyc=";
     aarch64-linux = "sha256-k8ba5JY1ezQSzey1BORFuQ1K2oVMy8mfnZn6m6BhaOo=";
-    x86_64-darwin = "sha256-Mf0Ck7m9H3nI83XJy7P5ToruADRNdPqoUTvwjl6vptw=";
     aarch64-darwin = "sha256-9XNbx4KdBVOYKmHA+whnTsG7ykVNb3jMHlsRswDAoGE=";
   };
   meta = {
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index 15c00f4e8794..54c6ece2bb53 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -18,7 +18,6 @@ let
   plat = lib.elemAt info 1;
   hashes = {
     x86_64-linux = "sha512-xlbdx/fFQxilECdDiN80U+s+huBowo9Qf5tDIYwZ1z9gUCriNL0rMNDkvzUDL73BEI3WMFMqHdbi3cn7b5l9gA==";
-    x86_64-darwin = "sha512-hiTSp7lO/x6tBYiUgKglce39k/oxT4hUlTAoC50pYFiqANALAN+2E0HtZdvsMmrOn4aGLxh+SKVglMHfrGxr+g==";
     aarch64-linux = "sha512-MPrDfBMcwNCgWW8dpOeAtlz9Odfk/0z8i+Rn08hTp35kU849KdPQLTmexlvnf/jVwqfwzN2xWJtNF0sQO26pUA==";
     aarch64-darwin = "sha512-uq5VVwvbOX4Rv32iLFw+RalFPBxQqA+1hBjFw3svzOaD1caOOrGHD4lJVHFxsFw0xl//AZuSG7S3r7Eh9AmWvQ==";
   };
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index c61f8d86ac5a..6ec8ed207a4e 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -18,13 +18,11 @@ let
     if enableUnfree then
       {
         x86_64-linux = "sha512-9JzopnY43Osoy4/0G9gxJYlbCl1a9Qy2pL4GL1uyjJ3uSNoOskEBhhsqLp9BhtJXOaquuRDgbJnXhbBrlE0rKg==";
-        x86_64-darwin = "sha512-ZcdKWFrIQUmGtxoWbLc2F7g85quXfRqy62DyVPR/9zBtMTgFH0eG4Cj40ELpW7nYXZqglmAUTF/0mZZYUg2Ciw==";
         aarch64-linux = "sha512-V2Nt/lup4ofgoMqpAH3OHF8Fp0PvC1M8nl6sCKmTf+ZXQYHNjAJkJwGJwHeQQ0L/348JHyCkeWL43dS7Jr6ZJQ==";
       }
     else
       {
         x86_64-linux = "sha512-L11ZUdXC8VDiSEVDBMous2OaMlAFgvkQ+eDbmbA9r/sDIXY8W7dx3jgPNXoorDtatTemwy8aXw1XJGaVmj4T3Q==";
-        x86_64-darwin = "sha512-az5ujFtwcuNNGuITDeGRu1FB2bb8/hIUmGMvm0Xcfvs0GZPnCZVY6ScsiHZYjT8X+qBYkn/httT3MYozrPOy4Q==";
         aarch64-linux = "sha512-iVft0kZYhvFJ1NKCfdePhRxDljPTwV+3G7wV94iykYISgLTVoehzDTMdxUyfK/mmQhu3hmmHbVpw1jXjTrS7ng==";
       };
   this = stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix
index 6c4b35b95834..299545175845 100644
--- a/pkgs/tools/misc/tdarr/common.nix
+++ b/pkgs/tools/misc/tdarr/common.nix
@@ -40,7 +40,6 @@ let
     {
       x86_64-linux = "linux_x64";
       aarch64-linux = "linux_arm64";
-      x86_64-darwin = "darwin_x64";
       aarch64-darwin = "darwin_arm64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -211,7 +210,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [ mistyttm ];
diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index 15bdcea84f1b..1ff571a5a7c7 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -204,7 +204,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [
diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 3a403dd48358..6bb8195a1949 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -79,7 +79,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
index e38375a92083..2aded838a94d 100644
--- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
@@ -11,7 +11,6 @@ let
     {
       x86_64-linux = "linux_x86_64";
       aarch64-linux = "linux_x86_64";
-      x86_64-darwin = "mac_x86_64";
       aarch64-darwin = "mac_arm_64";
     }
     .${stdenv.hostPlatform.system}
@@ -64,7 +63,6 @@ let
       platforms = [
         "x86_64-linux"
         "aarch64-linux"
-        "x86_64-darwin"
         "aarch64-darwin"
       ];
     };

From ff1efa68d5e63baa20178b5c5821edfffc3ffd2d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:27:16 +0000
Subject: [PATCH 0671/1386] upbound: drop `x86_64-darwin` from update script

---
 pkgs/by-name/up/upbound/sources-main.json   | 1 -
 pkgs/by-name/up/upbound/sources-stable.json | 1 -
 pkgs/by-name/up/upbound/update.hs           | 1 -
 3 files changed, 3 deletions(-)

diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json
index eb233e0cf6c4..675310331e1e 100644
--- a/pkgs/by-name/up/upbound/sources-main.json
+++ b/pkgs/by-name/up/upbound/sources-main.json
@@ -37,7 +37,6 @@
   "platformList": [
     "aarch64-darwin",
     "aarch64-linux",
-    "x86_64-darwin",
     "x86_64-linux"
   ],
   "version": "0.41.0-0.rc.0.152.g4da0ccab"
diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json
index d9ae0996dd70..fdf6028efebf 100644
--- a/pkgs/by-name/up/upbound/sources-stable.json
+++ b/pkgs/by-name/up/upbound/sources-stable.json
@@ -37,7 +37,6 @@
   "platformList": [
     "aarch64-darwin",
     "aarch64-linux",
-    "x86_64-darwin",
     "x86_64-linux"
   ],
   "version": "0.40.3"
diff --git a/pkgs/by-name/up/upbound/update.hs b/pkgs/by-name/up/upbound/update.hs
index d7406f8717a9..11d41a852de5 100755
--- a/pkgs/by-name/up/upbound/update.hs
+++ b/pkgs/by-name/up/upbound/update.hs
@@ -65,7 +65,6 @@ main = do
   -- Architecture mapping
   let archMapping = Map.fromList
         [ ("aarch64-darwin", "darwin_arm64")
-        , ("x86_64-darwin", "darwin_amd64")
         , ("aarch64-linux", "linux_arm64")
         , ("x86_64-linux", "linux_amd64")
         ]

From e78d71b6ff35beb66744e5b1a347e0a58d96c22d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:28:26 +0000
Subject: [PATCH 0672/1386] antigravity: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/an/antigravity/update.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/antigravity/update.js b/pkgs/by-name/an/antigravity/update.js
index 45bf250a2fd5..38eb4cf7a444 100755
--- a/pkgs/by-name/an/antigravity/update.js
+++ b/pkgs/by-name/an/antigravity/update.js
@@ -13,12 +13,12 @@ import * as path from "node:path";
  * @property {string} sha256hash SHA256 hash of the download file, example: "8eb01462dc4f26aba45be4992bda0b145d1ec210c63a6272578af27e59f23bef"
  * @property {string} url Download URL, example: "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/linux-arm/Antigravity.tar.gz", "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/darwin-x64/Antigravity.zip"
  */
-/** @typedef {"x86_64-linux" | "aarch64-linux" | "x86_64-darwin" | "aarch64-darwin"} Platform */
+/** @typedef {"x86_64-linux" | "aarch64-linux" | "aarch64-darwin"} Platform */
 /** @typedef {{ version: string; vscodeVersion: string; sources: Record<Platform, { url: string; sha256: string; }> }} Information */
 
 let version = "";
 let vscodeVersion = "";
-async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64" | "darwin"} */ targetSystem) {
+async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64"} */ targetSystem) {
   /** @type {UpdateInfo} */
   const latestInfo = await (await fetch(`https://antigravity-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json();
   const newVersion = /\/antigravity\/stable\/([\d.]+)-[\d]+/.exec(latestInfo.url)?.[1] ?? ""; // Current API lack version field now, we need to parse it from the URL temporarily.
@@ -35,7 +35,6 @@ async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "da
 const sources = {
   "x86_64-linux": await getLatestInformation("linux-x64"),
   "aarch64-linux": await getLatestInformation("linux-arm64"),
-  "x86_64-darwin": await getLatestInformation("darwin"),
   "aarch64-darwin": await getLatestInformation("darwin-arm64"),
 };
 /** @type {Information} */

From 8671773f43a8634176c3d8096d17962ae57eb0f0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:33:19 +0000
Subject: [PATCH 0673/1386] buck2: drop `x86_64-darwin` from update script

---
 pkgs/by-name/bu/buck2/update.nu | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/bu/buck2/update.nu b/pkgs/by-name/bu/buck2/update.nu
index dd43e7b834b6..57188e797bee 100755
--- a/pkgs/by-name/bu/buck2/update.nu
+++ b/pkgs/by-name/bu/buck2/update.nu
@@ -5,7 +5,6 @@
 
 const ARCHES = [
   { name: "x86_64-linux", target: "x86_64-unknown-linux-gnu" },
-  { name: "x86_64-darwin", target: "x86_64-apple-darwin" },
   { name: "aarch64-linux", target: "aarch64-unknown-linux-gnu" },
   { name: "aarch64-darwin", target: "aarch64-apple-darwin" },
 ];

From 464931110abd1c86948fe2aaa1f8510254e4f34d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:34:56 +0000
Subject: [PATCH 0674/1386] electron-bin: drop `x86_64-darwin` from update
 script

---
 pkgs/development/tools/electron/binary/update.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/electron/binary/update.py b/pkgs/development/tools/electron/binary/update.py
index 67efba73c362..1ee10323df6e 100755
--- a/pkgs/development/tools/electron/binary/update.py
+++ b/pkgs/development/tools/electron/binary/update.py
@@ -47,7 +47,6 @@ systems = {
     "x86_64-linux": "linux-x64",
     "armv7l-linux": "linux-armv7l",
     "aarch64-linux": "linux-arm64",
-    "x86_64-darwin": "darwin-x64",
     "aarch64-darwin": "darwin-arm64",
 }
 

From 3b75f9ba72d328bfc3cbc20b476d665c8bd825a1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:37:21 +0000
Subject: [PATCH 0675/1386] flutterPackages{,-source}.*: drop `x86_64-darwin`
 from update script

---
 .../compilers/flutter/update/get-artifact-hashes.nix.in         | 1 -
 .../development/compilers/flutter/update/get-dart-hashes.nix.in | 1 -
 pkgs/development/compilers/flutter/update/update.py             | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
index 8edff6a2e876..b67f45d42bbd 100644
--- a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
@@ -21,7 +21,6 @@ let
   systemPlatforms = [
     "x86_64-linux"
     "aarch64-linux"
-    "x86_64-darwin"
     "aarch64-darwin"
   ];
 
diff --git a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
index 0972a3578b52..7b140b1d6d70 100644
--- a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
@@ -9,7 +9,6 @@ let
     {
       x86_64-linux = "linux-x64";
       aarch64-linux = "linux-arm64";
-      x86_64-darwin = "macos-x64";
       aarch64-darwin = "macos-arm64";
     }
     ."@platform@";
diff --git a/pkgs/development/compilers/flutter/update/update.py b/pkgs/development/compilers/flutter/update/update.py
index 7a28cc46d949..971af0d17285 100755
--- a/pkgs/development/compilers/flutter/update/update.py
+++ b/pkgs/development/compilers/flutter/update/update.py
@@ -153,7 +153,7 @@ def get_artifact_hashes(flutter_compact_version):
 
 
 def get_dart_hashes(dart_version, channel):
-    platforms = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"]
+    platforms = ["x86_64-linux", "aarch64-linux", "aarch64-darwin"]
     result_dict = {}
     for platform in platforms:
         code = load_code(

From 0e752287b7dd6bce378fb9096eca10d903eb3073 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:39:01 +0000
Subject: [PATCH 0676/1386] mirrord: drop `x86_64-darwin` from update script

---
 pkgs/by-name/mi/mirrord/update.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mi/mirrord/update.py b/pkgs/by-name/mi/mirrord/update.py
index 5756363cfc7c..580aafb451c2 100755
--- a/pkgs/by-name/mi/mirrord/update.py
+++ b/pkgs/by-name/mi/mirrord/update.py
@@ -12,7 +12,6 @@ platforms = {
     "x86_64-linux": "linux_x86_64",
     "aarch64-linux": "linux_aarch64",
     "aarch64-darwin": "mac_universal",
-    "x86_64-darwin": "mac_universal",
 }
 
 if __name__ == "__main__":

From b1edf5e60665c42e5b97eccbcfcfd38a11fd19c3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:41:30 +0000
Subject: [PATCH 0677/1386] segger-jlink: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/se/segger-jlink/update.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/se/segger-jlink/update.py b/pkgs/by-name/se/segger-jlink/update.py
index 35e8586beb67..9768927006ed 100755
--- a/pkgs/by-name/se/segger-jlink/update.py
+++ b/pkgs/by-name/se/segger-jlink/update.py
@@ -18,7 +18,6 @@ ARCH_MAP = {
     'aarch64-linux': Arch(os='Linux', name='arm64', ext='tgz'),
     'armv7l-linux': Arch(os='Linux', name='arm', ext='tgz'),
     'aarch64-darwin': Arch(os='MacOSX', name='arm64', ext='pkg'),
-    'x86_64-darwin': Arch(os='MacOSX', name='x86_64', ext='pkg'),
 }
 
 

From 28a7b26e3a055b089a7c30ad292e537467eb48cc Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:42:20 +0000
Subject: [PATCH 0678/1386] ocis_5-bin: drop `x86_64-darwin` from update script

---
 pkgs/by-name/oc/ocis_5-bin/package.nix | 3 +--
 pkgs/by-name/oc/ocis_5-bin/update.py   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/oc/ocis_5-bin/package.nix b/pkgs/by-name/oc/ocis_5-bin/package.nix
index 2453d3df8c00..00e35dfab40c 100644
--- a/pkgs/by-name/oc/ocis_5-bin/package.nix
+++ b/pkgs/by-name/oc/ocis_5-bin/package.nix
@@ -30,7 +30,6 @@ let
       hash_amd64-linux = "sha256-tmUfDKLO35qCs1hauJQKhJhcnMhqOpcqDFtAggMFhLE=";
       hash_arm64-linux = "sha256-ggRDW1cnTHMQKvOvCDH3eptH3O3PgYaondlzOGHTjio=";
       hash_arm-linux = "sha256-uMLRow1NeHufSI5B4k5qSIfH3lTxg+WxzLxgdedAz40=";
-      hash_amd64-darwin = "sha256-LZ6n/f2MdbFaPnBCoJqZZ7HQiLG3Z6ZoatgFsxaFvMc=";
       hash_arm64-darwin = "sha256-k5X2ZInFS/HlToOZPX23TRJqlx/XM1ZG++Xr4BHn8SY=";
     }
     ."hash_${arch}-${os}";
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.intersectLists lib.platforms.linux (
         lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.x86
       ))
-      ++ (lib.intersectLists lib.platforms.darwin (lib.platforms.aarch64 ++ lib.platforms.x86_64));
+      ++ lib.platforms.darwin;
 
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     mainProgram = "ocis";
diff --git a/pkgs/by-name/oc/ocis_5-bin/update.py b/pkgs/by-name/oc/ocis_5-bin/update.py
index c2f717cb41d5..8436e735b6cb 100755
--- a/pkgs/by-name/oc/ocis_5-bin/update.py
+++ b/pkgs/by-name/oc/ocis_5-bin/update.py
@@ -251,7 +251,6 @@ def main():
 
     systems = [
         ("darwin", "arm64", "aarch64-darwin"),
-        ("darwin", "amd64", "x86_64-darwin"),
         ("linux", "arm64", "aarch64-linux"),
         ("linux", "arm", "armv7l-linux"),
         ("linux", "amd64", "x86_64-linux"),

From abfb500228958f8c387d04ca2a3ae6a77616e1f4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:42:52 +0000
Subject: [PATCH 0679/1386] fermyon-spin: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/fe/fermyon-spin/update.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/fe/fermyon-spin/update.py b/pkgs/by-name/fe/fermyon-spin/update.py
index 2a2129a5926e..7fbff7d295f2 100755
--- a/pkgs/by-name/fe/fermyon-spin/update.py
+++ b/pkgs/by-name/fe/fermyon-spin/update.py
@@ -7,7 +7,6 @@ from os.path import join, dirname
 # We set oldHash and newHash fields in the inner dict later.
 systems = {
   "x86_64-linux": {"os": "linux", "arch": "amd64"},
-  "x86_64-darwin": {"os": "macos", "arch": "amd64"},
   "aarch64-linux": {"os": "linux", "arch": "aarch64"},
   "aarch64-darwin": {"os": "macos", "arch": "aarch64"},
 }

From dcc0f1b8b6e70364d3a2b18e62aaf8ac1d46494c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:44:17 +0000
Subject: [PATCH 0680/1386] jetbrains: drop `x86_64-darwin` from update script

---
 pkgs/applications/editors/jetbrains/readme.md                   | 2 --
 .../editors/jetbrains/updater/jetbrains_nix_updater/config.py   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md
index 0ed0a67d4fd5..c890021090e9 100644
--- a/pkgs/applications/editors/jetbrains/readme.md
+++ b/pkgs/applications/editors/jetbrains/readme.md
@@ -78,7 +78,5 @@ Any comments or other manual changes between these markers will be removed when
  - on `aarch64-linux`:
    - from source build
    - see if build (binary or source) works without expat
- - on `x86_64-darwin`:
-   - from source build
  - on `aarch64-darwin`:
    - from source build
diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py
index 0449427e945f..d2c202c13fcf 100644
--- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py
+++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py
@@ -3,7 +3,7 @@ import os
 import dataclasses
 from pathlib import Path
 
-SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"]
+SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "aarch64-darwin"]
 
 
 def find_nixpkgs(current_path: Path) -> Path:

From 229a3a01d352236a89f959d9265d9484106c8460 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:47:36 +0000
Subject: [PATCH 0681/1386] vscodium: drop `x86_64-darwin` from update script

---
 pkgs/applications/editors/vscode/update-vscodium.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh
index 6420ff0ee1f2..08c776dd9a46 100755
--- a/pkgs/applications/editors/vscode/update-vscodium.sh
+++ b/pkgs/applications/editors/vscode/update-vscodium.sh
@@ -21,8 +21,7 @@ for i in \
     "aarch64-linux linux-arm64 tar.gz" \
     "armv7l-linux linux-armhf tar.gz" \
     "loongarch64-linux linux-loong64 tar.gz" \
-    "aarch64-darwin darwin-arm64 zip" \
-    "x86_64-darwin darwin-x64 zip"; do
+    "aarch64-darwin darwin-arm64 zip"; do
     set -- $i
     hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url "https://github.com/VSCodium/vscodium/releases/download/$latestVersion/VSCodium-$2-$latestVersion.$3"))
     update-source-version vscodium $latestVersion $hash --system=$1 --ignore-same-version

From f4f71222f4869d1e980490a014f5c4f91b06d29c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:56:47 +0000
Subject: [PATCH 0682/1386] grafana: drop `x86_64-darwin` from update script

---
 pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh
index 34638be8d264..1e28cab67df2 100755
--- a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh
+++ b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh
@@ -41,6 +41,5 @@ if echo "$api_response" | jq -e '.packages | select(length == 1) | .any' > /dev/
 else
     update "linux-amd64" "x86_64-linux"
     update "linux-arm64" "aarch64-linux"
-    update "darwin-amd64" "x86_64-darwin"
     update "darwin-arm64" "aarch64-darwin"
 fi

From 0d745b7d709671a1eddd2874af881b2aedac1c62 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:58:28 +0000
Subject: [PATCH 0683/1386] graalvmPackages.*: drop `x86_64-darwin` from update
 script

---
 pkgs/development/compilers/graalvm/community-edition/update.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh
index 30f1782e53b9..88c233e6d20f 100755
--- a/pkgs/development/compilers/graalvm/community-edition/update.sh
+++ b/pkgs/development/compilers/graalvm/community-edition/update.sh
@@ -82,14 +82,12 @@ if [[ "$product" == "graalvm-ce" ]]; then
     [aarch64-linux]="linux-aarch64"
     [x86_64-linux]="linux-x64"
     [aarch64-darwin]="macos-aarch64"
-    [x86_64-darwin]="macos-x64"
   )
 else
   declare -r -A platforms=(
     [aarch64-linux]="linux-aarch64"
     [x86_64-linux]="linux-amd64"
     [aarch64-darwin]="macos-aarch64"
-    [x86_64-darwin]="macos-amd64"
   )
 fi
 

From f87de25a75c11437e790c5bb05b9af1751ea657c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:59:08 +0000
Subject: [PATCH 0684/1386] infisical: drop `x86_64-darwin` from update script

---
 pkgs/development/tools/infisical/hashes.json | 1 -
 pkgs/development/tools/infisical/update.sh   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json
index f4b015db3c1c..3a88405c8e72 100644
--- a/pkgs/development/tools/infisical/hashes.json
+++ b/pkgs/development/tools/infisical/hashes.json
@@ -1,6 +1,5 @@
 { "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
 , "x86_64-linux": "sha256-/2fksPX6/hsz6hYGdn5iNah0LMR+avY0zf9UuNH8zAo="
-
 , "aarch64-linux": "sha256-lrkyolCSgLQiet287Br0aGYCP/daaYzJAaqMvsqsbsw="
 , "aarch64-darwin": "sha256-pw06koxiY9gYvDw0b6tRTMy3BGYS36mxV0q8TWEA7vM="
 }
diff --git a/pkgs/development/tools/infisical/update.sh b/pkgs/development/tools/infisical/update.sh
index dc2a855d9cf0..53f2b236dcd2 100755
--- a/pkgs/development/tools/infisical/update.sh
+++ b/pkgs/development/tools/infisical/update.sh
@@ -15,7 +15,6 @@ echo "Latest infisical release: $VERSION"
 
 ARCHS=(
     "x86_64-linux:linux_amd64"
-    "x86_64-darwin:darwin_amd64"
     "aarch64-linux:linux_arm64"
     "aarch64-darwin:darwin_arm64"
 )

From 0b3afe8c2c8882de6608a5fede6c1a677ab5f20b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:59:37 +0000
Subject: [PATCH 0685/1386] qq: drop `x86_64-darwin` from update script

---
 pkgs/by-name/qq/qq/update.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh
index ecc1c769d0dd..af58939b7598 100755
--- a/pkgs/by-name/qq/qq/update.sh
+++ b/pkgs/by-name/qq/qq/update.sh
@@ -36,18 +36,14 @@ cat >sources.nix <<EOF
 # Generated by ./update.sh - do not update manually!
 # Last updated: $(date +%F)
 { fetchurl }:
-let
-  any-darwin = {
+{
+  aarch64-darwin = {
     version = "$darwin_version";
     src = fetchurl {
       url = "$darwin_url";
       hash = "$darwin_hash";
     };
   };
-in
-{
-  aarch64-darwin = any-darwin;
-  x86_64-darwin = any-darwin;
   aarch64-linux = {
     version = "$linux_version";
     src = fetchurl {

From 1979feac56fc1ea173c8e3863e311e440d645965 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:00:03 +0000
Subject: [PATCH 0686/1386] python3Packages.semgrep: drop `x86_64-darwin` from
 update script

---
 pkgs/development/python-modules/semgrep/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/semgrep/update.sh b/pkgs/development/python-modules/semgrep/update.sh
index c5eecc39491f..58d492de5dce 100755
--- a/pkgs/development/python-modules/semgrep/update.sh
+++ b/pkgs/development/python-modules/semgrep/update.sh
@@ -105,7 +105,6 @@ update_core_platform() {
 # update_core_platform <nix-system> <pypi-arch> <pypi-distro>
 update_core_platform "x86_64-linux" "x86_64" "manylinux"
 update_core_platform "aarch64-linux" "aarch64" "manylinux"
-update_core_platform "x86_64-darwin" "x86_64" "macosx"
 update_core_platform "aarch64-darwin" "arm64" "macosx"
 
 OLD_PWD=$PWD

From c8f30b14bf4b2d9dd16577bfbd2bbba29b435bb3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:01:09 +0000
Subject: [PATCH 0687/1386] waveterm: drop `x86_64-darwin` from update script

---
 pkgs/by-name/wa/waveterm/package.nix | 16 ++++------------
 pkgs/by-name/wa/waveterm/update.sh   |  1 -
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index ede934b2012c..7a95527e4c9b 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -125,18 +125,10 @@ let
   darwin = stdenv.mkDerivation {
     inherit pname version passthru;
 
-    src =
-      let
-        arch = selectSystem {
-          aarch64-darwin = "arm64";
-        };
-      in
-      fetchurl {
-        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
-        hash = selectSystem {
-          aarch64-darwin = "sha256-NY/KFFGgtrQr9YL32nudWeTIGNDjswelcOD1wo+Jh3s=";
-        };
-      };
+    src = fetchurl {
+      url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-arm64-${version}.zip";
+      hash = "sha256-NY/KFFGgtrQr9YL32nudWeTIGNDjswelcOD1wo+Jh3s=";
+    };
 
     nativeBuildInputs = [ unzip ];
 
diff --git a/pkgs/by-name/wa/waveterm/update.sh b/pkgs/by-name/wa/waveterm/update.sh
index a6464739a68a..5d70fa08f18b 100755
--- a/pkgs/by-name/wa/waveterm/update.sh
+++ b/pkgs/by-name/wa/waveterm/update.sh
@@ -25,7 +25,6 @@ for i in \
 done
 
 for i in \
-    "x86_64-darwin x64" \
     "aarch64-darwin arm64"; do
     set -- $i
     prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/Wave-darwin-$2-$latestVersion.zip")

From bf47b711da79d76fed5697aae52cefd39686fe9d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:01:57 +0000
Subject: [PATCH 0688/1386] spotify: drop `x86_64-darwin` from update script

---
 pkgs/by-name/sp/spotify/darwin.nix | 22 +++++++---------------
 pkgs/by-name/sp/spotify/update.sh  |  6 ------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix
index dd5f6f64c675..b4ecae09c949 100644
--- a/pkgs/by-name/sp/spotify/darwin.nix
+++ b/pkgs/by-name/sp/spotify/darwin.nix
@@ -13,21 +13,13 @@ stdenv.mkDerivation {
 
   version = "1.2.92.147";
 
-  src =
-    # WARNING: This Wayback Machine URL redirects to the closest timestamp.
-    # Future maintainers must manually check the timestamp exists and exactly matches at:
-    # https://web.archive.org/web/*/https://download.scdn.co/SpotifyARM64.dmg
-    # https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg
-    if stdenv.hostPlatform.isAarch64 then
-      (fetchurl {
-        url = "https://web.archive.org/web/20260607203830/https://download.scdn.co/SpotifyARM64.dmg";
-        hash = "sha256-rQuvF7LWHBR3q8GJQWO671n1NRDKinQps+zYfXPktrU=";
-      })
-    else
-      (fetchurl {
-        url = "https://web.archive.org/web/20260607203705/https://download.scdn.co/Spotify.dmg";
-        hash = "sha256-jX7nBPiwxnKXWpN4/XiXKBl6Eg01954+VDwWRoJfdbk=";
-      });
+  # WARNING: This Wayback Machine URL redirects to the closest timestamp.
+  # Future maintainers must manually check the timestamp exists and exactly matches at:
+  # https://web.archive.org/web/*/https://download.scdn.co/SpotifyARM64.dmg
+  src = fetchurl {
+    url = "https://web.archive.org/web/20260607203830/https://download.scdn.co/SpotifyARM64.dmg";
+    hash = "sha256-rQuvF7LWHBR3q8GJQWO671n1NRDKinQps+zYfXPktrU=";
+  };
 
   nativeBuildInputs = [ undmg ];
 
diff --git a/pkgs/by-name/sp/spotify/update.sh b/pkgs/by-name/sp/spotify/update.sh
index 65f986f5668a..a05690ceedc4 100755
--- a/pkgs/by-name/sp/spotify/update.sh
+++ b/pkgs/by-name/sp/spotify/update.sh
@@ -83,7 +83,6 @@ update_macos() {
 
   pushd $tmp_dir
 
-  x86_64_url="https://download.scdn.co/Spotify.dmg"
   aarch64_url="https://download.scdn.co/SpotifyARM64.dmg"
 
   curl -OL $aarch64_url
@@ -99,13 +98,8 @@ update_macos() {
 
   if [[ "$current_nix_version" != "$upstream_version" ]]; then
     archive_url="https://web.archive.org/save"
-    archived_x86_64_url=$(curl -s -I -L -o /dev/null "$archive_url/$x86_64_url" -w '%{url_effective}')
     archived_aarch64_url=$(curl -s -I -L -o /dev/null "$archive_url/$aarch64_url" -w '%{url_effective}')
 
-    update-source-version "pkgsCross.x86_64-darwin.spotify" "$upstream_version" "" "$archived_x86_64_url" \
-      --file=$nix_file \
-      --ignore-same-version
-
     update-source-version "pkgsCross.aarch64-darwin.spotify" "$upstream_version" "" "$archived_aarch64_url" \
       --file=$nix_file \
       --ignore-same-version

From d5625ce08602b4704a6be84915d2b4aae96f7c96 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:03:46 +0000
Subject: [PATCH 0689/1386] vault-bin: drop `x86_64-darwin` from update script

---
 pkgs/by-name/va/vault-bin/update-bin.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/va/vault-bin/update-bin.sh b/pkgs/by-name/va/vault-bin/update-bin.sh
index 8a3ff2504196..90055597b9cf 100755
--- a/pkgs/by-name/va/vault-bin/update-bin.sh
+++ b/pkgs/by-name/va/vault-bin/update-bin.sh
@@ -27,7 +27,6 @@ VAULT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashi
 
 VAULT_LINUX_X86_SHA256=$(calc_hash "$VAULT_VER" "linux_386")
 VAULT_LINUX_X64_SHA256=$(calc_hash "$VAULT_VER" "linux_amd64")
-VAULT_DARWIN_X64_SHA256=$(calc_hash "$VAULT_VER" "darwin_amd64")
 VAULT_LINUX_AARCH64_SHA256=$(calc_hash "$VAULT_VER" "linux_arm64")
 VAULT_DARWIN_AARCH64_SHA256=$(calc_hash "$VAULT_VER" "darwin_arm64")
 
@@ -35,6 +34,5 @@ sed -i "s/version = \".*\"/version = \"$VAULT_VER\"/" "$NIX_DRV"
 
 replace_sha "i686-linux" "$VAULT_LINUX_X86_SHA256"
 replace_sha "x86_64-linux" "$VAULT_LINUX_X64_SHA256"
-replace_sha "x86_64-darwin" "$VAULT_DARWIN_X64_SHA256"
 replace_sha "aarch64-linux" "$VAULT_LINUX_AARCH64_SHA256"
 replace_sha "aarch64-darwin" "$VAULT_DARWIN_AARCH64_SHA256"

From fba6a76e376ea77388e83acb53b9ccfdc06549d7 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:04:23 +0000
Subject: [PATCH 0690/1386] urbit: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ur/urbit/update-bin.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ur/urbit/update-bin.sh b/pkgs/by-name/ur/urbit/update-bin.sh
index d8cc7deb9bb8..f26c53dc49f6 100755
--- a/pkgs/by-name/ur/urbit/update-bin.sh
+++ b/pkgs/by-name/ur/urbit/update-bin.sh
@@ -19,7 +19,6 @@ prefetch() {
 LINUX_AARCH64_SHA256=$(prefetch "linux-aarch64")
 LINUX_X64_SHA256=$(prefetch "linux-x86_64")
 DARWIN_AARCH64_SHA256=$(prefetch "macos-aarch64")
-DARWIN_X64_SHA256=$(prefetch "macos-x86_64")
 
 sed -i "s/version = \".*\"/version = \"$VERSION\"/" "$NIX_DRV"
 
@@ -32,4 +31,3 @@ replace-sha256() {
 replace-sha256 "aarch64-linux" "$LINUX_AARCH64_SHA256"
 replace-sha256 "x86_64-linux" "$LINUX_X64_SHA256"
 replace-sha256 "aarch64-darwin" "$DARWIN_AARCH64_SHA256"
-replace-sha256 "x86_64-darwin" "$DARWIN_X64_SHA256"

From 4162f8121eb88fea352c9dbd5d47d84140b943e7 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:04:47 +0000
Subject: [PATCH 0691/1386] pdfium-binaries: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/pd/pdfium-binaries/update.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdfium-binaries/update.sh b/pkgs/by-name/pd/pdfium-binaries/update.sh
index 7546a8926329..05957cc0d630 100755
--- a/pkgs/by-name/pd/pdfium-binaries/update.sh
+++ b/pkgs/by-name/pd/pdfium-binaries/update.sh
@@ -19,7 +19,6 @@ update-source-version pdfium-binaries $latestVersion || true
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.src.url" --system "$system" | tr -d '"')))
     update-source-version pdfium-binaries $latestVersion $hash --system=$system --ignore-same-version
@@ -28,7 +27,6 @@ done
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries-v8.src.url" --system "$system" | tr -d '"')))
     update-source-version pdfium-binaries-v8 $latestVersion $hash --system=$system --ignore-same-version

From 1246d6b04d79f7f565ae8bb67c33219fe143f06f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:05:32 +0000
Subject: [PATCH 0692/1386] slack: drop `x86_64-darwin` from update script

---
 pkgs/by-name/sl/slack/update.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/by-name/sl/slack/update.sh b/pkgs/by-name/sl/slack/update.sh
index c54a9a5e7c29..1001f3e1c32a 100755
--- a/pkgs/by-name/sl/slack/update.sh
+++ b/pkgs/by-name/sl/slack/update.sh
@@ -6,25 +6,20 @@ set -euo pipefail
 cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
 
 aarch64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=arm64&variant=dmg')
-x86_64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=dmg')
 x86_64_linux_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=deb')
 
 aarch64_darwin_version=$(jq -r .version <<< "$aarch64_darwin_data")
-x86_64_darwin_version=$(jq -r .version <<< "$x86_64_darwin_data")
 x86_64_linux_version=$(jq -r .version <<< "$x86_64_linux_data")
 
 aarch64_darwin_url=$(jq -r .download_url <<< "$aarch64_darwin_data")
-x86_64_darwin_url=$(jq -r .download_url <<< "$x86_64_darwin_data")
 x86_64_linux_url=$(jq -r .download_url <<< "$x86_64_linux_data")
 
 aarch64_darwin_hash=$(nix-prefetch-url "$aarch64_darwin_url")
-x86_64_darwin_hash=$(nix-prefetch-url "$x86_64_darwin_url")
 x86_64_linux_hash=$(nix-prefetch-url "$x86_64_linux_url")
 
 # use friendlier hashes
 
 aarch64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$aarch64_darwin_hash")
-x86_64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_darwin_hash")
 x86_64_linux_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_linux_hash")
 
 cat >sources.nix <<EOF
@@ -39,13 +34,6 @@ cat >sources.nix <<EOF
       hash = "$aarch64_darwin_hash";
     };
   };
-  x86_64-darwin = {
-    version = "$x86_64_darwin_version";
-    src = fetchurl {
-      url = "$x86_64_darwin_url";
-      hash = "$x86_64_darwin_hash";
-    };
-  };
   x86_64-linux = {
     version = "$x86_64_linux_version";
     src = fetchurl {

From a474ae29776a516732673a6f8c418180bfc15889 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:05:54 +0000
Subject: [PATCH 0693/1386] unison-ucm: drop `x86_64-darwin` from update script

---
 pkgs/by-name/un/unison-ucm/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/un/unison-ucm/update.sh b/pkgs/by-name/un/unison-ucm/update.sh
index e840fbf9d779..365866f1766c 100755
--- a/pkgs/by-name/un/unison-ucm/update.sh
+++ b/pkgs/by-name/un/unison-ucm/update.sh
@@ -28,7 +28,6 @@ sed -i "s/version = \"$current_version\";/version = \"$version\";/" package.nix
 # Define platforms and their corresponding URL suffixes
 declare -A platforms=(
     ["aarch64-darwin"]="ucm-macos-arm64.tar.gz"
-    ["x86_64-darwin"]="ucm-macos-x64.tar.gz"
     ["aarch64-linux"]="ucm-linux-arm64.tar.gz"
     ["x86_64-linux"]="ucm-linux-x64.tar.gz"
 )

From 7d6fcf6ee3c996ab1f8c08564ca202f16662c994 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:06:58 +0000
Subject: [PATCH 0694/1386] trilium-desktop: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/tr/trilium-desktop/update.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/tr/trilium-desktop/update.sh b/pkgs/by-name/tr/trilium-desktop/update.sh
index 13f217de8426..460559f74c28 100755
--- a/pkgs/by-name/tr/trilium-desktop/update.sh
+++ b/pkgs/by-name/tr/trilium-desktop/update.sh
@@ -18,11 +18,9 @@ setKV ./package.nix version $version
 # Update desktop application
 sha256_linux64=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-x64.zip | jq -r .hash)
 sha256_linux64_arm=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-arm64.zip | jq -r .hash)
-sha256_darwin64=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-x64.zip | jq -r .hash)
 sha256_darwin64_arm=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-arm64.zip | jq -r .hash)
 setKV ./package.nix x86_64-linux.hash $sha256_linux64
 setKV ./package.nix aarch64-linux.hash $sha256_linux64_arm
-setKV ./package.nix x86_64-darwin.hash $sha256_darwin64
 setKV ./package.nix aarch64-darwin.hash $sha256_darwin64_arm
 electronVersion=$(curl_github "https://raw.githubusercontent.com/TriliumNext/Trilium/v$version/apps/desktop/package.json" | jq -r ".devDependencies.electron" | sed -r 's|^\^?([0-9]+).*|\1|')
 sed -r "s|(electron_)[0-9]+|\1$electronVersion|" -i ./package.nix

From 1c709898af9c5ce40ccafd1986489a03187f4c0a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:07:19 +0000
Subject: [PATCH 0695/1386] tailwindcss_3: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/ta/tailwindcss_3/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ta/tailwindcss_3/update.sh b/pkgs/by-name/ta/tailwindcss_3/update.sh
index 0bc2cd7d0117..7ce464ea7f2d 100755
--- a/pkgs/by-name/ta/tailwindcss_3/update.sh
+++ b/pkgs/by-name/ta/tailwindcss_3/update.sh
@@ -27,5 +27,4 @@ function updatePlatform() {
 updatePlatform aarch64-darwin macos-arm64
 updatePlatform aarch64-linux linux-arm64
 updatePlatform armv7l-linux linux-armv7
-updatePlatform x86_64-darwin macos-x64
 updatePlatform x86_64-linux linux-x64

From 5ad13232c01872ea1cedd83a4cfee8d3ae8991c8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:08:51 +0000
Subject: [PATCH 0696/1386] tailwindcss_4: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/ta/tailwindcss_4/update.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss_4/update.sh b/pkgs/by-name/ta/tailwindcss_4/update.sh
index dbb5912c3437..93ea8329299e 100755
--- a/pkgs/by-name/ta/tailwindcss_4/update.sh
+++ b/pkgs/by-name/ta/tailwindcss_4/update.sh
@@ -24,12 +24,10 @@ VER=$(list-git-tags --url=https://github.com/tailwindlabs/tailwindcss | rg 'v4[0
 
 LINUX_X64_HASH=$(fetch_arch "$VER" "linux-x64")
 LINUX_AARCH64_HASH=$(fetch_arch "$VER" "linux-arm64")
-DARWIN_X64_HASH=$(fetch_arch "$VER" "macos-x64")
 DARWIN_AARCH64_HASH=$(fetch_arch "$VER" "macos-arm64")
 
 sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV"
 
 replace_hash "x86_64-linux" "$LINUX_X64_HASH"
 replace_hash "aarch64-linux" "$LINUX_AARCH64_HASH"
-replace_hash "x86_64-darwin" "$DARWIN_X64_HASH"
 replace_hash "aarch64-darwin" "$DARWIN_AARCH64_HASH"

From faa77940a8a844356aadc8cd3ebc18bb7927218b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:08:30 +0000
Subject: [PATCH 0697/1386] google-cloud-sdk: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/go/google-cloud-sdk/update.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/go/google-cloud-sdk/update.sh b/pkgs/by-name/go/google-cloud-sdk/update.sh
index e8f3caf832f8..aea218cc1f87 100755
--- a/pkgs/by-name/go/google-cloud-sdk/update.sh
+++ b/pkgs/by-name/go/google-cloud-sdk/update.sh
@@ -30,9 +30,6 @@ EOF
     echo -n "    x86_64-linux ="
     genMainSrc "linux" "x86_64"
 
-    echo -n "    x86_64-darwin ="
-    genMainSrc "darwin" "x86_64"
-
     echo -n "    aarch64-linux ="
     genMainSrc "linux" "arm"
 

From c612c10cb838dbeff4eaaa42f195b297a3e1ac91 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:09:30 +0000
Subject: [PATCH 0698/1386] tabnine: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ta/tabnine/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ta/tabnine/update.sh b/pkgs/by-name/ta/tabnine/update.sh
index 5269a027198b..928899327139 100755
--- a/pkgs/by-name/ta/tabnine/update.sh
+++ b/pkgs/by-name/ta/tabnine/update.sh
@@ -13,7 +13,6 @@ function prefetch-sri() {
 
 declare -A platforms=(
     [x86_64-unknown-linux-musl]="x86_64-linux"
-    [x86_64-apple-darwin]="x86_64-darwin"
     [aarch64-apple-darwin]="aarch64-darwin"
 )
 

From 380fb22754682a52b2976ac18eaca019cd543a98 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:09:50 +0000
Subject: [PATCH 0699/1386] nrfutil: drop `x86_64-darwin` mention in update
 script

---
 pkgs/by-name/nr/nrfutil/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh
index 72bb4763a361..c8329f892aec 100755
--- a/pkgs/by-name/nr/nrfutil/update.sh
+++ b/pkgs/by-name/nr/nrfutil/update.sh
@@ -17,7 +17,6 @@ declare -a packages
 architectures["x86_64-linux"]="x86_64-unknown-linux-gnu"
 architectures["aarch64-linux"]="aarch64-unknown-linux-gnu"
 # NOTE: segger-jlink is not yet packaged for darwin
-# architectures["x86_64-darwin"]="x86_64-apple-darwin"
 # architectures["aarch64-darwin"]="aarch64-apple-darwin"
 
 packages=(

From c93b651c03e7276414bb884f20fb5e35158bac4d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:11:35 +0000
Subject: [PATCH 0700/1386] mochi: drop `x86_64-darwin` from update script

---
 pkgs/by-name/mo/mochi/package.nix |  8 ++------
 pkgs/by-name/mo/mochi/update.sh   | 12 +++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix
index 81d56f9eb8ae..c513e7211733 100644
--- a/pkgs/by-name/mo/mochi/package.nix
+++ b/pkgs/by-name/mo/mochi/package.nix
@@ -41,12 +41,8 @@ let
     inherit pname version meta;
 
     src = fetchurl {
-      url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg";
-      hash =
-        if stdenv.hostPlatform.isAarch64 then
-          "sha256-2NADaVzkibWjxBymeF1McGEQH6xHaqDMBg080kCI0F8="
-        else
-          "sha256-XM4vQVQ9QtvqyDu2Wx/8/Z+8H2DetfCufJYrX/1JHFw=";
+      url = "https://download.mochi.cards/releases/Mochi-${version}-arm64.dmg";
+      hash = "sha256-2NADaVzkibWjxBymeF1McGEQH6xHaqDMBg080kCI0F8=";
     };
 
     sourceRoot = ".";
diff --git a/pkgs/by-name/mo/mochi/update.sh b/pkgs/by-name/mo/mochi/update.sh
index cc6e20044d54..64c69ee0f4a9 100755
--- a/pkgs/by-name/mo/mochi/update.sh
+++ b/pkgs/by-name/mo/mochi/update.sh
@@ -17,10 +17,8 @@ fi
 # Update version and hash for x86_64-linux (AppImage)
 update-source-version mochi "$latestVersion" --system=x86_64-linux
 
-# Update hashes for darwin systems
-for system in x86_64-darwin aarch64-darwin; do
-    url=$(nix-instantiate --eval --json -E "with import ./. { system = \"$system\"; }; mochi.src.url" | tr -d '"')
-    hash=$(nix-prefetch-url "$url")
-    sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash")
-    update-source-version mochi "$latestVersion" "$sriHash" --system="$system" --ignore-same-version
-done
+# Update hash for aarch64-darwin
+url=$(nix-instantiate --eval --json -E "with import ./. { system = \"aarch64-darwin\"; }; mochi.src.url" | tr -d '"')
+hash=$(nix-prefetch-url "$url")
+sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash")
+update-source-version mochi "$latestVersion" "$sriHash" --system=aarch64-darwin  --ignore-same-version

From 54e0a48d5376622abe5aeb572bc65e462dfe5789 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:11:56 +0000
Subject: [PATCH 0701/1386] notesnook: drop `x86_64-darwin` from update script

---
 pkgs/by-name/no/notesnook/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/no/notesnook/update.sh b/pkgs/by-name/no/notesnook/update.sh
index ed977f182a0d..fcf8f5c6027e 100755
--- a/pkgs/by-name/no/notesnook/update.sh
+++ b/pkgs/by-name/no/notesnook/update.sh
@@ -18,7 +18,6 @@ fi
 for i in \
   "x86_64-linux linux_x86_64.AppImage" \
   "aarch64-linux linux_arm64.AppImage" \
-  "x86_64-darwin mac_x64.dmg" \
   "aarch64-darwin mac_arm64.dmg"; do
   set -- $i
   hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "https://github.com/streetwriters/notesnook/releases/download/v$latestVersion/notesnook_$2")")

From 713b294e0dac11dc30a0f4088807b4dad4671bfb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:12:31 +0000
Subject: [PATCH 0702/1386] gitkraken: drop `x86_64-darwin` from update script

---
 pkgs/by-name/gi/gitkraken/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/gi/gitkraken/update.sh b/pkgs/by-name/gi/gitkraken/update.sh
index 8c75dc1a4977..3330868113c0 100755
--- a/pkgs/by-name/gi/gitkraken/update.sh
+++ b/pkgs/by-name/gi/gitkraken/update.sh
@@ -14,7 +14,6 @@ version=$(curl -fsSL https://api.gitkraken.dev/releases/production/linux/x64/REL
 # Hardcoded URLs to compute hashes
 declare -A tarballs=(
   ["x86_64-linux"]="https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz"
-  ["x86_64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip"
   ["aarch64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip"
 )
 

From 97e3b4eee7b21dd9dbef311aff86d191c2762099 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:12:54 +0000
Subject: [PATCH 0703/1386] cursor-cli: drop `x86_64-darwin` from update script

---
 pkgs/by-name/cu/cursor-cli/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cu/cursor-cli/update.sh b/pkgs/by-name/cu/cursor-cli/update.sh
index 82484933310f..26b370557183 100755
--- a/pkgs/by-name/cu/cursor-cli/update.sh
+++ b/pkgs/by-name/cu/cursor-cli/update.sh
@@ -22,7 +22,7 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
   exit 0
 fi
 
-declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [x86_64-darwin]="darwin/x64" [aarch64-darwin]="darwin/arm64" )
+declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [aarch64-darwin]="darwin/arm64" )
 
 for platform in "${!platforms[@]}"; do
   url="https://downloads.cursor.com/lab/$release/${platforms[$platform]}/agent-cli-package.tar.gz"

From 2a92b8f5ebb11b37e2b3641891f1c984296e8245 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:13:17 +0000
Subject: [PATCH 0704/1386] confluent-cli: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/co/confluent-cli/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/co/confluent-cli/update.sh b/pkgs/by-name/co/confluent-cli/update.sh
index e237957438f0..402304aa903e 100755
--- a/pkgs/by-name/co/confluent-cli/update.sh
+++ b/pkgs/by-name/co/confluent-cli/update.sh
@@ -23,7 +23,6 @@ fi
 for i in \
     "x86_64-linux linux_amd64" \
     "aarch64-linux linux_arm64" \
-    "x86_64-darwin darwin_amd64" \
     "aarch64-darwin darwin_arm64"; do
     set -- $i
     hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/$latestVersion/confluent_${latestVersion}_$2.tar.gz"))

From d2e4a045a0d1ce93ce2c431ce811ecd3a2d40a0a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:13:41 +0000
Subject: [PATCH 0705/1386] coder: drop `x86_64-darwin` from update script

---
 pkgs/by-name/co/coder/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh
index 7f5e29d10b00..65a4dd6fcc84 100755
--- a/pkgs/by-name/co/coder/update.sh
+++ b/pkgs/by-name/co/coder/update.sh
@@ -13,7 +13,6 @@ LATEST_MAINLINE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail
 # Define the platforms
 declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz"
                   ["aarch64-linux"]="linux_arm64.tar.gz"
-                  ["x86_64-darwin"]="darwin_amd64.zip"
                   ["aarch64-darwin"]="darwin_arm64.zip")
 
 update_version_and_hashes() {

From 794000a761d288aa27f95178c2ec34bcc0a6536e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:14:05 +0000
Subject: [PATCH 0706/1386] legends-of-equestria: drop `x86_64-darwin` from
 update script

---
 pkgs/by-name/le/legends-of-equestria/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/le/legends-of-equestria/update.sh b/pkgs/by-name/le/legends-of-equestria/update.sh
index 1035b733a8da..b3ac969539e1 100755
--- a/pkgs/by-name/le/legends-of-equestria/update.sh
+++ b/pkgs/by-name/le/legends-of-equestria/update.sh
@@ -60,5 +60,4 @@ applyUpdate() {
 }
 
 applyUpdate x86_64-linux Linux
-applyUpdate x86_64-darwin macOS
 applyUpdate aarch64-darwin "macOS arm64"

From 6b29ad30d94a2e2e7021e56649b37a6d051ac583 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:14:47 +0000
Subject: [PATCH 0707/1386] code-cursor: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/co/code-cursor/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/co/code-cursor/update.sh b/pkgs/by-name/co/code-cursor/update.sh
index d0d7308c81e1..da907c7aa003 100755
--- a/pkgs/by-name/co/code-cursor/update.sh
+++ b/pkgs/by-name/co/code-cursor/update.sh
@@ -17,7 +17,6 @@ VSCODE=""
 for pair in \
   x86_64-linux:linux-x64 \
   aarch64-linux:linux-arm64 \
-  x86_64-darwin:darwin-x64 \
   aarch64-darwin:darwin-arm64
 do
   IFS=: read -r sys platform <<< "$pair"

From f9e8c0b41f722464d42feb2d437c03e8283633cf Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:15:09 +0000
Subject: [PATCH 0708/1386] codeium: drop `x86_64-darwin` from update script

---
 pkgs/by-name/co/codeium/update.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/co/codeium/update.sh b/pkgs/by-name/co/codeium/update.sh
index 268886b576a0..1c3bfabb32dd 100755
--- a/pkgs/by-name/co/codeium/update.sh
+++ b/pkgs/by-name/co/codeium/update.sh
@@ -24,12 +24,10 @@ CODEIUM_VER=$(curl -s "https://api.github.com/repos/Exafunction/codeium/releases
 
 CODEIUM_LINUX_X64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_x64")
 CODEIUM_LINUX_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_arm")
-CODEIUM_DARWIN_X64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_x64")
 CODEIUM_DARWIN_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_arm")
 
 sed -i "s/version = \".*\"/version = \"$CODEIUM_VER\"/" "$NIX_DRV"
 
 replace_hash "x86_64-linux" "$CODEIUM_LINUX_X64_HASH"
 replace_hash "aarch64-linux" "$CODEIUM_LINUX_AARCH64_HASH"
-replace_hash "x86_64-darwin" "$CODEIUM_DARWIN_X64_HASH"
 replace_hash "aarch64-darwin" "$CODEIUM_DARWIN_AARCH64_HASH"

From cc249b5e2209e4bd669aa38473f0474d3ae2f0c2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:15:55 +0000
Subject: [PATCH 0709/1386] floorp-bin-unwrapped: drop `x86_64-darwin` from
 update script

---
 pkgs/by-name/fl/floorp-bin-unwrapped/update.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
index 3d0b87d688f2..f912437dd84b 100755
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
@@ -34,10 +34,9 @@ jq '
           elif .url | contains("linux-x86_64") then
             {key: "x86_64-linux", value: .}
           elif .url | contains("macOS-universal") then
-            [{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}]
+            {key: "aarch64-darwin", value: .}
           else null end
         )
-      | flatten
       | from_entries
     )
   }

From 8e6d436dac0683bec00e5967b06db68af934e4a5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:16:16 +0000
Subject: [PATCH 0710/1386] typesense: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ty/typesense/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ty/typesense/update.sh b/pkgs/by-name/ty/typesense/update.sh
index 7d502bc63a74..a9700b9315eb 100755
--- a/pkgs/by-name/ty/typesense/update.sh
+++ b/pkgs/by-name/ty/typesense/update.sh
@@ -16,7 +16,6 @@ fi
 declare -A platforms=(
     [aarch64-linux]="linux-arm64"
     [aarch64-darwin]="darwin-arm64"
-    [x86_64-darwin]="darwin-amd64"
     [x86_64-linux]="linux-amd64"
 )
 

From f4a353124df224dfb4c671e1d1a0a42f8c399172 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:16:44 +0000
Subject: [PATCH 0711/1386] wpsoffice-cn: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/wp/wpsoffice-cn/update.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/by-name/wp/wpsoffice-cn/update.sh b/pkgs/by-name/wp/wpsoffice-cn/update.sh
index 25c309f3edf3..01262d71561b 100755
--- a/pkgs/by-name/wp/wpsoffice-cn/update.sh
+++ b/pkgs/by-name/wp/wpsoffice-cn/update.sh
@@ -17,18 +17,15 @@ linux_version=$(echo "$linux_payload" | grep -oP '(?<=banner_txt">)[^<]+')
 darwin_version=$(echo "$darwin_payload" | grep -oP '(?<=\s)\d+(?:\.\d+)+(?=/)')
 
 linux_amd64_url=$(echo "$linux_payload" | grep -oP "downLoad\('[^']*'" | head -1 | sed "s/downLoad('//;s/'$//")
-darwin_amd64_url="https://package.mac.wpscdn.cn/mac_wps_pkg/${darwin_version}/WPS_Office_${darwin_version}(${darwin_version##*.})_x64.dmg"
 darwin_arm64_url="https://package.mac.wpscdn.cn/mac_wps_pkg/${darwin_version}/WPS_Office_${darwin_version}(${darwin_version##*.})_arm64.dmg"
 
 timestamp10=$(date '+%s')
 linux_amd64_md5hash=($(printf '%s' "$SECURITY_KEY${linux_amd64_url#$prefix}$timestamp10" | md5sum))
 
 linux_amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$linux_version.deb" "$linux_amd64_url?t=$timestamp10&k=$linux_amd64_md5hash")
-darwin_amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$darwin_version.dmg" "$darwin_amd64_url")
 darwin_arm64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$darwin_version.dmg" "$darwin_arm64_url")
 
 linux_amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$linux_amd64_hash")
-darwin_amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$darwin_amd64_hash")
 darwin_arm64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$darwin_arm64_hash")
 
 cat > sources.nix << EOF
@@ -41,10 +38,6 @@ cat > sources.nix << EOF
     url = "$linux_amd64_url";
     hash = "$linux_amd64_hash";
   };
-  x86_64-darwin = {
-    url = "$darwin_amd64_url";
-    hash = "$darwin_amd64_hash";
-  };
   aarch64-darwin = {
     url = "$darwin_arm64_url";
     hash = "$darwin_arm64_hash";

From babd6e72fd5e7f352020c8f5f5bc3bfb77b57294 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:17:06 +0000
Subject: [PATCH 0712/1386] rar: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ra/rar/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ra/rar/update.sh b/pkgs/by-name/ra/rar/update.sh
index 2ac315343d48..edd36684131c 100755
--- a/pkgs/by-name/ra/rar/update.sh
+++ b/pkgs/by-name/ra/rar/update.sh
@@ -72,6 +72,5 @@ fi
 
 updateHash "$latestVersion" x64 linux x86_64-linux
 updateHash "$latestVersion" arm macos aarch64-darwin
-updateHash "$latestVersion" x64 macos x86_64-darwin
 
 updateVersion "$latestVersion"

From 1234cb922aed95a5d95222235eec1f19b4226196 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 19:36:45 +0100
Subject: [PATCH 0713/1386] p4v: clean up after `x86_64-darwin` drop

---
 pkgs/by-name/p4/p4v/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/p4/p4v/package.nix b/pkgs/by-name/p4/p4v/package.nix
index 9e6d58e391fd..1e0deb5f9b0b 100644
--- a/pkgs/by-name/p4/p4v/package.nix
+++ b/pkgs/by-name/p4/p4v/package.nix
@@ -17,7 +17,6 @@ let
       url = "https://web.archive.org/web/20260414052748/https://filehost.perforce.com/perforce/r26.1/bin.macosx12u/P4V.dmg";
       sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY=";
     };
-    # this is universal
   };
 
   mkDerivation =

From 9e7a0923ae65ec99fdeb6f4cb9342132a3ae9254 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:17:49 +0000
Subject: [PATCH 0714/1386] zoom-us: drop `x86_64-darwin` from update script

---
 pkgs/by-name/zo/zoom-us/package.nix | 1 -
 pkgs/by-name/zo/zoom-us/update.sh   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index bd573c080e3b..34c8a05cac58 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -55,7 +55,6 @@ let
   # We write them on three lines like this (rather than using {}) so that the updater script can
   # find where to edit them.
   versions.aarch64-darwin = "7.1.0.83064";
-  versions.x86_64-darwin = "7.1.0.83064";
 
   # This is the fallback version so that evaluation can produce a meaningful result.
   versions.x86_64-linux = "7.1.0.3715";
diff --git a/pkgs/by-name/zo/zoom-us/update.sh b/pkgs/by-name/zo/zoom-us/update.sh
index 25e8d58eb9a2..7147ecd8abfc 100755
--- a/pkgs/by-name/zo/zoom-us/update.sh
+++ b/pkgs/by-name/zo/zoom-us/update.sh
@@ -17,7 +17,6 @@ version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data")
 echo >&2 "=== Updating package.nix ..."
 # update-source-version expects to be at the root of nixpkgs
 (cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.aarch64-darwin pkgsCross.aarch64-darwin.zoom-us "$version_aarch64_darwin")
-(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-darwin pkgsCross.x86_64-darwin.zoom-us "$version_x86_64_darwin")
 (cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-linux pkgsCross.gnu64.zoom-us "$version_x86_64_linux" --source-key=unpacked.src)
 
 echo >&2 "=== Done!"

From 7ca063e9d128399edd96cf5902af70541e90e53b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:58:54 +0000
Subject: [PATCH 0715/1386] mas: clean up after `x86_64-darwin` drop

---
 pkgs/by-name/ma/mas/package.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix
index fc07f3ad0c03..5e34f52f41bc 100644
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -15,23 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   __structuredAttrs = true;
 
-  src =
-    let
-      # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-$ARCH.pkg
-      sources =
-        {
-          aarch64-darwin = {
-            arch = "arm64";
-            hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U=";
-          };
-        }
-        .${stdenvNoCC.hostPlatform.system}
-          or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
-    in
-    fetchurl {
-      url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-${sources.arch}.pkg";
-      inherit (sources) hash;
-    };
+  # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-arm64.pkg
+  src = fetchurl {
+    url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-arm64.pkg";
+    hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U=";
+  };
 
   nativeBuildInputs = [
     installShellFiles

From ed10a04ad041e710f447a99b3ff3f2aafc351b52 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:18:36 +0000
Subject: [PATCH 0716/1386] pulumi-bin: drop `x86_64-darwin` from update script

---
 pkgs/by-name/pu/pulumi-bin/update.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/pu/pulumi-bin/update.sh b/pkgs/by-name/pu/pulumi-bin/update.sh
index f71812135552..4da7ff0fc381 100755
--- a/pkgs/by-name/pu/pulumi-bin/update.sh
+++ b/pkgs/by-name/pu/pulumi-bin/update.sh
@@ -141,11 +141,6 @@ EOF
   genSrcs "linux" "amd64"
   echo "    ];"
 
-  echo "    x86_64-darwin = ["
-  genMainSrc "darwin" "x64"
-  genSrcs "darwin" "amd64"
-  echo "    ];"
-
   echo "    aarch64-linux = ["
   genMainSrc "linux" "arm64"
   genSrcs "linux" "arm64"

From f8fed4b5a776aa7d350d8c6e5d902b250b5d2bab Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:07:20 +0000
Subject: [PATCH 0717/1386] bun: clean up after `x86_64-darwin` drop

---
 pkgs/by-name/bu/bun/package.nix | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index b901985b3808..2ead9ba2e839 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -58,23 +58,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib'
       '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun
     ''
-    # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is:
-    # 1. Not currently supported by the version of Rosetta on our aarch64 builders
-    # 2. Is not correctly detected even on macOS 15+, where it is available through Rosetta
-    #
-    # The baseline builds are no longer an option because they too now require avx support.
-    +
-      lib.optionalString
-        (
-          stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform
-          && !(stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isx86_64)
-        )
-        ''
-          installShellCompletion --cmd bun \
-            --bash <(SHELL="bash" $out/bin/bun completions) \
-            --zsh <(SHELL="zsh" $out/bin/bun completions) \
-            --fish <(SHELL="fish" $out/bin/bun completions)
-        '';
+    + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
+      installShellCompletion --cmd bun \
+        --bash <(SHELL="bash" $out/bin/bun completions) \
+        --zsh <(SHELL="zsh" $out/bin/bun completions) \
+        --fish <(SHELL="fish" $out/bin/bun completions)
+    '';
 
   passthru = {
     sources = {
@@ -134,8 +123,5 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # Broken for Musl at 2024-01-13, tracking issue:
     # https://github.com/NixOS/nixpkgs/issues/280716
     broken = stdenvNoCC.hostPlatform.isMusl;
-
-    # Hangs when run via Rosetta 2 on Apple Silicon
-    hydraPlatforms = lib.lists.remove "x86_64-darwin" lib.platforms.all;
   };
 })

From 94b0cc89daea2cee2ffb58335cad2dad9344584f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:19:03 +0000
Subject: [PATCH 0718/1386] boundary: drop `x86_64-darwin` from update script

---
 pkgs/by-name/bo/boundary/update.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/bo/boundary/update.sh b/pkgs/by-name/bo/boundary/update.sh
index 660f44964a95..a163881d604c 100644
--- a/pkgs/by-name/bo/boundary/update.sh
+++ b/pkgs/by-name/bo/boundary/update.sh
@@ -26,13 +26,11 @@ replace_sha() {
 BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//')
 
 BOUNDARY_LINUX_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_amd64")
-BOUNDARY_DARWIN_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_amd64")
 BOUNDARY_LINUX_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_arm64")
 BOUNDARY_DARWIN_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_arm64")
 
 sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV"
 
 replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256"
-replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256"
 replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256"
 replace_sha "aarch64-darwin" "$BOUNDARY_DARWIN_AARCH64_SHA256"

From 9f9be9981785e15479efabccad55e2ae847ae348 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 16:44:46 +0100
Subject: [PATCH 0719/1386] mongocxx: clean up `badPlatforms`

---
 pkgs/by-name/mo/mongocxx/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mo/mongocxx/package.nix b/pkgs/by-name/mo/mongocxx/package.nix
index 2b8177ca41b2..1e7a68ee21ba 100644
--- a/pkgs/by-name/mo/mongocxx/package.nix
+++ b/pkgs/by-name/mo/mongocxx/package.nix
@@ -59,6 +59,5 @@ stdenv.mkDerivation (finalAttrs: {
       "libbsoncxx"
     ];
     platforms = lib.platforms.all;
-    badPlatforms = [ ]; # needs sdk >= 10.14
   };
 })

From ea839121879a3124e84c318a625dba6491535ad4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:06:37 +0000
Subject: [PATCH 0720/1386] azure-static-sites-client: clean up after
 `x86_64-darwin` drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It didn’t actually support the platform, anyway…
---
 .../az/azure-static-sites-client/package.nix     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/az/azure-static-sites-client/package.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix
index c007204348f1..51bb767bfabf 100644
--- a/pkgs/by-name/az/azure-static-sites-client/package.nix
+++ b/pkgs/by-name/az/azure-static-sites-client/package.nix
@@ -16,23 +16,15 @@
 let
   versions = lib.importJSON ./versions.json;
   flavor = lib.head (lib.filter (x: x.version == versionFlavor) versions);
-  fetchBinary =
-    runtimeId:
-    fetchurl {
-      url = flavor.files.${runtimeId}.url;
-      sha256 = flavor.files.${runtimeId}.sha;
-    };
-  sources = {
-    "x86_64-linux" = fetchBinary "linux-x64";
-  };
 in
 stdenv.mkDerivation {
   pname = "StaticSitesClient-${versionFlavor}";
   version = flavor.buildId;
 
-  src =
-    sources.${stdenv.hostPlatform.system}
-      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  src = fetchurl {
+    url = flavor.files.linux-x64.url;
+    sha256 = flavor.files.linux-x64.sha;
+  };
 
   nativeBuildInputs = [
     autoPatchelfHook

From 417d7af8488c6808421175d6a070ed273e6e0c0c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:19:18 +0000
Subject: [PATCH 0721/1386] clouddrive2: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/cl/clouddrive2/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/cl/clouddrive2/update.sh b/pkgs/by-name/cl/clouddrive2/update.sh
index 200bb47700fe..1e121ba98260 100755
--- a/pkgs/by-name/cl/clouddrive2/update.sh
+++ b/pkgs/by-name/cl/clouddrive2/update.sh
@@ -15,7 +15,6 @@ fi
 for i in \
     "x86_64-linux linux-x86_64" \
     "aarch64-linux linux-aarch64" \
-    "x86_64-darwin macos-x86_64" \
     "aarch64-darwin macos-aarch64"; do
     set -- $i
     prefetch=$(nix-prefetch-url "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v$latestVersion/clouddrive-2-$2-$latestVersion.tgz")

From 66195bdef4f1a3877ef813a228b30b253c536942 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:18:02 +0100
Subject: [PATCH 0722/1386] handy: clean up `badPlatforms`

---
 pkgs/by-name/ha/handy/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix
index d7253a3314a1..1870494bec50 100644
--- a/pkgs/by-name/ha/handy/package.nix
+++ b/pkgs/by-name/ha/handy/package.nix
@@ -281,6 +281,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
       philocalyst
     ];
     platforms = with lib.platforms; linux ++ darwin;
-    badPlatforms = [ ]; # We weren't able to get hashes here
   };
 })

From d3b1e8c674014d3bda029469b093c07e100338e5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:15:52 +0100
Subject: [PATCH 0723/1386] ripcord: clean up after `x86_64-darwin` drop

---
 .../instant-messengers/ripcord/darwin.nix     | 38 -------------------
 pkgs/top-level/all-packages.nix               |  6 +--
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/ripcord/darwin.nix

diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix
deleted file mode 100644
index 030234b95fb5..000000000000
--- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchzip,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "ripcord";
-  version = "0.4.29";
-
-  src = fetchzip {
-    url = "https://cancel.fm/dl/Ripcord_Mac_${version}.zip";
-    sha256 = "sha256-v8iydjLBjFN5LuctpcBpEkhSICxPhLKzLjSASWtsQok=";
-    stripRoot = false;
-  };
-
-  dontBuild = true;
-  dontFixup = true; # modification is not allowed by the license https://cancel.fm/ripcord/shareware-redistribution/
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/Applications
-    cp -r $src/Ripcord.app $out/Applications/
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Desktop chat client for Slack and Discord";
-    homepage = "https://cancel.fm/ripcord/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    # See: https://cancel.fm/ripcord/shareware-redistribution/
-    license = lib.licenses.unfreeRedistributable;
-    maintainers = with lib.maintainers; [ mikroskeem ];
-    platforms = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd203b155387..3fd56be961e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9321,11 +9321,7 @@ with pkgs;
 
   ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; };
 
-  ripcord =
-    if stdenv.hostPlatform.isLinux then
-      qt5.callPackage ../applications/networking/instant-messengers/ripcord { }
-    else
-      callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { };
+  ripcord = qt5.callPackage ../applications/networking/instant-messengers/ripcord { };
 
   inherit (callPackage ../applications/networking/cluster/rke2 { })
     rke2_1_33

From 6eacc88f2ad70fa0954672e168112c4e2efc46fb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:19:36 +0000
Subject: [PATCH 0724/1386] pgsql-tools: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/pg/pgsql-tools/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/pg/pgsql-tools/update.sh b/pkgs/by-name/pg/pgsql-tools/update.sh
index ddd35c318e8a..f6932338bd7f 100644
--- a/pkgs/by-name/pg/pgsql-tools/update.sh
+++ b/pkgs/by-name/pg/pgsql-tools/update.sh
@@ -19,7 +19,6 @@ update-source-version pgsql-tools "$latestVersion" --file=pkgs/by-name/pg/pgsql-
 declare -A platforms=(
   ["x86_64-linux"]="pgsqltoolsservice-linux-x64.tar.gz"
   ["aarch64-linux"]="pgsqltoolsservice-linux-arm64.tar.gz"
-  ["x86_64-darwin"]="pgsqltoolsservice-osx-x86.tar.gz"
   ["aarch64-darwin"]="pgsqltoolsservice-osx-arm64.tar.gz"
 )
 

From 1dc115bdeeff498f48b32a6d7d5af824b39bdf06 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:34:56 +0000
Subject: [PATCH 0725/1386] openmvg: clean up `badPlatforms`

---
 pkgs/by-name/op/openmvg/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/op/openmvg/package.nix b/pkgs/by-name/op/openmvg/package.nix
index 5203c5dfbdbb..0a37cfad64df 100644
--- a/pkgs/by-name/op/openmvg/package.nix
+++ b/pkgs/by-name/op/openmvg/package.nix
@@ -94,8 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/openMVG/openMVG/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
-    badPlatforms = [
-    ];
     maintainers = with lib.maintainers; [
       mdaiter
       bouk

From 3dfc4a6c320f1b632118283d484f3d6b55cce363 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:17:46 +0100
Subject: [PATCH 0726/1386] gitaly: clean up after `x86_64-darwin` drop

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

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 2158bd9241a5..ce1fbf8d160e 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -98,7 +98,7 @@ buildGoModule (
     meta = {
       homepage = "https://gitlab.com/gitlab-org/gitaly";
       description = "Git RPC service for handling all the git calls made by GitLab";
-      platforms = lib.platforms.linux ++ [ ];
+      platforms = lib.platforms.linux;
       teams = [ lib.teams.gitlab ];
       license = lib.licenses.mit;
     };

From 3336a0bce72db502d77ea9fe7e789851db4c2600 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:23:15 +0000
Subject: [PATCH 0727/1386] orbstack: drop `x86_64-darwin` from update script

---
 pkgs/by-name/or/orbstack/package.nix | 24 ++++++------------------
 pkgs/by-name/or/orbstack/update.sh   | 21 ++++-----------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix
index 0f8fa3730fb9..d9ac7e1107af 100644
--- a/pkgs/by-name/or/orbstack/package.nix
+++ b/pkgs/by-name/or/orbstack/package.nix
@@ -8,28 +8,17 @@
 let
   inherit (stdenvNoCC.hostPlatform) system;
   version = "2.2.1-20628";
-  sourceData = {
-    aarch64-darwin = {
-      arch = "arm64";
-      hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU=";
-    };
-  };
-  sources = lib.mapAttrs (
-    system:
-    { arch, hash }:
-    fetchurl {
-      url = "https://cdn-updates.orbstack.dev/${arch}/OrbStack_v${
-        lib.replaceString "-" "_" version
-      }_${arch}.dmg";
-      inherit hash;
-    }
-  ) sourceData;
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "orbstack";
   inherit version;
 
-  src = finalAttrs.passthru.sources.${system} or (throw "unsupported system ${system}");
+  src = fetchurl {
+    url = "https://cdn-updates.orbstack.dev/arm64/OrbStack_v${
+      lib.replaceString "-" "_" version
+    }_arm64.dmg";
+    hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU=";
+  };
 
   # -snld prevents "ERROR: Dangerous symbolic link path was ignored"
   # -xr'!*:com.apple.*' prevents macOS extended attributes (e.g. macl or
@@ -66,7 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    inherit sources;
     updateScript = ./update.sh;
   };
 
diff --git a/pkgs/by-name/or/orbstack/update.sh b/pkgs/by-name/or/orbstack/update.sh
index 39c1c2ffe787..582719072a99 100755
--- a/pkgs/by-name/or/orbstack/update.sh
+++ b/pkgs/by-name/or/orbstack/update.sh
@@ -4,21 +4,8 @@
 
 set -eu -o pipefail
 
-update_arch() {
-  local arch="$1"
-  local system="$2"
+source_url="$(curl -L -I "https://orbstack.dev/download/stable/latest/arm64" | grep -i "location:" | awk '{print $2}' | tr -d '\r')"
+version="$(echo "$source_url" | grep -o '\([0-9]\+\.\)\{2\}[0-9]\+_[0-9]\+' | sed 's/_/-/')"
+hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$source_url")")
 
-  local source_url
-  source_url="$(curl -L -I "https://orbstack.dev/download/stable/latest/$arch" | grep -i "location:" | awk '{print $2}' | tr -d '\r')"
-
-  local version
-  version="$(echo "$source_url" | grep -o '\([0-9]\+\.\)\{2\}[0-9]\+_[0-9]\+' | sed 's/_/-/')"
-
-  local hash
-  hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$source_url")")
-
-  update-source-version orbstack "$version" "$hash" --system="$system" --source-key="sources.$system" --ignore-same-version
-}
-
-update_arch "arm64" "aarch64-darwin"
-update_arch "amd64" "x86_64-darwin"
+update-source-version orbstack "$version" "$hash" --ignore-same-version

From 6a34cc8a2ec1ff13436afebf433144c320e5e52e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:54:49 +0000
Subject: [PATCH 0728/1386] iverilog: clean up `badPlatforms`

---
 pkgs/by-name/iv/iverilog/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix
index 55a852bdf73b..d5cf8f12a57e 100644
--- a/pkgs/by-name/iv/iverilog/package.nix
+++ b/pkgs/by-name/iv/iverilog/package.nix
@@ -93,9 +93,5 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = lib.platforms.all;
-    badPlatforms = [
-      # Several tests fail with:
-      # ==> Failed - running iverilog.
-    ];
   };
 })

From f38248e8500182ce4f42aa6ddf8d31c3ba71ac2f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:32:46 +0000
Subject: [PATCH 0729/1386] fbc: clean up after `x86_64-darwin` drop

---
 pkgs/development/compilers/fbc/mac-bin.nix | 36 ----------------------
 pkgs/top-level/all-packages.nix            |  6 +---
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 pkgs/development/compilers/fbc/mac-bin.nix

diff --git a/pkgs/development/compilers/fbc/mac-bin.nix b/pkgs/development/compilers/fbc/mac-bin.nix
deleted file mode 100644
index 13c95fe18aae..000000000000
--- a/pkgs/development/compilers/fbc/mac-bin.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchzip,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "fbc-mac-bin";
-  version = "1.06-darwin-wip20160505";
-
-  src = fetchzip {
-    url = "https://tmc.castleparadox.com/temp/fbc-${version}.tar.bz2";
-    sha256 = "sha256-hD3SRUkk50sf0MhhgHNMvBoJHTKz/71lyFxaAXM4/qI=";
-  };
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp -R * $out
-
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://rpg.hamsterrepublic.com/ohrrpgce/Compiling_in_Mac_OS_X";
-    description = "FreeBASIC, a multi-platform BASIC Compiler (precompiled Darwin build by OHRRPGCE team)";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.gpl2Plus; # runtime & graphics libraries are LGPLv2+ w/ static linking exception
-    maintainers = with lib.maintainers; [ OPNA2608 ];
-    platforms = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fd56be961e0..beb553b86ccc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3256,11 +3256,7 @@ with pkgs;
   };
   fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
 
-  fbc =
-    if stdenv.hostPlatform.isDarwin then
-      callPackage ../development/compilers/fbc/mac-bin.nix { }
-    else
-      callPackage ../development/compilers/fbc { };
+  fbc = callPackage ../development/compilers/fbc { };
 
   filecheck = with python3Packages; toPythonApplication filecheck;
 

From 792d6a0fbf5de59d77f2974f1e4f95f311c49814 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:23:33 +0000
Subject: [PATCH 0730/1386] phoenixd: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ph/phoenixd/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ph/phoenixd/update.sh b/pkgs/by-name/ph/phoenixd/update.sh
index a983312c6a71..4c051abfede3 100755
--- a/pkgs/by-name/ph/phoenixd/update.sh
+++ b/pkgs/by-name/ph/phoenixd/update.sh
@@ -17,7 +17,6 @@ fi
 
 for system in \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; phoenixd.src.url" --system "$system" | tr -d '"')))
     update-source-version phoenixd $latestVersion $hash --system=$system --ignore-same-version

From 2059df24f5896e0b2157ecbf5b44e1ae0b35fc51 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:54:21 +0000
Subject: [PATCH 0731/1386] nesting: clean up `badPlatforms`

---
 pkgs/by-name/ne/nesting/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ne/nesting/package.nix b/pkgs/by-name/ne/nesting/package.nix
index b011c3d10118..bfe7a8326ad4 100644
--- a/pkgs/by-name/ne/nesting/package.nix
+++ b/pkgs/by-name/ne/nesting/package.nix
@@ -53,8 +53,5 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "nesting";
     maintainers = with lib.maintainers; [ commiterate ];
-    badPlatforms = [
-      # Only supports AArch64 for Darwin.
-    ];
   };
 })

From 059979d3d975db1ff61a3365546b099754eefeb0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:54:36 +0000
Subject: [PATCH 0732/1386] ooklaserver: clean up after `x86_64-darwin` drop

---
 pkgs/by-name/oo/ooklaserver/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/oo/ooklaserver/package.nix b/pkgs/by-name/oo/ooklaserver/package.nix
index 34c3fc8e0949..53604b67e2f1 100644
--- a/pkgs/by-name/oo/ooklaserver/package.nix
+++ b/pkgs/by-name/oo/ooklaserver/package.nix
@@ -8,7 +8,6 @@ let
   filenameMapping = {
     "x86_64-linux" = "OoklaServer-linux-x86_64-static-musl.zip";
     "aarch64-linux" = "OoklaServer-linux-aarch64-static-musl.zip";
-    # Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64]
     "aarch64-darwin" = "OoklaServer-macosx.zip";
     "x86_64-windows" = "OoklaServer-windows64.zip";
     "i686-windows" = "OoklaServer-windows32.zip";

From ff2c2b1b50c542eb4808d80e0b06f9d0e47988fd Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:24:08 +0000
Subject: [PATCH 0733/1386] hoppscotch: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ho/hoppscotch/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ho/hoppscotch/update.sh b/pkgs/by-name/ho/hoppscotch/update.sh
index dd18d1942cad..ce3a73ceb62c 100755
--- a/pkgs/by-name/ho/hoppscotch/update.sh
+++ b/pkgs/by-name/ho/hoppscotch/update.sh
@@ -17,7 +17,6 @@ update-source-version hoppscotch $latestVersion || true
 
 for system in \
     x86_64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.src.url" --system "$system" | tr -d '"')))
     (cd $BASEDIR && update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version)

From 9b6c174ce8ab6c24fc16533c80707b6f2c14e5b1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:54:07 +0000
Subject: [PATCH 0734/1386] luau-lsp: clean up `badPlatforms`

---
 pkgs/by-name/lu/luau-lsp/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 149392825566..a2c108728a95 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -57,9 +57,5 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ HeitorAugustoLN ];
     mainProgram = "luau-lsp";
     platforms = lib.platforms.all;
-    badPlatforms = [
-      # Could not find a package configuration file provided by "Protobuf"
-      # It is unclear why this is only happening on x86_64-darwin
-    ];
   };
 })

From 993791272bb5607500cbfb7b472f17c59363d1d5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:01:54 +0000
Subject: [PATCH 0735/1386] firefox-bin: clean up after `x86_64-darwin` drop

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 80174bc67d6e..88d59af1aa81 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -39,7 +39,6 @@ let
     i686-linux = "linux-i686";
     x86_64-linux = "linux-x86_64";
     aarch64-linux = "linux-aarch64";
-    # bundles are universal and can be re-used for both darwin architectures
     aarch64-darwin = "mac";
   };
 

From 4a59a9d8dca3e8ff7c4f33038fe891296080fe55 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:24:31 +0000
Subject: [PATCH 0736/1386] ibmcloud-cli: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/ib/ibmcloud-cli/package.nix | 8 +-------
 pkgs/by-name/ib/ibmcloud-cli/update.sh   | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/ib/ibmcloud-cli/package.nix b/pkgs/by-name/ib/ibmcloud-cli/package.nix
index d4048cfd7ef4..ae09b5cb8e96 100644
--- a/pkgs/by-name/ib/ibmcloud-cli/package.nix
+++ b/pkgs/by-name/ib/ibmcloud-cli/package.nix
@@ -21,13 +21,7 @@ let
       "s390x"
     else
       throw "Unsupported arch: ${stdenv.hostPlatform.system}";
-  platform =
-    if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
-      "macos_arm64"
-    else if stdenv.hostPlatform.isDarwin then
-      "macos"
-    else
-      "linux_${arch}";
+  platform = if stdenv.hostPlatform.isDarwin then "macos_arm64" else "linux_${arch}";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ibmcloud-cli";
diff --git a/pkgs/by-name/ib/ibmcloud-cli/update.sh b/pkgs/by-name/ib/ibmcloud-cli/update.sh
index 26f1525a3202..2d340e8d12ee 100755
--- a/pkgs/by-name/ib/ibmcloud-cli/update.sh
+++ b/pkgs/by-name/ib/ibmcloud-cli/update.sh
@@ -19,7 +19,6 @@ for system in \
     i686-linux \
     powerpc64le-linux \
     s390x-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     tmp=$(mktemp -d)
     curl -fsSL -o $tmp/ibmcloud-cli $(nix-instantiate --eval -E "with import ./. {}; ibmcloud-cli.src.url" --system "$system" | tr -d '"')

From 1b08df48975a33d181814316d48a68d1c6e42124 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:49:04 +0000
Subject: [PATCH 0737/1386] sqlpkg-cli: clean up `badPlatforms`

---
 pkgs/by-name/sq/sqlpkg-cli/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sq/sqlpkg-cli/package.nix b/pkgs/by-name/sq/sqlpkg-cli/package.nix
index 830f5619cc2c..6453c513a6db 100644
--- a/pkgs/by-name/sq/sqlpkg-cli/package.nix
+++ b/pkgs/by-name/sq/sqlpkg-cli/package.nix
@@ -40,7 +40,6 @@ buildGoModule (finalAttrs: {
     platforms = lib.platforms.unix;
     badPlatforms = [
       "aarch64-linux" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: linux-arm64
-      # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: darwin-amd64
       "aarch64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH
     ];
   };

From 65350d3600ce71d4860c0584e9257efdc9fabe1f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:26:58 +0100
Subject: [PATCH 0738/1386] thunderbird-bin: clean up after `x86_64-darwin`
 drop

---
 .../networking/mailreaders/thunderbird-bin/default.nix           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 601ead626005..004c91f93cfc 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -39,7 +39,6 @@ let
 
   mozillaPlatforms = {
     x86_64-linux = "linux-x86_64";
-    # bundles are universal and can be re-used for both darwin architectures
     aarch64-darwin = "mac";
   };
 

From 32379a9bc7fb0c15d7ce5207912a6ef68ff947e0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:26:34 +0000
Subject: [PATCH 0739/1386] osu-lazer-bin: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/os/osu-lazer-bin/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/update.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh
index 19508b7825e9..7a1edd076fc5 100755
--- a/pkgs/by-name/os/osu-lazer-bin/update.sh
+++ b/pkgs/by-name/os/osu-lazer-bin/update.sh
@@ -15,7 +15,6 @@ echo "Updating osu-lazer-bin from $old_version to $new_version..."
 
 for pair in \
     'aarch64-darwin osu.app.Apple.Silicon.zip' \
-    'x86_64-darwin osu.app.Intel.zip' \
     'x86_64-linux osu.AppImage'
 do
     set -- $pair

From dbbca5cff773fedf8a5998867c710f5a73e4646c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:24:38 +0100
Subject: [PATCH 0740/1386] kilo: clean up `badPlatforms`

---
 pkgs/by-name/ki/kilo/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix
index 0da0230bd7c3..b49d470751de 100644
--- a/pkgs/by-name/ki/kilo/package.nix
+++ b/pkgs/by-name/ki/kilo/package.nix
@@ -191,8 +191,5 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-darwin"
     ];
-    badPlatforms = [
-      # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon.
-    ];
   };
 })

From b31d2f0465e0c1f72741a1101876fa673df9be9e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 06:25:48 +0000
Subject: [PATCH 0741/1386] nix: clean up after `x86_64-darwin` drop

---
 pkgs/tools/package-management/nix/README.md                     | 2 +-
 .../package-management/nix/modular/packaging/components.nix     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/README.md b/pkgs/tools/package-management/nix/README.md
index a45e38f749bd..5682d4922810 100644
--- a/pkgs/tools/package-management/nix/README.md
+++ b/pkgs/tools/package-management/nix/README.md
@@ -4,7 +4,7 @@
 
 Branch to merge into: **master** or **release-$nixos-version**
 
-Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, **x86_64-darwin**, and **aarch64-darwin**.
+Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, and **aarch64-darwin**.
 If you lack the necessary hardware for these platforms, you may need to ask others for assistance with the builds.
 Alternatively, you can request access to the Nix community builder for all platforms [here](https://github.com/NixOS/aarch64-build-box) and [here](https://nix-community.org/community-builder/).
 
diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index 22a362c16d5f..fb6970ce68c0 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -125,8 +125,6 @@ let
             !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin)
             # build failure
             && !stdenv.hostPlatform.isStatic
-            # LTO breaks exception handling on x86-64-darwin.
-            && stdenv.system != "x86_64-darwin"
           )
           ''
             case "$mesonBuildType" in

From 26c7a71492cf2470245a50e631a6be6cdf1b61dd Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:26:58 +0000
Subject: [PATCH 0742/1386] kiro: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ki/kiro/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ki/kiro/update.sh b/pkgs/by-name/ki/kiro/update.sh
index 211dd624d020..07652514b9c2 100755
--- a/pkgs/by-name/ki/kiro/update.sh
+++ b/pkgs/by-name/ki/kiro/update.sh
@@ -12,7 +12,6 @@ SOURCES_JSON="${SCRIPT_DIR}/sources.json"
 # Platform configuration
 declare -A PLATFORM_URLS=(
     ["x86_64-linux"]="https://prod.download.desktop.kiro.dev/stable/metadata-linux-x64-stable.json"
-    ["x86_64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-x64-stable.json"
     ["aarch64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-arm64-stable.json"
 )
 

From cea0306b62fde7b7e28ac0d8c32bfb1a0c895522 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:24:57 +0100
Subject: [PATCH 0743/1386] tokenspeed-triton-llvm: clean up `badPlatforms`

---
 pkgs/by-name/to/tokenspeed-triton-llvm/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
index 9e1c5874d2ae..568542fccfe3 100644
--- a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
+++ b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
@@ -78,8 +78,5 @@ stdenv.mkDerivation (finalAttrs: {
       ];
     maintainers = with lib.maintainers; [ prince213 ];
     platforms = with lib.platforms; aarch64 ++ x86;
-    badPlatforms = [
-      # clang++: error: clang frontend command failed with exit code 139
-    ];
   };
 })

From 7dd3e5ddee3cb7d76fb9f550c2b5989fa4a085b8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:47:35 +0000
Subject: [PATCH 0744/1386] peertube: drop `x86_64-darwin` mention in comment

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

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index 408dd20c1d2d..326846061102 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       # feasible, looking for maintainer to help out
-      # "x86_64-darwin" "aarch64-darwin"
+      # "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
       immae

From c5d4bc1395ede93b5d47eff775ec8d6977ad8be1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:59:38 +0000
Subject: [PATCH 0745/1386] reaper-sws-extension: clean up after
 `x86_64-darwin` drop

---
 pkgs/by-name/re/reaper-sws-extension/darwin.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
index 9ad9d3679f6c..dc84ddba15ff 100644
--- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
@@ -16,16 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     let
       plugin = fetchurl {
-        url =
-          let
-            arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64";
-          in
-          "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib";
-        hash =
-          {
-            aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo=";
-          }
-          .${stdenvNoCC.hostPlatform.system};
+        url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-arm64.dylib";
+        hash = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo=";
       };
     in
     [

From 572ae8d9e833cfb42196d3916ca3b88ff0d89bd1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:37:23 +0000
Subject: [PATCH 0746/1386] dotnetCorePackages.*: drop obsolete `broken`

---
 pkgs/development/compilers/dotnet/source/vmr.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix
index c832c28abcb0..597e89134045 100644
--- a/pkgs/development/compilers/dotnet/source/vmr.nix
+++ b/pkgs/development/compilers/dotnet/source/vmr.nix
@@ -541,8 +541,5 @@ stdenv.mkDerivation {
       "aarch64-linux"
       "aarch64-darwin"
     ];
-    # build deadlocks intermittently on rosetta
-    # https://github.com/dotnet/runtime/issues/111628
-    broken = stdenv.hostPlatform.system == "x86_64-darwin";
   };
 }

From 1f53ab6c98e2144f330a18130666e8f474af516f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:27:30 +0000
Subject: [PATCH 0747/1386] dbeaver-bin: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/db/dbeaver-bin/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh
index 8ab7bd75fcef..8a1e992dcef1 100755
--- a/pkgs/by-name/db/dbeaver-bin/update.sh
+++ b/pkgs/by-name/db/dbeaver-bin/update.sh
@@ -18,7 +18,6 @@ fi
 for i in \
     "x86_64-linux linux-x86_64.tar.gz" \
     "aarch64-linux linux-aarch64.tar.gz" \
-    "x86_64-darwin macos-x86_64.dmg" \
     "aarch64-darwin macos-aarch64.dmg"
 do
     # shellcheck disable=SC2086 # $i is intentionally splitted to $1 and $2

From 46643d9b998dd6e93035bd10559b64a4259cf73b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:34:42 +0000
Subject: [PATCH 0748/1386] python3Packages.tensorflow-bin: clean up
 `badPlatforms`

---
 pkgs/development/python-modules/tensorflow/bin.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index c6f3ff11c804..23d61c163664 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -240,7 +240,6 @@ buildPythonPackage (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     maintainers = [ ];
-    badPlatforms = [ ];
     # unsupported combination
     broken = stdenv.hostPlatform.isDarwin && cudaSupport;
   };

From da43840e1c29799308fd7bdbc57ec9fff3dcdfc1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:44:28 +0000
Subject: [PATCH 0749/1386] jackett: drop `x86_64-darwin` mention in comments

---
 pkgs/by-name/ja/jackett/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix
index 1bf8590d5df0..db8409117d56 100644
--- a/pkgs/by-name/ja/jackett/package.nix
+++ b/pkgs/by-name/ja/jackett/package.nix
@@ -39,8 +39,6 @@ buildDotnetModule (finalAttrs: {
 
   runtimeDeps = [ openssl ];
   # mono is not available on aarch64-darwin
-  #x86_64-darwin is failed with
-  #System.Net.Sockets.SocketException (13): Permission denied
   doCheck = !stdenv.hostPlatform.isDarwin;
   nativeCheckInputs = [ mono ];
   testProjectFile = "src/Jackett.Test/Jackett.Test.csproj";

From 676db82c9e62e270f2540cdfa3abf382bec2734f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:00:19 +0000
Subject: [PATCH 0750/1386] reaper-reapack-extension: clean up after
 `x86_64-darwin` drop

---
 pkgs/by-name/re/reaper-reapack-extension/darwin.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
index 3f643cbed2a4..d8fedc11f106 100644
--- a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
+++ b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix
@@ -13,16 +13,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     meta
     ;
   src = fetchurl {
-    url =
-      let
-        arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64";
-      in
-      "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-${arch}.dylib";
-    hash =
-      {
-        aarch64-darwin = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4=";
-      }
-      .${stdenvNoCC.hostPlatform.system};
+    url = "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-arm64.dylib";
+    hash = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4=";
   };
 
   dontUnpack = true;

From 6e7a4d690d39dd372b58eb1480f467b981f7b701 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:47:53 +0000
Subject: [PATCH 0751/1386] visp: drop obsolete `broken`

---
 pkgs/by-name/vi/visp/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix
index 8975e006dc86..b17dffcc4caf 100644
--- a/pkgs/by-name/vi/visp/package.nix
+++ b/pkgs/by-name/vi/visp/package.nix
@@ -99,8 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Open Source Visual Servoing Platform";
-    # ref. https://github.com/lagadic/visp/pull/1658
-    broken = stdenv.hostPlatform.system == "x86_64-darwin";
     homepage = "https://visp.inria.fr";
     changelog = "https://github.com/lagadic/visp/blob/v${finalAttrs.version}/ChangeLog.txt";
     license = lib.licenses.gpl2Plus;

From ee71f615d8646fba8821c9b2ede1ce30cd3074f5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:27:53 +0000
Subject: [PATCH 0752/1386] brioche: drop `x86_64-darwin` from update script

---
 pkgs/by-name/br/brioche/update-librusty.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/br/brioche/update-librusty.sh b/pkgs/by-name/br/brioche/update-librusty.sh
index 0ba452c803f5..575755a3c110 100755
--- a/pkgs/by-name/br/brioche/update-librusty.sh
+++ b/pkgs/by-name/br/brioche/update-librusty.sh
@@ -36,7 +36,6 @@ fetchLibrustyV8 {
     # NOTE; Follows supported platforms of package (see meta.platforms attribute)!
     x86_64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz)";
     aarch64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz)";
-    x86_64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-apple-darwin.a.gz)";
     aarch64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-apple-darwin.a.gz)";
   };
 }

From 45dbd8bdbd86d7dd739e8261fae06fe1f09762cf Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:47:02 +0000
Subject: [PATCH 0753/1386] python3Packages.ultralytics: remove obsolete
 `badPlatforms`

---
 pkgs/development/python-modules/ultralytics/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index 027e5a9639b9..b4ab1b2b0d7a 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -138,9 +138,5 @@ buildPythonPackage (finalAttrs: {
       osbm
       mana-byte
     ];
-    badPlatforms = [
-      # Tests crash with:
-      # Fatal Python error: Segmentation fault for x86_64 Darwin in tests/python.py
-    ];
   };
 })

From 856551df45dcb40a3c4f501a1ed0f5c9a894e932 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:55:10 +0000
Subject: [PATCH 0754/1386] podman-bootc: drop `x86_64-darwin` mention in
 comment

---
 pkgs/by-name/po/podman-bootc/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/po/podman-bootc/package.nix b/pkgs/by-name/po/podman-bootc/package.nix
index 59c7fa4388c0..cf1d644e0d26 100644
--- a/pkgs/by-name/po/podman-bootc/package.nix
+++ b/pkgs/by-name/po/podman-bootc/package.nix
@@ -66,8 +66,6 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/bootc-dev/podman-bootc/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ evan-goode ];
     license = lib.licenses.asl20;
-    # x86_64-darwin does not seem to be supported at this time:
-    # https://github.com/containers/podman-bootc/issues/46
     platforms = [
       "aarch64-linux"
       "aarch64-darwin"

From 4af12149d1d84dc894c94c56cd265b8c0d3f0e10 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:19:41 +0000
Subject: [PATCH 0755/1386] wechat: clean up after `x86_64-darwin` drop

---
 pkgs/by-name/we/wechat/package.nix | 58 ++++++++++++++----------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 95c75acd1da4..a09398e05dd0 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -24,42 +24,38 @@ let
     ];
   };
 
-  sources =
-    let
-      # https://dldir1.qq.com/weixin/mac/mac-release.xml
-      any-darwin =
-        let
-          version = "4.1.8.106-37335";
-          version' = lib.replaceString "-" "_" version;
-        in
-        {
-          inherit version;
-          src = fetchurl {
-            url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-lygjqWbNqh9fCnhbyfEhnRdKdfQ9MOwPv5unqwJJsvE=";
-          };
-        };
-    in
-    {
-      aarch64-darwin = any-darwin;
-      # use https://web.archive.org/save to archive the Linux versions
-      # add `if_` at the end of timestamps to avoid toolbar insertion
-      # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine
-      aarch64-linux = {
-        version = "4.1.1.4";
+  sources = {
+    # https://dldir1.qq.com/weixin/mac/mac-release.xml
+    aarch64-darwin =
+      let
+        version = "4.1.8.106-37335";
+        version' = lib.replaceString "-" "_" version;
+      in
+      {
+        inherit version;
         src = fetchurl {
-          url = "https://web.archive.org/web/20260311102559if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
-          hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo=";
+          url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
+          hash = "sha256-lygjqWbNqh9fCnhbyfEhnRdKdfQ9MOwPv5unqwJJsvE=";
         };
       };
-      x86_64-linux = {
-        version = "4.1.1.4";
-        src = fetchurl {
-          url = "https://web.archive.org/web/20260311102439if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
-          hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8=";
-        };
+    # use https://web.archive.org/save to archive the Linux versions
+    # add `if_` at the end of timestamps to avoid toolbar insertion
+    # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine
+    aarch64-linux = {
+      version = "4.1.1.4";
+      src = fetchurl {
+        url = "https://web.archive.org/web/20260311102559if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
+        hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo=";
       };
     };
+    x86_64-linux = {
+      version = "4.1.1.4";
+      src = fetchurl {
+        url = "https://web.archive.org/web/20260311102439if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
+        hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8=";
+      };
+    };
+  };
 in
 callPackage (if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix) {
   inherit pname meta;

From d1ceecd3de30c3db825adfbb5ba72d04b1333a21 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:52:05 +0000
Subject: [PATCH 0756/1386] flamp: drop obsolete `broken`

---
 pkgs/by-name/fl/flamp/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/fl/flamp/package.nix b/pkgs/by-name/fl/flamp/package.nix
index 841a43c6a9f5..43a893f92198 100644
--- a/pkgs/by-name/fl/flamp/package.nix
+++ b/pkgs/by-name/fl/flamp/package.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ stteague ];
     platforms = lib.platforms.unix;
-    broken = stdenv.system == "x86_64-darwin";
     mainProgram = "flamp";
   };
 })

From 0ac2c5c14d37e0b173a384cbb1b929ce9338f7d7 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:28:35 +0000
Subject: [PATCH 0757/1386] dbgate: drop `x86_64-darwin` from update script

---
 pkgs/by-name/db/dbgate/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/db/dbgate/update.sh b/pkgs/by-name/db/dbgate/update.sh
index 1e893aaa7706..d37000bac6a1 100755
--- a/pkgs/by-name/db/dbgate/update.sh
+++ b/pkgs/by-name/db/dbgate/update.sh
@@ -15,7 +15,6 @@ fi
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; dbgate.src.url" --system "$system" | tr -d '"')))
     update-source-version dbgate $latestVersion $hash --system=$system --ignore-same-version

From cbbe9cb6bf5e12f44c6a32d1e9577e0e4ed82948 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:27:48 +0000
Subject: [PATCH 0758/1386] pcsx2-bin: drop

---
 pkgs/by-name/pc/pcsx2-bin/package.nix | 56 ---------------------------
 pkgs/by-name/pc/pcsx2-bin/update.sh   | 20 ----------
 pkgs/top-level/aliases.nix            |  1 +
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 pkgs/by-name/pc/pcsx2-bin/package.nix
 delete mode 100755 pkgs/by-name/pc/pcsx2-bin/update.sh

diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
deleted file mode 100644
index a3348ec1c803..000000000000
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  makeWrapper,
-}:
-
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "pcsx2-bin";
-  version = "2.4.0";
-
-  src = fetchurl {
-    url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
-    hash = "sha256-nExKu5WwBVxUA8P3DZ7SVln5zORXcR3lM/gWjFxgAV8=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/Applications
-    cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app
-    runHook postInstall
-  '';
-
-  passthru = {
-    updateScript = ./update.sh;
-  };
-
-  meta = {
-    homepage = "https://pcsx2.net";
-    description = "Playstation 2 emulator (precompiled binary, repacked from official website)";
-    longDescription = ''
-      PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose is
-      to emulate the PS2 hardware, using a combination of MIPS CPU Interpreters,
-      Recompilers and a Virtual Machine which manages hardware states and PS2
-      system memory. This allows you to play PS2 games on your PC, with many
-      additional features and benefits.
-    '';
-    changelog = "https://github.com/PCSX2/pcsx2/releases/tag/v${finalAttrs.version}";
-    downloadPage = "https://github.com/PCSX2/pcsx2";
-    license = with lib.licenses; [
-      gpl3Plus
-      lgpl3Plus
-    ];
-    maintainers = with lib.maintainers; [ matteopacini ];
-    platforms = [ ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})
diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh
deleted file mode 100755
index 943d2693d201..000000000000
--- a/pkgs/by-name/pc/pcsx2-bin/update.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq gnused
-
-set -euo pipefail
-
-cd "$(dirname "$0")" || exit 1
-
-# Grab latest version, ignoring "latest" and "preview" tags
-LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"
-CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)"
-
-if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then
-    echo "pcsx2-bin is up-to-date"
-    exit 0
-fi
-
-HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/PCSX2/pcsx2/releases/download/v${LATEST_VER}/pcsx2-v${LATEST_VER}-macos-Qt.tar.xz")")"
-
-sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix
-sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dd04ac39ad95..2abc245de37e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1779,6 +1779,7 @@ mapAliases {
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
   pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
   pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27
+  pcsx2-bin = throw "pcsx2-bin has been removed as it only supported x86_64-darwin"; # Added 2026-06-26
   pdf2djvu = throw "pdf2djvu has been removed because it was broken and archived upstream"; # added 2025-12-06
   pdf4tcl = throw "'pdf4tcl' has been renamed to/replaced by 'tclPackages.pdf4tcl'"; # Converted to throw 2025-10-27
   pdf-quench = throw "'pdf-quench' has been removed as it was unmaintained upstream and depended on the outdated and vulnerable pypdf2"; # Added 2026-03-29

From b65a9b8471b1068cb1137e7736ac9b7a0e22dc64 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:43:20 +0000
Subject: [PATCH 0759/1386] python3Packges.pcodec: clean up `badPlatforms`

---
 pkgs/development/python-modules/pcodec/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix
index 2d579838f2ea..9d87bcba9880 100644
--- a/pkgs/development/python-modules/pcodec/default.nix
+++ b/pkgs/development/python-modules/pcodec/default.nix
@@ -48,8 +48,5 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [
       flokli
     ];
-    badPlatforms = [
-      # Illegal instruction: 4
-    ];
   };
 }

From b2b8197317bcf2c34ee8c4f4fcc61f799b92865f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:56:16 +0000
Subject: [PATCH 0760/1386] howl: drop `x86_64-darwin` mention in comment

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

diff --git a/pkgs/by-name/ho/howl/package.nix b/pkgs/by-name/ho/howl/package.nix
index 7f04a9497a48..6c4cd032ace6 100644
--- a/pkgs/by-name/ho/howl/package.nix
+++ b/pkgs/by-name/ho/howl/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ euxane ];
     mainProgram = "howl";
 
-    # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively
+    # Howl builds fail for aarch64-linux
     platforms = [
       "i686-linux"
       "x86_64-linux"

From 0681d42ec62de615fe9b7e79eaa37a63cbbcf53a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:00:40 +0000
Subject: [PATCH 0761/1386] sketchybar: clean up after `x86_64-darwin` drop

---
 pkgs/by-name/sk/sketchybar/package.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix
index 8c622c8ea8ab..139b02922412 100644
--- a/pkgs/by-name/sk/sketchybar/package.nix
+++ b/pkgs/by-name/sk/sketchybar/package.nix
@@ -10,12 +10,6 @@
 
 let
   inherit (stdenv.hostPlatform) system;
-
-  target =
-    {
-      "aarch64-darwin" = "arm64";
-    }
-    .${system} or (throw "Unsupported system: ${system}");
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sketchybar";
@@ -37,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     apple-sdk_15
   ];
 
-  makeFlags = [ target ];
+  makeFlags = [ "arm64" ];
 
   # TODO: Remove once #536365 reaches this branch
   env.NIX_CFLAGS_LINK = "-fuse-ld=lld";

From 15848340b5b324a53904845bd7de44236fbb25c8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:47:11 +0000
Subject: [PATCH 0762/1386] scalapack: drop obsolete `broken`

---
 pkgs/by-name/sc/scalapack/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix
index fafc948ba4f6..aab733638a17 100644
--- a/pkgs/by-name/sc/scalapack/package.nix
+++ b/pkgs/by-name/sc/scalapack/package.nix
@@ -61,9 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     mpi
   ];
 
-  # xslu and xsllt tests seem to time out on x86_64-darwin.
-  # this line is left so those who force installation on x86_64-darwin can still build
-  doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin);
+  doCheck = true;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
@@ -93,7 +91,5 @@ stdenv.mkDerivation (finalAttrs: {
       markuskowa
       gdinh
     ];
-    # xslu and xsllt tests fail on x86 darwin
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 })

From e02ab51e5936b25a6a4139b05ecc3ad4071fb799 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:31:14 +0000
Subject: [PATCH 0763/1386] brave: drop `x86_64-darwin` from update script

---
 pkgs/by-name/br/brave/update.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh
index f806154aa9dc..ccb7c9b826b0 100755
--- a/pkgs/by-name/br/brave/update.sh
+++ b/pkgs/by-name/br/brave/update.sh
@@ -8,7 +8,6 @@ latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://ap
 hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")"
 hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")"
 hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")"
-hashAmd64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-x64.zip")")"
 
 cat > $SCRIPT_DIR/package.nix << EOF
 # Expression generated by update.sh; do not edit it by hand!
@@ -31,10 +30,6 @@ let
       url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip";
       hash = "${hashAarch64Darwin}";
     };
-    x86_64-darwin = {
-      url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-x64.zip";
-      hash = "${hashAmd64Darwin}";
-    };
   };
 
   archive =

From f20665307813290f94d34ed91e7141400bb01123 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:15:20 +0100
Subject: [PATCH 0764/1386] docker-machine-hyperkit: drop

---
 .../cluster/docker-machine/hyperkit.nix       | 35 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  3 --
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/docker-machine/hyperkit.nix

diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
deleted file mode 100644
index 2264b15eb947..000000000000
--- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  minikube,
-}:
-
-buildGoModule rec {
-  inherit (minikube)
-    version
-    src
-    nativeBuildInputs
-    buildInputs
-    vendorHash
-    doCheck
-    postPatch
-    ;
-
-  pname = "docker-machine-hyperkit";
-
-  buildPhase = ''
-    make docker-machine-driver-hyperkit COMMIT=${src.rev}
-  '';
-
-  installPhase = ''
-    install out/docker-machine-driver-hyperkit -Dt $out/bin
-  '';
-
-  meta = {
-    homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit";
-    description = "HyperKit driver for docker-machine";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ atkinschang ];
-    platforms = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2abc245de37e..582b971aa387 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -662,6 +662,7 @@ mapAliases {
   dleyna-server = throw "'dleyna-server' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
   dnscrypt-proxy2 = throw "'dnscrypt-proxy2' has been renamed to/replaced by 'dnscrypt-proxy'"; # Converted to throw 2025-10-27
   docker-distribution = throw "'docker-distribution' has been renamed to/replaced by 'distribution'"; # Converted to throw 2025-10-27
+  docker-machine-hyperkit = throw "docker-machine-hyperkit has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
   docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
   docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd203b155387..06ef7f62abba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8536,9 +8536,6 @@ with pkgs;
   docker-client = docker.override { clientOnly = true; };
 
   docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
-  docker-machine-hyperkit =
-    callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix
-      { };
   docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
   docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
   docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };

From f5a19d32ebe3d3f140441eb6f4a3bb0e74f84ed9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:43:41 +0000
Subject: [PATCH 0765/1386] python3Packages.vllm: clean up `badPlatforms`

---
 pkgs/development/python-modules/vllm/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 7dde4420901f..e7cf14357a5c 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -598,10 +598,6 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
       #   vLLM CPU backend requires AVX512, AVX2, Power9+ ISA, S390X ISA, ARMv8 or
       #   RISC-V support.
       "aarch64-darwin"
-
-      # CMake Error at cmake/cpu_extension.cmake:78 (find_isa):
-      # find_isa Function invoked with incorrect arguments for function named:
-      # find_isa
     ];
     knownVulnerabilities = [
       "CVE-2026-25960"

From 919042f6e63e1d7841bb6bbb4bc7eb1189a21aee Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:56:34 +0000
Subject: [PATCH 0766/1386] mesa: drop `x86_64-darwin` mention in comment

---
 pkgs/development/libraries/mesa/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 5e3bbf9d6131..5b9465d50566 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -2,7 +2,7 @@
 # When updating this package, please verify at least these build (assuming x86_64-linux):
 # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
 # Ideally also verify:
-# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
+# nix build .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
   version = "26.1.4";

From 5db85b0c0daff6ae8982a05bd56621cf03beef86 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:35:34 +0000
Subject: [PATCH 0767/1386] arduino-core-unwrapped: clean up after
 `x86_64-darwin` drop

---
 .../ar/arduino-core-unwrapped/downloads.nix   | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix
index b450b1137833..67722d2b081a 100644
--- a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix
+++ b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix
@@ -156,29 +156,6 @@
   };
 }
 
-// optionalAttrs (system == "x86_64-darwin") {
-  "build/arduino-builder-macosx-1.6.1-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.6.1-signed.tar.bz2";
-    sha256 = "sha256-icMXwovzT2UQAKry9sWyRvcNxPXaFdltAPyW/DDVEFA=";
-  };
-  "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2";
-    sha256 = "0lcnp525glnc2chcynnz2nllm4q6ar4n9nrjqd1jbj4m706zbv67";
-  };
-  "build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2";
-    sha256 = "1m24dci8mjf70yrf033mp1834pbp870m8sns2jxs3iy2i4qviiki";
-  };
-  "build/linux/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2" = fetchurl {
-    url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2";
-    sha256 = "12pwfnikq3z3ji5wgjhzx1mfyaha5cym7mr63r8kfl5a85fhk8nz";
-  };
-  "build/macosx/appbundler/appbundler-1.0ea-arduino5.jar.zip" = fetchurl {
-    url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip";
-    sha256 = "1ims951z7ajprqms7yd8ll83c79n7krhd9ljw30yn61f6jk46x82";
-  };
-}
-
 // optionalAttrs (system == "aarch64-linux") {
   "build/arduino-builder-linuxaarch64-1.6.1.tar.bz2" = fetchurl {
     url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.6.1.tar.bz2";

From f861a3908b3eeac0f684f2a978a924da1ed8955d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:51:58 +0000
Subject: [PATCH 0768/1386] ccl: drop obsolete `broken`

---
 pkgs/development/compilers/ccl/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 8754458b76f8..665b7ebdbe32 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -105,8 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   meta = {
-    # assembler failures during build, x86_64-darwin broken since 2020-10-14
-    broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
     description = "Clozure Common Lisp";
     homepage = "https://ccl.clozure.com/";
     license = lib.licenses.asl20;

From 477f76c9bb5b970ba1332161d33cd5d3cca3e9c9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:41:54 +0000
Subject: [PATCH 0769/1386] yandex-cloud: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/ya/yandex-cloud/update.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ya/yandex-cloud/update.py b/pkgs/by-name/ya/yandex-cloud/update.py
index d6309118bf92..53d4555f061a 100644
--- a/pkgs/by-name/ya/yandex-cloud/update.py
+++ b/pkgs/by-name/ya/yandex-cloud/update.py
@@ -14,7 +14,6 @@ systems = [
     ("aarch64", "darwin"),
     ("aarch64", "linux"),
     ("i686", "linux"),
-    ("x86_64", "darwin"),
     ("x86_64", "linux"),
 ]
 

From 02b4e97982f99e2f36428d8c5698249ef73ef98e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:16:34 +0100
Subject: [PATCH 0770/1386] disk-inventory-x: drop

---
 pkgs/by-name/di/disk-inventory-x/package.nix | 36 --------------------
 pkgs/top-level/aliases.nix                   |  1 +
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/di/disk-inventory-x/package.nix

diff --git a/pkgs/by-name/di/disk-inventory-x/package.nix b/pkgs/by-name/di/disk-inventory-x/package.nix
deleted file mode 100644
index 6721aa766ff2..000000000000
--- a/pkgs/by-name/di/disk-inventory-x/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  undmg,
-}:
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "disk-inventory-x";
-  version = "1.3";
-
-  src = fetchurl {
-    url = "https://www.derlien.com/diskinventoryx/downloads/Disk%20Inventory%20X%20${finalAttrs.version}.dmg";
-    sha256 = "1rfqp8ia6ficvqxynn43f1pba4rfmhf61kn2ihysbnjs8c33bbvq";
-  };
-  sourceRoot = ".";
-
-  nativeBuildInputs = [ undmg ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/Applications
-    cp -r *.app $out/Applications
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Disk usage utility for Mac OS X";
-    homepage = "https://www.derlien.com";
-    license = lib.licenses.gpl3Plus;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ emilytrau ];
-    platforms = [ ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 582b971aa387..04c61ce16ce9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -654,6 +654,7 @@ mapAliases {
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
   discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29
+  disk-inventory-x = throw "disk-inventory-x has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
   DisnixWebService = warnAlias "'DisnixWebService' has been renamed to 'disnix-web-service'" disnix-web-service; # Added 2026-01-14
   djmount = throw "'djmount' has been removed as it is no longer maintained"; # Added 2026-05-19
   dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27

From 338789c88b9d96398aa9ee2e6d65d7df412e5f25 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:44:11 +0000
Subject: [PATCH 0771/1386] python3Packages.scalene: clean up `badPlatforms`

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

diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index 052860c7690c..67ff7b76f9c5 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -138,8 +138,8 @@ buildPythonPackage (finalAttrs: {
       # The scalene doesn't seem to account for arm64 linux
       "aarch64-linux"
 
-      # On darwin, builds 1) assume aarch64 and 2) mistakenly compile one part as
-      # x86 and the other as arm64 then tries to link them into a single binary
+      # On darwin, builds mistakenly compile one part as x86 and the
+      # other as arm64 then tries to link them into a single binary
       # which fails.
       "aarch64-darwin"
     ];

From 1eaa3c57cb79198298b7c93a1baed69985e70e4d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:59:05 +0000
Subject: [PATCH 0772/1386] python3: drop `x86_64-darwin` mention in comment

---
 pkgs/development/interpreters/python/cpython/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 02c6e27d11d4..e9440614cf34 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -870,7 +870,7 @@ stdenv.mkDerivation (finalAttrs: {
       lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows ++ lib.platforms.freebsd;
     mainProgram = executable;
     teams = [ lib.teams.python ];
-    # static build on x86_64-darwin/aarch64-darwin breaks with:
+    # static build on aarch64-darwin breaks with:
     # configure: error: C compiler cannot create executables
 
     # mingw patches only apply to Python 3.11 currently

From 6b35b9b68bf03347338cdb1796f39afb06e21b27 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:39:23 +0000
Subject: [PATCH 0773/1386] mlton: clean up after `x86_64-darwin` drop

---
 pkgs/development/compilers/mlton/20130715.nix | 16 ---------
 .../compilers/mlton/20180207-binary.nix       | 35 +++++--------------
 .../compilers/mlton/20210117-binary.nix       |  5 ---
 .../compilers/mlton/20241230-binary.nix       |  5 ---
 pkgs/development/compilers/mlton/default.nix  |  4 +--
 5 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index ed460b7e5cfe..766111dc012a 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -29,11 +29,6 @@ stdenv.mkDerivation rec {
         url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz";
         hash = "sha256-9vkSAJsJRrc6+I/18+cTtr5juHFpbiaXzPFWS1bn0Ds=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz";
-        hash = "sha256-qb//O8Wnk+hDBvmM1g8ZWoE5kCkA+W4QctE8CBO0nBA=";
-      })
     else
       throw "Architecture not supported";
 
@@ -76,9 +71,6 @@ stdenv.mkDerivation rec {
   ''
   + lib.optionalString stdenv.cc.isClang ''
     sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
   '';
 
   preBuild = ''
@@ -93,19 +85,11 @@ stdenv.mkDerivation rec {
     # So the builder runs the binary compiler with gmp.
     export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
 
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
     # Patch ELF interpreter.
     patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     for e in mllex mlyacc ; do
       patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
     done
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Patch libgmp linking
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
   '';
 
   doCheck = true;
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
index 324abd0a16e9..773e8f3d322b 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz";
         hash = "sha256-jkq9ufPvgcAbmJpmc03KKn9BicVWc6HIu61U58spmDg=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz";
-        hash = "sha256-uy2YLvl9bvTv4HjSOgm68+Uvb9bI8aYAFuFiRDj0h7M=";
-      })
     else
       throw "Architecture not supported";
 
@@ -40,29 +35,15 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  postFixup =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
-      patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
+  postFixup = ''
+    patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
+    patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
 
-      for e in mllex mlnlffigen mlprof mlyacc; do
-        patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
-        patchelf --set-rpath ${gmp}/lib $out/bin/$e
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -change \
-        /opt/local/lib/libgmp.10.dylib \
-        ${gmp}/lib/libgmp.10.dylib \
-        $out/lib/mlton/mlton-compile
-
-      for e in mllex mlnlffigen mlprof mlyacc; do
-        install_name_tool -change \
-          /opt/local/lib/libgmp.10.dylib \
-          ${gmp}/lib/libgmp.10.dylib \
-          $out/bin/$e
-      done
-    '';
+    for e in mllex mlnlffigen mlprof mlyacc; do
+      patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
+      patchelf --set-rpath ${gmp}/lib $out/bin/$e
+    done
+  '';
 
   meta = import ./meta.nix { inherit lib; };
 }
diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix
index 94c79d70d3cf..625a8bddb8b5 100644
--- a/pkgs/development/compilers/mlton/20210117-binary.nix
+++ b/pkgs/development/compilers/mlton/20210117-binary.nix
@@ -20,11 +20,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz";
         hash = "sha256-dJy1nWuszWRBQ3Cb6GYQUijSttzUDFB6kLicm14PRdI=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz";
-        hash = "sha256-W+qfYBNupoR4kMX05F1xJqMu8U/UaiMDyrh1ypXIzXY=";
-      })
     else if stdenv.hostPlatform.system == "aarch64-darwin" then
       (fetchurl {
         url = "https://projects.laas.fr/tina/software/mlton-${version}-1.arm64-darwin-21.6-gmp-static.tgz";
diff --git a/pkgs/development/compilers/mlton/20241230-binary.nix b/pkgs/development/compilers/mlton/20241230-binary.nix
index dbc7cdb05bc4..25e1b8aa6a7b 100644
--- a/pkgs/development/compilers/mlton/20241230-binary.nix
+++ b/pkgs/development/compilers/mlton/20241230-binary.nix
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.arm64-linux.ubuntu-24.04-arm_glibc2.39.tgz";
         hash = "sha256-rn65t253SfUShAM3kXiLQJHT7JS7EO3fAPB23LWIwfc=";
       })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then
-      (fetchurl {
-        url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.macos-13_gmp-static.tgz";
-        hash = "sha256-fW0hqjrWUcy+PIN8WHb1r4EYgfuwF9Zz3q7f2ZtxOi0=";
-      })
     else if stdenv.hostPlatform.system == "aarch64-darwin" then
       (fetchurl {
         url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.arm64-darwin.macos-15_gmp-static.tgz";
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index c51e41d14f59..89e4ee50a531 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -29,7 +29,7 @@ rec {
     rev = "on-20241230-release";
     hash = "sha256-gJUzav2xH8C4Vy5FuqN73Z6lPMSPQgJApF8LgsJXRWo=";
     # https://github.com/MLton/mlton/issues/631
-    doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin);
+    doCheck = !stdenv.hostPlatform.isDarwin;
   };
 
   mltonHEAD = callPackage ./from-git-source.nix {
@@ -38,6 +38,6 @@ rec {
     rev = "61baac7108fbd91413f0537b7a42d9a1023455f4";
     hash = "sha256-nWR7ZaXfKxeXfZ9IHipAQ39ASVtva4BeDHP3Zq8mqPo=";
     # https://github.com/MLton/mlton/issues/631
-    doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin);
+    doCheck = !stdenv.hostPlatform.isDarwin;
   };
 }

From 8d69f21b71a7be196becc6f2d0b079db7d1d824e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 13:42:55 +0000
Subject: [PATCH 0774/1386] qolibri: drop obsolete `broken`

---
 pkgs/by-name/qo/qolibri/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/qo/qolibri/package.nix b/pkgs/by-name/qo/qolibri/package.nix
index 0d8e6088b5ba..b92ab6372e07 100644
--- a/pkgs/by-name/qo/qolibri/package.nix
+++ b/pkgs/by-name/qo/qolibri/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.azahi ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; # Looks like a libcxx version mismatch problem.
     mainProgram = "qolibri";
   };
 }

From 8669954c0891dbff2d21ca588baec335d9840826 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:54:38 +0000
Subject: [PATCH 0775/1386] playwright: drop `x86_64-darwin` from update script

---
 pkgs/development/web/playwright/browser-downloads-test.js   | 1 -
 pkgs/development/web/playwright/chromium-headless-shell.nix | 6 +-----
 pkgs/development/web/playwright/chromium.nix                | 6 +-----
 pkgs/development/web/playwright/firefox.nix                 | 6 +-----
 pkgs/development/web/playwright/update.sh                   | 2 +-
 pkgs/development/web/playwright/webkit.nix                  | 6 +-----
 6 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/web/playwright/browser-downloads-test.js b/pkgs/development/web/playwright/browser-downloads-test.js
index 5f4ec96259c0..9db75a07d66b 100644
--- a/pkgs/development/web/playwright/browser-downloads-test.js
+++ b/pkgs/development/web/playwright/browser-downloads-test.js
@@ -15,7 +15,6 @@ const browserNames = Object.keys(browserDownloads);
 const hostPlatformBySystem = {
   "x86_64-linux": "ubuntu24.04-x64",
   "aarch64-linux": "ubuntu24.04-arm64",
-  "x86_64-darwin": "mac15",
   "aarch64-darwin": "mac15-arm64",
 };
 
diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix
index 645d15fd5559..e83de5fa56de 100644
--- a/pkgs/development/web/playwright/chromium-headless-shell.nix
+++ b/pkgs/development/web/playwright/chromium-headless-shell.nix
@@ -70,11 +70,7 @@ let
 
   darwin = fetchzip {
     inherit (download) url stripRoot;
-    hash =
-      {
-        aarch64-darwin = "sha256-qWrMOreqTOFhmFBROlXIPXrM3wqNT7iJJwpelVFke6I=";
-      }
-      .${system} or throwSystem;
+    hash = "sha256-qWrMOreqTOFhmFBROlXIPXrM3wqNT7iJJwpelVFke6I=";
   };
 in
 {
diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix
index 4d92563b30a1..1eb744ffd82d 100644
--- a/pkgs/development/web/playwright/chromium.nix
+++ b/pkgs/development/web/playwright/chromium.nix
@@ -128,11 +128,7 @@ let
   };
   chromium-darwin = fetchzip {
     inherit (download) url stripRoot;
-    hash =
-      {
-        aarch64-darwin = "sha256-aJbvZQ1hY0FfDC+ZktfW2yNW3nwc0kh/P30+n/cmLf0=";
-      }
-      .${system} or throwSystem;
+    hash = "sha256-aJbvZQ1hY0FfDC+ZktfW2yNW3nwc0kh/P30+n/cmLf0=";
   };
 in
 {
diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix
index e757f9af593d..91c70ebcf75b 100644
--- a/pkgs/development/web/playwright/firefox.nix
+++ b/pkgs/development/web/playwright/firefox.nix
@@ -40,11 +40,7 @@ let
   };
   firefox-darwin = fetchzip {
     inherit (download) url stripRoot;
-    hash =
-      {
-        aarch64-darwin = "sha256-Opwa5SbuAaXf2A+qrldHc6BkhRaOzzl0dy7R4vodG5w=";
-      }
-      .${system} or throwSystem;
+    hash = "sha256-Opwa5SbuAaXf2A+qrldHc6BkhRaOzzl0dy7R4vodG5w=";
   };
 in
 {
diff --git a/pkgs/development/web/playwright/update.sh b/pkgs/development/web/playwright/update.sh
index 21d8b85cbc85..8043188eb16e 100755
--- a/pkgs/development/web/playwright/update.sh
+++ b/pkgs/development/web/playwright/update.sh
@@ -17,7 +17,7 @@ playwright_driver_file="$root/driver.nix"
 playwright_raw_repo_url="https://raw.githubusercontent.com/microsoft/playwright"
 playwright_mcp_package_file="$root/../../../by-name/pl/playwright-mcp/package.nix"
 browser_names=(chromium chromium-headless-shell firefox webkit ffmpeg)
-browser_systems=(x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin)
+browser_systems=(x86_64-linux aarch64-linux aarch64-darwin)
 
 github_api_get() {
     curl "${github_api_curl_args[@]}" -fsSL "$1"
diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix
index da2028c325b1..e3e191410ab1 100644
--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -202,11 +202,7 @@ let
   };
   webkit-darwin = fetchzip {
     inherit (download) url stripRoot;
-    hash =
-      {
-        aarch64-darwin = "sha256-glVkYnthOFBPp1gZXTue9WwjP+oCgQpq6j9Mlm/bjmg=";
-      }
-      .${system} or throwSystem;
+    hash = "sha256-glVkYnthOFBPp1gZXTue9WwjP+oCgQpq6j9Mlm/bjmg=";
   };
 in
 {

From 1a9cfd0ff5e287e7366e35b177487c1f76c90f68 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:17:15 +0100
Subject: [PATCH 0776/1386] dxmt: drop

---
 pkgs/by-name/dx/dxmt/package.nix    | 132 ----------------------------
 pkgs/by-name/dx/dxmt/winecrt0.patch |  33 -------
 pkgs/top-level/aliases.nix          |   1 +
 3 files changed, 1 insertion(+), 165 deletions(-)
 delete mode 100644 pkgs/by-name/dx/dxmt/package.nix
 delete mode 100644 pkgs/by-name/dx/dxmt/winecrt0.patch

diff --git a/pkgs/by-name/dx/dxmt/package.nix b/pkgs/by-name/dx/dxmt/package.nix
deleted file mode 100644
index 37cea9f27d7a..000000000000
--- a/pkgs/by-name/dx/dxmt/package.nix
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  lib,
-  stdenv,
-  pkgsCross,
-  fetchFromGitHub,
-  buildPackages,
-  cmake,
-  git,
-  python3,
-  meson,
-  ninja,
-  tinyxxd,
-  sqlite,
-  libz,
-  ncurses,
-  libxml2,
-  wine64,
-  darwin,
-  symlinkJoin,
-}:
-let
-  dxmt-llvm = stdenv.mkDerivation rec {
-    pname = "dxmt-llvm";
-    version = "15.0.7";
-
-    src = fetchFromGitHub {
-      owner = "llvm";
-      repo = "llvm-project";
-      tag = version;
-      hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      git
-      ninja
-      python3
-    ];
-
-    cmakeFlags = [
-      "-DLLVM_ENABLE_ZSTD=OFF"
-      "-DLLVM_BUILD_TOOLS=Off"
-      "-S ../llvm"
-    ];
-  };
-  inherit (darwin) xcode;
-
-  dxmt = pkgsCross.mingwW64.stdenv.mkDerivation (finalAttrs: {
-    pname = "dxmt";
-    version = "0.80";
-
-    src = fetchFromGitHub {
-      owner = "3shain";
-      repo = "dxmt";
-      rev = "v${finalAttrs.version}";
-      hash = "sha256-HNSKqEYu8se8DyzwRbqfmHRRyBXyW6D5ddPaEdnkuL4=";
-      fetchSubmodules = true;
-    };
-
-    patches = [
-      ./winecrt0.patch
-    ];
-
-    postPatch = ''
-      substituteInPlace src/airconv/darwin/meson.build --replace-fail -lcurses -lncurses
-
-      sed -e "/find_program('xcrun')/d" \
-          -e "s,metalir_generator = generator(xcrun,metalir_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal')," \
-          -e "s,metallib_generator = generator(xcrun,metallib_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib')," \
-          -e "s/'-sdk', 'macosx', 'metal\(lib\)\{0,1\}', //" \
-          -i meson.build
-    '';
-
-    nativeBuildInputs = [
-      meson
-      ninja
-      tinyxxd
-      buildPackages.stdenv.cc
-    ];
-
-    buildInputs = [
-      sqlite
-      libz
-      ncurses
-      libxml2
-    ];
-
-    mesonFlags = [
-      (lib.mesonOption "native_llvm_path" "${dxmt-llvm}")
-      (lib.mesonOption "wine_install_path" "${wine64}")
-    ];
-
-    preBuild = ''
-      export HOME=$TMPDIR
-    '';
-
-    __structuredAttrs = true;
-    strictDeps = true;
-
-    meta = {
-      description = "Metal-based translation layer for Direct3D 10/11";
-      homepage = "https://github.com/3shain/dxmt";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.feyorsh ];
-      platforms = lib.platforms.windows;
-      hydraPlatforms = [ ];
-    };
-  });
-in
-symlinkJoin {
-  name = "dxmt-${dxmt.version}";
-
-  paths = [ dxmt ];
-
-  passthru = {
-    inherit dxmt;
-  };
-
-  __structuredAttrs = true;
-  strictDeps = true;
-
-  meta = {
-    inherit (dxmt.meta)
-      description
-      homepage
-      maintainers
-      license
-      ;
-    platforms = [ ];
-    hydraPlatforms = [ ];
-  };
-}
diff --git a/pkgs/by-name/dx/dxmt/winecrt0.patch b/pkgs/by-name/dx/dxmt/winecrt0.patch
deleted file mode 100644
index f4d0830659bb..000000000000
--- a/pkgs/by-name/dx/dxmt/winecrt0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git c/src/winemetal/meson.build i/src/winemetal/meson.build
-index 858d4b3..d937e29 100644
---- c/src/winemetal/meson.build
-+++ i/src/winemetal/meson.build
-@@ -26,8 +26,19 @@ elif wine_install_path != ''
-   if not wine_install_path.startswith('/')
-     wine_install_path = join_paths(meson.project_source_root(), wine_install_path)
-   endif
--  lib_winecrt0 = cc.find_library('winecrt0', dirs : [ join_paths(wine_install_path,'lib/wine', windows_builtin_install_dir) ])
--  lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)], static: true)
-+  winecrt0_unix_archive = custom_target(
-+    'winecrt0_fixup',
-+    output : 'libwinecrt0_fixed.a',
-+    command : [
-+      'sh', '-c',
-+      'ar p "$1" unix_lib.o > unix_lib.o && ar crs "$2" unix_lib.o',
-+      'sh',
-+      join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir, 'libwinecrt0.a'),
-+      '@OUTPUT@',
-+    ],
-+  )
-+  lib_winecrt0 = declare_dependency(sources : winecrt0_unix_archive)
-+  lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)])
-   lib_dbghelp = cc.find_library('dbghelp', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir) ])
-   winebuild = join_paths(wine_install_path, 'bin/winebuild')
- else
-@@ -59,4 +70,4 @@ custom_target('postprocess_lib',
- 
- if cpu_family == 'x86_64' or cpu_family == 'aarch64'
-   subdir('unix')
--endif
-\ No newline at end of file
-+endif
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 04c61ce16ce9..bf945551a201 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -690,6 +690,7 @@ mapAliases {
   dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14
   dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27
   dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13
+  dxmt = throw "dxmt has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
   e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15
   e-search = throw "'e-search' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01
   eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26

From 711c517164f6a0cc72906a7cc23d14f95076ab8e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:45:02 +0000
Subject: [PATCH 0777/1386] python3Packages.jaxlib-bin: clean up `badPlatforms`

---
 pkgs/development/python-modules/jaxlib/bin.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index c4430ca12bb4..7b4324041314 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -145,11 +145,5 @@ buildPythonPackage {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ samuela ];
-    badPlatforms = [
-      # Fails at pythonImportsCheckPhase:
-      # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4
-      # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c
-      # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))'
-    ];
   };
 }

From 0bce55e3e5ec216514500350d32b41e24c3d6a31 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 11:00:46 +0000
Subject: [PATCH 0778/1386] python3Packages.pyannote-audio: drop
 `x86_64-darwin` mention in comment

---
 pkgs/development/python-modules/pyannote-audio/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 8613419900bb..0ccbceceecef 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -124,7 +124,6 @@ buildPythonPackage (finalAttrs: {
     lib.optionals stdenv.hostPlatform.isDarwin [
       # Crashes the interpreter
       # - On aarch64-darwin: Trace/BPT trap: 5
-      # - On x86_64-darwin: Fatal Python error: Illegal instruction
       "tests/inference_test.py"
       "tests/test_train.py"
     ]

From 83c4d29157859c1d2fdcabc225ba4b996282f4f1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 17:28:48 +0100
Subject: [PATCH 0779/1386] flywheel-cli: clean up after `x86_64-darwin` drop

---
 pkgs/by-name/fl/flywheel-cli/package.nix | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix
index b134fa032be8..aab993c1f79b 100644
--- a/pkgs/by-name/fl/flywheel-cli/package.nix
+++ b/pkgs/by-name/fl/flywheel-cli/package.nix
@@ -5,29 +5,13 @@
   unzip,
 }:
 
-let
-  inherit (stdenv.hostPlatform) system;
-  throwSystem = throw "Unsupported system: ${system}";
-
-  os =
-    {
-      x86_64-linux = "linux";
-    }
-    .${system} or throwSystem;
-
-  sha256 =
-    {
-      x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78=";
-    }
-    .${system} or throwSystem;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flywheel-cli";
   version = "16.2.0";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-${os}_amd64-${finalAttrs.version}.zip";
-    inherit sha256;
+    url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-linux_amd64-${finalAttrs.version}.zip";
+    hash = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78=";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -38,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    install -Dt $out/bin ./${os}_amd64/fw
+    install -Dt $out/bin ./linux_amd64/fw
     runHook postInstall
   '';
 

From bfee621d4a0a2ba7549918de8ff7e8c1b1c8f14c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 13:43:20 +0000
Subject: [PATCH 0780/1386] imagineer: drop obsolete `broken`

---
 pkgs/by-name/im/imagineer/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/im/imagineer/package.nix b/pkgs/by-name/im/imagineer/package.nix
index 24e108b02ff0..3114786491e2 100644
--- a/pkgs/by-name/im/imagineer/package.nix
+++ b/pkgs/by-name/im/imagineer/package.nix
@@ -51,7 +51,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
     maintainers = [ lib.maintainers.progrm_jarvis ];
     mainProgram = "ig";
-    # The last successful Darwin Hydra build was in 2024
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 })

From ec11a3817c69b96f9f7bcfda8545c7117f54e5a2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 07:56:41 +0000
Subject: [PATCH 0781/1386] chromedriver: drop `x86_64-darwin` from update
 script

---
 .../networking/browsers/chromium/info.json      |  1 -
 .../networking/browsers/chromium/update.mjs     |  1 -
 .../tools/selenium/chromedriver/binary.nix      | 17 ++---------------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index c4ef999b274b..32dc2768b0c8 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -3,7 +3,6 @@
     "version": "150.0.7871.124",
     "chromedriver": {
       "version": "150.0.7871.125",
-      "hash_darwin": "sha256-HJTBS6eRmAsxrn7WW4hCxMCXdzn+1PYz1W0uZHJ38yk=",
       "hash_darwin_aarch64": "sha256-VCgkc6MeMPbt0F2ZVTJNn9yJbSYNhy1zr8KzPVaVi0I="
     },
     "deps": {
diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs
index 9aab0753db78..c3652f161d5e 100755
--- a/pkgs/applications/networking/browsers/chromium/update.mjs
+++ b/pkgs/applications/networking/browsers/chromium/update.mjs
@@ -170,7 +170,6 @@ async function fetch_chromedriver_binaries(version) {
   const url = (platform) => `https://storage.googleapis.com/chrome-for-testing-public/${version}/${platform}/chromedriver-${platform}.zip`
   return {
     version,
-    hash_darwin: await prefetch(url('mac-x64')),
     hash_darwin_aarch64: await prefetch(url('mac-arm64')),
   }
 }
diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix
index 84ab490d6dc9..745a2f864fd5 100644
--- a/pkgs/development/tools/selenium/chromedriver/binary.nix
+++ b/pkgs/development/tools/selenium/chromedriver/binary.nix
@@ -12,19 +12,6 @@ let
     (lib.importJSON ../../../../applications/networking/browsers/chromium/info.json)
     .chromium.chromedriver;
 
-  # See ./source.nix for Linux
-  allSpecs = {
-
-    aarch64-darwin = {
-      system = "mac-arm64";
-      hash = upstream-info.hash_darwin_aarch64;
-    };
-  };
-
-  spec =
-    allSpecs.${stdenv.hostPlatform.system}
-      or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
-
   inherit (upstream-info) version;
 in
 stdenv.mkDerivation {
@@ -32,8 +19,8 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchzip {
-    url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip";
-    inherit (spec) hash;
+    url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/mac-arm64/chromedriver-mac-arm64.zip";
+    hash = upstream-info.hash_darwin_aarch64;
   };
 
   nativeBuildInputs = [ unzip ];

From d8a8f66ef75f452e588f986f860b959aef58920c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:11:46 +0000
Subject: [PATCH 0782/1386] libreoffice-bin: drop `x86_64-darwin` from update
 script

---
 .../office/libreoffice/darwin/default.nix     | 20 +++++--------------
 .../office/libreoffice/darwin/update.nix      |  6 ++----
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix
index a2fdd448cdec..eb613364c8f3 100644
--- a/pkgs/applications/office/libreoffice/darwin/default.nix
+++ b/pkgs/applications/office/libreoffice/darwin/default.nix
@@ -12,22 +12,15 @@ let
   version = "26.2.4";
 
   dist = {
-    aarch64-darwin = rec {
-      arch = "aarch64";
-      archSuffix = arch;
-      url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
-      sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1";
-    };
+    url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/aarch64/LibreOffice_${version}_MacOS_aarch64.dmg";
+    sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1";
   };
 in
 stdenvNoCC.mkDerivation {
   inherit version;
   pname = "libreoffice";
   src = fetchurl {
-    inherit
-      (dist.${stdenvNoCC.hostPlatform.system}
-        or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}")
-      )
+    inherit (dist)
       url
       sha256
       ;
@@ -52,16 +45,13 @@ stdenvNoCC.mkDerivation {
     let
       defaultNixFile = toString ./default.nix;
       updateNix = toString ./update.nix;
-      aarch64Url = dist."aarch64-darwin".url;
-      x86_64Url = dist."x86_64-darwin".url;
     in
     writeScript "update-libreoffice.sh" ''
       #!/usr/bin/env nix-shell
-      #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix}
+      #!nix-shell -i bash --argstr url ${dist.url} --argstr version ${version} ${updateNix}
       set -eou pipefail
 
-      update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin --ignore-same-version
-      update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin --ignore-same-version
+      update-source-version libreoffice-bin $newVersion $newSha256 --file=${defaultNixFile} --ignore-same-version
     '';
 
   meta = {
diff --git a/pkgs/applications/office/libreoffice/darwin/update.nix b/pkgs/applications/office/libreoffice/darwin/update.nix
index f3c5c758b428..17f4c69cf85e 100644
--- a/pkgs/applications/office/libreoffice/darwin/update.nix
+++ b/pkgs/applications/office/libreoffice/darwin/update.nix
@@ -1,7 +1,6 @@
 # Impure functions, for passthru.updateScript runtime only
 {
-  aarch64Url,
-  x86_64Url,
+  url,
   version,
   pkgs ? import ../../../../../default.nix { },
 }:
@@ -14,6 +13,5 @@ in
 pkgs.mkShell rec {
   buildInputs = [ pkgs.common-updater-scripts ];
   newVersion = getLatestStableVersion;
-  newAarch64Sha256 = getSha256 aarch64Url version newVersion;
-  newX86_64Sha256 = getSha256 x86_64Url version newVersion;
+  newSha256 = getSha256 url version newVersion;
 }

From 597163a8e0c354cef0a6081efd6227e93f1259d0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:22:27 +0000
Subject: [PATCH 0783/1386] kiro-cli: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ki/kiro-cli/package.nix | 11 ++++-------
 pkgs/by-name/ki/kiro-cli/update.sh   |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix
index bdb2b27bd3c6..295cfe09be35 100644
--- a/pkgs/by-name/ki/kiro-cli/package.nix
+++ b/pkgs/by-name/ki/kiro-cli/package.nix
@@ -17,12 +17,6 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.10.0";
 
   src =
-    let
-      darwinDmg = fetchurl {
-        url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
-        hash = "sha256-NDeyXQO9NBsK3xqAEcO1gGn9ta+ZVQ1GNwZ4hbGUe3Q=";
-      };
-    in
     {
       x86_64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
@@ -32,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
         hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ=";
       };
-      aarch64-darwin = darwinDmg;
+      aarch64-darwin = fetchurl {
+        url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
+        hash = "sha256-NDeyXQO9NBsK3xqAEcO1gGn9ta+ZVQ1GNwZ4hbGUe3Q=";
+      };
     }
     .${system} or (throw "Unsupported system: ${system}");
 
diff --git a/pkgs/by-name/ki/kiro-cli/update.sh b/pkgs/by-name/ki/kiro-cli/update.sh
index baff24e34e71..bedf83491dfc 100755
--- a/pkgs/by-name/ki/kiro-cli/update.sh
+++ b/pkgs/by-name/ki/kiro-cli/update.sh
@@ -63,7 +63,7 @@ echo "darwin hash: $darwin_hash"
 # Get current hashes from package.nix
 current_x86_hash=$(grep -A2 'x86_64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+')
 current_aarch64_hash=$(grep -A2 'aarch64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+')
-current_darwin_hash=$(grep -A2 'darwinDmg = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+')
+current_darwin_hash=$(grep -A2 'aarch64-darwin = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+')
 
 # Update version and hashes
 sed -i "s|version = \"$current_version\"|version = \"$latest_version\"|" "$PACKAGE_NIX"

From 064627d7e7c8a7619b16ba854274397e1199d770 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:33:33 +0100
Subject: [PATCH 0784/1386] python3Packages.frida-python: drop `x86_64-darwin`
 from update script

---
 pkgs/development/python-modules/frida-python/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/frida-python/update.sh b/pkgs/development/python-modules/frida-python/update.sh
index 2dde81527470..88132590f18c 100755
--- a/pkgs/development/python-modules/frida-python/update.sh
+++ b/pkgs/development/python-modules/frida-python/update.sh
@@ -11,7 +11,6 @@ sed -i "s/version = \".*\"/version = \"$latest\"/" "$dir/default.nix"
 for system_platform in \
   "x86_64-linux|manylinux1_x86_64" \
   "aarch64-linux|manylinux2014_aarch64" \
-  "x86_64-darwin|macosx_10_13_x86_64" \
   "aarch64-darwin|macosx_11_0_arm64"
 do
   system="${system_platform%%|*}"

From cb9dc78a306875287ecf3b13ee9bcd8e495d1e2c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:34:54 +0100
Subject: [PATCH 0785/1386] antigravity-cli: drop `x86_64-darwin` from update
 script

---
 pkgs/by-name/an/antigravity-cli/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/an/antigravity-cli/update.sh b/pkgs/by-name/an/antigravity-cli/update.sh
index 835800502981..61ca43ac4483 100755
--- a/pkgs/by-name/an/antigravity-cli/update.sh
+++ b/pkgs/by-name/an/antigravity-cli/update.sh
@@ -25,7 +25,6 @@ update-source-version --version-key=version antigravity-cli $latestVersion || tr
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix store prefetch-file --json --hash-type sha256 \
       $(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.src.url" --system "$system") | jq -r '.hash')

From 6fa658d6731875606531c29a01654944ba631c9f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:35:22 +0100
Subject: [PATCH 0786/1386] box-cli: drop `x86_64-darwin` from update script

---
 pkgs/by-name/bo/box-cli/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/bo/box-cli/update.sh b/pkgs/by-name/bo/box-cli/update.sh
index 3656eb168b46..093689c68b3f 100755
--- a/pkgs/by-name/bo/box-cli/update.sh
+++ b/pkgs/by-name/bo/box-cli/update.sh
@@ -32,7 +32,6 @@ echo "Updating box-cli from $old_version to $version"
 declare -A platforms=(
     [x86_64-linux]="box-linux-x64"
     [aarch64-linux]="box-linux-arm64"
-    [x86_64-darwin]="box-darwin-x64"
     [aarch64-darwin]="box-darwin-arm64"
 )
 

From 844528779d894ff5c872ace0ce6fe263e8caa31c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:35:50 +0100
Subject: [PATCH 0787/1386] saw-tools: drop `x86_64-darwin` from update script

---
 pkgs/by-name/sa/saw-tools/update.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/by-name/sa/saw-tools/update.sh b/pkgs/by-name/sa/saw-tools/update.sh
index 0baf5021543f..2d64cbbac007 100755
--- a/pkgs/by-name/sa/saw-tools/update.sh
+++ b/pkgs/by-name/sa/saw-tools/update.sh
@@ -8,15 +8,12 @@ cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
 version="1.5"
 
 aarch64_darwin_url="https://github.com/GaloisInc/saw-script/releases/download/v${version}/saw-${version}-macos-15-ARM64-with-solvers.tar.gz"
-x86_64_darwin_url="https://github.com/GaloisInc/saw-script/releases/download/v${version}/saw-${version}-macos-15-intel-X64-with-solvers.tar.gz"
 x86_64_linux_url="https://github.com/GaloisInc/saw-script/releases/download/v${version}/saw-${version}-ubuntu-22.04-X64-with-solvers.tar.gz"
 
 aarch64_darwin_hash=$(nix-prefetch-url "$aarch64_darwin_url")
-x86_64_darwin_hash=$(nix-prefetch-url "$x86_64_darwin_url")
 x86_64_linux_hash=$(nix-prefetch-url "$x86_64_linux_url")
 
 aarch64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$aarch64_darwin_hash")
-x86_64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_darwin_hash")
 x86_64_linux_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_linux_hash")
 
 sed -i "s/version = \".*\"/version = \"${version}\"/" package.nix
@@ -29,10 +26,6 @@ cat >sources.nix <<EOF
     url = "$aarch64_darwin_url";
     hash = "$aarch64_darwin_hash";
   };
-  x86_64-darwin = {
-    url = "$x86_64_darwin_url";
-    hash = "$x86_64_darwin_hash";
-  };
   x86_64-linux = {
     url = "$x86_64_linux_url";
     hash = "$x86_64_linux_hash";

From 0261cc6bab22026c84554f131f91fa9943a875e3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:36:14 +0100
Subject: [PATCH 0788/1386] grok-build: drop `x86_64-darwin` from update script

---
 pkgs/by-name/gr/grok-build/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grok-build/update.sh b/pkgs/by-name/gr/grok-build/update.sh
index 371f2853e8ad..5d7553dc2603 100755
--- a/pkgs/by-name/gr/grok-build/update.sh
+++ b/pkgs/by-name/gr/grok-build/update.sh
@@ -16,7 +16,7 @@ fi
 
 update-source-version grok-build "${version}" || true
 
-for system in "aarch64-darwin macos-aarch64" "aarch64-linux linux-aarch64" "x86_64-darwin macos-x86_64" "x86_64-linux linux-x86_64"; do
+for system in "aarch64-darwin macos-aarch64" "aarch64-linux linux-aarch64" "x86_64-linux linux-x86_64"; do
   # shellcheck disable=SC2086
   set -- ${system}
 

From 3f7578576545ce8512012c1ee9c3784f7fa03f46 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:38:24 +0100
Subject: [PATCH 0789/1386] snipaste: drop `x86_64-darwin` from update script

---
 pkgs/by-name/sn/snipaste/sources.nix | 7 ++-----
 pkgs/by-name/sn/snipaste/update.sh   | 8 ++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sn/snipaste/sources.nix b/pkgs/by-name/sn/snipaste/sources.nix
index b3ed093ee007..3db155ef822e 100644
--- a/pkgs/by-name/sn/snipaste/sources.nix
+++ b/pkgs/by-name/sn/snipaste/sources.nix
@@ -1,17 +1,14 @@
 # Generated by ./update.sh - do not update manually!
 # Last updated: 2026-06-20
 { fetchurl }:
-let
-  any-darwin = {
+{
+  aarch64-darwin = {
     version = "2.11.3";
     src = fetchurl {
       url = "https://download.snipaste.com/archives/Snipaste-2.11.3.dmg";
       hash = "sha256-oih4OIieexc0pl2VK65e9/R5vcFj0MMb6RhZvKEg/T4=";
     };
   };
-in
-{
-  aarch64-darwin = any-darwin;
   x86_64-linux = {
     version = "2.11.3";
     src = fetchurl {
diff --git a/pkgs/by-name/sn/snipaste/update.sh b/pkgs/by-name/sn/snipaste/update.sh
index 114574e3732d..7bc6dbadf47f 100755
--- a/pkgs/by-name/sn/snipaste/update.sh
+++ b/pkgs/by-name/sn/snipaste/update.sh
@@ -29,18 +29,14 @@ cat >sources.nix <<EOF
 # Generated by ./update.sh - do not update manually!
 # Last updated: $(date +%F)
 { fetchurl }:
-let
-  any-darwin = {
+{
+  aarch64-darwin = {
     version = "$mac_version";
     src = fetchurl {
       url = "$mac_url";
       hash = "$mac_hash";
     };
   };
-in
-{
-  aarch64-darwin = any-darwin;
-  x86_64-darwin = any-darwin;
   x86_64-linux = {
     version = "$linux_version";
     src = fetchurl {

From 3eea541e4d9b2a4c842db5236d4881a3b920f54a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:38:56 +0100
Subject: [PATCH 0790/1386] lens: drop `x86_64-darwin` from update script

---
 pkgs/by-name/le/lens/update.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/lens/update.sh b/pkgs/by-name/le/lens/update.sh
index 12174d9799fc..ec0f3bd9d32f 100755
--- a/pkgs/by-name/le/lens/update.sh
+++ b/pkgs/by-name/le/lens/update.sh
@@ -28,10 +28,9 @@ appimage_hash=$(manifest_hash '.x86_64.AppImage' "$linux_manifest")
 dmg_hash=$(manifest_hash '-latest.dmg' "$mac_manifest")
 arm64_dmg_hash=$(manifest_hash '-arm64.dmg' "$mac_manifest")
 
-# The three platforms share one version but have distinct hashes. --system picks
+# The two platforms share one version but have distinct hashes. --system picks
 # which source (and therefore which hash) update-source-version rewrites; passing
 # the hash explicitly avoids a download. The version is written on the first call,
 # so the darwin calls need --ignore-same-version to not early-exit as "unchanged".
 update-source-version lens "$version" "$appimage_hash" --system=x86_64-linux
-update-source-version lens "$version" "$dmg_hash" --system=x86_64-darwin --ignore-same-version
 update-source-version lens "$version" "$arm64_dmg_hash" --system=aarch64-darwin --ignore-same-version

From f2e1368bb125eddad2b41af832930208e227ab05 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:39:12 +0100
Subject: [PATCH 0791/1386] amp-cli: drop `x86_64-darwin` from update script

---
 pkgs/by-name/am/amp-cli/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/am/amp-cli/update.sh b/pkgs/by-name/am/amp-cli/update.sh
index 86b348d857a2..d795637ef432 100755
--- a/pkgs/by-name/am/amp-cli/update.sh
+++ b/pkgs/by-name/am/amp-cli/update.sh
@@ -10,7 +10,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")/../../../.."
 for system in \
   x86_64-linux \
   aarch64-linux \
-  x86_64-darwin \
   aarch64-darwin
 do
   update-source-version amp-cli "$version" \

From ecd27fca3e4c8945044ffa34a069b87f64e73405 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:39:35 +0100
Subject: [PATCH 0792/1386] sunshine: drop `x86_64-darwin` from update script

---
 pkgs/by-name/su/sunshine/updater.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/su/sunshine/updater.sh b/pkgs/by-name/su/sunshine/updater.sh
index 99e063be5310..96c293699844 100755
--- a/pkgs/by-name/su/sunshine/updater.sh
+++ b/pkgs/by-name/su/sunshine/updater.sh
@@ -96,7 +96,6 @@ ffmpeg_url() {
 declare -A ffmpeg_arch=(
     [x86_64-linux]=Linux-x86_64
     [aarch64-linux]=Linux-aarch64
-    [x86_64-darwin]=Darwin-x86_64
     [aarch64-darwin]=Darwin-arm64
 )
 

From 342b6b29272878d1841587f18b32ee1776a4b816 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:40:24 +0100
Subject: [PATCH 0793/1386] codex-acp: drop `x86_64-darwin` from update script

---
 pkgs/by-name/co/codex-acp/update.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codex-acp/update.sh b/pkgs/by-name/co/codex-acp/update.sh
index 2a8328e7bcf5..aa434ded6b25 100755
--- a/pkgs/by-name/co/codex-acp/update.sh
+++ b/pkgs/by-name/co/codex-acp/update.sh
@@ -141,7 +141,6 @@ fetchurl {
     {
       x86_64-linux = "${V8_HASH_X86_64_LINUX}";
       aarch64-linux = "${V8_HASH_AARCH64_LINUX}";
-      x86_64-darwin = "${V8_HASH_X86_64_DARWIN}";
       aarch64-darwin = "${V8_HASH_AARCH64_DARWIN}";
     }
     .\${stdenv.hostPlatform.system}
@@ -198,9 +197,8 @@ export CODEX_HASH
 
 V8_HASH_X86_64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz")"
 V8_HASH_AARCH64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz")"
-V8_HASH_X86_64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-apple-darwin.a.gz")"
 V8_HASH_AARCH64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-apple-darwin.a.gz")"
-export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_X86_64_DARWIN V8_HASH_AARCH64_DARWIN
+export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_AARCH64_DARWIN
 
 update-source-version "$ATTR_PATH" "$latest_version" "$src_hash" --ignore-same-version
 update_codex_pins

From 91c3cab3e68e485a801b2580b7ce18cc65204e62 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:41:49 +0100
Subject: [PATCH 0794/1386] acli: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ac/acli/update.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ac/acli/update.py b/pkgs/by-name/ac/acli/update.py
index 4afb0b902f6d..0bec673b26b0 100755
--- a/pkgs/by-name/ac/acli/update.py
+++ b/pkgs/by-name/ac/acli/update.py
@@ -10,7 +10,7 @@ from urllib.request import urlopen, Request
 
 def get_arch_os_key(url) -> str:
     if "darwin_amd64" in url:
-        return "x86_64-darwin"
+        return None
     elif "darwin_arm64" in url:
         return "aarch64-darwin"
     elif "linux_amd64" in url:
@@ -57,9 +57,8 @@ def parse_and_check(content):
         )
 
     for url, hex_sha in matches:
-        key = get_arch_os_key(url)
-
-        data["sources"][key] = {"url": url, "sha256": hex_sha}
+        if key := get_arch_os_key(url):
+            data["sources"][key] = {"url": url, "sha256": hex_sha}
 
     data["sources"] = dict(sorted(data["sources"].items()))
 

From 5fbfef30940d78c12602b9605f1a0a73e8c6a7c5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:42:01 +0100
Subject: [PATCH 0795/1386] swiftlint: drop `x86_64-darwin` from update script

---
 pkgs/by-name/sw/swiftlint/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sw/swiftlint/update.sh b/pkgs/by-name/sw/swiftlint/update.sh
index 0839de6e5565..6cfec190556e 100755
--- a/pkgs/by-name/sw/swiftlint/update.sh
+++ b/pkgs/by-name/sw/swiftlint/update.sh
@@ -19,7 +19,6 @@ echo "Updating swiftlint from $old_version to $version"
 declare -A platforms=(
     [x86_64-linux]="swiftlint_linux_amd64.zip"
     [aarch64-linux]="swiftlint_linux_arm64.zip"
-    [x86_64-darwin]="portable_swiftlint.zip"
     [aarch64-darwin]="portable_swiftlint.zip"
 )
 

From edb5a960e5e67c7918892d8f7048ab1c1b024e3c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:08:46 +0000
Subject: [PATCH 0796/1386] raycast: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ra/raycast/package.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
index aa90edbbf9bd..8e6b1196db41 100644
--- a/pkgs/by-name/ra/raycast/package.nix
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -14,15 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raycast";
   version = "1.104.17";
 
-  src =
-    {
-      aarch64-darwin = fetchurl {
-        name = "Raycast.dmg";
-        url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-muX6PPanjU+ElCQhIfo7Y7cChbTO8Q/gH12ULvBK43s=";
-      };
-    }
-    .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
+  src = fetchurl {
+    name = "Raycast.dmg";
+    url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
+    hash = "sha256-muX6PPanjU+ElCQhIfo7Y7cChbTO8Q/gH12ULvBK43s=";
+  };
 
   dontPatch = true;
   dontConfigure = true;
@@ -55,15 +51,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       version=$(echo "$url" | jq -r '.version')
 
       arm_url="https://releases.raycast.com/releases/$version/download?build=arm"
-      x86_url="https://releases.raycast.com/releases/$version/download?build=x86_64"
-
       arm_hash="sha256-$(curl -sL "$arm_url" | openssl dgst -sha256 -binary | openssl base64)"
-      x86_hash="sha256-$(curl -sL "$x86_url" | openssl dgst -sha256 -binary | openssl base64)"
 
       sed -i -E \
         -e 's|(version = )"[0-9]+\.[0-9]+\.[0-9]+";|\1"'"$version"'";|' \
-        -e '/aarch64-darwin = fetchurl/,/};/ s|(hash = )"sha256-[A-Za-z0-9+/]+=";|\1"'"$arm_hash"'";|' \
-        -e '/x86_64-darwin = fetchurl/,/};/ s|(hash = )"sha256-[A-Za-z0-9+/]+=";|\1"'"$x86_hash"'";|' \
+        -e '/src = fetchurl/,/};/ s|(hash = )"sha256-[A-Za-z0-9+/]+=";|\1"'"$arm_hash"'";|' \
         ./pkgs/by-name/ra/raycast/package.nix
     '';
   });

From a76ba612d60ca868570db143d207ca5392b24ea0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 08:01:09 +0000
Subject: [PATCH 0797/1386] tidgi: drop `x86_64-darwin` from update script

---
 pkgs/by-name/ti/tidgi/package.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ti/tidgi/package.nix b/pkgs/by-name/ti/tidgi/package.nix
index 291abd95e9b4..5d60806bbe93 100644
--- a/pkgs/by-name/ti/tidgi/package.nix
+++ b/pkgs/by-name/ti/tidgi/package.nix
@@ -13,14 +13,10 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "tidgi";
   version = "0.12.4";
 
-  src =
-    {
-      aarch64-darwin = fetchurl {
-        url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-arm64-${finalAttrs.version}.zip";
-        hash = "sha256-bSJFM67+KVECUqjwu1HYipn+zOps1ahNzM721yZL52c=";
-      };
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  src = fetchurl {
+    url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-arm64-${finalAttrs.version}.zip";
+    hash = "sha256-bSJFM67+KVECUqjwu1HYipn+zOps1ahNzM721yZL52c=";
+  };
 
   dontBuild = true;
 
@@ -51,10 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       regex: '^\s*version\s*='
     fix: 'version = \"$latestVersion\";'
     " --update-all $(env EDITOR=echo nix edit --file . tidgi)
-    systems=$(nix eval --json -f . tidgi.meta.platforms | ${lib.getExe jq} --raw-output '.[]')
-    for system in $systems; do
-      hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . tidgi.src.url --system "$system")))
-      ${lib.getExe' common-updater-scripts "update-source-version"} tidgi $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash
+    ${lib.getExe' common-updater-scripts "update-source-version"} tidgi $latestVersion --ignore-same-version --ignore-same-hash
     done
   '';
 

From 18378b98faa7f8770fe3b50ac430259fdb09c425 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Jul 2026 20:42:29 +0100
Subject: [PATCH 0798/1386] sprite: drop `x86_64-darwin` from update script

---
 pkgs/by-name/sp/sprite/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sp/sprite/update.sh b/pkgs/by-name/sp/sprite/update.sh
index 91c2464ae641..26e37dd7c763 100755
--- a/pkgs/by-name/sp/sprite/update.sh
+++ b/pkgs/by-name/sp/sprite/update.sh
@@ -43,5 +43,4 @@ updateVersion "$latestVersion"
 
 updateHash "$latestVersion" x86_64-linux   linux-amd64
 updateHash "$latestVersion" aarch64-linux  linux-arm64
-updateHash "$latestVersion" x86_64-darwin  darwin-amd64
 updateHash "$latestVersion" aarch64-darwin darwin-arm64

From 221afe9df1306643f5a5202e00194d2ff5f133f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:01:53 +0000
Subject: [PATCH 0799/1386] python3Packages.robot-descriptions: 2.0.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/robot-descriptions/default.nix b/pkgs/development/python-modules/robot-descriptions/default.nix
index a4e76e813cab..491cdf114eb0 100644
--- a/pkgs/development/python-modules/robot-descriptions/default.nix
+++ b/pkgs/development/python-modules/robot-descriptions/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "robot-descriptions";
-  version = "2.0.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robot-descriptions";
     repo = "robot_descriptions.py";
     tag = "v${version}";
-    hash = "sha256-PykMzWOwnjvay5zzddqD/07SdZ03GN80tRAa1CzrJzU=";
+    hash = "sha256-THLGQWZVeXwbanBIyYw8ymM+c/x5rXJxD7YWgn8GCWw=";
   };
 
   build-system = [

From 562593dfb88ab7815dc30fd255cea6183a9452e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:02:38 +0000
Subject: [PATCH 0800/1386] vscode-extensions.gitlab.gitlab-workflow: 6.84.2 ->
 6.85.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index de3ec7a5475f..ce9a3d7368e8 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2015,8 +2015,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.84.2";
-          hash = "sha256-UBoZ6DxT5d7zeTycgmuLomzoVcB7iAnflfxAup6QslI=";
+          version = "6.85.3";
+          hash = "sha256-EsQ+95Wo/5F9mEMQ7X36vBgUWlsz5BCOm+7QrGHuepc=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";

From 3cdd216f5ad50205ade99a78b05a54ea5b2651c3 Mon Sep 17 00:00:00 2001
From: Ross Nomann <rossnomann@protonmail.com>
Date: Wed, 15 Jul 2026 05:06:51 +0200
Subject: [PATCH 0801/1386] deadbeef: disable swift in libdispatch build input

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

diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix
index bd5af326d7c2..919017ab9d6b 100644
--- a/pkgs/by-name/de/deadbeef/package.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -77,7 +77,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     jansson
-    swift-corelibs-libdispatch
+    (swift-corelibs-libdispatch.override { useSwift = false; })
     gtk3
     gsettings-desktop-schemas
   ]

From 3b87f8efd3f001b5444200d812a9ef25e487d6ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:07:30 +0000
Subject: [PATCH 0802/1386] libretro.prboom: 0-unstable-2026-07-01 ->
 0-unstable-2026-07-07

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

diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix
index 907e3f47386f..38a3b5c3ecca 100644
--- a/pkgs/applications/emulators/libretro/cores/prboom.nix
+++ b/pkgs/applications/emulators/libretro/cores/prboom.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "prboom";
-  version = "0-unstable-2026-07-01";
+  version = "0-unstable-2026-07-07";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-prboom";
-    rev = "141978db577b52cb943641629401776e49ccbbe6";
-    hash = "sha256-USRBq+h2HAoDIdYVd47wGLEnUzJAEOvikuvSNTHpboI=";
+    rev = "31563d6e65faa6b9b7e975754d2062370bba4342";
+    hash = "sha256-eFRzbVTL5ARf650D0ZAEFGNTxjAy1CjBiAhwSQR8vJ4=";
   };
 
   makefile = "Makefile";

From 7e81099b51220796fee03c5de6a17d5409131d46 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 14 Jul 2026 23:12:53 -0400
Subject: [PATCH 0803/1386] vector: skip flakey test

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

diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 2a378fde56ab..727084178694 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -109,6 +109,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics"
     "--skip=sources::host_metrics::cpu::tests::generates_cpu_metrics"
     "--skip=sources::internal_logs::tests::repeated_logs_are_not_rate_limited"
+    "--skip=topology::test::reload::topology_reload_preserves_enrichment_table_state"
 
     # Requires access to journalctl
     "--skip=sources::journald::tests::emits_cursor"

From 04f40393c068b55b8554b8ae63efca2a90fa65be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:27:24 +0000
Subject: [PATCH 0804/1386] pocketbase: 0.39.5 -> 0.39.6

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

diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index c717b2df6932..e31c998bf487 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocketbase";
-  version = "0.39.5";
+  version = "0.39.6";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3OsvxKhYd/kQuxDVBjClJrOdFevTeBJmT3gImP/aTcE=";
+    hash = "sha256-EQMgqdxssB4FbVJDoYZTdk9vq+++k52MJe/6ZiGgHjo=";
   };
 
-  vendorHash = "sha256-8ABdBsV7FhXNbKkUUcje8OgtVHB4BfRjWVfFAK4I8As=";
+  vendorHash = "sha256-Xu9jokD5Dkov5kZjO05q60YpM3NZlbwOZs0XJmQ8kC8=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 2aa87d6f7ca24a2173559316e1da5e759fc2f143 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:32:17 +0000
Subject: [PATCH 0805/1386] dprint: 0.55.1 -> 0.55.2

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

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 00d6545bc097..4af408029750 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dprint";
-  version = "0.55.1";
+  version = "0.55.2";
 
   # Prefer repository rather than crate here
   #   - They have Cargo.lock in the repository
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dprint";
     repo = "dprint";
     tag = finalAttrs.version;
-    hash = "sha256-OXXLpKgP2cUuPl7ikgZVPFgJiLY0Zy8MmBkz8Kp2+XM=";
+    hash = "sha256-80YdmDyyofBoHhLcldI9l1chpI6NKScyLQneJ068q/U=";
   };
 
-  cargoHash = "sha256-IDxJPicTq0/7LI/07QfJrteaKAHDoeKdzpbEv871xxE=";
+  cargoHash = "sha256-b6N4cKzsYRJEhvxVAtc+kfQJeDJMD7IpkGm14e9Icuo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f8cba33bb5533fbc6ab657d5fd625d808f712e68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:33:46 +0000
Subject: [PATCH 0806/1386] python3Packages.mistralai: 2.5.2 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix
index a3fc4e9f92f2..2efd07c6d862 100644
--- a/pkgs/development/python-modules/mistralai/default.nix
+++ b/pkgs/development/python-modules/mistralai/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mistralai";
-  version = "2.5.2";
+  version = "2.6.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     owner = "mistralai";
     repo = "client-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-skcg4fa9WUNqQs3rqfwVovpQ65hCXqhDDyeJa7kAwNA=";
+    hash = "sha256-ddQOi7jZiV3affmbsDI36n3wpbkLup5MuJ+9iDPZbro=";
   };
 
   preBuild = ''

From fa548aa1ad28bcdfe29b26c12394061a6aa85e3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:48:28 +0000
Subject: [PATCH 0807/1386] home-assistant-custom-components.powercalc: 1.21.2
 -> 1.22.0

---
 .../home-assistant/custom-components/powercalc/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
index a294f47c40b8..6f7e85e3e3ba 100644
--- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
@@ -17,13 +17,13 @@
 buildHomeAssistantComponent rec {
   owner = "bramstroker";
   domain = "powercalc";
-  version = "1.21.2";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-powercalc";
     tag = "v${version}";
-    hash = "sha256-D8gFEhitQjryZLLcP2ZsXNqWLvPyayuoYGq5C0B2D5w=";
+    hash = "sha256-JToHHnteIH6uJEZSl22hBsUxkf7Cj0s1sPaAcKmaFao=";
   };
 
   dependencies = [ numpy ];

From b5031fb44ad291b8b18e7100788b94d23f86f64f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:54:41 +0000
Subject: [PATCH 0808/1386] alacritty-theme: 0-unstable-2026-06-12 ->
 0-unstable-2026-07-10

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

diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix
index 901d8f32365c..15713eea5f6a 100644
--- a/pkgs/by-name/al/alacritty-theme/package.nix
+++ b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alacritty-theme";
-  version = "0-unstable-2026-06-12";
+  version = "0-unstable-2026-07-10";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = "alacritty-theme";
-    rev = "659d2e1d669cd5722f11e58c44fd45dc26a6ffcd";
-    hash = "sha256-1GMpnDdfzBIMm9fzQjxYgLNUGA3amvGYgO3VRcd49ro=";
+    rev = "03cce642656759f440c97bb99ce65fc1c5b064a1";
+    hash = "sha256-JfvBUsmw3lRxOj2lb9yVmkRwfUpjJwjBujwztoXtgMY=";
     sparseCheckout = [ "themes" ];
   };
 

From f205cb30b9a8dbc364ccf7a6acddeec407a89996 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:58:12 +0000
Subject: [PATCH 0809/1386] owmods-cli: 0.15.5 -> 0.15.7

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

diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix
index 1e3b266f44cb..b204820e1efd 100644
--- a/pkgs/by-name/ow/owmods-cli/package.nix
+++ b/pkgs/by-name/ow/owmods-cli/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "owmods-cli";
-  version = "0.15.5";
+  version = "0.15.7";
 
   src = fetchFromGitHub {
     owner = "ow-mods";
     repo = "ow-mod-man";
     rev = "cli_v${finalAttrs.version}";
-    hash = "sha256-8ZHLb57/gC03+rWe8mHcBS0nJVNjjRMtLADwGcSZ0CI=";
+    hash = "sha256-ohCP0VKf2jEtjZsDN5ISZ5c/EGYANvjuCPyKQcNCwyc=";
   };
 
-  cargoHash = "sha256-WxfbkfOXU1NgUYagsDu3ri26k+XytG7Vy8+ofuQEwjE=";
+  cargoHash = "sha256-oYTz7Dzdv9prHzDSSjX9PozzKToMXRW6qs8Y2dfYQ8A=";
 
   nativeBuildInputs = [
     pkg-config

From cd506216058d07cf2bb361daac54f2dbc4a2b6f9 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <anton.tayanovskyy@gmail.com>
Date: Tue, 14 Jul 2026 22:46:37 -0400
Subject: [PATCH 0810/1386] ecl: use fixDarwinDylibNames

This change makes sure dynamic libraries such as result/lib/libecl.dylib have no runtime-resolved paths
left, e.g. otool -L result/lib/libecl.dylib results have no "@rpath" entries.
---
 pkgs/development/compilers/ecl/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 14cc4f5b2466..c1b63fceeab6 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -18,6 +18,7 @@
   useBoehmgc ? false,
   boehmgc,
   sbcl,
+  fixDarwinDylibNames,
 }:
 
 let
@@ -38,7 +39,11 @@ stdenv.mkDerivation rec {
     automake
     texinfo
     makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
   ];
+
   propagatedBuildInputs = [
     libffi
     gmp

From d95510967393924c06934764509813fb1dc82fdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 04:07:27 +0000
Subject: [PATCH 0811/1386] dwproton-bin: dwproton-11.0-5 -> dwproton-11.0-7

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

diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix
index 0d10c39ca128..350041457939 100644
--- a/pkgs/by-name/dw/dwproton-bin/package.nix
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs (
     inherit steamDisplayName;
 
     pname = "dwproton-bin";
-    version = "dwproton-11.0-5";
+    version = "dwproton-11.0-7";
 
     src = fetchzip {
       url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
-      hash = "sha256-2x4xotJ2aJYbg+G2TDPqyU7uuoc/hZQon9CA6SFGin0=";
+      hash = "sha256-M8wcC7pKFs0Qena5NN9ylq2TykRfPK7JiHnzP6DkZv0=";
     };
 
     preFixup = ''

From b1c60a62062eed4dccf31665282122d83a7c2977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 04:23:30 +0000
Subject: [PATCH 0812/1386] autoprefixer: 10.5.0 -> 10.5.3

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

diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix
index 35ea1a5adc2c..76efe7f2cd45 100644
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "autoprefixer";
-  version = "10.5.0";
+  version = "10.5.3";
 
   src = fetchFromGitHub {
     owner = "postcss";
     repo = "autoprefixer";
     tag = finalAttrs.version;
-    hash = "sha256-s152v9sIuQLvhfPsZvQa+O9UhoASgm/e8dnz0t4pP3A=";
+    hash = "sha256-hjckcgWojItp2gseQI18zzxizjw/HxQPiTb/JegSCcs=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 4;
-    hash = "sha256-Sxt4vtdlMdXxXqt22hfZJskj8mkB5t85IZ5BsbCoDF4=";
+    hash = "sha256-diOgX9lXKOwCx9V737mmmtrhqDg5beXJH/PjlJHFpto=";
   };
 
   installPhase = ''

From 065ead44ec64717485df7d2a40483d8d97c88ca2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 04:37:03 +0000
Subject: [PATCH 0813/1386] envoy-bin: 1.38.2 -> 1.39.0

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

diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index 47ad70b28786..fcbf5d0a0033 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -7,7 +7,7 @@
   versionCheckHook,
 }:
 let
-  version = "1.38.2";
+  version = "1.39.0";
   inherit (stdenvNoCC.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -20,8 +20,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-nHFdDu2KrzqZgw7glwvDtevH1CIbvB4vP/chBWHanX0=";
-      x86_64-linux = "sha256-h3RKH8mY1ncHjJcDEToZLQgwutxoiGYkQWMoR/yziJk=";
+      aarch64-linux = "sha256-7lOk9TdVZvFZRNycsDr7H8Io3zj2FzfGd/E5ITIVr88=";
+      x86_64-linux = "sha256-RAna3IeTHY+GdjFMvYMHHLZRJftP6sP2M1gAWA36khg=";
     }
     .${system} or throwSystem;
 in

From 07c11810b9ff09d8fedae19dd7111ec29e1c7dd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 04:40:45 +0000
Subject: [PATCH 0814/1386] fastfetch-unwrapped: 2.65.2 -> 2.66.0

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

diff --git a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
index 3fe6b67b2fa9..cae780fd2c07 100644
--- a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
+++ b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
@@ -47,7 +47,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch-unwrapped";
-  version = "2.65.2";
+  version = "2.66.0";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fastfetch-cli";
     repo = "fastfetch";
     tag = finalAttrs.version;
-    hash = "sha256-yRKxETZEIlpl42y+adp9wpQhD6ZDebdfGj4SL1zxr3w=";
+    hash = "sha256-ttszEPEywszDGHoYKZYXM2WAUcuOSIj589LeEWxtRaU=";
   };
 
   outputs = [

From a44c25bf74eeacc68db1e2ecebd77838ba697b88 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 10 Jul 2026 13:33:40 -0700
Subject: [PATCH 0815/1386] celestia: move to by-name/

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

diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/by-name/ce/celestia/package.nix
similarity index 98%
rename from pkgs/applications/science/astronomy/celestia/default.nix
rename to pkgs/by-name/ce/celestia/package.nix
index d7215163a78b..8e6d4fbcace6 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/by-name/ce/celestia/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   libglut,
   gtk2,
-  gtkglext,
+  gnome2,
   libjpeg_turbo,
   libtheora,
   libxmu,
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libglut
     gtk2
-    gtkglext
+    gnome2.gtkglext
     lua
     perl
     libjpeg_turbo
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06ef7f62abba..5e653ed6bde4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10581,10 +10581,6 @@ with pkgs;
 
   boinc-headless = boinc.override { headless = true; };
 
-  celestia = callPackage ../applications/science/astronomy/celestia {
-    inherit (gnome2) gtkglext;
-  };
-
   faissWithCuda = faiss.override {
     cudaSupport = true;
   };

From 0d7517afd325f976673dbcd068520e63972e2115 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 10 Jul 2026 17:22:13 -0700
Subject: [PATCH 0816/1386] lib/licenses: add CC-BY-NC-3.0-IGO and JPL-image
 licenses

---
 lib/licenses/licenses.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index faaf92e6a68e..cbe1b0d05d72 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -382,6 +382,13 @@ lib.mapAttrs mkLicense (
       free = false;
     };
 
+    cc-by-nc-30-igo = {
+      # Currently does not have a spdxID will get one in the future https://github.com/spdx/license-list-XML/issues/2845
+      # spdxId = "CC-BY-NC-3.0-IGO";
+      fullName = "Creative Commons Attribution Non Commercial 3.0 IGO";
+      free = false;
+    };
+
     cc-by-nc-40 = {
       spdxId = "CC-BY-NC-4.0";
       fullName = "Creative Commons Attribution Non Commercial 4.0 International";
@@ -926,6 +933,11 @@ lib.mapAttrs mkLicense (
       free = false;
     };
 
+    jpl-image = {
+      fullName = "JPL Image Use Policy";
+      spdxId = "JPL-image";
+    };
+
     knuth = {
       fullName = "Knuth CTAN License";
       spdxId = "Knuth-CTAN";

From 87ee58a72eb1939c5d917a26db1b531a1bf2c4a7 Mon Sep 17 00:00:00 2001
From: returnyx <m0xbf00@gmail.com>
Date: Wed, 15 Jul 2026 12:53:09 +0800
Subject: [PATCH 0817/1386] audacity: use ffmpeg 8

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

diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 74bd8b0a589c..ff0bd1ae1e67 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -31,7 +31,7 @@
   libid3tag,
   libopus,
   libuuid,
-  ffmpeg_7,
+  ffmpeg_8,
   soundtouch,
   portaudio, # given up fighting their portaudio.patch?
   portmidi,
@@ -59,7 +59,7 @@
 # 1. detach sbsms
 
 let
-  ffmpeg = ffmpeg_7;
+  ffmpeg = ffmpeg_8;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "audacity";

From e72f8bd90de25061924cef1e63b47a88eb0b4886 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Wed, 15 Jul 2026 06:53:24 +0200
Subject: [PATCH 0818/1386] amd-debug-tools: 0.2.18 -> 0.2.20

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/am/amd-debug-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/am/amd-debug-tools/package.nix b/pkgs/by-name/am/amd-debug-tools/package.nix
index 309eb68b0593..226caa0d22ba 100644
--- a/pkgs/by-name/am/amd-debug-tools/package.nix
+++ b/pkgs/by-name/am/amd-debug-tools/package.nix
@@ -9,13 +9,13 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "amd-debug-tools";
-  version = "0.2.18";
+  version = "0.2.20";
   pyproject = true;
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
     tag = finalAttrs.version;
-    hash = "sha256-qBgQFjiWFRKVTsIx0aLZC9AQWsVzgbJGOPGG6ojKoDE=";
+    hash = "sha256-JDacCakZC+4N4IDAODWLSuensAtFArl052I4weK/zJQ=";
   };
 
   build-system = with python3Packages; [

From fba4e2fc093a174d2b26cf5199de7519f984bb59 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:24:56 +0700
Subject: [PATCH 0819/1386] python3Packages.click-help-colors: migrate to
 pyproject

---
 .../python-modules/click-help-colors/default.nix           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix
index 021e5d2847f8..30cdd309c108 100644
--- a/pkgs/development/python-modules/click-help-colors/default.nix
+++ b/pkgs/development/python-modules/click-help-colors/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  setuptools,
   click,
   pytestCheckHook,
 }:
@@ -9,14 +10,16 @@
 buildPythonPackage rec {
   pname = "click-help-colors";
   version = "0.9.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-9Mq+Us9VApm4iI9PLuTF81msJ+M7z+TWHbR3haXMk2w=";
   };
 
-  propagatedBuildInputs = [ click ];
+  build-system = [ setuptools ];
+
+  dependencies = [ click ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 1870658c076722bc6408a55a6d261780aedc19cc Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:25:03 +0700
Subject: [PATCH 0820/1386] python3Packages.click-configfile: migrate to
 pyproject

---
 .../python-modules/click-configfile/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix
index f116862157d3..1b13cdda5942 100644
--- a/pkgs/development/python-modules/click-configfile/default.nix
+++ b/pkgs/development/python-modules/click-configfile/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   click,
   six,
   pytestCheckHook,
@@ -10,14 +11,16 @@
 buildPythonPackage rec {
   pname = "click-configfile";
   version = "0.2.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     click
     six
   ];

From b2f975df0a51c3fe871b289712a8a3d62ec9b613 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:25:18 +0700
Subject: [PATCH 0821/1386] python3Packages.click-completion: migrate to
 pyproject

---
 .../python-modules/click-completion/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
index c87468bd5955..4229e3505d11 100644
--- a/pkgs/development/python-modules/click-completion/default.nix
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 
   # propagates
   click,
@@ -13,14 +14,16 @@
 buildPythonPackage rec {
   pname = "click-completion";
   version = "0.5.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     click
     jinja2
     shellingham

From 807388a21d33d0b4cedf0c86ca83c9209825eec6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:26:26 +0700
Subject: [PATCH 0822/1386] python3Packages.clickhouse-driver: migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix
index d19aac86de6f..f625c0989d9d 100644
--- a/pkgs/development/python-modules/clickhouse-driver/default.nix
+++ b/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -18,7 +18,7 @@
 buildPythonPackage rec {
   pname = "clickhouse-driver";
   version = "0.2.10";
-  format = "setuptools";
+  pyproject = true;
 
   # pypi source doesn't contain tests
   src = fetchFromGitHub {
@@ -28,12 +28,15 @@ buildPythonPackage rec {
     hash = "sha256-veFkmXAp8b6/Npt7f1EhMfM9OKlLugKtlXS+zMHWAro=";
   };
 
-  nativeBuildInputs = [
-    cython
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  nativeBuildInputs = [
+    cython
+  ];
+
+  dependencies = [
     clickhouse-cityhash
     lz4
     pytz

From 7395f010425c7010d56a51bfb2d00c70ffa7b236 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:27:34 +0700
Subject: [PATCH 0823/1386] python3Packages.click-help-colors: modernize

---
 .../python-modules/click-help-colors/default.nix      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix
index 30cdd309c108..d3c04fd8a10b 100644
--- a/pkgs/development/python-modules/click-help-colors/default.nix
+++ b/pkgs/development/python-modules/click-help-colors/default.nix
@@ -7,13 +7,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "click-help-colors";
   version = "0.9.4";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    pname = "click-help-colors";
+    inherit (finalAttrs) version;
     hash = "sha256-9Mq+Us9VApm4iI9PLuTF81msJ+M7z+TWHbR3haXMk2w=";
   };
 
@@ -28,8 +31,8 @@ buildPythonPackage rec {
   meta = {
     description = "Colorization of help messages in Click";
     homepage = "https://github.com/click-contrib/click-help-colors";
-    changelog = "https://github.com/click-contrib/click-help-colors/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/click-contrib/click-help-colors/blob/${finalAttrs.version}/CHANGES.rst";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 125f236f8f5cb49d4d2089f53ea8e8d653022930 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:27:41 +0700
Subject: [PATCH 0824/1386] python3Packages.click-configfile: modernize

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

diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix
index 1b13cdda5942..ab9d11277324 100644
--- a/pkgs/development/python-modules/click-configfile/default.nix
+++ b/pkgs/development/python-modules/click-configfile/default.nix
@@ -8,13 +8,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "click-configfile";
   version = "0.2.3";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    pname = "click-configfile";
+    inherit (finalAttrs) version;
     hash = "sha256-lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE=";
   };
 
@@ -29,7 +32,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "install_requires=install_requires," 'install_requires=["click >= 6.6", "six >= 1.10"],'
+      --replace-fail "install_requires=install_requires," 'install_requires=["click >= 6.6", "six >= 1.10"],'
   '';
 
   pythonImportsCheck = [ "click_configfile" ];
@@ -45,4 +48,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

From e5dfc73ebb3c48a8d6df476d66b2a358f69aa2d2 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:28:30 +0700
Subject: [PATCH 0825/1386] python3Packages.click-completion: modernize

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

diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
index 4229e3505d11..73e077d49377 100644
--- a/pkgs/development/python-modules/click-completion/default.nix
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -11,14 +11,17 @@
   six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "click-completion";
   version = "0.5.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86";
+    pname = "click-completion";
+    inherit (finalAttrs) version;
+    hash = "sha256-W/gWuBNn5jihkLbpG1B3kAfRQwGz+fMUXWjjyt57zoY=";
   };
 
   build-system = [ setuptools ];
@@ -41,4 +44,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mbode ];
   };
-}
+})

From 6002f755d928da80d0f8160b4d6cdcee7ed478f9 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 12:29:24 +0700
Subject: [PATCH 0826/1386] python3Packages.clickhouse-driver: modernize

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

diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix
index f625c0989d9d..d5678f897d31 100644
--- a/pkgs/development/python-modules/clickhouse-driver/default.nix
+++ b/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -15,16 +15,18 @@
   zstd,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "clickhouse-driver";
   version = "0.2.10";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   # pypi source doesn't contain tests
   src = fetchFromGitHub {
     owner = "mymarilyn";
     repo = "clickhouse-driver";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-veFkmXAp8b6/Npt7f1EhMfM9OKlLugKtlXS+zMHWAro=";
   };
 
@@ -53,7 +55,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "lz4<=3.0.1" "lz4<=4"
+      --replace-fail "lz4<=3.0.1" "lz4<=4"
   '';
 
   # remove source to prevent pytest testing source instead of the build artifacts
@@ -77,4 +79,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ breakds ];
   };
-}
+})

From 3f58121755064e4b0844cc13b93d6be2d7960860 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 07:31:51 +0200
Subject: [PATCH 0827/1386] lttng-tools: 2.14.1 -> 2.15.1

https://github.com/lttng/lttng-tools/releases/tag/v2.15.1

Align with lttng-ust 2.15 and provide Python for the 2.15 test source generator.

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/lt/lttng-tools/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix
index ffe2ed82880b..e91b33e858fb 100644
--- a/pkgs/by-name/lt/lttng-tools/package.nix
+++ b/pkgs/by-name/lt/lttng-tools/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
+  python3,
   babeltrace2,
   popt,
   libuuid,
@@ -14,14 +15,21 @@
 
 stdenv.mkDerivation rec {
   pname = "lttng-tools";
-  version = "2.14.1";
+  version = "2.15.1";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-DmjrJ5I2IcS8Enz85AQi0oz35HP+32IprmwyulxbfG0=";
+    sha256 = "sha256-i21Lp64sA299r7tOKXF2d0EQePmp2WGy3HwboWJz6ek=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ];
+
+  # Used by the test source generator during the build.
+  makeFlags = [ "PYTHON=${lib.getExe python3}" ];
+
   buildInputs = [
     babeltrace2
     popt

From e066da2f80a56a3f448d68178bf42f16fa660a67 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 15 Jul 2026 07:50:38 +0200
Subject: [PATCH 0828/1386] claude-code: 2.1.209 -> 2.1.210

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 41 ++++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index f32f16ee3d24..6bd58d1851a3 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.209",
-  "commit": "0fe048596fd45e79e99353cbe2c3d1b1ac069568",
-  "buildDate": "2026-07-14T03:58:29Z",
+  "version": "2.1.210",
+  "commit": "88e9fbf39bf4efa5bca44549b7fd9461628657e6",
+  "buildDate": "2026-07-14T15:12:31Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "59d2de7f49db2f75d5c33bbb46a6b8f288ad24d40b61e30602a502bb7ddc380c",
-      "size": 240377264
+      "checksum": "1b471d62d1117482689d75447f5e050c640da717a5a3c91e6c13792450f8c662",
+      "size": 241509968
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "4cc3f44b905d45bd27a6db9306ec6de928aea758537205329851ae478f2fa2c6",
-      "size": 249886224
+      "checksum": "892f2c878050d8829e67119328dd9768345fba18a58c169212b70597c9175c40",
+      "size": 251025552
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "278cb68ef7217cfcc5c949d2573bb8e59a8b1305f76689fba88eb722b0d9e2f0",
-      "size": 256817904
+      "checksum": "84feb193c1d91f3b5eba836ed47c0e4dee953195abba950917c3e101eff174e8",
+      "size": 257932016
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "b882f4b8b27772f897540df50f24000206f43a9426e8f7d19bd065959b69e9dd",
-      "size": 259951416
+      "checksum": "e7d2ceb53ed4c2ced1fe7fc1c6331c98dc5f7b4c9b2722d9c5fa3dd5dff6f719",
+      "size": 261081912
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "d5785d7c25f86a00ba5d5fe81d98726c89ea7d6f45dca90fcc4cbabef6a9e0b5",
-      "size": 250066104
+      "checksum": "17f617e24a05533cea8a344f44f0a25b6fb20ee467500601c3cd8392064ec528",
+      "size": 251180216
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "7ad8e7d428e1ddef18040fe43f54110541ced063a7b5903091aac8f45c57ee21",
-      "size": 254607744
+      "checksum": "03012f856faa1a9409d9add13936794f168e530c9746c8a099dec6ce8415c32b",
+      "size": 255742336
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "b9d5e8542338a0918534e55d046a7c960ae4af5ee214c7e4e80a89067b63ea2c",
-      "size": 251303072
+      "checksum": "29aa99c436f0d4125780691123b756176d83b59cc7d492304cd4694292d3f04f",
+      "size": 252385952
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "a29607da80ac0d6f2620553e52026ecc7744b27d49128f143eacd120e5f2ad9d",
-      "size": 245652640
+      "checksum": "4a603da0a33d49478e55938898ddd06c4ec5d1ec7f443d92dd4352665faaef05",
+      "size": 246736544
     }
   },
   "sdkCompat": {
@@ -63,7 +63,8 @@
       "0.3.204",
       "0.3.205",
       "0.3.207",
-      "0.3.208"
+      "0.3.208",
+      "0.3.209"
     ],
     "harnessSchema": 1
   }

From 18881306ce438059d566decfe870d2185ee5765a Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 15 Jul 2026 07:50:43 +0200
Subject: [PATCH 0829/1386] vscode-extensions.anthropic.claude-code: 2.1.209 ->
 2.1.210

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../vscode/extensions/anthropic.claude-code/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 2382c040f5c6..634ab22464ac 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-YVomTY/KpBcR4dZr0EN4egkuzvQXUCj7RvwgMo88z9Q=";
+          hash = "sha256-uWghjE/Ue+i2kUD4KedN4NDTllgiZPMFFXbT0RQnGrE=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-jbTFmXqtdt6+1SdhfOLcnhOhtSESYM9th8k5EJ4Nex4=";
+          hash = "sha256-pIwEx6+1Wc+MazqJQYA4h9oOqNOOA8MyJcJOd9Bx2ZM=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-YFLVhDckeXIItc+AvHlJ/B45c43Ubi3BKr8gy3Ui68w=";
+          hash = "sha256-Iq5C55YrV5ud74a218pTPIyq1oJisbDRNNefkzjpGs4=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.209";
+      version = "2.1.210";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 4030854e9750af032710480d4942a1f0a5ace096 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:48:15 +0700
Subject: [PATCH 0830/1386] python3Packages.versiontools: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix
index d812439e72bb..fd4c03f8eb5a 100644
--- a/pkgs/development/python-modules/versiontools/default.nix
+++ b/pkgs/development/python-modules/versiontools/default.nix
@@ -2,19 +2,22 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   isPy3k,
 }:
 
 buildPythonPackage rec {
   pname = "versiontools";
   version = "1.9.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "1xhl6kl7f4srgnw6zw4lr8j2z5vmrbaa83nzn2c9r2m1hwl36sd9";
   };
 
+  build-system = [ setuptools ];
+
   doCheck = (!isPy3k);
 
   meta = {

From c5aa611bc8025e61672068d32b22e2947bbc218a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 01:53:03 +0700
Subject: [PATCH 0831/1386] python3Packages.versiontools: modernize

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

diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix
index fd4c03f8eb5a..5e99a1560e6b 100644
--- a/pkgs/development/python-modules/versiontools/default.nix
+++ b/pkgs/development/python-modules/versiontools/default.nix
@@ -6,14 +6,17 @@
   isPy3k,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "versiontools";
   version = "1.9.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1xhl6kl7f4srgnw6zw4lr8j2z5vmrbaa83nzn2c9r2m1hwl36sd9";
+    pname = "versiontools";
+    inherit (finalAttrs) version;
+    hash = "sha256-qWkzKIehipyYsN8OpNTKdZcvJMqU8G+4fVkTd+g0FPY=";
   };
 
   build-system = [ setuptools ];
@@ -25,4 +28,4 @@ buildPythonPackage rec {
     description = "Smart replacement for plain tuple used in __version__";
     license = lib.licenses.lgpl2;
   };
-}
+})

From 7e220b052bf160b3802511433ccd822ef5e7443c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 05:54:16 +0000
Subject: [PATCH 0832/1386] jellyfin-tui: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index b1fe48e44087..ffbaf54fb7aa 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jellyfin-tui";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "dhonus";
     repo = "jellyfin-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-su2zybyRc5Tyi7F+xX/YsWxqz8vLJdX3mAccqKqkRgo=";
+    hash = "sha256-ZdcAPN+APEnkQbPdLpcQd/fdQnEP6peQ+xdZI5sskSM=";
   };
 
-  cargoHash = "sha256-euTJMkTPAnPJCAGUWkmcME1w6nOBq0GSUTDFEhE5nIc=";
+  cargoHash = "sha256-mri4PhYcUTWWKLl39sDhLUsFQFGLUAvDlhKNcj9gTFU=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 0a042e7459eb374dd65b09ba47d0c8a1a0433558 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Wed, 15 Jul 2026 05:54:19 +0000
Subject: [PATCH 0833/1386] souffle: Use lib.getDev

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

diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix
index 23b1935b68a0..df5acb20c7b7 100644
--- a/pkgs/by-name/so/souffle/package.nix
+++ b/pkgs/by-name/so/souffle/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     substituteInPlace "$out/bin/souffle-compile.py" \
         --replace-fail "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \
-                  "-I${ncurses.dev}/include -I${zlib.dev}/include -I${sqlite.dev}/include -I${libffi.dev}/include -I$out/include"
+                  "-I${lib.getDev ncurses}/include -I${lib.getDev zlib}/include -I${lib.getDev sqlite}/include -I${lib.getDev libffi}/include -I$out/include"
   '';
 
   outputs = [ "out" ];

From d77748d336bbdacafbcb997a7015c581efdef29f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 06:02:49 +0000
Subject: [PATCH 0834/1386] python3Packages.socid-extractor: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix
index 55ff357ffd52..de9285feb945 100644
--- a/pkgs/development/python-modules/socid-extractor/default.nix
+++ b/pkgs/development/python-modules/socid-extractor/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "socid-extractor";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "soxoj";
     repo = "socid-extractor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZYLoHFyRnSHP3Od/cMOx690KFbJoEYK3cICjzbSfLm0=";
+    hash = "sha256-Ct2i4ORFsQqYWvaBjEPlar8DDsGaUssPcI1kOaprq/c=";
   };
 
   pythonRelaxDeps = [ "beautifulsoup4" ];

From 3fb877a3b4b5b9aa69f2dd3aeb5d4c1ab710a99e Mon Sep 17 00:00:00 2001
From: "Mr. why" <silicalet@outlook.com>
Date: Wed, 15 Jul 2026 14:07:23 +0800
Subject: [PATCH 0835/1386] maintainers: add silicalet

Assisted-by: OpenAI Codex (GPT-5)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 16fe945d61c9..852b6c6f233f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25962,6 +25962,12 @@
     name = "Nikolay Korotkiy";
     keys = [ { fingerprint = "ADF4 C13D 0E36 1240 BD01  9B51 D1DE 6D7F 6936 63A5"; } ];
   };
+  silicalet = {
+    name = "Mr. why";
+    email = "silicalet@outlook.com";
+    github = "silicalet";
+    githubId = 188071249;
+  };
   silky = {
     name = "Noon van der Silk";
     email = "noonsilk+nixpkgs@gmail.com";

From d7837db4d7ace25bee46c2703f36c656afdbf3c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 06:27:00 +0000
Subject: [PATCH 0836/1386] vicinae: 0.22.3 -> 0.23.1

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

diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index 45746fc8744e..c183555b6bff 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.22.3";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1c6rl+PMI61l3H2a8Ks1qbFGW2psHs0FamJd/Vzq6NY=";
+    hash = "sha256-qFDb6I9w9F/KfRVHmwezykv7y/Tb8BjJQD2v5AxlEfU=";
   };
 
   apiDeps = fetchNpmDeps {

From 692daeac48bce39026786e7193ae15b8e5f1b2a1 Mon Sep 17 00:00:00 2001
From: Niols <niols@niols.fr>
Date: Tue, 14 Jul 2026 19:06:48 +0200
Subject: [PATCH 0837/1386] nixos/rtorrent: remove deprecated commands from
 default config

Assisted-by: DeepSeek V4 Flash (via OpenCode Zen)
---
 nixos/modules/services/torrent/rtorrent.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix
index 07825ecbc897..2b672d6a6584 100644
--- a/nixos/modules/services/torrent/rtorrent.nix
+++ b/nixos/modules/services/torrent/rtorrent.nix
@@ -149,13 +149,6 @@ in
 
       protocol.encryption.set = allow_incoming,try_outgoing,enable_retry
 
-      # Limits for file handle resources, this is optimized for
-      # an `ulimit` of 1024 (a common default). You MUST leave
-      # a ceiling of handles reserved for rTorrent's internal needs!
-      network.http.max_open.set = 50
-      network.max_open_files.set = 600
-      network.max_open_sockets.set = 3000
-
       # Memory resource usage (increase if you have a large number of items loaded,
       # and/or the available resources to spend)
       pieces.memory.max.set = 1800M
@@ -169,15 +162,14 @@ in
       execute.nothrow = sh, -c, (cat, "echo >", (session.path), "rtorrent.pid", " ", (system.pid))
 
       # Other operational settings (check & adapt)
-      encoding.add = utf8
       system.umask.set = 0027
       system.cwd.set = (cfg.basedir)
       network.http.dns_cache_timeout.set = 25
-      schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M))
+      schedule = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M))
 
       # Watch directories (add more as you like, but use unique schedule names)
-      #schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent")))
-      #schedule2 = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent")))
+      #schedule = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent")))
+      #schedule = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent")))
 
       # Logging:
       #   Levels = critical error warn notice info debug
@@ -218,6 +210,10 @@ in
               RuntimeDirectory = "rtorrent";
               RuntimeDirectoryMode = 750;
 
+              # rtorrent derives socket limits from this value since 0.16.15; see table in
+              # https://github.com/rakshasa/rtorrent/wiki/Socket-Manager-and-Resource-Allocation
+              LimitNOFILE = lib.mkDefault 16384;
+
               CapabilityBoundingSet = [ "" ];
               LockPersonality = true;
               NoNewPrivileges = true;

From 595ee93e32205eb35124324c72a71bcca1e59f78 Mon Sep 17 00:00:00 2001
From: "Mr. why" <silicalet@outlook.com>
Date: Wed, 15 Jul 2026 14:15:54 +0800
Subject: [PATCH 0838/1386] atomgit-cli: init at 0.5.0

Assisted-by: OpenAI Codex (GPT-5)
---
 pkgs/by-name/at/atomgit-cli/package.nix | 67 +++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/at/atomgit-cli/package.nix

diff --git a/pkgs/by-name/at/atomgit-cli/package.nix b/pkgs/by-name/at/atomgit-cli/package.nix
new file mode 100644
index 000000000000..c300db3104f9
--- /dev/null
+++ b/pkgs/by-name/at/atomgit-cli/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchgit,
+  gitMinimal,
+  makeWrapper,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+  xdg-utils,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "atomgit-cli";
+  version = "0.5.0";
+
+  src = fetchgit {
+    url = "https://atomgit.com/hust-open-atom-club/atomgit-cli.git";
+    rev = "11f1ff216053bf47c0a3baaed6698c9222f1ce77";
+    hash = "sha256-ZvQ8S0f1jUfN48UE/U+JnTTrtoWYZfwhDPDBbKKLlC0=";
+  };
+
+  vendorHash = "sha256-7K17JaXFsjf163g5PXCb5ng2gYdotnZ2IDKk8KFjNj0=";
+
+  subPackages = [ "cmd/ag" ];
+
+  preCheck = ''
+    # Test all packages, not only cmd/ag.
+    unset subPackages
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Version=v${finalAttrs.version}"
+    "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Commit=${finalAttrs.src.rev}"
+    "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.BuildDate=2026-07-13T07:53:45Z"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/ag \
+      --prefix PATH : ${
+        lib.makeBinPath (
+          [ gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ]
+        )
+      }
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckProgramArg = "version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Command-line interface for AtomGit";
+    homepage = "https://atomgit.com/hust-open-atom-club/atomgit-cli";
+    changelog = "https://atomgit.com/hust-open-atom-club/atomgit-cli/tags/v${finalAttrs.version}";
+    license = lib.licenses.mulan-psl2;
+    mainProgram = "ag";
+    maintainers = [ lib.maintainers.silicalet ];
+  };
+})

From 62f69a8c388dfff331ec963636fc20e83e0421b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 06:30:24 +0000
Subject: [PATCH 0839/1386] radarr: 6.2.1.10461 -> 6.3.0.10514

---
 pkgs/by-name/ra/radarr/deps.json   | 6 +++---
 pkgs/by-name/ra/radarr/package.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/radarr/deps.json b/pkgs/by-name/ra/radarr/deps.json
index 85245045429c..993445ebd52e 100644
--- a/pkgs/by-name/ra/radarr/deps.json
+++ b/pkgs/by-name/ra/radarr/deps.json
@@ -808,9 +808,9 @@
   },
   {
     "pname": "Servarr.FFprobe",
-    "version": "5.1.4.112",
-    "hash": "sha256-OdPIvZcrGj0XaqFJQCnrPt0zgPPvB5nd7WpYFF9Bnh0=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.4.112/servarr.ffprobe.5.1.4.112.nupkg"
+    "version": "5.1.10.124",
+    "hash": "sha256-7/xXsQNQGIAF+KtVln2x5QnLs0L1zyDmusyJESOsNP8=",
+    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.10.124/servarr.ffprobe.5.1.10.124.nupkg"
   },
   {
     "pname": "SharpZipLib",
diff --git a/pkgs/by-name/ra/radarr/package.nix b/pkgs/by-name/ra/radarr/package.nix
index 15c4af170792..571bd6e1abe2 100644
--- a/pkgs/by-name/ra/radarr/package.nix
+++ b/pkgs/by-name/ra/radarr/package.nix
@@ -21,7 +21,7 @@
   applyPatches,
 }:
 let
-  version = "6.2.1.10461";
+  version = "6.3.0.10514";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -29,7 +29,7 @@ let
       owner = "Radarr";
       repo = "Radarr";
       tag = "v${version}";
-      hash = "sha256-gDEMahF0uhwlOisD0gWzY3M17mXftKBm9gN5Uaatqsk=";
+      hash = "sha256-1CAcsqhdAH2dOcOMVyIlaqEmCKDwXNUJf3SuVuJEZ7E=";
     };
     postPatch = ''
       mv src/NuGet.config NuGet.Config

From 71135707791becebe43f7c42889c0a3f49fd14e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 06:31:42 +0000
Subject: [PATCH 0840/1386] uv: 0.11.26 -> 0.11.28

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index ca6a683fd214..3649b9c72eee 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.11.26";
+  version = "0.11.28";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-p9JOn28Mf2bbDqIR3z4pKmcIw54hKEINnz5KeD4ASRo=";
+    hash = "sha256-/mTH2hojC+l0yxn+LEAIj8FTA/nWKIPZ7uLMVJxebw4=";
   };
 
-  cargoHash = "sha256-EIRWisiPt+YaZsK5PgYP7nZ+3ZeaXkx5ThxD+o0Ehyg=";
+  cargoHash = "sha256-FvLl32JfIq5a1NnLtnFJyy5T+vkcOD+qfQLDy6NYhHg=";
 
   buildInputs = [
     rust-jemalloc-sys

From 63eb066f5860015c2c4e2648453ce73f03187888 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 06:33:05 +0000
Subject: [PATCH 0841/1386] cargo-diet: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index fc5f821f6f60..3c55e294ef75 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-diet";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "the-lean-crate";
     repo = "cargo-diet";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YjUO8UUXWZvZZZ2Y0py5LQdVBpq8jjwvGimVAWC8Gr8=";
+    hash = "sha256-/f5GbNWkx/pOQgsaxg+HeI4Z9joX3pCL8u4Pu7VZg08=";
   };
 
-  cargoHash = "sha256-CnaeS7mh+QDPcQgeKzNV5Vey3zsiD10NdlfdQ1kcDB8=";
+  cargoHash = "sha256-PK5Ru/Slz1MTD9DxVY0zratzAeXAokJZ+Kz/MznaeB0=";
 
   meta = {
     description = "Help computing optimal include directives for your Cargo.toml manifest";

From 59c327dee1266e7134c92e067c4b85552dd500e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 06:38:30 +0000
Subject: [PATCH 0842/1386] qtalarm: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix
index d052eca2251d..edd300015566 100644
--- a/pkgs/by-name/qt/qtalarm/package.nix
+++ b/pkgs/by-name/qt/qtalarm/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtalarm";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "CountMurphy";
     repo = "QTalarm";
     tag = finalAttrs.version;
-    hash = "sha256-IN/XdR8J5uMIAjb1G2kzuLDtO972RLKSy3Ceh9CcHWw=";
+    hash = "sha256-rf1Vd5npCu6HVPunRfV2yFIWiSJ686iU3gXcT8g4VUQ=";
   };
 
   buildInputs = [

From b815be4125f96f44f73ae64691e77fbbb39887af Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 06:41:13 +0000
Subject: [PATCH 0843/1386] codexbar: 0.42.1 -> 0.43.0

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

diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix
index ad9647c26197..62684d7c3540 100644
--- a/pkgs/by-name/co/codexbar/package.nix
+++ b/pkgs/by-name/co/codexbar/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "codexbar";
-  version = "0.42.1";
+  version = "0.43.0";
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchurl {
     url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip";
-    hash = "sha256-PXzuRhlQUwqc6ftC8UKpnNY6EK8r9DKPeVbItiGnL64=";
+    hash = "sha256-dKr5/7HzgqDXUwkHGj1z534ekTajyUFNSrpg+vK/4Yw=";
   };
 
   sourceRoot = ".";

From c3783cb6c32b5a0524eb29df23a8b090eaa5b11a Mon Sep 17 00:00:00 2001
From: "Mr. why" <silicalet@outlook.com>
Date: Wed, 15 Jul 2026 14:49:06 +0800
Subject: [PATCH 0844/1386] atomgit-cli: fix lint checks

Assisted-by: OpenAI Codex (GPT-5)
---
 pkgs/by-name/at/atomgit-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/atomgit-cli/package.nix b/pkgs/by-name/at/atomgit-cli/package.nix
index c300db3104f9..39bcf62fbe39 100644
--- a/pkgs/by-name/at/atomgit-cli/package.nix
+++ b/pkgs/by-name/at/atomgit-cli/package.nix
@@ -11,6 +11,8 @@
 }:
 
 buildGoModule (finalAttrs: {
+  __structuredAttrs = true;
+
   pname = "atomgit-cli";
   version = "0.5.0";
 
@@ -42,9 +44,7 @@ buildGoModule (finalAttrs: {
   postFixup = ''
     wrapProgram $out/bin/ag \
       --prefix PATH : ${
-        lib.makeBinPath (
-          [ gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ]
-        )
+        lib.makeBinPath ([ gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ])
       }
   '';
 

From b5910857f79a37593ff0789cf5af43988c13ec34 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 06:50:50 +0000
Subject: [PATCH 0845/1386] zennotes-desktop: 2.13.1 -> 2.13.2

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

diff --git a/pkgs/by-name/ze/zennotes-desktop/package.nix b/pkgs/by-name/ze/zennotes-desktop/package.nix
index d0845373c487..2ec8888bca27 100644
--- a/pkgs/by-name/ze/zennotes-desktop/package.nix
+++ b/pkgs/by-name/ze/zennotes-desktop/package.nix
@@ -13,14 +13,14 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "zennotes-desktop";
-  version = "2.13.1";
+  version = "2.13.2";
   npmDepsHash = "sha256-7dchbcGAZm+PlVsES76sYD9NOqeCulEKC7S0zLERvvY=";
 
   src = fetchFromGitHub {
     owner = "ZenNotes";
     repo = "zennotes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jhdX+GFzBBxbT+B04RDqm66qfDi/LcpJR5eCRlQhx68=";
+    hash = "sha256-Wazp3v6fV0gBh4ASlinhmA6SnGDmBvRcWFEXbENQUII=";
   };
 
   npmWorkspace = "apps/desktop";

From 11c5319861a052e22b50508523514f9f572e594f Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 15 Jul 2026 09:14:32 +0200
Subject: [PATCH 0846/1386] =?UTF-8?q?glab:=201.106.0=20=E2=86=92=201.108.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 2b9d3eabec65..fc64a8eddc9a 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.106.0";
+  version = "1.108.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GO4SeXr/kT8vvg7v/ehreu9g3ZDeXIC7jKB9/Cg4ze4=";
+    hash = "sha256-JVUeCq21D5ajBiGU+fR6MHGF1Nz6i1aQFUiJZsw2zUI=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-fwsefYGNnx9OkITaZ0Z9Xc+1/Pj4FxEX+194C93d5K0=";
+  vendorHash = "sha256-Ss5JnTa9KfOw5fElleu+HcDHVW5Bz8QxZ++YrCF2jCY=";
 
   ldflags = [
     "-s"

From 96e26140e651081b20c8c289438e744a1a8a452a Mon Sep 17 00:00:00 2001
From: ash <x-hv2j5m@keysmash.solutions>
Date: Fri, 3 Jul 2026 22:57:51 +0100
Subject: [PATCH 0847/1386] fflogs: drop

---
 doc/release-notes/rl-2611.section.md |  2 ++
 pkgs/by-name/ff/fflogs/package.nix   | 40 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 3 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/by-name/ff/fflogs/package.nix

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 04b1c0a0b8d0..bcc8574addd5 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -46,6 +46,8 @@
 
 - `mcphost` has been removed, as it was archived upstream and declared unmaintained.
 
+- `fflogs` has been removed because it was no longer functional. Users should switch to `archon-lite`.
+
 - `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`.
   Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information.
 
diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
deleted file mode 100644
index 2de7dfe9bf3c..000000000000
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  appimageTools,
-  fetchurl,
-}:
-
-let
-  pname = "fflogs";
-  version = "9.3.65";
-  src = fetchurl {
-    url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-HsanoX1iJpLC8p64H4enlo20X6LOBNAxkubwPBp5juA=";
-  };
-  extracted = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    mkdir -p $out/share/applications
-    mkdir -p $out/share/icons/hicolor/512x512/apps
-    cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'FF Logs Uploader.png' $out/share/icons/hicolor/512x512/apps/fflogs.png
-    chmod -R +w $out/share/
-    test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294
-    cp ${extracted}/'FF Logs Uploader.desktop' $out/share/applications/fflogs.desktop
-    sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop
-    sed -i 's@^Icon=FF Logs Uploader@Icon=fflogs@g' $out/share/applications/fflogs.desktop
-  '';
-
-  meta = {
-    description = "Application for uploading Final Fantasy XIV combat logs to fflogs.com";
-    homepage = "https://www.fflogs.com/client/download";
-    downloadPage = "https://github.com/RPGLogs/Uploaders-fflogs/releases/latest";
-    license = lib.licenses.unfree; # no license listed
-    mainProgram = "fflogs";
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ keysmashes ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bf945551a201..9407085f56a2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -778,6 +778,7 @@ mapAliases {
   fedifetcher = throw "'fedifetcher' has been removed because there is now a similar native feature in Mastodon."; # Added 2025-12-08
   fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
+  fflogs = throw "fflogs has been removed because it stopped working on 2026-06-29 and was replaced by archon-lite"; # Added 2026-07-03
   FIL-plugins = throw "'FIL-plugins' has been renamed to/replaced by 'fil-plugins'"; # Converted to throw 2025-10-27
   filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17
   finger_bsd = throw "'finger_bsd' has been renamed to/replaced by 'bsd-finger'"; # Converted to throw 2025-10-27

From e768cd917417336eade1513b6a4d0eb5b1a089df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= <lblasc@tvbeat.com>
Date: Wed, 15 Jul 2026 07:20:18 +0000
Subject: [PATCH 0848/1386] python3Packages.pyemd: 1.0.0 -> 2.0.0

Now a pure-Python wrapper around POT; fixes build on python 3.14.

Changelog: https://github.com/wmayner/pyemd/blob/v2.0.0/CHANGELOG.rst
---
 .../python-modules/pyemd/default.nix          | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index 4ac6e9155541..11eb9d95d8d3 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -1,24 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  cython,
   fetchPypi,
   numpy,
-  oldest-supported-numpy,
-  packaging,
+  pot,
   pytestCheckHook,
+  pythonOlder,
   setuptools-scm,
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyemd";
-  version = "1.0.0";
+  version = "2.0.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
+  disabled = pythonOlder "3.12";
+
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-FZaflENcK+mOajakkwfINm49/BpnASrMMG6SyQtQP+U=";
   };
 
   build-system = [
@@ -26,28 +29,18 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  nativeBuildInputs = [
-    cython
+  dependencies = [
     numpy
-    oldest-supported-numpy
-    packaging
+    pot
   ];
 
-  dependencies = [ numpy ];
-
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # Broken with Numpy 2.x, https://github.com/wmayner/pyemd/issues/68
-    "test_emd_samples_2"
-    "test_emd_samples_3"
-  ];
-
   meta = {
     description = "Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
     homepage = "https://github.com/wmayner/pyemd";
-    changelog = "https://github.com/wmayner/pyemd/releases/tag/${version}";
+    changelog = "https://github.com/wmayner/pyemd/blob/v${finalAttrs.version}/CHANGELOG.rst";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From fcbfba63a629ef883793340c110b6bab5b959bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= <lblasc@tvbeat.com>
Date: Wed, 15 Jul 2026 07:20:18 +0000
Subject: [PATCH 0849/1386] python3Packages.gensim: fix build with python 3.14

Apply piskvorky/gensim#3649 for the forkserver multiprocessing default.
---
 .../python-modules/gensim/default.nix         |  19 ++-
 .../python314-chunkize-forkserver.patch       | 149 ++++++++++++++++++
 2 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch

diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 4cf38bdb3d0a..9f962fe3ef5d 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -19,18 +19,28 @@
   testfixtures,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gensim";
   version = "4.4.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "piskvorky";
     repo = "gensim";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-TXutcU43ReBj9ss9+zBJFUxb5JqVHpl+B0c7hqcJAJY=";
   };
 
+  patches = [
+    # Fall back to serial chunkize when the multiprocessing start method is not
+    # "fork" (the default changed to "forkserver" on Linux with Python 3.14).
+    # Vendored (filtered to gensim/utils.py) from the not yet merged
+    # https://github.com/piskvorky/gensim/pull/3649
+    ./python314-chunkize-forkserver.patch
+  ];
+
   build-system = [
     cython
     setuptools
@@ -70,7 +80,8 @@ buildPythonPackage rec {
     description = "Topic-modelling library";
     homepage = "https://radimrehurek.com/gensim/";
     downloadPage = "https://github.com/piskvorky/gensim";
-    changelog = "https://github.com/RaRe-Technologies/gensim/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/RaRe-Technologies/gensim/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.lgpl21Only;
+    maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch b/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch
new file mode 100644
index 000000000000..f6ce575b254b
--- /dev/null
+++ b/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch
@@ -0,0 +1,149 @@
+diff --git a/gensim/utils.py b/gensim/utils.py
+index 2abd5179e09671de1ea9ef48a9dc3fc4bce9b465..20bad4857bf4e159bc0e244522aa21bd41af8712 100644
+--- a/gensim/utils.py
++++ b/gensim/utils.py
+@@ -1302,90 +1302,68 @@
+             self.q.put(wrapped_chunk.pop(), block=True)
+ 
+ 
+-# Multiprocessing on Windows (and on OSX with python3.8+) uses "spawn" mode, which
+-# causes issues with pickling.
+-# So for these two platforms, use simpler serial processing in `chunkize`.
+-# See https://github.com/RaRe-Technologies/gensim/pull/2800#discussion_r410890171
+-if os.name == 'nt' or (sys.platform == "darwin" and sys.version_info >= (3, 8)):
+-    def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
+-        """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
++def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
++    """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
+ 
+-        Parameters
+-        ----------
+-        corpus : iterable of object
+-            An iterable.
+-        chunksize : int
+-            Split `corpus` into chunks of this size.
+-        maxsize : int, optional
+-            Ignored. For interface compatibility only.
+-        as_numpy : bool, optional
+-            Yield chunks as `np.ndarray` s instead of lists?
+-
+-        Yields
+-        ------
+-        list OR np.ndarray
+-            "chunksize"-ed chunks of elements from `corpus`.
+-
+-        """
+-        if maxsize > 0:
+-            entity = "Windows" if os.name == 'nt' else "OSX with python3.8+"
+-            warnings.warn("detected %s; aliasing chunkize to chunkize_serial" % entity)
+-        for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
+-            yield chunk
+-else:
+-    def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
+-        """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
+-
+-        Parameters
+-        ----------
+-        corpus : iterable of object
+-            An iterable.
+-        chunksize : int
+-            Split `corpus` into chunks of this size.
+-        maxsize : int, optional
+-            If > 0, prepare chunks in a background process, filling a chunk queue of size at most `maxsize`.
+-        as_numpy : bool, optional
+-            Yield chunks as `np.ndarray` instead of lists?
+-
+-        Yields
+-        ------
+-        list OR np.ndarray
+-            "chunksize"-ed chunks of elements from `corpus`.
++    Parameters
++    ----------
++    corpus : iterable of object
++        An iterable.
++    chunksize : int
++        Split `corpus` into chunks of this size.
++    maxsize : int, optional
++        If > 0, prepare chunks in a background process, filling a chunk queue of size at most `maxsize`.
++    as_numpy : bool, optional
++        Yield chunks as `np.ndarray` instead of lists?
+ 
+-        Notes
+-        -----
+-        Each chunk is of length `chunksize`, except the last one which may be smaller.
+-        A once-only input stream (`corpus` from a generator) is ok, chunking is done efficiently via itertools.
++    Yields
++    ------
++    list OR np.ndarray
++        "chunksize"-ed chunks of elements from `corpus`.
+ 
+-        If `maxsize > 0`, don't wait idly in between successive chunk `yields`, but rather keep filling a short queue
+-        (of size at most `maxsize`) with forthcoming chunks in advance. This is realized by starting a separate process,
+-        and is meant to reduce I/O delays, which can be significant when `corpus` comes from a slow medium
+-        like HDD, database or network.
++    Notes
++    -----
++    Each chunk is of length `chunksize`, except the last one which may be smaller.
++    A once-only input stream (`corpus` from a generator) is ok, chunking is done efficiently via itertools.
+ 
+-        If `maxsize == 0`, don't fool around with parallelism and simply yield the chunksize
+-        via :func:`~gensim.utils.chunkize_serial` (no I/O optimizations).
++    If `maxsize > 0`, don't wait idly in between successive chunk `yields`, but rather keep filling a short queue
++    (of size at most `maxsize`) with forthcoming chunks in advance. This is realized by starting a separate process,
++    and is meant to reduce I/O delays, which can be significant when `corpus` comes from a slow medium
++    like HDD, database or network.
+ 
+-        Yields
+-        ------
+-        list of object OR np.ndarray
+-            Groups based on `iterable`
++    If `maxsize == 0`, don't fool around with parallelism and simply yield the chunksize
++    via :func:`~gensim.utils.chunkize_serial` (no I/O optimizations).
+ 
+-        """
+-        assert chunksize > 0
++    Yields
++    ------
++    list of object OR np.ndarray
++        Groups based on `iterable`
+ 
++    """
++    assert chunksize > 0
++
++    # 1. Evaluate the start method dynamically at runtime
++    # 2. Only attempt multiprocessing if maxsize > 0 AND the method is 'fork'
++    # See https://github.com/RaRe-Technologies/gensim/pull/2800#discussion_r410890171
++    if maxsize > 0 and multiprocessing.get_start_method() == "fork":
++        q = multiprocessing.Queue(maxsize=maxsize)
++        worker = InputQueue(q, corpus, chunksize, maxsize=maxsize, as_numpy=as_numpy)
++        worker.daemon = True
++        worker.start()
++        while True:
++            chunk = [q.get(block=True)]
++            if chunk[0] is None:
++                break
++            yield chunk.pop()
++    else:
++        # Fallback to serial processing
+         if maxsize > 0:
+-            q = multiprocessing.Queue(maxsize=maxsize)
+-            worker = InputQueue(q, corpus, chunksize, maxsize=maxsize, as_numpy=as_numpy)
+-            worker.daemon = True
+-            worker.start()
+-            while True:
+-                chunk = [q.get(block=True)]
+-                if chunk[0] is None:
+-                    break
+-                yield chunk.pop()
+-        else:
+-            for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
+-                yield chunk
++            # We only warn if they asked for multiprocessing but we have to deny it
++            current_method = multiprocessing.get_start_method()
++            warnings.warn(f"start method is '{current_method}', not 'fork'; aliasing chunkize to chunkize_serial")
++
++        for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
++            yield chunk
+ 
+ 
+ def smart_extension(fname, ext):

From 3fe1ac2894e62780cbe8d782e7dd748d13391a00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 07:36:20 +0000
Subject: [PATCH 0850/1386] terraform-providers.rootlyhq_rootly: 5.16.1 ->
 5.17.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 369471be3c1f..bbd0d279a248 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1139,13 +1139,13 @@
     "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-eJKJedLDp6CdFNimI8artmKYMsgURFXxS/RpMEJnVWk=",
+    "hash": "sha256-uxEqnGPJPUHhD2qtT9BR34/x6xSN5cZcW0JvH8fKfT0=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v5.16.1",
+    "rev": "v5.17.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM="
+    "vendorHash": "sha256-CndTtUfv1NWZd1sgfGq+e4lPm68aQuqwo55KzmdgXeI="
   },
   "rundeck_rundeck": {
     "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",

From 1f544d25e9f070e516a4aa94337bf6edc481ce91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 07:41:26 +0000
Subject: [PATCH 0851/1386] s7: 11.9-unstable-2026-06-27 ->
 11.9-unstable-2026-07-10

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

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index c480594bd0e0..25f8c5d4242e 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.9-unstable-2026-06-27";
+  version = "11.9-unstable-2026-07-10";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "1416ca232c9154e47235be2378151f9f2beea278";
-    hash = "sha256-lA4nLtJ6+O5Cn7TQRzZCPhk3oB8qHdpewZE5yM8z4iw=";
+    rev = "2a631b545cbe66d9cf3f5343fbaab1449e3d8957";
+    hash = "sha256-gYgwQDcWgugZemM2kNu09hwNtJqT49AmvXPlxj+/Ink=";
   };
 
   buildInputs =

From 32ae5c7bd3e369bb3d01b2b6d489e919b887507a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Wed, 15 Jul 2026 08:48:44 +0100
Subject: [PATCH 0852/1386] sone: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/by-name/so/sone/package.nix b/pkgs/by-name/so/sone/package.nix
index 52fc423d1013..91f5114aeac3 100644
--- a/pkgs/by-name/so/sone/package.nix
+++ b/pkgs/by-name/so/sone/package.nix
@@ -26,22 +26,22 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sone";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "lullabyX";
     repo = "sone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dVAVMcEr9cUPJetcVj9y9Lkj6LevJH0M7WYui43IjnY=";
+    hash = "sha256-JhzO4n6bR9Mb5U8hr6DuRm2xCjTVPasA86d6d/EG5Ig=";
   };
 
-  cargoHash = "sha256-gsg/aKy+RpJFF6Q2P5O7btoeY4Q/A9D/w3s1nLvnp1Q=";
+  cargoHash = "sha256-sLw31tCdmNLubsWySwGS5cp935wpqkwmM8/YCuQnM98=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-vOfDSTu7AnZINejVwnIXdZJYlmHSljJpddRRQqlI7ko=";
+    hash = "sha256-JCvImjN73oImtPKstbqqBsKHDW9iLPJMQsNm5I4Ws7k=";
   };
 
   nativeBuildInputs = [

From 3b370d9691fde3a6095e923dfc2f37033287952e Mon Sep 17 00:00:00 2001
From: Tom Vincent <git@tlvince.com>
Date: Wed, 15 Jul 2026 09:05:37 +0100
Subject: [PATCH 0853/1386] immich-kiosk: 0.39.3 -> 0.41.0

---
 pkgs/by-name/im/immich-kiosk/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix
index 113ce904c923..0ca88bb23802 100644
--- a/pkgs/by-name/im/immich-kiosk/package.nix
+++ b/pkgs/by-name/im/immich-kiosk/package.nix
@@ -10,28 +10,28 @@
 
 buildGoModule rec {
   pname = "immich-kiosk";
-  version = "0.39.3";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "damongolding";
     repo = "immich-kiosk";
     tag = "v${version}";
-    hash = "sha256-kdTEvH8MqL3oXe0QZlPTVpeByLpqAdNfPGfu5f2G6g0=";
+    hash = "sha256-mr0cxHdekpzfKfJ2IKpm79vTu5qnSl8q2c8eWose7tg=";
   };
 
   postPatch = ''
     # Delete vendor directory to regenerate it consistently across platforms
     rm -rf vendor
     # immich-kiosk bumps go at a faster cadence than nixpkgs
-    sed 's/^go 1\.26\.\d+$/go 1.26/' go.mod
+    sed -i -E 's/^go 1\.26\.[0-9]+$/go 1.26/' go.mod
   '';
-  vendorHash = "sha256-y6Xl00G+mkhRKVGwMS0WCXZhQqqGGX5qY8PhMxtw7z8=";
+  vendorHash = "sha256-5mMU73/XvHfvT8VaseSymZjDalvHj/KR6cTz1nvXHPQ=";
   proxyVendor = true;
 
   npmDeps = fetchNpmDeps {
     inherit src;
     sourceRoot = "${src.name}/frontend";
-    hash = "sha256-lNON0/lxix2aczC0+m7Er5Te1+4fsSoLkk6Z2pYzQYQ=";
+    hash = "sha256-1m0JvPZDYjd2cNy9atENRS3/GHWzLnPISwGnJbSZwAo=";
   };
   # Frontend is in a subdirectory
   npmRoot = "frontend";

From 4b474cbdf9248e107e08bc5935cdc76479d65698 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:10:14 +0000
Subject: [PATCH 0854/1386] python3Packages.pyprusalink: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix
index 9442b384e01f..c808f7d199d5 100644
--- a/pkgs/development/python-modules/pyprusalink/default.nix
+++ b/pkgs/development/python-modules/pyprusalink/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyprusalink";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "pyprusalink";
     tag = version;
-    hash = "sha256-y+onh52ES2WvfBYjksLBbnZKkm41BBXEc2ORLw9yfGM=";
+    hash = "sha256-qgcwbpQxjaoG/XDRv0kjryT0MqswYb7s6lhWKGHQB/4=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 0602ec7981a024178c032beea5ca1ef5cfc3353e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 14:45:43 +0000
Subject: [PATCH 0855/1386] python3Packages.django-haystack: 3.3.0 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index 847843fd21e4..0991cfbd6d1a 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "django-haystack";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "django_haystack";
     inherit version;
-    hash = "sha256-487ta4AAYl2hTUCetNrGmJSQXirIrBj5v9tZMjygLqs=";
+    hash = "sha256-Eianyc4T4efq2KyD9uh7/vSZbxRu0klx/eeJYRWxxTA=";
   };
 
   build-system = [
@@ -59,8 +59,6 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    # crashes in threading during tests
-    broken = pythonAtLeast "3.14";
     description = "Pluggable search for Django";
     homepage = "http://haystacksearch.org/";
     changelog = "https://github.com/django-haystack/django-haystack/releases/tag/v${version}";

From f7391805e3720e6a0f6a0690e383a2e02eb835b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:15:49 +0000
Subject: [PATCH 0856/1386] all-the-package-names: 2.0.2495 -> 2.0.2503

---
 pkgs/by-name/al/all-the-package-names/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 837cd4e989cf..3908ee82c0cc 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2495";
+  version = "2.0.2503";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-65UbcJXOUZVDEtjDy0PkRLPIlhk8/WxItDeyiULLpNY=";
+    hash = "sha256-UtwbQXhX8dmmA6dVuVFcMQkM98kOt/U//OAVMGBImDU=";
   };
 
-  npmDepsHash = "sha256-Vv3rJBDRSwWnbYFO01M0rLJM3b2gP0z8wAi9T2nRwxQ=";
+  npmDepsHash = "sha256-V7MWSEJT2RtYE1iYJHj2ltrfzke+GO1PfT/wo+MqlZk=";
 
   passthru.updateScript = nix-update-script { };
 

From 4b66ac912fec60e89b8f088ca4d326dbd5c3dfb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:31:50 +0000
Subject: [PATCH 0857/1386] john: 1.9.0-Jumbo-1-unstable-2026-06-07 ->
 1.9.0-Jumbo-1-unstable-2026-07-07

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

diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index 7378febe2b92..0a95f2b97525 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation {
   pname = "john";
-  version = "1.9.0-Jumbo-1-unstable-2026-06-07";
+  version = "1.9.0-Jumbo-1-unstable-2026-07-07";
 
   src = fetchFromGitHub {
     owner = "openwall";
     repo = "john";
-    rev = "309326510e585c7a1340dab2e475c2ebfa6295aa";
-    hash = "sha256-9bk5Icnm7PgQdSVrAKWHaKN0POctVKbofR7Aa9T2fXE=";
+    rev = "b544069b36ac166fb0a2fb19d0dc144ca72da6bb";
+    hash = "sha256-dSdezI0+WSufYVLNChNJQ04VzuKczbfBLrI/5smR1fA=";
   };
 
   patches = lib.optionals withOpenCL [

From fee5081dc86c00adee3b5cb2c063735af871cba3 Mon Sep 17 00:00:00 2001
From: Fida Waseque Choudhury <146055002+u3kkasha@users.noreply.github.com>
Date: Wed, 15 Jul 2026 14:33:01 +0600
Subject: [PATCH 0858/1386] antigravity-cli: remove x86_64-darwin from
 update.sh system list

Removed x86_64-darwin from the system list in update.sh as it was removed from package.nix in commit fdb8206.
---
 pkgs/by-name/an/antigravity-cli/update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/an/antigravity-cli/update.sh b/pkgs/by-name/an/antigravity-cli/update.sh
index 835800502981..61ca43ac4483 100755
--- a/pkgs/by-name/an/antigravity-cli/update.sh
+++ b/pkgs/by-name/an/antigravity-cli/update.sh
@@ -25,7 +25,6 @@ update-source-version --version-key=version antigravity-cli $latestVersion || tr
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix store prefetch-file --json --hash-type sha256 \
       $(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.src.url" --system "$system") | jq -r '.hash')

From 9f4d0a83d6f9611bd890933a28222dbecb2bc08b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:34:01 +0000
Subject: [PATCH 0859/1386] cargo-update: 20.0.3 -> 22.0.0

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

diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 82b09665fd65..3edff871f022 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-update";
-  version = "20.0.3";
+  version = "22.0.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-YTUMC9jY3l21uW3W+M0qUQUqmgyC4FN0uM4IYH1kuC0=";
+    hash = "sha256-7SjJ+v+6PzwV8dTXxSVxKrj4/yUlyGVJtt0A+WaWNc8=";
   };
 
-  cargoHash = "sha256-fpcN09e12Am7+UAa9OojyxShvK2QTKeWGm/vkUkk0UU=";
+  cargoHash = "sha256-xRjPnZPewo/5pCDUem8+9Ko0XJ1p5HJtLLmErtZQb8w=";
 
   nativeBuildInputs = [
     cmake

From e34d105f0a7ec379f6524de0beb46c1ac187cde1 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 10:39:28 +0200
Subject: [PATCH 0860/1386] thunderbird-mcp: 0.7.3 -> 0.7.4

https://github.com/TKasperczyk/thunderbird-mcp/releases/tag/v0.7.4

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/th/thunderbird-mcp/package-lock.json | 4 ++--
 pkgs/by-name/th/thunderbird-mcp/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/th/thunderbird-mcp/package-lock.json b/pkgs/by-name/th/thunderbird-mcp/package-lock.json
index 6eab8be02f1b..3ad83f5984f8 100644
--- a/pkgs/by-name/th/thunderbird-mcp/package-lock.json
+++ b/pkgs/by-name/th/thunderbird-mcp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "thunderbird-mcp",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "thunderbird-mcp",
-      "version": "0.7.3",
+      "version": "0.7.4",
       "license": "MIT",
       "bin": {
         "thunderbird-mcp": "mcp-bridge.cjs"
diff --git a/pkgs/by-name/th/thunderbird-mcp/package.nix b/pkgs/by-name/th/thunderbird-mcp/package.nix
index d2ff5690148e..a15fa5372f94 100644
--- a/pkgs/by-name/th/thunderbird-mcp/package.nix
+++ b/pkgs/by-name/th/thunderbird-mcp/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "thunderbird-mcp";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "TKasperczyk";
     repo = "thunderbird-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VIJUMMiJ2NCdMfxK4E/FAQ4P2ryS6KlxhPj749JH6sE=";
+    hash = "sha256-jrmHqToe+lJTpoG1QYaYHVk84PaO5zKAXLwr3Opl0A4=";
   };
 
   postPatch = ''
@@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: {
   forceEmptyCache = true;
   dontNpmBuild = true;
 
-  npmDepsHash = "sha256-6irpujYRk/OvoTA43CvtoaOmHvK4coMFXRfXhGrjFNk=";
+  npmDepsHash = "sha256-D0DAjK/u59rOKNf5kCu/OYkch+4lZYgdHkuib0sqtIw=";
 
   doCheck = true;
 

From 7f5031fae865304fdbb65007f371bc2247d1d4de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:42:08 +0000
Subject: [PATCH 0861/1386] reproxy: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/by-name/re/reproxy/package.nix b/pkgs/by-name/re/reproxy/package.nix
index 23850ea81c48..404a75ea7903 100644
--- a/pkgs/by-name/re/reproxy/package.nix
+++ b/pkgs/by-name/re/reproxy/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "reproxy";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "reproxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eAxksLPCQrmKRKNlFhDb5dfXSaa9o/rexM1n+CiPZvw=";
+    hash = "sha256-dxQWuONVYidNtppLd5S1tBEPXM64JdnAhdFWzOsaG6U=";
   };
 
   vendorHash = null;

From a8d7e404207c643996e994ac6811bffbf5eec70c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:47:34 +0000
Subject: [PATCH 0862/1386] simplotask: 1.20.0 -> 1.20.1

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

diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index 5e67109b2471..816baca71ed9 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "simplotask";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iSUT5b0nL+6wiiMXFoXwe9r4WV68BXopCYRrswwFxyk=";
+    hash = "sha256-VZXtteRXzjxXtAOYXZHBXknOyegbaCAPPXyRtig3PIs=";
   };
 
   vendorHash = null;

From 5cb38b104a4ccce3e203c521bde366f5c1019718 Mon Sep 17 00:00:00 2001
From: csanthiago <git@csanthiago.dev>
Date: Wed, 15 Jul 2026 09:34:00 +0100
Subject: [PATCH 0863/1386] pulumi-bin: 3.250.0 -> 3.253.0

Assisted-by: Crush:kimi-for-coding-highspeed
---
 pkgs/by-name/pu/pulumi-bin/data.nix  | 158 +++++++++++++--------------
 pkgs/by-name/pu/pulumi-bin/update.sh |   5 -
 2 files changed, 79 insertions(+), 84 deletions(-)

diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix
index f944e90eabde..d501b8b4083b 100644
--- a/pkgs/by-name/pu/pulumi-bin/data.nix
+++ b/pkgs/by-name/pu/pulumi-bin/data.nix
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.250.0";
+  version = "3.253.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-linux-x64.tar.gz";
-        sha256 = "1wxqf2c6v2l721bf0ajhjiypcfsyd15ijyd6bkadnsn9rhvgs5l9";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-linux-x64.tar.gz";
+        sha256 = "1b6ini1p2232wq0lh9fzj251377zlpdl8qx4jmrwgrl02991w5ik";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-linux-amd64.tar.gz";
@@ -21,28 +21,28 @@
         sha256 = "1hkg2h7q5g4swjm07wfjfww7y3ssbm3ffi38vdy0p6xs1aamcn4q";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-linux-amd64.tar.gz";
-        sha256 = "0q4m959ynywipzyznarq1y1wzkn8yiwc6sbd8sllpfwi6ny3dlpn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-linux-amd64.tar.gz";
+        sha256 = "1h7fk2c83d6qxb2n3mvmdpmxk7b67mwkg6zv1isjmdfmkxiz84ir";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-linux-amd64.tar.gz";
-        sha256 = "0n08ywnndbqqs2mfifi4cvxzwi2l5zkijy08hvjqb20c03j40zr2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-linux-amd64.tar.gz";
+        sha256 = "0ja9jm9giz231ip8mi0phnfm50hz991kwgnp94yiq25hmk3h5ifl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-linux-amd64.tar.gz";
         sha256 = "1bwbdm21a5kr2z6jd36idn78yas9ysgg29d14wqjjwhqb0hw3pkq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-linux-amd64.tar.gz";
-        sha256 = "10nl0b3wgr7rhgy195z67w3013yvxl4dasdr4sy4v368lz7rvk7j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-linux-amd64.tar.gz";
+        sha256 = "1h1yrkxd2w8vc2kj097mb7jzv21948vp6kv0x7p5bgcbgpyh69qp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-amd64.tar.gz";
         sha256 = "0hx94wf890a8cz9k66q4p89w9330axb1a3lg2g6j5lbxhrp2bvac";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-linux-amd64.tar.gz";
-        sha256 = "0hb10w22n602shb73my53d79qb91h87qa2q02xkpmaqkkwblz36a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-linux-amd64.tar.gz";
+        sha256 = "13crj1h932vf9ch4m3yphm701dqc86j8pmi4ymjlg0yzfm6b8xwb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-amd64.tar.gz";
@@ -53,12 +53,12 @@
         sha256 = "0xbx66jaknq7n8s77s1zkv3jdacqv4pnxfnlg424vlk04laar6q0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-linux-amd64.tar.gz";
-        sha256 = "1gyw3jy8dj2q67rkgm1jgx209h2941qsjirvl5p11pzm70x42nbh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-linux-amd64.tar.gz";
+        sha256 = "0lv8bsm05rw1xv5m8wscanq1crrphhrdah8nd28vww3akr36af2q";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-linux-amd64.tar.gz";
-        sha256 = "1bq7wnd2bj11gvjcac6f2s95iw03xxkm8i1rnak4qkfk7pn5wk0p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-linux-amd64.tar.gz";
+        sha256 = "0lccw7i98d43v0pipabb7i67588jllil2s882fjlvj3afk7njqza";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-linux-amd64.tar.gz";
@@ -69,12 +69,12 @@
         sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-linux-amd64.tar.gz";
-        sha256 = "1n011z28l4ppgh77vyv79r4d9i0z26fywgd7jbigvrw88zrgwpj9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-linux-amd64.tar.gz";
+        sha256 = "0qgyrfy24bsny0l0kyb4dwyfrpk0a8bh7cl0c11gjh7idwazrn9p";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-linux-amd64.tar.gz";
-        sha256 = "0mzi4crgrrzl912wjqaw9w3c8xqxzx0bv5pr1r410zxqkkml9qwd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-linux-amd64.tar.gz";
+        sha256 = "1dq271jcbqi705w691yrfnk09qwj3d5zghz058hsv6b7zmjzp5mf";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-amd64.tar.gz";
@@ -93,12 +93,12 @@
         sha256 = "030rn7smyfq1j5lgrx50psqbabdjiqr7qmrq965aydjwb2kfs8lx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-linux-amd64.tar.gz";
-        sha256 = "0wqngqq46a8z0m5milbc90aqblwi6sh389ix133zvnjcmag2gx7h";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-linux-amd64.tar.gz";
+        sha256 = "09j62fdkmsn1kzqyqcbs2sykx58db13nw3mlsmdm9pnnkskh02p5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-linux-amd64.tar.gz";
-        sha256 = "0sqf6g99dyml386rpmn662lb54q5c33wgyv2ddl23cz2w1vz2x9a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.1.0-linux-amd64.tar.gz";
+        sha256 = "18s9p81kqf89807wm77g8s6dvh99wpaxd5f064k1kdypb6snbp6p";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-amd64.tar.gz";
@@ -121,8 +121,8 @@
         sha256 = "07lqjsz8d7cn52zfawhxj6k9n6g1a220kcckdfnf6135h26w75h0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-linux-amd64.tar.gz";
-        sha256 = "00lbq7w5qdkpa8xywb9mhfa1x6niik9a17qifz22akb57p8fkzky";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-linux-amd64.tar.gz";
+        sha256 = "1y9wcln87jpy22fvdx5l44kj1n4fw1kkk3jmdvkz5byjy64yf7ji";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-linux-amd64.tar.gz";
@@ -133,8 +133,8 @@
         sha256 = "0pppwgwl726rfy92fnya9afj3cciw13vzs9r60w2477i3250slqj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-linux-amd64.tar.gz";
-        sha256 = "0d15p18as2y37ay40bmwnffmvww0gx5gk8ldy05w42lppkpvf216";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.29.0-linux-amd64.tar.gz";
+        sha256 = "0203qf994hjablrl6nm51f6j69z469q46rm1d15gvxsgi17g23sx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-amd64.tar.gz";
@@ -163,8 +163,8 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-linux-arm64.tar.gz";
-        sha256 = "1rdl6yj7fs0kv3m3hcz377qfpl4s0d2glbzqvhxazjxl0l6vzd6y";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-linux-arm64.tar.gz";
+        sha256 = "1skpnnrh4inw20p2ldji4a75vm7v2igkdck3q4k944vngbb78w3x";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-linux-arm64.tar.gz";
@@ -179,28 +179,28 @@
         sha256 = "0s6h6l77jkz38bifcb61sfx1bqwdyf4ayi7f0m0idcji5b28anpr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-linux-arm64.tar.gz";
-        sha256 = "0wjpmwfnbm0hqknbzzy9kxzrwds2phbhavc3bbahp1ggzvx3r7pl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-linux-arm64.tar.gz";
+        sha256 = "1dnkx3qhh2ln6gps8z7gwknb6cjzl0v5ximvz91gqz1i8pshvqz4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-linux-arm64.tar.gz";
-        sha256 = "0xygw9q77vs4k59m8ngszrjhy2mi7g1bchfbc9yycha2iidgd4r1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-linux-arm64.tar.gz";
+        sha256 = "16ckjw8375yrz92wm0dgdp1yamswikr9gbrigad2f3yf6crmlyia";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-linux-arm64.tar.gz";
         sha256 = "0hmwjbg8l32vgy8ydl5makl1l6x9frz6abg3yah597flwdy8afgd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-linux-arm64.tar.gz";
-        sha256 = "1w1j0k70ah61zrad83j8ksnws18ic31i1g352il0fsidm7bhxy8p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-linux-arm64.tar.gz";
+        sha256 = "06bkdfipmgjq1ahfmpjzsfz73kkasxwajciym9y1gmlb62zq75ac";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-arm64.tar.gz";
         sha256 = "0660ml58rak26im6fc6vr7mj943xpn7fnrysg7h8a6yi2rs31vb1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-linux-arm64.tar.gz";
-        sha256 = "1lqmk6wmx8r2ip706v3mdlwp7ji8m10xvy0dyc5p81vlx95inpgi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-linux-arm64.tar.gz";
+        sha256 = "1zwqw37zvv5yqdy95vs7dvq8x6a34glfy5sg336rgz36mnrbs2fb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-arm64.tar.gz";
@@ -211,12 +211,12 @@
         sha256 = "0jgqk4sp7rkapxfi3gs5z74rrrs050bqs6kggpfz32v6sp5514z1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-linux-arm64.tar.gz";
-        sha256 = "07lc11mk0agnrd3wxlkzq7fgfv5icicvacrdr2si6ycz0hwzpbqi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-linux-arm64.tar.gz";
+        sha256 = "1gsi703xf1zl508wsrwpcgnj0g6g81fjdqhgc4shd7sk1iykjnd3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-linux-arm64.tar.gz";
-        sha256 = "1c5caj9djz0q98k73sldmi211d0xq2af0yjxv6h3nficiwjx74p5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-linux-arm64.tar.gz";
+        sha256 = "1n3hkniyzd14sijcbhd9kl7nvq6gfmmg42q4knp4vwjrf26dv86a";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-linux-arm64.tar.gz";
@@ -227,12 +227,12 @@
         sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-linux-arm64.tar.gz";
-        sha256 = "1pv5nsdv060pfhkh2g2ryf0xvpiingnyklpi0mdk24w91axr09ax";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-linux-arm64.tar.gz";
+        sha256 = "1viavidp6g7s2pyczic4iq5p7pakg3g7994yfx03nar76sv94rgp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-linux-arm64.tar.gz";
-        sha256 = "0vmijcammjlb7grycrgn1xwkx24jvmz8s9ib86kdrb1dcr43fq1q";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-linux-arm64.tar.gz";
+        sha256 = "09v3mpdscgsjpd3h1g8q2fk7amh5z7iindszf0wf8zml4qcg187v";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-arm64.tar.gz";
@@ -251,12 +251,12 @@
         sha256 = "0w0caqipdipj56qqv2vkcn5srbb6h1xv741d53v5863ax1hgp0w3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-linux-arm64.tar.gz";
-        sha256 = "1hnri0akhifaanibmpp23lfrr4ns2fv5nj2xp3adhqw4qm5nq03d";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-linux-arm64.tar.gz";
+        sha256 = "1ab0pl2i1bphy8y5ws82s23l3iz99dmfsz6n09b0yb8wwzwzcphj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-linux-arm64.tar.gz";
-        sha256 = "09v8fabiwj8hr3bxh9jr5whrmcm3v3xjqw4iwv9wx001lmf35jf9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.1.0-linux-arm64.tar.gz";
+        sha256 = "16gwcr4j5fwmsxkcvna1wkx1hjxzyiycv4b4fwysd5y7myh4zsnb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-arm64.tar.gz";
@@ -279,8 +279,8 @@
         sha256 = "1d6j1hqy0w3w4jssyp3w7xdkg8501vljra8299giiv0cycmhd3w8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-linux-arm64.tar.gz";
-        sha256 = "0x5c0zjpb2i27yblv22izhaa86wfxfkq1qvyczsnh1pizyd4jlr6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-linux-arm64.tar.gz";
+        sha256 = "12pd2ms6xkmbl0d1lfa1p63gpdc9vqv05hsjp4naj9clmd8l0wm5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-linux-arm64.tar.gz";
@@ -291,8 +291,8 @@
         sha256 = "0glljz03v764n53n5l33ji64vj86ipdv5bkr03ijl8wrc22j5syy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-linux-arm64.tar.gz";
-        sha256 = "0nnshs122f00lw5xpfhz1rd73kc62nn55pi8v7fgndl31f9b6ca7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.29.0-linux-arm64.tar.gz";
+        sha256 = "0bi1i8ysx2way6gix1bxixdiipk6w0wqp3xh8vvzw8s61ax4awsa";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-arm64.tar.gz";
@@ -321,8 +321,8 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-darwin-arm64.tar.gz";
-        sha256 = "0a6sbxpz7wv4dwlgfvalbxvk7xdf4vi84815hdv5dkv96378klnv";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-darwin-arm64.tar.gz";
+        sha256 = "0glfsanndr725r4dr0cjj24yhd529kczp6ksy2dan4b4387d1l8j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-darwin-arm64.tar.gz";
@@ -337,28 +337,28 @@
         sha256 = "1mqzky6ilc14jsdxpzjyx9ldhiiid2akmhj3wqw2mjqlcmz4sxvd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-darwin-arm64.tar.gz";
-        sha256 = "1qh627z9ql54nhhh5qi1laq7lxcrznh3dyhqknwybfh5vgb197yl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-darwin-arm64.tar.gz";
+        sha256 = "0q5i2mx7isdgiqscqkswnqgrg25xm4wf2nqxcpmr91bvwc5rrjsi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-darwin-arm64.tar.gz";
-        sha256 = "0sabxdbzhqy6243m0p8nf2dpcgbmvdghb0nvv65i7haj07xb0ilb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-darwin-arm64.tar.gz";
+        sha256 = "03ymhjv30xyi3nsw40mz7saazaw7xw20l2bnmia37nnn5336qlhd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-darwin-arm64.tar.gz";
         sha256 = "0m5xbg919vvmhv6v644wivfgaq4mzsfbf7bdq001z4065v6im2sg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-arm64.tar.gz";
-        sha256 = "0lbfv8md4zkxgvg9rg0l2j4h3p3lnmp3q0dgc30m2637qf19ggdn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-darwin-arm64.tar.gz";
+        sha256 = "17rfxhnfkdwkpnv1kfzl427s6ysaggdy6z37d4h5cxpl6d6kf8nr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-arm64.tar.gz";
         sha256 = "0rzjlcwq1gpp7v9a4xcfwcc09g9ry6c8d7s00jiy8ix5cfzmwv10";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-arm64.tar.gz";
-        sha256 = "0nlhi9i0l0csw9s86fkzaxccqs622jzjbhny14lggakx6g00ynjh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-darwin-arm64.tar.gz";
+        sha256 = "01cfgmb13ylbi2dk7ng8mda6lsrjgaccyrffjp6jhfp245fj97pb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-arm64.tar.gz";
@@ -369,12 +369,12 @@
         sha256 = "1ly07rsqrrxqcbgwf0a0dhjgv16bbsanc56k04yhvsq1i4cis8v3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-darwin-arm64.tar.gz";
-        sha256 = "1qfl1nmynp2lbjbjrhysp5pyqxhamyklz4xx4pw64y01b30zy09l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-darwin-arm64.tar.gz";
+        sha256 = "0833vlgcy3jcnnlhb94wr1fn1j1r4sjqlwhxsqldkd53w1x0rxqs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-darwin-arm64.tar.gz";
-        sha256 = "1afmxz2cmsxmrhcyng6vf56swpv3clbrvf2i4q160ds6kx5hyzw5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-darwin-arm64.tar.gz";
+        sha256 = "16nv45p1gfbyjxcvmw9w28yzk9vygd5w1l2ifhax27g63zwzb7yk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-darwin-arm64.tar.gz";
@@ -385,12 +385,12 @@
         sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-darwin-arm64.tar.gz";
-        sha256 = "0s85j50l66fjrnrzrxwygf0zqfipliqv396q3af6hi9rd1sdpz7w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-darwin-arm64.tar.gz";
+        sha256 = "1dsr4d1i1rrq6801x1mmqgqg5rw2fibvqid5gbv9gyb73vkaafkn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-darwin-arm64.tar.gz";
-        sha256 = "0i9ccb49mv6xl5kzgpxcapxs7fiqsczrh5md67cc1g4hbsxiacp0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-darwin-arm64.tar.gz";
+        sha256 = "1vzaypv5wqa9vdggcv5m7kkxcmbwim100j85jsbylkhnf8lg5sq3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-arm64.tar.gz";
@@ -409,12 +409,12 @@
         sha256 = "1mfv6qlzm6l94j12pfy1dni5w9laix3s5fak7csmpwywnyf82dgx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-darwin-arm64.tar.gz";
-        sha256 = "1aj0axqnd4pmcchir2hy4dyjhgsby7si2swk0407wgam3kafbrnw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-darwin-arm64.tar.gz";
+        sha256 = "1c4l129v163p31vc8wnbqq3pq9ai5rfj0zcrhhvwajbwdfv7g719";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-darwin-arm64.tar.gz";
-        sha256 = "1jni02v137jcwcg0f6sjd817ycm9krbynqplycn2zkwlydz3fcx6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.1.0-darwin-arm64.tar.gz";
+        sha256 = "1xf9k1aqqrpq6apjgmqs4l276w5qzg2337ixcp3f12z8l476yv40";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-arm64.tar.gz";
@@ -437,8 +437,8 @@
         sha256 = "1ccyxmkzmj5qah2z912vks548bbrhiifa65h0dm5bkihyjk1bi95";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-darwin-arm64.tar.gz";
-        sha256 = "0k1y0vxnavmp9q0hl3rp2srkddhjwg7r540lvl0i766y6l4n69ha";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-darwin-arm64.tar.gz";
+        sha256 = "0c5lsqfh4bmkws9lmrg0rrsvsh4i2zpyblf93hnl8sybq53h21rb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-darwin-arm64.tar.gz";
@@ -449,8 +449,8 @@
         sha256 = "1c4pn5nr8d97n9bqd7vz9gzlbi50hnfjylwwch445ylqp5l8gvqf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-arm64.tar.gz";
-        sha256 = "0cbdkcphzkfchz3xipf950np79i8hyazdlgjycp173zfq8n7323y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.29.0-darwin-arm64.tar.gz";
+        sha256 = "0bjp4076cbkvdcjj3jcvy4r50zdv74vwbzq706i31rz1c121dm3x";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-arm64.tar.gz";
diff --git a/pkgs/by-name/pu/pulumi-bin/update.sh b/pkgs/by-name/pu/pulumi-bin/update.sh
index f71812135552..4da7ff0fc381 100755
--- a/pkgs/by-name/pu/pulumi-bin/update.sh
+++ b/pkgs/by-name/pu/pulumi-bin/update.sh
@@ -141,11 +141,6 @@ EOF
   genSrcs "linux" "amd64"
   echo "    ];"
 
-  echo "    x86_64-darwin = ["
-  genMainSrc "darwin" "x64"
-  genSrcs "darwin" "amd64"
-  echo "    ];"
-
   echo "    aarch64-linux = ["
   genMainSrc "linux" "arm64"
   genSrcs "linux" "arm64"

From d97b86f1e0cc4f35f6ab90d4cef1780eaf8bd560 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:52:06 +0000
Subject: [PATCH 0864/1386] sqls: 0.2.45 -> 0.2.48

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

diff --git a/pkgs/by-name/sq/sqls/package.nix b/pkgs/by-name/sq/sqls/package.nix
index 8a6a0f2e3924..0b04885b3c60 100644
--- a/pkgs/by-name/sq/sqls/package.nix
+++ b/pkgs/by-name/sq/sqls/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sqls";
-  version = "0.2.45";
+  version = "0.2.48";
 
   src = fetchFromGitHub {
     owner = "sqls-server";
     repo = "sqls";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-r9D3YtUk/hv3ex/PSGPTNIBTW3s3a3KdIBtxDry30Zc=";
+    hash = "sha256-TjGu8QcwYIPoW2v61fXpq/oZKoksOUZ2/dnleJhPjFM=";
   };
 
-  vendorHash = "sha256-eh43G0fR+NRRXRPCfxjlwzzw3yg/ZRb1GpWwHGqyRrE=";
+  vendorHash = "sha256-VVa77h0mgWLEuL2+Q3qre5V71kbBaWaugNN9TcTC8y0=";
 
   ldflags = [
     "-s"

From e71375e18f23fdd6935c3462fcdd44009d0ab4cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 09:04:04 +0000
Subject: [PATCH 0865/1386] knowsmore: 0.1.50 -> 0.1.51

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

diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix
index 9c0f9ef1f627..77ea63f6ff98 100644
--- a/pkgs/by-name/kn/knowsmore/package.nix
+++ b/pkgs/by-name/kn/knowsmore/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "knowsmore";
-  version = "0.1.50";
+  version = "0.1.51";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "helviojunior";
     repo = "knowsmore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D3WhlReBwQLU+U/389r5gR73+DNvFiVuSr6NQgG2oFY=";
+    hash = "sha256-GpFcRLPyWmkqyF4cpsm7uNv2U1TTJI0NoRV6IQQiQw4=";
   };
 
   pythonRelaxDeps = [

From c883276fe11b89d9050e58becfba691c51d08123 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 09:10:52 +0000
Subject: [PATCH 0866/1386] python3Packages.publicsuffixlist: 1.0.2.20260710 ->
 1.0.2.20260715

---
 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 79c84d9eb12d..b71a56c2d572 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260710";
+  version = "1.0.2.20260715";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-lCJ66oP52KxMfVJ/LIan0qx2tjn09RAD0J9+8foEI6Q=";
+    hash = "sha256-C2hMkJSeC6BEyQLXzPFN5SaMnXCA/O9OiqqPSm4HGn0=";
   };
 
   postPatch = ''

From ed4e602d7f75a859f72d429d477d2513fd2cc6ec Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 11:22:46 +0200
Subject: [PATCH 0867/1386] vlang: 0.5.1 -> 0.5.2

https://github.com/vlang/v/releases/tag/0.5.2

Use nixpkgs SQLite for the new vbug-report and vsqlite tools, and install v.mod for modules using @VMODROOT.

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/vl/vlang/package.nix | 37 +++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix
index 5e9fd1cc8ecc..deded5495626 100644
--- a/pkgs/by-name/vl/vlang/package.nix
+++ b/pkgs/by-name/vl/vlang/package.nix
@@ -6,6 +6,8 @@
   freetype,
   openssl,
   makeWrapper,
+  pkg-config,
+  sqlite,
   upx,
   boehmgc,
   libxdmcp,
@@ -16,7 +18,7 @@
 }:
 
 let
-  version = "0.5.1";
+  version = "0.5.2";
   ptraceSubstitution = ''
     #include <sys/types.h>
     #include <sys/ptrace.h>
@@ -25,12 +27,12 @@ let
   # So we fix its rev to correspond to the V version.
   vc = stdenv.mkDerivation {
     pname = "v.c";
-    version = "0.5.1";
+    version = "0.5.2";
     src = fetchFromGitHub {
       owner = "vlang";
       repo = "vc";
-      rev = "f461dfebcdfac3c75fdf28fec80c07f0a7a9a53d";
-      hash = "sha256-GsciyAqCVbLpC6L+HFX90+1yX1Iq/GIBZIIzLVXbFN0=";
+      rev = "7eb8c54a3843e5107d5af06d7a8c3e928f322475";
+      hash = "sha256-Ca8RqMN2BwnwCfjvtGtFAl/qaoSLQTHGmhIk5FN3CO8=";
     };
 
     # patch the ptrace reference for darwin
@@ -48,8 +50,8 @@ let
   markdown = fetchFromGitHub {
     owner = "vlang";
     repo = "markdown";
-    rev = "6ecbf4c519de2ca4cb26432bb2653c9cb9f17309";
-    hash = "sha256-tFOI9Dh1yvFtsWHr4JvFUonbI6la3aj47YmfuFt3unI=";
+    rev = "ef2f1018c37c1db6e379331b3cd841331b6a6fd2";
+    hash = "sha256-drhDQYm7yiL+EDyslkTb0MGA9NQRrDLVg3IElwXAIIY=";
   };
   boehmgcStatic = boehmgc.override {
     enableStatic = true;
@@ -63,17 +65,21 @@ stdenv.mkDerivation {
     owner = "vlang";
     repo = "v";
     rev = version;
-    hash = "sha256-f9YtL2+gWvFI/fX09CtQlPRLDZT7D6K8bRQvXApXByU=";
+    hash = "sha256-0PInqMmb4sNzJwVD9SMhTXzvxMdaC1uIJl7fpdXKESE=";
   };
 
   propagatedBuildInputs = [
     glfw
     freetype
     openssl
+    sqlite
   ]
   ++ lib.optional stdenv.hostPlatform.isUnix upx;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ];
 
   buildInputs = [
     binaryen
@@ -103,13 +109,20 @@ stdenv.mkDerivation {
     mkdir -p $out/{bin,lib,share}
     cp -r examples $out/share
     cp -r {cmd,vlib,thirdparty} $out/lib
-    cp v $out/lib
+    cp v v.mod $out/lib
     ln -s $out/lib/v $out/bin/v
-    wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
+    wrapProgram $out/bin/v \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          stdenv.cc
+          pkg-config
+        ]
+      } \
+      --prefix PKG_CONFIG_PATH : ${lib.getDev sqlite}/lib/pkgconfig
 
     # gen_vc is a V-maintainer tool for pushing bootstrap C files to the vc
-    # repo; it requires network/SSH access and a v.mod root that doesn't exist
-    # in the installed layout, so it cannot be built in the Nix sandbox.
+    # repo; it requires network/SSH access, so it cannot be built in the Nix
+    # sandbox.
     rm $out/lib/cmd/tools/gen_vc.v
 
     mkdir -p $HOME/.vmodules;

From 58849d22c4d1dba16848f8320005d4b7e1daae13 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 15 Jul 2026 11:31:57 +0200
Subject: [PATCH 0868/1386] viser: allow rich 15

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

diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix
index 0313910feef8..e30bdac6d16a 100644
--- a/pkgs/development/python-modules/viser/default.nix
+++ b/pkgs/development/python-modules/viser/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
 
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -171,6 +170,11 @@ buildPythonPackage (finalAttrs: {
     "viser"
   ];
 
+  pythonRelaxDeps = [
+    # rich<15.0.0,>=13.3.3 not satisfied by version 15.0.0
+    "rich"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = {

From f15dd47f0680e4c05dc3171926e3b3be5c7b9d8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 09:35:37 +0000
Subject: [PATCH 0869/1386] filtr: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix
index 64ee9511d35d..4ba17c3a3d3e 100644
--- a/pkgs/by-name/fi/filtr/package.nix
+++ b/pkgs/by-name/fi/filtr/package.nix
@@ -23,14 +23,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "filtr";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "tiagolr";
     repo = "filtr";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-LW21Hv0Gs7csgHg9tMPa4fmZGAby64uDAOdkwhOSwx4=";
+    hash = "sha256-diOM6Y2HrOP5wXg4tVXms7TYOSM16t06ZDg1/Q1L/zc=";
   };
 
   nativeBuildInputs = [

From 82473c7d4c39c0b72e37f5dc100022eefa30a9ff Mon Sep 17 00:00:00 2001
From: kilyanni <github@nkilian.org>
Date: Fri, 10 Jul 2026 17:02:08 +0200
Subject: [PATCH 0870/1386] python3Packages.ansible-vault-rw: rename to
 ansible-vault

---
 .../{ansible-vault-rw => ansible-vault}/default.nix           | 4 ++--
 pkgs/development/python-modules/bittensor-wallet/default.nix  | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/development/python-modules/{ansible-vault-rw => ansible-vault}/default.nix (95%)

diff --git a/pkgs/development/python-modules/ansible-vault-rw/default.nix b/pkgs/development/python-modules/ansible-vault/default.nix
similarity index 95%
rename from pkgs/development/python-modules/ansible-vault-rw/default.nix
rename to pkgs/development/python-modules/ansible-vault/default.nix
index 16b858e5a1b0..a4f8912c02ce 100644
--- a/pkgs/development/python-modules/ansible-vault-rw/default.nix
+++ b/pkgs/development/python-modules/ansible-vault/default.nix
@@ -14,8 +14,8 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ansible-vault-rw";
-  version = "2.1.0";
+  pname = "ansible-vault";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/bittensor-wallet/default.nix b/pkgs/development/python-modules/bittensor-wallet/default.nix
index 508fc635930c..d6e04065d52c 100644
--- a/pkgs/development/python-modules/bittensor-wallet/default.nix
+++ b/pkgs/development/python-modules/bittensor-wallet/default.nix
@@ -9,7 +9,7 @@
   libsodium,
   libiconv,
   pytestCheckHook,
-  ansible-vault-rw,
+  ansible-vault,
   setuptools,
 }:
 
@@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     pytestCheckHook
-    ansible-vault-rw
+    ansible-vault
     setuptools
   ];
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index e59d88ce3f66..be7ef4fbf689 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -86,6 +86,7 @@ mapAliases {
   amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
   amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22
+  ansible-vault-rw = ansible-vault; # Added 2026-07-10
   ansiconv = throw "ansiconv has been removed because it was archived upstream"; # Added 2026-01-14
   ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a951003c2f95..0eb74b53b248 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1139,7 +1139,7 @@ self: super: with self; {
 
   ansible-runner = callPackage ../development/python-modules/ansible-runner { };
 
-  ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { };
+  ansible-vault = callPackage ../development/python-modules/ansible-vault { };
 
   ansicolor = callPackage ../development/python-modules/ansicolor { };
 

From 54d0774e467786420f887edab9ebbfd09281d386 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Wed, 15 Jul 2026 11:49:36 +0200
Subject: [PATCH 0871/1386] home-assistant-custom-components.systemair: 1.0.28
 -> 1.0.29

Add missing dependencies and enable tests.
---
 .../custom-components/systemair/package.nix   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index be387f0dd7aa..c9436486048b 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -5,18 +5,22 @@
   fetchFromGitHub,
   async-timeout,
   aiohttp,
+  websocket-client,
+  beautifulsoup4,
+  pytestCheckHook,
+  pytest-homeassistant-custom-component,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "AN3Orik";
   domain = "systemair";
-  version = "1.0.28";
+  version = "1.0.29";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-6JLcWBZU5YXgdcZUuCIs2KAJJJ8U7nawYwOgSjsNajc=";
+    hash = "sha256-qpwF1HZZ8pEDywkFij9ipF3BPFe3oAj8wQKILNuKoHc=";
   };
 
   ignoreVersionRequirement = [
@@ -27,6 +31,17 @@ buildHomeAssistantComponent rec {
     pymodbus
     async-timeout
     aiohttp
+    websocket-client
+    beautifulsoup4
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-homeassistant-custom-component
+  ];
+
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn9Warning"
   ];
 
   meta = {

From f7b42cafc617a6a20794d0030b027f2fbc935694 Mon Sep 17 00:00:00 2001
From: kilyanni <github@nkilian.org>
Date: Wed, 15 Jul 2026 11:39:55 +0200
Subject: [PATCH 0872/1386] python3Packages.ansible-vault: 2.1.0 -> 4.1.0

---
 .../python-modules/ansible-vault/default.nix  | 56 +++++++++++++------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-vault/default.nix b/pkgs/development/python-modules/ansible-vault/default.nix
index a4f8912c02ce..ac8a5d39e70d 100644
--- a/pkgs/development/python-modules/ansible-vault/default.nix
+++ b/pkgs/development/python-modules/ansible-vault/default.nix
@@ -1,49 +1,71 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   setuptools,
 
   # dependencies
   ansible-core,
+  pyyaml,
 
   # tests
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ansible-vault";
   version = "4.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "ansible-vault";
-    inherit version;
-    hash = "sha256-XOj9tUcPFEm3a/B64qvFZIDa1INWrkBchbaG77ZNvV4";
+  # Fetched from GitHub because PyPI doesn't ship the test suite.
+  src = fetchFromGitHub {
+    owner = "tomoh1r";
+    repo = "ansible-vault";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JSFZavafUByn4u+WkPo01lPCzjv/ekCM8nvWSy4QrAs=";
   };
 
+  # The test helper resolves the ansible-vault CLI as a sibling of sys.executable,
+  # which holds in a venv but not under nix's split store; point it at ansible-core.
+  postPatch = ''
+    substituteInPlace test/lib/testing/__init__.py \
+      --replace-fail 'os.path.join(os.path.dirname(sys.executable), "ansible-vault")' \
+                     '"${lib.getExe' ansible-core "ansible-vault"}"'
+  '';
+
   nativeBuildInputs = [ setuptools ];
 
-  propagatedBuildInputs = [ ansible-core ];
+  propagatedBuildInputs = [
+    ansible-core
+    pyyaml
+  ];
 
-  # Otherwise tests will fail to create directory
-  # Permission denied: '/homeless-shelter'
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+    # importing ansible writes to HOME, without this import check and checkPhase would both fail
+    writableTmpDirAsHomeHook
+  ];
 
-  # no tests in sdist, no 2.1.0 tag on git
-  doCheck = false;
+  disabledTestPaths = [
+    # dev-only lint suite (black/flake8/isort/pylint), not useful for nixpkgs
+    "test/linter"
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  disabledTests = [
+    # This fails on a benign reformatting of ansible-core's error message
+    "TestCannotLoadWithInvalidPassword"
+  ];
+
+  pythonImportsCheck = [ "ansible_vault" ];
 
   meta = {
-    description = "This project aim to R/W an ansible-vault yaml file";
+    description = "R/W an ansible-vault yaml file";
     homepage = "https://github.com/tomoh1r/ansible-vault";
     changelog = "https://github.com/tomoh1r/ansible-vault/blob/master/CHANGES.txt";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ StillerHarpo ];
   };
-}
+})

From 0bbc8ba36dfb854036f13fbc68239ed71d1bf570 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 09:57:54 +0000
Subject: [PATCH 0873/1386] openspeedrun: 0.3.3 -> 0.4.3

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

diff --git a/pkgs/by-name/op/openspeedrun/package.nix b/pkgs/by-name/op/openspeedrun/package.nix
index 73ea17ef9e3e..34cfdd802cb3 100644
--- a/pkgs/by-name/op/openspeedrun/package.nix
+++ b/pkgs/by-name/op/openspeedrun/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openspeedrun";
-  version = "0.3.3";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "SrWither";
     repo = "OpenSpeedRun";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EZPApXUVhsaOYa6CnpR8IWeEoHEl89KJGGoBOYFqBV0=";
+    hash = "sha256-0gVFnQbbtlQG2H0oD28cbbqvGsAxqC5DPsKvHC1CUw8=";
   };
 
-  cargoHash = "sha256-WzsLEfDZpjpUrbyPOr5QUkTMrlAJoC9Rej5BMOKF7OM=";
+  cargoHash = "sha256-xOz/Ru6NqpI20t+hz/81xaVU6XrsqGx0tI04O6nkRj4=";
 
   nativeBuildInputs = [
     autoPatchelfHook

From 815bae6aac952c9302081dbb20608e219567c1ab Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Wed, 15 Jul 2026 11:59:00 +0200
Subject: [PATCH 0874/1386] nono: add update script

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

diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix
index 271b2e56ae4c..79eef3783395 100644
--- a/pkgs/by-name/no/nono/package.nix
+++ b/pkgs/by-name/no/nono/package.nix
@@ -9,6 +9,7 @@
   dbus,
 
   writableTmpDirAsHomeHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -112,6 +113,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ]
   );
 
+  passthru.updateScript = nix-update-script { };
   meta = {
     description = "Secure, kernel-enforced sandbox for AI agents, MCP and LLM workloads";
     homepage = "https://github.com/always-further/nono";

From 724c449a80c194541a35c8940bea975f20026876 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 10:03:02 +0000
Subject: [PATCH 0875/1386] home-assistant-matter-hub: 2.0.48 -> 2.0.49

---
 pkgs/by-name/ho/home-assistant-matter-hub/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix
index c5e6f7188d8c..b6feefcde22d 100644
--- a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix
+++ b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-assistant-matter-hub";
-  version = "2.0.48";
+  version = "2.0.49";
 
   src = fetchFromGitHub {
     owner = "RiDDiX";
     repo = "home-assistant-matter-hub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0M1ZSqNyLQECaO0cj4MpDGN5x8wVZeJczMViW5d9IXQ=";
+    hash = "sha256-AbXm70mxpqIefVyoapdYc8NC+XUTAdfRDhorMP446JI=";
   };
 
   # The bundled cli.js imports transitive dependencies (e.g. @noble/curves)
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       ;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-Bfg2c6gYTUv1rsBGriXUiftlOwGCzPdbdYgW9qhFSLw=";
+    hash = "sha256-PESk5TexRfwD/4upUA7npGQobhFwgm87oqVS1LqzbRg=";
   };
 
   __structuredAttrs = true;

From 02c2a539f2b99d0ca6e72e0ff2721095d6f5c2a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 10:09:34 +0000
Subject: [PATCH 0876/1386] kazumi: 2.1.8 -> 2.2.0

---
 pkgs/by-name/ka/kazumi/package.nix       |  4 +-
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 68 +++++++++++++++---------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 382a297f1865..dd288a2724bd 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -18,13 +18,13 @@
 }:
 
 let
-  version = "2.1.8";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-g6Z2DTZVhLD9M1jJAyJexi4lYd7Y3XUci2mjvJWxvkU=";
+    hash = "sha256-xAXhESIGk3St2TgqLtUl6je7DlS4j4vD338T5t99OAE=";
   };
 in
 flutter.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 166f9d6a1c28..ccd5c300e2fe 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -146,11 +146,11 @@
       "dependency": "transitive",
       "description": {
         "name": "auto_injector",
-        "sha256": "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8",
+        "sha256": "81815294ad9a512e294d97819bdbeccc7f93f18daeceac321e0c046a6f25eeb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -524,7 +524,7 @@
       "version": "1.3.3"
     },
     "ffi": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "ffi",
         "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
@@ -729,11 +729,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_modular",
-        "sha256": "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586",
+        "sha256": "04b924a79e17ec897aa40886a46f27954ee0194e4601a006bdba3cb2be65e180",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
+      "version": "7.1.0"
     },
     "flutter_native_splash": {
       "dependency": "direct dev",
@@ -1017,6 +1017,16 @@
       "source": "hosted",
       "version": "1.0.5"
     },
+    "iregexp": {
+      "dependency": "transitive",
+      "description": {
+        "name": "iregexp",
+        "sha256": "c79119931b7ae9c0b6327adaa4495811813fcae7e6236ac68c15f45ca857d38b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "isolate_channel": {
       "dependency": "transitive",
       "description": {
@@ -1067,6 +1077,16 @@
       "source": "hosted",
       "version": "4.12.0"
     },
+    "json_path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "json_path",
+        "sha256": "99cef94ca7b604ad85b9442bc8852e55396f559c08c0ab961d10b90b730c326f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.9.0"
+    },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
@@ -1147,6 +1167,16 @@
       "source": "hosted",
       "version": "0.13.0"
     },
+    "maybe_just_nothing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "maybe_just_nothing",
+        "sha256": "57af3cacbbe57d5889a4479983755b76551db3c8862aa6335f57f50657945054",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
     "media_kit": {
       "dependency": "direct main",
       "description": {
@@ -1296,16 +1326,6 @@
       "source": "hosted",
       "version": "2.7.7"
     },
-    "modular_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "modular_core",
-        "sha256": "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.1"
-    },
     "msix": {
       "dependency": "direct dev",
       "description": {
@@ -1477,7 +1497,7 @@
       "version": "2.2.1"
     },
     "path_provider_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "path_provider_platform_interface",
         "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
@@ -1527,7 +1547,7 @@
       "version": "3.1.6"
     },
     "plugin_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "plugin_platform_interface",
         "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
@@ -1557,7 +1577,7 @@
       "version": "6.5.0"
     },
     "provider": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "provider",
         "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
@@ -1606,15 +1626,15 @@
       "source": "hosted",
       "version": "0.6.0"
     },
-    "result_dart": {
+    "rfc_6901": {
       "dependency": "transitive",
       "description": {
-        "name": "result_dart",
-        "sha256": "80096f0928e276c024e53cf1bb2aaffd5a94623dac8fdfa5cb3529e82b51eb3c",
+        "name": "rfc_6901",
+        "sha256": "6a43b1858dca2febaf93e15639aa6b0c49ccdfd7647775f15a499f872b018154",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "0.2.1"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -2314,7 +2334,7 @@
       "version": "0.4.0"
     },
     "win32": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "win32",
         "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
@@ -2396,6 +2416,6 @@
   },
   "sdks": {
     "dart": ">=3.11.0 <4.0.0",
-    "flutter": ">=3.44.4"
+    "flutter": ">=3.44.5"
   }
 }

From ca62b9d68eb889f791e578eb657cff190d0da9fe Mon Sep 17 00:00:00 2001
From: "user.name" <user.email@git>
Date: Wed, 15 Jul 2026 12:09:52 +0200
Subject: [PATCH 0877/1386] verilator: 5.048 -> 5.050

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

diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix
index b011167f1ee9..765730487591 100644
--- a/pkgs/by-name/ve/verilator/package.nix
+++ b/pkgs/by-name/ve/verilator/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  bash,
   perl,
   flex,
   bison,
@@ -19,15 +20,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "verilator";
-  version = "5.048";
+  version = "5.050";
 
   src = fetchFromGitHub {
     owner = "verilator";
     repo = "verilator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xvqqgbW7L07+NBYzGN2KLhwir58ByShxo4VVPI3pgZk=";
+    hash = "sha256-ZOwBBbVNP0PaYUvrjdvbWu88fZOZ6IJ8BHAiajcOjP8=";
   };
-
   enableParallelBuilding = true;
   buildInputs = [
     perl
@@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
     test_regress/t/t_a1_first_cc.py \
     test_regress/t/t_a2_first_sc.py \
     ci/* ci/docker/run/* ci/docker/run/hooks/* ci/docker/buildenv/build.sh
-    # verilator --gdbbt uses /bin/echo to test if gdb works.
-    substituteInPlace bin/verilator --replace-fail "/bin/echo" "${coreutils}/bin/echo"
+    # verilator --gdbbt uses /bin/sh to test if gdb works.
+    substituteInPlace bin/verilator --replace-fail "/bin/sh" "${bash}/bin/sh"
   '';
   # grep '^#!/' -R . | grep -v /nix/store | less
   # (in nix-shell after patchPhase)

From 0e8ab1170898ea67d0bb8ecbb4e05260cfdc7855 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 10:32:53 +0000
Subject: [PATCH 0878/1386] ruqola: 2.7.2 -> 2.8.1

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

diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix
index ca6412a65467..5a29ac99dba5 100644
--- a/pkgs/by-name/ru/ruqola/package.nix
+++ b/pkgs/by-name/ru/ruqola/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ruqola";
-  version = "2.7.2";
+  version = "2.8.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = "ruqola";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ModByNU47fWsUUp7TTqgStFViTZy5ZXPYcrj0Rwrpc=";
+    hash = "sha256-+Ry4Ns+QHhgFJpVkDsbyfLt/aVvp2AZk/1dyrbOIH0A=";
   };
 
   nativeBuildInputs = [

From 9ac72d2b8d5a250ac7be4139d61f278fbf7f8937 Mon Sep 17 00:00:00 2001
From: Emilia Bopp <contact@ebopp.de>
Date: Wed, 15 Jul 2026 12:35:16 +0200
Subject: [PATCH 0879/1386] =?UTF-8?q?python3Packages.schwifty:=202026.07.0?=
 =?UTF-8?q?=20=E2=86=92=202026.07.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix
index 5c5c30a5e89a..3b1be2fa9372 100644
--- a/pkgs/development/python-modules/schwifty/default.nix
+++ b/pkgs/development/python-modules/schwifty/default.nix
@@ -23,15 +23,15 @@
 
 buildPythonPackage rec {
   pname = "schwifty";
-  version = "2026.07.0";
+  version = "2026.07.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname;
     # The version is different missing leading zeros in the CalVer month.
     # This is due to PyPI's normalization of integers
-    version = "2026.7.0";
-    hash = "sha256-ej/mSjACWqM1nm8zGhgSeOxCFHarll3wCXUA2d2+V8Y=";
+    version = "2026.7.1";
+    hash = "sha256-Rux0m5MQG5aBrEiQAEjalxdbabYWAU33qFSuN+rddEA=";
   };
 
   build-system = [

From 1501096c5fdf6dcc60ff0e6e48cf108bd549bf5d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 15 Jul 2026 13:56:41 +0300
Subject: [PATCH 0880/1386] musescore: fix 'New score' window crash

Fixes #540783.
---
 pkgs/by-name/mu/musescore/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix
index dae5ea43ad8a..b26f526f7d29 100644
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
 
   # nativeBuildInputs
   cmake,
@@ -45,6 +46,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-wWqFJkXLRi3JtnEW3STTG/jBBIQK1dIYPZdKCiBn0m0=";
   };
 
+  patches = [
+    # Fix for https://github.com/musescore/MuseScore/issues/34091 also reported
+    # downstream at: https://github.com/NixOS/nixpkgs/issues/540783. PR to
+    # track: https://github.com/musescore/MuseScore/pull/34204
+    (fetchpatch {
+      url = "https://github.com/musescore/MuseScore/commit/f273501e418842351c4bda10cce32b0e329eaff1.patch";
+      hash = "sha256-zrZRzeAHSFGtCuw/o4A3b1Blbo3FxKGxw1UDu9IggzY=";
+    })
+  ];
+
   cmakeFlags = [
     (lib.cmakeFeature "MUSE_APP_BUILD_MODE" "release")
     # Disable the build and usage of the `/bin/crashpad_handler` utility - it's

From 5bf1c5663dcff1288635a7c9294c4577bf89bff1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 15 Jul 2026 13:57:43 +0300
Subject: [PATCH 0881/1386] musescore: 4.7.3 -> 4.7.4

Diff: https://github.com/musescore/MuseScore/compare/v4.7.3...v4.7.4
---
 pkgs/by-name/mu/musescore/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix
index b26f526f7d29..76e90f3b9c30 100644
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "musescore";
-  version = "4.7.3";
+  version = "4.7.4";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wWqFJkXLRi3JtnEW3STTG/jBBIQK1dIYPZdKCiBn0m0=";
+    hash = "sha256-ny6s5hQUxopb6c45KJugYEZULkC8fLP+Au5ghic0KvI=";
   };
 
   patches = [

From 85bb72d912d3a7515c5b53f99893f782ddbcec04 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 15 Jul 2026 13:01:37 +0200
Subject: [PATCH 0882/1386] yosys: 0.62 -> 0.67

---
 pkgs/by-name/yo/yosys/package.nix | 95 ++++++++++++++-----------------
 1 file changed, 42 insertions(+), 53 deletions(-)

diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix
index 5c2d4cb9c020..042b9b49d5f4 100644
--- a/pkgs/by-name/yo/yosys/package.nix
+++ b/pkgs/by-name/yo/yosys/package.nix
@@ -5,12 +5,15 @@
 
   # nativeBuildInputs
   bison,
+  cmake,
   flex,
+  ninja,
   pkg-config,
-
-  # propagatedBuildInputs
-  libffi,
   python3,
+
+  # buildInputs
+  gtest,
+  libffi,
   readline,
   tcl,
   zlib,
@@ -62,85 +65,71 @@ let
   }
   // yosys-symbiflow;
 
+  pythonEnv = python3.withPackages (
+    pp:
+    with pp;
+    [ click ]
+    ++ lib.optionals enablePython [
+      pybind11
+      cxxheaderparser
+    ]
+  );
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "yosys";
-  version = "0.62";
+  version = "0.67";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "yosys";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FzvdjdAURB5iCkGwsYY6A2wP/Je/IW4AOd4kVOEOeVc=";
+    hash = "sha256-sJaekoBnLEn7j56duQOFMkT4fELHNgkYCbcY6E8hgyA=";
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    patchShebangs tests
+    substituteInPlace tests/aiger/generate_mk.py \
+      --replace-fail 'SHELL := /usr/bin/env bash' 'SHELL := ${stdenv.shell}'
+    # these plugin tests only work against the installed output, so skip them.
+    rm tests/various/plugin.sh tests/various/ezcmdline_plugin.sh
+  '';
+
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
     bison
+    cmake
     flex
+    ninja
     pkg-config
+    pythonEnv
   ];
 
-  propagatedBuildInputs = [
+  buildInputs = [
+    gtest
     libffi
     readline
     tcl
     zlib
-    (python3.withPackages (
-      pp: with pp; [
-        click
-        cxxheaderparser
-        pybind11
-      ]
-    ))
   ]
   ++ lib.optionals enablePython [
-    python3.pkgs.boost
+    python3
   ];
 
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "YOSYS_VER=${finalAttrs.version}"
+  cmakeFlags = [
+    (lib.cmakeBool "YOSYS_SKIP_ABC_SUBMODULE_CHECK" true)
+    (lib.cmakeFeature "YOSYS_CHECKOUT_INFO" "v${finalAttrs.version}")
+    # slang is not packaged yet.
+    (lib.cmakeBool "YOSYS_WITHOUT_SLANG" true)
+    (lib.cmakeBool "YOSYS_WITH_PYTHON" enablePython)
+  ]
+  ++ lib.optionals enablePython [
+    (lib.cmakeBool "YOSYS_INSTALL_PYTHON" true)
+    (lib.cmakeFeature "YOSYS_INSTALL_PYTHON_SITEDIR" "${placeholder "out"}/${python3.sitePackages}")
   ];
 
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace-fail 'GIT_REV := $(shell GIT_DIR=$(YOSYS_SRC)/.git git rev-parse --short=9 HEAD || echo UNKNOWN)' 'GIT_REV := v${finalAttrs.version}' \
-      --replace-fail 'GIT_DIRTY := $(shell GIT_DIR=$(YOSYS_SRC)/.git git diff --exit-code --quiet 2>/dev/null; if [ $$? -ne 0 ]; then echo "-dirty"; fi)' 'GIT_DIRTY := ""'
-
-    substituteInPlace Makefile \
-      --replace-fail "| check-git-abc" ""
-
-    substituteInPlace Makefile \
-      --replace-fail 'new=$$(cd abc 2>/dev/null && git rev-parse HEAD 2>/dev/null || echo none)' 'new=none'
-
-    sed -i 's/^YOSYS_VER :=.*/YOSYS_VER := ${finalAttrs.version}/' Makefile
-
-    patchShebangs tests ./misc/yosys-config.in
-  '';
-
-  preBuild = ''
-    chmod -R u+w .
-    make config-${if stdenv.cc.isClang or false then "clang" else "gcc"}
-
-    if ! grep -q "YOSYS_VER := ${finalAttrs.version}" Makefile; then
-      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package, failing."
-      exit 1
-    fi
-  ''
-  + lib.optionalString enablePython ''
-    echo "PYOSYS_USE_UV := 0" >> Makefile.conf
-    echo "ENABLE_PYOSYS := 1" >> Makefile.conf
-    echo "PYTHON_DESTDIR := $out/${python3.sitePackages}" >> Makefile.conf
-    echo "BOOST_PYTHON_LIB := -lboost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" >> Makefile.conf
-  '';
-
-  preCheck = ''
-    tests/tools/autotest.sh
-  '';
-
   checkTarget = "test";
   doCheck = true;
   nativeCheckInputs = [

From d3c939d0feca66755d86ed5060a3515905041497 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 14:45:17 +0000
Subject: [PATCH 0883/1386] nanoarrow: fix build with c++20

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff | 13 +++++++++++++
 pkgs/by-name/na/nanoarrow/package.nix              |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff

diff --git a/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff
new file mode 100644
index 000000000000..ee8d2dcfa412
--- /dev/null
+++ b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff
@@ -0,0 +1,13 @@
+diff --git i/meson.build w/meson.build
+index 5c3032d..5ec2e56 100644
+--- i/meson.build
++++ w/meson.build
+@@ -22,7 +22,7 @@ project(
+     version: '0.8.0',
+     license: 'Apache-2.0',
+     meson_version: '>=0.58.0',
+-    default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++17'],
++    default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++20'],
+ )
+ 
+ cc = meson.get_compiler('c')
diff --git a/pkgs/by-name/na/nanoarrow/package.nix b/pkgs/by-name/na/nanoarrow/package.nix
index 07b48bdb0dbf..862f2ce0bff3 100644
--- a/pkgs/by-name/na/nanoarrow/package.nix
+++ b/pkgs/by-name/na/nanoarrow/package.nix
@@ -30,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
     tag = "apache-arrow-nanoarrow-${finalAttrs.version}";
     hash = "sha256-1iLbT1eeyZaoB75uYTgg4qns+C7b4DErqMwJ9nQPRls=";
   };
+  patches = [
+    # Fixes an issue between our `arrow-cpp` and this version of `nanoarrow`.
+    # Not applicable for upstreaming so it seems. See discussion:
+    # https://github.com/apache/arrow-nanoarrow/issues/902
+    ./cpp20-arrow-cpp-fix.diff
+  ];
 
   nativeBuildInputs = [
     meson

From c74b782bcf02b00e9747c12aed7d5a400f2d4041 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 15 Jul 2026 13:05:12 +0200
Subject: [PATCH 0884/1386] yosys-bluespec: fix build with yosys 0.67

---
 pkgs/development/compilers/yosys/plugins/bluespec.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/compilers/yosys/plugins/bluespec.nix b/pkgs/development/compilers/yosys/plugins/bluespec.nix
index 4379a5a16394..84a31eb5b12f 100644
--- a/pkgs/development/compilers/yosys/plugins/bluespec.nix
+++ b/pkgs/development/compilers/yosys/plugins/bluespec.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation {
     sha256 = "sha256-3cNFP/k4JsgLyUQHWU10Htl2Rh0staAcA3R4piD6hDE=";
   };
 
+  # yosys >=0.67 headers require C++20; the Makefile otherwise pins c++17.
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail '-std=c++17' '-std=c++20'
+  '';
+
   buildInputs = [
     yosys
     readline

From edc7beb2db9614964459226f3755de03d0c74c1f Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 15 Jul 2026 13:10:48 +0200
Subject: [PATCH 0885/1386] yosys-symbiflow: mark as broken

---
 pkgs/development/compilers/yosys/plugins/symbiflow.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index 30bff56df4fc..b694a641af2b 100644
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@@ -103,6 +103,8 @@ lib.genAttrs plugins (
       description = "Symbiflow ${plugin} plugin for Yosys";
       license = lib.licenses.isc;
       platforms = lib.platforms.all;
+      # incompatible with yosys >= 0.67
+      broken = true;
       maintainers = with lib.maintainers; [
         ollieB
         thoughtpolice

From 2ff20dc81559ca1bab8f4400039326e8d78d9a02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 11:14:43 +0000
Subject: [PATCH 0886/1386] python3Packages.python-duco-connectivity: 0.7.1 ->
 0.8.0

---
 .../python-modules/python-duco-connectivity/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-duco-connectivity/default.nix b/pkgs/development/python-modules/python-duco-connectivity/default.nix
index aef185b4713f..bd2dd8d5ed66 100644
--- a/pkgs/development/python-modules/python-duco-connectivity/default.nix
+++ b/pkgs/development/python-modules/python-duco-connectivity/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-duco-connectivity";
-  version = "0.7.1";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ronaldvdmeer";
     repo = "python-duco-connectivity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Txm7l7fVkEcUIX2J5CEF3OLLgTiT9O/xva0tSCCMZpI=";
+    hash = "sha256-b0tjx/0GCHJxWDJmRcMwfLGWMphyfocdQNyojWyaVZo=";
   };
 
   build-system = [ setuptools ];

From ba67162c8a4837f6f0604c5c15dfe676f07df451 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 13:18:58 +0200
Subject: [PATCH 0887/1386] python3Packages.seekpath: 2.2.0 -> 2.2.1

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/development/python-modules/seekpath/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
index 45b2b2eef4a0..e526b3c01bf3 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "seekpath";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "giovannipizzi";
+    owner = "materialscloud-org";
     repo = "seekpath";
     tag = "v${version}";
-    hash = "sha256-mrutQCSSiiLPt0KEohZeYcQ8aw2Jhy02bEvn6Of8w6U=";
+    hash = "sha256-yz9IX68AmFP8P8uzZMKa4d/pdzbOm0IcQsZMvC7MuSU=";
   };
 
   env.LC_ALL = "en_US.utf-8";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Module to obtain and visualize band paths in the Brillouin zone of crystal structures";
-    homepage = "https://github.com/giovannipizzi/seekpath";
+    homepage = "https://github.com/materialscloud-org/seekpath";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ psyanticy ];
   };

From a486360f0b6cf41c577dc38ad3690eee43e7de49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 11:22:35 +0000
Subject: [PATCH 0888/1386] tsx: 4.23.0 -> 4.23.1

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

diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix
index aea6ac539008..542ddc058ac4 100644
--- a/pkgs/by-name/ts/tsx/package.nix
+++ b/pkgs/by-name/ts/tsx/package.nix
@@ -15,13 +15,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "tsx";
-  version = "4.23.0";
+  version = "4.23.1";
 
   src = fetchFromGitHub {
     owner = "privatenumber";
     repo = "tsx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-De/l8Z7+VAwkOZmAZZumqJBIMrDNhY9DM0fh4LuTWZM=";
+    hash = "sha256-zR3a3AZLPYmnIeiT0SNwN6gVcnR4ObzJsfj7aQ8LOkQ=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm';
     fetcherVersion = 3;
-    hash = "sha256-kd28ZK1c7a/h7ZNf0fQuJdNUiuvJ1a9qvQut4Ms4xuo=";
+    hash = "sha256-jnCz9u+UMGV20t6fhzk/rVq68K+e5eBvUth6O7jOpQg=";
   };
 
   nativeBuildInputs = [

From 5dcfb7a710220ce9df79ee7e7c64db6dcacb2ab9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 11:23:26 +0000
Subject: [PATCH 0889/1386] supabase-cli: 2.109.0 -> 2.109.1

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

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index fd128ad3a71b..851827cff5e7 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "supabase-cli";
-  version = "2.109.0";
+  version = "2.109.1";
 
   __structuredAttrs = true;
 
@@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
     owner = "supabase";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5AfSH69poNnUlK7oT9W5k37DjcitCOSJEPBtnRMUqVc=";
+    hash = "sha256-wTqvbcYC2QeeUXUzkmvUin0oXulmhMXIiyNCXaWqPSQ=";
   };
 
   # Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli.
   sourceRoot = "${finalAttrs.src.name}/apps/cli-go";
 
-  vendorHash = "sha256-yHNtzzdYhCgBSb/VwGe2cqmZwNNwrKLVg2RVE0Nwq1M=";
+  vendorHash = "sha256-qfQgcdRv4GHmZWQWth3Hqknlr9yCjRkZFO0p2jeZG0A=";
 
   ldflags = [
     "-s"

From 17d6e0648bb80467d565485ae80561486be2a196 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 15 Jul 2026 14:25:56 +0300
Subject: [PATCH 0890/1386] nixos/networkd-dispatcher: fix warning to actually
 be correct

---
 nixos/modules/services/networking/networkd-dispatcher.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix
index adc948104da3..e2f766463e38 100644
--- a/nixos/modules/services/networking/networkd-dispatcher.nix
+++ b/nixos/modules/services/networking/networkd-dispatcher.nix
@@ -93,8 +93,8 @@ in
 
   config = mkIf cfg.enable {
 
-    warnings = mkIf (!config.networking.useNetworkd) [
-      "services.networkd-dispatcher will not execute any scripts unless networking.useNetworkd is enabled."
+    warnings = mkIf (!config.systemd.network.enable) [
+      "services.networkd-dispatcher will not execute any scripts unless networkd is enabled, either via `systemd.network.enable` or via `networking.useNetworkd`."
     ];
 
     systemd = {

From be7ac8d1cd49c6503a0fccc18939d6b4d64a6d7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 11:41:30 +0000
Subject: [PATCH 0891/1386] spread: 0-unstable-2025-02-06 -> 2026.07.12

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

diff --git a/pkgs/by-name/sp/spread/package.nix b/pkgs/by-name/sp/spread/package.nix
index bed3d7d354c7..9b1515cc4953 100644
--- a/pkgs/by-name/sp/spread/package.nix
+++ b/pkgs/by-name/sp/spread/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule {
   pname = "spread";
-  version = "0-unstable-2025-02-06";
+  version = "2026.07.12";
 
   src = fetchFromGitHub {
     owner = "snapcore";

From 5b3fb02758dea3d89da7afbeadf9d3484fa87ac3 Mon Sep 17 00:00:00 2001
From: Simon Leiner <simon@leiner.me>
Date: Wed, 15 Jul 2026 13:34:20 +0200
Subject: [PATCH 0892/1386] helm-secrets: Fix CLI compatibility with Helm v4

While introducing support for Helm v4, helm-secrets has split
up into multiple plugins [1], with the the v4-compatible
manifest residing at "plugins/helm-secrets-cli/plugin.yaml"
[2] in the source repo, while the manifest in the root
directory [3] is compatible to Helm v3, not v4.

This patch is minimally invasive and only restores the CLI;
getter and post-renderer do not become available through this.

[1]: https://github.com/jkroepke/helm-secrets/wiki/Installation#helm-4
[2]: https://github.com/jkroepke/helm-secrets/blob/main/plugins/helm-secrets-cli/plugin.yaml
[3]: https://github.com/jkroepke/helm-secrets/blob/main/plugin.yaml

Fixes: https://github.com/NixOS/nixpkgs/issues/536239
---
 .../networking/cluster/helm/plugins/helm-secrets.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index 6395244fe708..7b23822646e0 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     install -dm755 $out/helm-secrets $out/helm-secrets/scripts
-    install -m644 -Dt $out/helm-secrets plugin.yaml
-    cp -r scripts/* $out/helm-secrets/scripts
+    install -m644 -Dt $out/helm-secrets plugins/helm-secrets-cli/plugin.yaml
+    cp -r plugins/helm-secrets-cli/scripts/* $out/helm-secrets/scripts
     wrapProgram $out/helm-secrets/scripts/run.sh \
         --prefix PATH : ${
           lib.makeBinPath [

From defc71f0efe7829845c0f93b272285874c83aed8 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 15 Jul 2026 13:45:12 +0200
Subject: [PATCH 0893/1386] lazygit: 0.63.0 -> 0.63.1

Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.63.1
Diff: https://github.com/jesseduffield/lazygit/compare/v0.63.0...v0.63.1
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index a11eacfd6409..27bf48fb73a8 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lazygit";
-  version = "0.63.0";
+  version = "0.63.1";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WDGYS2W0FCIDoayafzUjcwTAW+v2jxfJo54kaM6ymCE=";
+    hash = "sha256-vcpd04DEHmtEJtOOYohxHUgNtQfiChErWmNiQle8pvc=";
   };
 
   vendorHash = null;

From af9b23694821dcabf121681a98437e76722e0536 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 11:58:24 +0000
Subject: [PATCH 0894/1386] slint-lsp: 1.17.0 -> 1.17.1

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

diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index f477b22e8125..afdab4339a91 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -18,14 +18,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-lsp";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-6TwEB3t0vwDnvGmZU1LSIkYbA02NEyVI4wbEeqYbatM=";
+    hash = "sha256-GAy2D2eEx2NYEXx/x4z+43CbRV7gWwY2Sgd9iAK6T2Y=";
   };
 
-  cargoHash = "sha256-RTWfR/RmijSj5DlS+9tJ6uG534NmG5jy+p1hliEsdiE=";
+  cargoHash = "sha256-4Cs+ezxoBeeGeUcJK0ury63zW0AJADDZk/zhIeJV6Uc=";
 
   rpathLibs = [
     fontconfig

From e8c1d8bffa93c98f4c1d19bb84877140ccfb5295 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 12:05:17 +0000
Subject: [PATCH 0895/1386] pods: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 7838c7c3c75c..efe8edd68f3b 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -23,18 +23,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pods";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "marhkb";
     repo = "pods";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-50NOkLffLbs5/qug6xzoSWSMZ3+/Lau9sTPi9za4+LA=";
+    hash = "sha256-GMFrcWFozRR0G0+7g5JJyMkWzPY79cVF4Go1Wd/4HtA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-JbYJQdli3OAxnbGApVe5+KAAcGePTTH59fdXdFx0+hA=";
+    hash = "sha256-P0teC048Z61pMrl5cvlvrGaPcccxTki/AIthyzQusGI=";
   };
 
   nativeBuildInputs = [

From 1df2a4c729309228f605266ea7acc430fa06c9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= <git@nicomem.com>
Date: Mon, 27 Apr 2026 18:08:53 +0200
Subject: [PATCH 0896/1386] nixos/authelia: Make secrets available to the
 service even if not readable by the authelia user

---
 .../manual/release-notes/rl-2611.section.md   |  2 +
 nixos/modules/services/security/authelia.nix  | 44 +++++++++++--------
 nixos/tests/authelia.nix                      |  2 -
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index 5eec5286eb9f..d9de29b0c06e 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -142,6 +142,8 @@
 
 - The `newuidmap` and `newgidmap` security wrappers are now installed with `cap_setuid`/`cap_setgid` file capabilities instead of the setuid-root bit, matching shadow's `--with-fcaps` install mode and other major distributions. Rootless containers (podman, docker-rootless, unprivileged user namespaces) are unaffected. The only behavioural change is that mapping host uid 0 via `/etc/subuid` (which NixOS never configures by default) additionally requires `cap_setfcap`; users who explicitly grant uid 0 in a subuid range can restore the previous behaviour with `security.wrappers.newuidmap.capabilities = lib.mkForce "cap_setuid,cap_setfcap+ep";`.
 
+- The `authelia` module now uses systemd's `LoadCredential` to load all files defined in `secrets`. As such, these files no longer need to be readable by the authelia user and group: they can for example be set to be only readable by the root user.
+
 - `zoneminder` has been updated to 1.38.x release. See [upstream release note](https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.0). While database migration should happen automatically, it's recommended that you make a backup of the database before upgrading your system.
 
 - The latest available version of Nextcloud is v34 (available as `pkgs.nextcloud34`). The installation logic is as follows:
diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix
index f8bcc4bb15b9..5fe0d6bc23e3 100644
--- a/nixos/modules/services/security/authelia.nix
+++ b/nixos/modules/services/security/authelia.nix
@@ -268,15 +268,6 @@ let
       };
     };
 
-  writeOidcJwksConfigFile =
-    oidcIssuerPrivateKeyFile:
-    pkgs.writeText "oidc-jwks.yaml" ''
-      identity_providers:
-        oidc:
-          jwks:
-            - key: {{ secret "${oidcIssuerPrivateKeyFile}" | mindent 10 "|" | msquote }}
-    '';
-
   # Remove an attribute in a nested set
   # https://discourse.nixos.org/t/modify-an-attrset-in-nix/29919/5
   removeAttrByPath =
@@ -362,7 +353,12 @@ in
           execCommand = "${instance.package}/bin/authelia";
           configFile = format.generate "config.yml" cleanedSettings;
           oidcJwksConfigFile = lib.optional (instance.secrets.oidcIssuerPrivateKeyFile != null) (
-            writeOidcJwksConfigFile instance.secrets.oidcIssuerPrivateKeyFile
+            pkgs.writeText "oidc-jwks.yaml" ''
+              identity_providers:
+                oidc:
+                  jwks:
+                    - key: {{ mustEnv "CREDENTIALS_DIRECTORY" | printf "%s/oidcIssuerPrivateKeyFile" | secret | mindent 10 "|" | msquote }}
+            ''
           );
           configArg = "--config ${
             builtins.concatStringsSep "," (
@@ -373,21 +369,25 @@ in
               ]
             )
           }";
+          # Mapping between the Authelia env variables and the secret keys defined in the module
+          envSecretsMap = {
+            AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE = "jwtSecretFile";
+            AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE = "storageEncryptionKeyFile";
+            AUTHELIA_SESSION_SECRET_FILE = "sessionSecretFile";
+            AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET_FILE = "oidcHmacSecretFile";
+          };
+          nonNullEnvSecretsMap = lib.filterAttrs (_: v: instance.secrets.${v} != null) envSecretsMap;
         in
         {
           description = "Authelia authentication and authorization server";
           wantedBy = [ "multi-user.target" ];
           after = [ "network-online.target" ]; # Checks SMTP notifier creds during startup
           wants = [ "network-online.target" ];
-          environment =
-            (lib.filterAttrs (_: v: v != null) {
-              X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template";
-              AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE = instance.secrets.jwtSecretFile;
-              AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE = instance.secrets.storageEncryptionKeyFile;
-              AUTHELIA_SESSION_SECRET_FILE = instance.secrets.sessionSecretFile;
-              AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET_FILE = instance.secrets.oidcHmacSecretFile;
-            })
-            // instance.environmentVariables;
+          environment = {
+            X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template";
+          }
+          // lib.mapAttrs (_: v: "%d/${v}") nonNullEnvSecretsMap
+          // instance.environmentVariables;
 
           preStart = "${execCommand} ${configArg} validate-config";
           serviceConfig = {
@@ -399,6 +399,12 @@ in
             StateDirectory = autheliaName instance.name;
             StateDirectoryMode = "0700";
 
+            LoadCredential =
+              lib.optional (
+                instance.secrets.oidcIssuerPrivateKeyFile != null
+              ) "oidcIssuerPrivateKeyFile:${instance.secrets.oidcIssuerPrivateKeyFile}"
+              ++ lib.mapAttrsToList (_: v: "${v}:${instance.secrets.${v}}") nonNullEnvSecretsMap;
+
             # Security options:
             AmbientCapabilities = "";
             CapabilityBoundingSet = "";
diff --git a/nixos/tests/authelia.nix b/nixos/tests/authelia.nix
index 98abca0fbc57..256c92cd706e 100644
--- a/nixos/tests/authelia.nix
+++ b/nixos/tests/authelia.nix
@@ -28,12 +28,10 @@
         # This is purely for testing purposes!
         environment.etc."authelia/storageEncryptionKeyFile" = {
           mode = "0400";
-          user = "authelia-testing";
           text = "you_must_generate_a_random_string_of_more_than_twenty_chars_and_configure_this";
         };
         environment.etc."authelia/jwtSecretFile" = {
           mode = "0400";
-          user = "authelia-testing";
           text = "a_very_important_secret";
         };
         environment.etc."authelia/users_database.yml" = {

From d1039f17b547a4ba504b073a75dbeb6c02519729 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 15 Jul 2026 14:13:15 +0200
Subject: [PATCH 0897/1386] glasgow: fix build

---
 pkgs/by-name/gl/glasgow/package.nix | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix
index 9c9a4c44f328..ef05b07e02b4 100644
--- a/pkgs/by-name/gl/glasgow/package.nix
+++ b/pkgs/by-name/gl/glasgow/package.nix
@@ -2,13 +2,30 @@
   lib,
   python3,
   fetchFromGitHub,
+  fetchPypi,
   sdcc,
   yosys,
   icestorm,
   nextpnr,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  # glasgow uses importlib_resources' open_text(), removed in 7.x; pin it to 6.x.
+  pythonPackages = python3.pkgs.overrideScope (
+    final: prev: {
+      importlib-resources = prev.importlib-resources.overridePythonAttrs (old: rec {
+        version = "6.5.2";
+        src = fetchPypi {
+          pname = "importlib_resources";
+          inherit version;
+          hash = "sha256-GF+Hre9bzCiESdmPtPugfOp4vANkVd1ExfxKL+eP7Sw=";
+        };
+        doCheck = false;
+      });
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
   pname = "glasgow";
   version = "0-unstable-2025-12-22";
   # Similar to `pdm show`, but without the commit counter
@@ -36,10 +53,10 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   build-system = [
-    python3.pkgs.pdm-backend
+    pythonPackages.pdm-backend
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with pythonPackages; [
     aiohttp
     amaranth
     cobs
@@ -54,7 +71,7 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = [
     # pytestCheckHook discovers way less tests
-    python3.pkgs.unittestCheckHook
+    pythonPackages.unittestCheckHook
     icestorm
     nextpnr
     yosys
@@ -67,10 +84,10 @@ python3.pkgs.buildPythonApplication rec {
   __darwinAllowLocalNetworking = true;
 
   preBuild = ''
-    make -C firmware GIT_REV_SHORT=${firmwareGitRev} LIBFX2=${python3.pkgs.fx2}/share/libfx2
+    make -C firmware GIT_REV_SHORT=${firmwareGitRev} LIBFX2=${pythonPackages.fx2}/share/libfx2
 
     # Normalize the .ihex file, see ./software/deploy-firmware.sh.
-    ${python3.withPackages (p: [ p.fx2 ])}/bin/python firmware/normalize.py \
+    ${pythonPackages.python.withPackages (p: [ p.fx2 ])}/bin/python firmware/normalize.py \
       firmware/glasgow.ihex firmware/glasgow.ihex
 
     # Ensure the compiled firmware is exactly the same as the one shipped in the repo.

From 958b882e67d03511a08d7defc8851a9cbcfe299e Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 15 Jul 2026 19:19:19 +0700
Subject: [PATCH 0898/1386] python3Packages.dbf: use pytestCheckHook

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

diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 3eef542370a1..f1af77599783 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   setuptools,
   aenum,
+  pytestCheckHook,
   python,
 }:
 
@@ -27,12 +28,14 @@ buildPythonPackage (finalAttrs: {
 
   dependencies = [ aenum ];
 
-  checkPhase = ''
-    runHook preCheck
-    ${python.interpreter} -m dbf.test
-    runHook postCheck
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    sed -i '/^import tempfile$/a tempdir = tempfile.mkdtemp()' dbf/test.py
   '';
 
+  enabledTestPaths = [ "dbf/test.py" ];
+
   pythonImportsCheck = [ "dbf" ];
 
   meta = {

From 5ff3683a69af51c0bd206e9591e9875e32c93573 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:03:50 +0200
Subject: [PATCH 0899/1386] skalibs: 2.15.0.0 -> 2.15.1.0

---
 pkgs/development/skaware-packages/skalibs/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index 9d0c622612dd..1a3ee89624c8 100644
--- a/pkgs/development/skaware-packages/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "skalibs";
-  version = "2.15.0.0";
-  sha256 = "sha256-f96W6K+0GRWToVMoiD6cdybJaJHPBxIiFGgh6Mh/gAc=";
+  version = "2.15.1.0";
+  sha256 = "sha256-+ckF50k1xv6RHH40Tj6J1fvSAUwaBGULUksVzptWNdE=";
 
   description = "Set of general-purpose C programming libraries";
 
@@ -50,6 +50,8 @@ skawarePackages.buildPackage {
     # child has successfully exec'ed. That happens with old glibcs
     # and some virtual platforms.
     "--with-sysdep-posixspawnearlyreturn=no"
+
+    "--with-sysdep-selectinfinite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
   ];
 
   postInstall = ''

From 6f57884abc37d750c90c2010d0b7edb0a3fdc52f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:04:04 +0200
Subject: [PATCH 0900/1386] execline: 2.9.9.1 -> 2.9.9.2

---
 pkgs/development/skaware-packages/execline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index f47dd73b295f..f49e79712c38 100644
--- a/pkgs/development/skaware-packages/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
@@ -7,14 +7,14 @@
 }:
 
 let
-  version = "2.9.9.1";
+  version = "2.9.9.2";
 in
 skawarePackages.buildPackage {
   inherit version;
 
   pname = "execline";
   # ATTN: also check whether there is a new manpages version
-  sha256 = "sha256-vmNTMpepPDb9JnGVEXtOZoaHpSb4NFF6jbR9hbbH7Go=";
+  sha256 = "sha256-kI7U2zprOiOiBdj9TPKnEIkVbyrq4PVGVgRar60t7jI=";
 
   # Maintainer of manpages uses following versioning scheme: for every
   # upstream $version he tags manpages release as ${version}.1, and,

From 911b4c771eb5596e4e5380470f36b5812dd1a59c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:04:50 +0200
Subject: [PATCH 0901/1386] s6: 2.15.0.0 -> 2.15.1.0

Closes: https://github.com/NixOS/nixpkgs/issues/529958
---
 pkgs/development/skaware-packages/s6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix
index d88a808762db..8fb427878dae 100644
--- a/pkgs/development/skaware-packages/s6/default.nix
+++ b/pkgs/development/skaware-packages/s6/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6";
-  version = "2.15.0.0";
-  sha256 = "sha256-J9/3PWJihVQBM+B151iHCH9RF/1R3llQPvfSnpb2nkw=";
+  version = "2.15.1.0";
+  sha256 = "sha256-6rnEbiK2axYTX5oF7Gig6ih9kGC4TRDe+qosqtFYq1I=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-man-pages";

From ce53fe45eb3e32a94bd9d5c4bc65b55d21a55c0d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:12 +0200
Subject: [PATCH 0902/1386] nsss: 0.2.1.2 -> 0.2.1.3

---
 pkgs/development/skaware-packages/nsss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix
index 9432e8293649..f10e1cc4454a 100644
--- a/pkgs/development/skaware-packages/nsss/default.nix
+++ b/pkgs/development/skaware-packages/nsss/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "nsss";
-  version = "0.2.1.2";
-  sha256 = "sha256-zKpz6QUJ8/pbUq+F2QIDumKMFsna7TTFQmea52gfEGc=";
+  version = "0.2.1.3";
+  sha256 = "sha256-FNpESoNtJLaihvrIilAr2qKWpNMo8J1Sl1aK07PgJoU=";
 
   description = "Implementation of a subset of the pwd.h, group.h and shadow.h family of functions";
 

From 81db60c21f8dc06d70ddf8d0c2007b938536b611 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:25 +0200
Subject: [PATCH 0903/1386] s6-dns: 2.4.1.2 -> 2.4.1.3

Closes: https://github.com/NixOS/nixpkgs/pull/542037
---
 pkgs/development/skaware-packages/s6-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix
index ee0c7878533e..df5d39f1b5cf 100644
--- a/pkgs/development/skaware-packages/s6-dns/default.nix
+++ b/pkgs/development/skaware-packages/s6-dns/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-dns";
-  version = "2.4.1.2";
-  sha256 = "sha256-BhjYgw/OY+4Xt/VeSUKAachcl6FxCCensjSbZgzTOk4=";
+  version = "2.4.1.3";
+  sha256 = "sha256-+enetGSMVQeoSFVINkvRxW2r2jlLye4tfxy7FqA2zXY=";
 
   description = "Suite of DNS client programs and libraries for Unix systems";
 

From ff375817b423dd9b35e9e74a5ceb88db8540e1bb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:37 +0200
Subject: [PATCH 0904/1386] s6-linux-init: 1.2.0.1 -> 1.2.0.2

---
 pkgs/development/skaware-packages/s6-linux-init/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix
index ff8137aa19ec..03b79d9ad513 100644
--- a/pkgs/development/skaware-packages/s6-linux-init/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-linux-init";
-  version = "1.2.0.1";
-  sha256 = "sha256-ctWbE2g9E5D335ooa+Rn5zKTQWAhr5+hAjySk+xcfXw=";
+  version = "1.2.0.2";
+  sha256 = "sha256-b60BTaFiwMgZJBl8V9FuGnXBM7NKIOQjQxobdB6Qex0=";
 
   description = "Set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
   platforms = lib.platforms.linux;

From 7bb3b889d1627f47c9e7ff8d610e20c688c1c8d3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:50 +0200
Subject: [PATCH 0905/1386] s6-networking: 2.8.0.0 -> 2.8.0.1

---
 pkgs/development/skaware-packages/s6-networking/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix
index 79a133fc8886..344ad98aa42b 100644
--- a/pkgs/development/skaware-packages/s6-networking/default.nix
+++ b/pkgs/development/skaware-packages/s6-networking/default.nix
@@ -25,8 +25,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 
 skawarePackages.buildPackage {
   pname = "s6-networking";
-  version = "2.8.0.0";
-  sha256 = "sha256-rE9lhA/OwWJPe/nGMvtAVThRvJApV/+VayofIoGkXNQ=";
+  version = "2.8.0.1";
+  sha256 = "sha256-bwEcM7oFhs5Y/u4M+FSgsIfpCC/b0kq7eGFIRjgw80E=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-networking-man-pages";

From a5662f4e9265bf468e3b6d07091c129359722174 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:57 +0200
Subject: [PATCH 0906/1386] s6-rc: 0.6.1.1 -> 0.7.0.0

---
 pkgs/development/skaware-packages/s6-rc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix
index 63c5cda8cf3d..69f1b2034a04 100644
--- a/pkgs/development/skaware-packages/s6-rc/default.nix
+++ b/pkgs/development/skaware-packages/s6-rc/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-rc";
-  version = "0.6.1.1";
-  sha256 = "sha256-tU8iajW+HuVqIovxpMOUN/ByvGTmnb81bnM+YGqGQC0=";
+  version = "0.7.0.0";
+  sha256 = "sha256-v1uM4NpaTucNZCuBi2HZkWp6m2SkV1lfOIET5UoYhog=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-rc-man-pages";

From ab2de20c98e8b280ecc8b5fd0a47eec8af55f637 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:06:06 +0200
Subject: [PATCH 0907/1386] tipidee: 0.0.7.2 -> 0.0.8.0

Closes: https://github.com/NixOS/nixpkgs/pull/542011
---
 pkgs/development/skaware-packages/tipidee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix
index 6e8d07841ef8..245417379777 100644
--- a/pkgs/development/skaware-packages/tipidee/default.nix
+++ b/pkgs/development/skaware-packages/tipidee/default.nix
@@ -6,8 +6,8 @@
 
 skawarePackages.buildPackage {
   pname = "tipidee";
-  version = "0.0.7.2";
-  sha256 = "sha256-x34St9s/3FbcI9s3ncpmhhbnQmA/6Gf6K9yNTxrKj5s=";
+  version = "0.0.8.0";
+  sha256 = "sha256-GjllM2YqxwvCsKC4xlYW/6f6IBUIhZMA67mtM82mEC0=";
 
   description = "HTTP 1.1 webserver, serving static files and CGI/NPH";
 

From d616968d1b6727df9933e7b7f0c17b6975cd19c3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:06:12 +0200
Subject: [PATCH 0908/1386] utmps: 0.1.3.3 -> 0.1.3.4

Closes: https://github.com/NixOS/nixpkgs/pull/542010
---
 pkgs/development/skaware-packages/utmps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix
index 37a375380465..70b5e138a0ed 100644
--- a/pkgs/development/skaware-packages/utmps/default.nix
+++ b/pkgs/development/skaware-packages/utmps/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "utmps";
-  version = "0.1.3.3";
-  sha256 = "sha256-4iEr0C/hdzBCT39eMKTd5x0IYqUrI9i3Ke7XRCCjSaI=";
+  version = "0.1.3.4";
+  sha256 = "sha256-EtzBAq1qyB+BrsxJUHM9uU81CBlHBUubFHPKxckIELw=";
 
   description = "Secure utmpx and wtmp implementation";
 

From 8f70fa9f591b9195b9c907a08e36f1caeefd723b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:27:11 +0200
Subject: [PATCH 0909/1386] Reapply "sdnotify-wrapper: drop"

This reverts commit 09384d7270eed91a1eac560ad312b0b599a22b78.
---
 nixos/modules/services/desktops/seatd.nix     |   3 +-
 pkgs/development/skaware-packages/default.nix |  10 +-
 .../sdnotify-wrapper/default.nix              |  47 -----
 .../sdnotify-wrapper/sdnotify-wrapper.c       | 174 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   1 -
 6 files changed, 10 insertions(+), 226 deletions(-)
 delete mode 100644 pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
 delete mode 100644 pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c

diff --git a/nixos/modules/services/desktops/seatd.nix b/nixos/modules/services/desktops/seatd.nix
index bedcc9a43120..939b9f338af9 100644
--- a/nixos/modules/services/desktops/seatd.nix
+++ b/nixos/modules/services/desktops/seatd.nix
@@ -40,7 +40,6 @@ in
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       seatd
-      sdnotify-wrapper
     ];
     users.groups.seat = lib.mkIf (cfg.group == "seat") { };
 
@@ -55,7 +54,7 @@ in
         Type = "notify";
         NotifyAccess = "all";
         SyslogIdentifier = "seatd";
-        ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
+        ExecStart = "${lib.getExe' pkgs.s6 "s6-notify-socket-from-fd"} ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
         RestartSec = 1;
         Restart = "always";
       };
diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix
index b0877ada8c36..0ae8c4d43865 100644
--- a/pkgs/development/skaware-packages/default.nix
+++ b/pkgs/development/skaware-packages/default.nix
@@ -1,4 +1,8 @@
-{ lib, pkgs }:
+{
+  lib,
+  pkgs,
+  config,
+}:
 
 lib.makeScope pkgs.newScope (
   self:
@@ -22,7 +26,6 @@ lib.makeScope pkgs.newScope (
     # libs
     skalibs = callPackage ./skalibs { };
     skalibs_2_10 = callPackage ./skalibs/2_10.nix { };
-    sdnotify-wrapper = callPackage ./sdnotify-wrapper { };
 
     # s6 tooling
     s6 = callPackage ./s6 { };
@@ -40,4 +43,7 @@ lib.makeScope pkgs.newScope (
     s6-portable-utils-man-pages = self.s6-portable-utils.passthru.manpages;
     s6-rc-man-pages = self.s6-rc.passthru.manpages;
   }
+  // lib.optionalAttrs config.allowAliases {
+    sdnotify-wrapper = throw "sdnotify-wrapper has been removed in favour of s6-notify-socket-from-fd in the s6 package";
+  }
 )
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
deleted file mode 100644
index d9fa940a3294..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  runCommandCC,
-  skalibs,
-}:
-
-let
-  # From https://skarnet.org/software/misc/sdnotify-wrapper.c,
-  # which is unversioned.
-  src = ./sdnotify-wrapper.c;
-
-in
-runCommandCC "sdnotify-wrapper"
-  {
-
-    outputs = [
-      "bin"
-      "doc"
-      "out"
-    ];
-
-    meta = {
-      homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c";
-      description = "Use systemd sd_notify without having to link against libsystemd";
-      mainProgram = "sdnotify-wrapper";
-      platforms = lib.platforms.linux;
-      license = lib.licenses.isc;
-      maintainers = with lib.maintainers; [ Profpatsch ];
-    };
-
-  }
-  ''
-    mkdir -p $bin/bin
-    mkdir $out
-
-    # the -lskarnet has to come at the end to support static builds
-    $CC \
-      -o $bin/bin/sdnotify-wrapper \
-      -I${skalibs.dev}/include \
-      -L${skalibs.lib}/lib \
-      ${src} \
-      -lskarnet
-
-    mkdir -p $doc/share/doc/sdnotify-wrapper
-    # copy the documentation comment
-    sed -ne '/Usage:/,/*\//p' ${src} > $doc/share/doc/sdnotify-wrapper/README
-  ''
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
deleted file mode 100644
index 00ede0b2d706..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-   Copyright: (C)2015-2020 Laurent Bercot.  http://skarnet.org/
-   ISC license. See http://opensource.org/licenses/ISC
-
-   Build-time requirements: skalibs.  https://skarnet.org/software/skalibs/
-   Run-time requirements: none, if you link skalibs statically.
-
-   Compilation:
-     gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet
-   Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically.
-   Adapt gcc's -I and -L options to your skalibs installation paths.
-
-   Usage: if a daemon would be launched by systemd as "foobard args...",
-   launch it as "sdnotify-wrapper foobard args..." instead, and you can now
-   tell systemd that this daemon supports readiness notification.
-
-   Instead of using sd_notify() and having to link against the systemd
-   library, the daemon notifies readiness by writing whatever it wants
-   to a file descriptor (by default: stdout), then a newline. (Then it
-   should close that file descriptor.) The simplest way is something like
-   int notify_readiness() { write(1, "\n", 1) ; close(1) ; }
-   This mechanism is understandable by any notification readiness framework.
-
-   Readiness notification occurs when the newline is written, not when
-   the descriptor is closed; but since sdnotify-wrapper stops reading
-   after the first newline and will exit, any subsequent writes will
-   fail and it's best to simply close the descriptor right away.
-
-   sdnotify-wrapper sees the notification when it occurs and sends it
-   to systemd using the sd_notify format.
-
-   Options:
-     -d fd: the daemon will write its notification on descriptor fd.
-     Default is 1.
-     -f: do not doublefork. Use if the daemon waits for children it does
-     not know it has (for instance, superservers do this). When in doubt,
-     do not use that option, or you may have a zombie hanging around.
-     -t timeout: if the daemon has not sent a notification after timeout
-     milliseconds, give up and exit; systemd will not be notified.
-     -k: keep the NOTIFY_SOCKET environment variable when execing into the
-     daemon. By default, the variable is unset: the daemon should not need it.
-
-   Notes:
-     sdnotify-wrapper does not change the daemon's pid. It runs as a
-     (grand)child of the daemon.
-     If the NOTIFY_SOCKET environment variable is not set, sdnotify-wrapper
-     does nothing - it only execs into the daemon.
-     sdnotify-wrapper is more liberal than sd_notify(). It will accept
-     a relative path in NOTIFY_SOCKET.
-*/
-
-
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include <skalibs/uint64.h>
-#include <skalibs/types.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/sgetopt.h>
-#include <skalibs/strerr.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/tai.h>
-#include <skalibs/iopause.h>
-#include <skalibs/djbunix.h>
-#include <skalibs/socket.h>
-#include <skalibs/exec.h>
-
-#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..."
-#define dieusage() strerr_dieusage(100, USAGE)
-
-#define VAR "NOTIFY_SOCKET"
-
-static inline int ipc_sendto (int fd, char const *s, size_t len, char const *path)
-{
-  struct sockaddr_un sa ;
-  size_t l = strlen(path) ;
-  if (l > IPCPATH_MAX) return (errno = ENAMETOOLONG, 0) ;
-  memset(&sa, 0, sizeof sa) ;
-  sa.sun_family = AF_UNIX ;
-  memcpy(sa.sun_path, path, l+1) ;
-  if (path[0] == '@') sa.sun_path[0] = 0 ;
-  return sendto(fd, s, len, MSG_NOSIGNAL, (struct sockaddr *)&sa, sizeof sa) >= 0 ;
-}
-
-static inline void notify_systemd (pid_t pid, char const *socketpath)
-{
-  size_t n = 16 ;
-  char fmt[16 + PID_FMT] = "READY=1\nMAINPID=" ;
-  int fd = ipc_datagram_b() ;
-  if (fd < 0) strerr_diefu1sys(111, "create socket") ;
-  n += pid_fmt(fmt + n, pid) ;
-  fmt[n++] = '\n' ;
-  if (!ipc_sendto(fd, fmt, n, socketpath))
-    strerr_diefu2sys(111, "send notification message to ", socketpath) ;
-  close(fd) ;
-}
-
-static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const *s)
-{
-  char dummy[4096] ;
-  iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ;
-  tain deadline ;
-  tain_now_g() ;
-  if (timeout) tain_from_millisecs(&deadline, timeout) ;
-  else deadline = tain_infinite_relative ;
-  tain_add_g(&deadline, &deadline) ;
-  for (;;)
-  {
-    int r = iopause_g(&x, 1, &deadline) ;
-    if (r < 0) strerr_diefu1sys(111, "iopause") ;
-    if (!r) return 99 ;
-    r = sanitize_read(fd_read(fd, dummy, 4096)) ;
-    if (r < 0)
-      if (errno == EPIPE) return 1 ;
-      else strerr_diefu1sys(111, "read from parent") ;
-    else if (r && memchr(dummy, '\n', r)) break ;
-  }
-  close(fd) ;
-  notify_systemd(pid, s) ;
-  return 0 ;
-}
-
-int main (int argc, char const *const *argv)
-{
-  char const *s = getenv(VAR) ;
-  unsigned int fd = 1 ;
-  unsigned int timeout = 0 ;
-  int df = 1, keep = 0 ;
-  PROG = "sdnotify-wrapper" ;
-  {
-    subgetopt l = SUBGETOPT_ZERO ;
-    for (;;)
-    {
-      int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
-      if (opt == -1) break ;
-      switch (opt)
-      {
-        case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ;
-        case 'f' : df = 0 ; break ;
-        case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ;
-        case 'k' : keep = 1 ; break ;
-        default : dieusage() ;
-      }
-    }
-    argc -= l.ind ; argv += l.ind ;
-  }
-  if (!argc) dieusage() ;
-
-  if (!s) xexec(argv) ;
-  else
-  {
-    pid_t parent = getpid() ;
-    pid_t child ;
-    int p[2] ;
-    if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ;
-    child = df ? doublefork() : fork() ;
-    if (child < 0) strerr_diefu1sys(111, df ? "doublefork" : "fork") ;
-    else if (!child)
-    {
-      PROG = "sdnotify-wrapper (child)" ;
-      close(p[1]) ;
-      return run_child(p[0], timeout, parent, s) ;
-    }
-    close(p[0]) ;
-    if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ;
-    if (keep) xexec(argv) ;
-    else xmexec_m(argv, VAR, sizeof(VAR)) ;
-  }
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9407085f56a2..c2f58bbf9dbd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2053,6 +2053,7 @@ mapAliases {
   SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL_compat = sdl12-compat; # Added 2026-05-19
+  sdnotify-wrapper = skawarePackages.sdnotify-wrapper;
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
   securefs = throw "'securefs' has been removed as it depends on fuse2"; # Added 2026-05-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06ef7f62abba..33c26ea4216c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6713,7 +6713,6 @@ with pkgs;
     s6-portable-utils-man-pages
     s6-rc
     s6-rc-man-pages
-    sdnotify-wrapper
     skalibs
     skalibs_2_10
     tipidee

From 50a76acaf9e42c4a6e3c1f6abb9cd05f77128598 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 14:27:50 +0200
Subject: [PATCH 0910/1386] tilt: 0.37.3 -> 0.37.5

https://github.com/tilt-dev/tilt/releases/tag/v0.37.4
https://github.com/tilt-dev/tilt/releases/tag/v0.37.5

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/ti/tilt/assets.nix  | 2 +-
 pkgs/by-name/ti/tilt/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix
index a167d1a57773..61b5cfccc096 100644
--- a/pkgs/by-name/ti/tilt/assets.nix
+++ b/pkgs/by-name/ti/tilt/assets.nix
@@ -77,7 +77,7 @@ stdenvNoCC.mkDerivation {
     dontInstall = true;
 
     outputHashAlgo = "sha256";
-    outputHash = "sha256-3P42xJ1tBVRpe1hNDy4ax9bUmiaPnSZolTGmsKpzYUA=";
+    outputHash = "sha256-nPbIFUBbbgaFpKBky5FXFBopZd4IxvTGbYXfC3SfaUE=";
     outputHashMode = "recursive";
   };
 
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index 0a2872f88f13..c041b515d910 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -9,13 +9,13 @@ let
       running in development environment and try to serve assets from the
       source tree, which is not there once build completes.
     */
-    version = "0.37.3";
+    version = "0.37.5";
 
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
       tag = "v${version}";
-      hash = "sha256-gJQ9ECGsJ4VBASxmNewOhA3zLl7YjMm5GRDuAefmFYE=";
+      hash = "sha256-aa5ZPheqRZDgcIuuI/tXRHxMtB2RH0yITwvA2SMN9Ec=";
     };
   };
 

From 583578595d518a2dad9b9dacc0bb0cd2b31896e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 12:37:23 +0000
Subject: [PATCH 0911/1386] cyrus-imapd: 3.12.2 -> 3.12.3

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

diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index 8e95b5a449a5..0d777e1251bd 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -66,13 +66,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cyrus-imapd";
-  version = "3.12.2";
+  version = "3.12.3";
 
   src = fetchFromGitHub {
     owner = "cyrusimap";
     repo = "cyrus-imapd";
     tag = "cyrus-imapd-${finalAttrs.version}";
-    hash = "sha256-zPEaxETzG4Aj8JYP/aZpN2xXrD+O22io/HzI4LK+s/o=";
+    hash = "sha256-2HTrFjFlFFqF1TWtClPSOJSCgmomjSgEU7o2UPgd/Cs=";
   };
 
   nativeBuildInputs = [

From 31833bb654f2778f8de6b78ebce5c25aed5e4c63 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Wed, 15 Jul 2026 14:38:28 +0200
Subject: [PATCH 0912/1386] forgejo: 15.0.4 -> 15.0.5

Release notes: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/15.0.5.md
Security announcement: https://codeberg.org/forgejo/security-announcements/issues/56
Diff: https://codeberg.org/forgejo/forgejo/compare/v15.0.4...v15.0.5
See also: https://codeberg.org/forgejo/forgejo/releases/tag/v15.0.5
---
 pkgs/by-name/fo/forgejo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 29c9b2a22a96..474e72baff85 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "15.0.4";
-  hash = "sha256-8AMq5CT4q7aaF5gj9d5+JINp5rrI5U98juI9BA0wVVo=";
+  version = "15.0.5";
+  hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ=";
   npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg=";
   vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig=";
   lts = true;

From 22e4a068e3901d1ef309272d71886e8cf0b99bc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 12:39:27 +0000
Subject: [PATCH 0913/1386] kdePackages.ktextaddons: 2.1.0 -> 2.1.1

---
 pkgs/kde/misc/ktextaddons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix
index 49691d741bd7..85a88eb4a882 100644
--- a/pkgs/kde/misc/ktextaddons/default.nix
+++ b/pkgs/kde/misc/ktextaddons/default.nix
@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "ktextaddons";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
-    hash = "sha256-QsdrZiDc6vqYuwKp4lrAWbSIGfmSO1VRfJ4IfYXUE64=";
+    hash = "sha256-fOWWG3qCrVDk/ytDhtdkzSnTCGAOu7X9duJJLTHg9fA=";
   };
 
   extraBuildInputs = [

From b8145bbead06fe509c12bd79f68af8981dae1461 Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Wed, 15 Jul 2026 20:41:30 +0800
Subject: [PATCH 0914/1386] dolt: 2.1.10 -> 2.1.11

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 7db759314cc4..6078a0d850cf 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "dolt";
-  version = "2.1.10";
+  version = "2.1.11";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-svBAmp/gPHSa6HXmqiFFB31sbaQa6s3HIW1tti8G1pA=";
+    hash = "sha256-bHQBnZpghqh01Voq9U5nOWKrvujx6n3xZNtZqUDIpeU=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-tBvNKDBv86pGBhzPc9tGDVwR1tB/HmUMn2VH42B6QRc=";
+  vendorHash = "sha256-mvoy/ChZVGG9QxRGUG902Eda37SuJGjYLOi87OqjF68=";
   proxyVendor = true;
   doCheck = false;
 

From 6d63426db06913d90b267de2960055f378d1f89a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:43:34 +0200
Subject: [PATCH 0915/1386] python3Packages.lazr-delegates: pin setuptools

Following upstream.

Link: https://git.launchpad.net/lazr.delegates/commit/?id=7d44413b9e14085b53d462fc842760853ef5042e
---
 pkgs/development/python-modules/lazr-delegates/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lazr-delegates/default.nix b/pkgs/development/python-modules/lazr-delegates/default.nix
index a2a922b8ddf2..6bc463c2fcc9 100644
--- a/pkgs/development/python-modules/lazr-delegates/default.nix
+++ b/pkgs/development/python-modules/lazr-delegates/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
+  setuptools_80,
   zope-interface,
   pytestCheckHook,
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     hash = "sha256-rs6yYW5Rtz8yf78SxOwrfXZwy4IL1eT2hRIV+3lsAtw=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ setuptools_80 ];
 
   dependencies = [ zope-interface ];
 

From a4cc46d2ffafb4c3ee3935cc654eac08f6cf4a05 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:47:53 +0200
Subject: [PATCH 0916/1386] python3Packages.lazr-config: pin setuptools

Upstream has done this for lazr.delegates so I'd expect them to do the
same thing here.
---
 pkgs/development/python-modules/lazr-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lazr-config/default.nix b/pkgs/development/python-modules/lazr-config/default.nix
index acde7d6b1c34..f510a34cc464 100644
--- a/pkgs/development/python-modules/lazr-config/default.nix
+++ b/pkgs/development/python-modules/lazr-config/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchgit,
-  setuptools,
+  setuptools_80,
   lazr-delegates,
   zope-interface,
   pytestCheckHook,
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     hash = "sha256-eYJY4JRoqTMG4j1jyiYrI8xEKdJ+wQYVVU/6OqVIodk=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ setuptools_80 ];
 
   dependencies = [
     lazr-delegates

From c9b0c119ecb1c17f4f3a44a6799e3049fa0bb816 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:00:58 +0000
Subject: [PATCH 0917/1386] museum: 1.3.36 -> 1.3.58

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

diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index 9e43e19dbe83..27b5b1a8fcce 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.3.36";
+  version = "1.3.58";
 
   src = fetchFromGitHub {
     owner = "ente";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${finalAttrs.version}";
-    hash = "sha256-9MWmJ3QUgS7BToTnSZzTi4ywGW1RtwrCO+9yQJkvejM=";
+    hash = "sha256-G9T5qsBKzO7bMCf3IexF9YyDeHK+gZI1Unm4pBq69iI=";
   };
 
-  vendorHash = "sha256-qrcfNacMR2hwdtezwYrYTPpr1ALCwZktSW8UiyzGXjQ=";
+  vendorHash = "sha256-Ri2hsPkBvAGGbk9vREmkYxY+JX+nv/OfIAkhU2y0xnQ=";
 
   sourceRoot = "${finalAttrs.src.name}/server";
 

From 5d242469b627b4f44f673b9e2d1eb6cbec33023a Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Wed, 15 Jul 2026 21:06:01 +0800
Subject: [PATCH 0918/1386] nerva: 1.40.1 -> 1.40.2

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

diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix
index 07be8a91c966..d9ba85e22c02 100644
--- a/pkgs/by-name/ne/nerva/package.nix
+++ b/pkgs/by-name/ne/nerva/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "nerva";
-  version = "1.40.1";
+  version = "1.40.2";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "nerva";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JiTTcrdiH/gKt/7/PybUWBN4Qwn+5cmfE9VLwWmsuMk=";
+    hash = "sha256-znkY0R3g8ueazxx+ljCAdsBMkY1FmKn8R9GLYYIY2cA=";
   };
 
   vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8=";

From 7bbb33f48c390831fcfeffb981f5a55ff9aca95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Jul 2026 15:03:45 +0200
Subject: [PATCH 0919/1386] freerdp: 3.27.1 -> 3.29.0

Diff: https://github.com/FreeRDP/FreeRDP/compare/3.27.1...3.29.0

Changelog: https://github.com/FreeRDP/FreeRDP/releases/tag/3.28.0
Changelog: https://github.com/FreeRDP/FreeRDP/releases/tag/3.29.0
---
 pkgs/by-name/fr/freerdp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index 994be73f4e3a..d6ef4cb0bf35 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -72,13 +72,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.27.1";
+  version = "3.29.0";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     tag = finalAttrs.version;
-    hash = "sha256-4U3QC1hka+qTQ0F7GqKPiMVwkkFeJvbjNtom5A7V/Sg=";
+    hash = "sha256-LTRV1vRTMR8015iFXZIEjz6ApN5kg1+T2nGZWJ873zY=";
   };
 
   postPatch = ''

From 93ba0ffb052a992525e884dff31056e4a88aa077 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:13:11 +0000
Subject: [PATCH 0920/1386] python3Packages.verlib2: 0.3.2 -> 26.2

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

diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix
index 40b0d0527796..8320625d87fa 100644
--- a/pkgs/development/python-modules/verlib2/default.nix
+++ b/pkgs/development/python-modules/verlib2/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "verlib2";
-  version = "0.3.2";
+  version = "26.2";
   pyproject = true;
 
   # This tarball doesn't include tests unfortunately, and the GitHub tarball
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # should work for us as well.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oKavmDjY0mwYIlowyNV/twcURi480p8kUeeYLVpR4h4=";
+    hash = "sha256-B0Cjs1dVqdjruTP/zpifN3YRP+MZq2LfX6IPfBQ0PVg=";
   };
 
   nativeBuildInputs = [

From 40fd09d2bafc4baa4d14afcbd2c8f872da588c94 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Jul 2026 08:25:31 +0200
Subject: [PATCH 0921/1386] ocamlPackages.apron: fix propagated inputs

---
 pkgs/development/ocaml-modules/apron/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix
index c329f36bf345..a57e4a1007ef 100644
--- a/pkgs/development/ocaml-modules/apron/default.nix
+++ b/pkgs/development/ocaml-modules/apron/default.nix
@@ -31,13 +31,15 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     gmp
-    mpfr
     ppl
-    camlidl
     flint
     pplite
   ];
-  propagatedBuildInputs = [ mlgmpidl ];
+  propagatedBuildInputs = [
+    camlidl
+    mlgmpidl
+    mpfr
+  ];
 
   outputs = [
     "out"

From 5637900bd83807bc2647c2d817183850cff119b4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Jul 2026 08:25:36 +0200
Subject: [PATCH 0922/1386] ocamlPackages.apronext: init at 1.0.4

---
 .../ocaml-modules/apronext/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/apronext/default.nix

diff --git a/pkgs/development/ocaml-modules/apronext/default.nix b/pkgs/development/ocaml-modules/apronext/default.nix
new file mode 100644
index 000000000000..ef85c933378e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/apronext/default.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  apron,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "apronext";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "ghilesZ";
+    repo = "apronext";
+    rev = "39610de5930e12c8d0156ed2d55fedc220f1e77d";
+    hash = "sha256-K19hmvyI1RJlKv24VJustDfkGTdrW4PcR8xif/y/giQ=";
+  };
+
+  propagatedBuildInputs = [ apron ];
+
+  meta = {
+    license = lib.licenses.asl20;
+    homepage = "https://github.com/ghilesZ/apronext";
+    description = "Extension for the OCaml interface of the apron library";
+  };
+
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 03cd672321f2..aa39bdfb9244 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -58,6 +58,8 @@ let
 
         apron = callPackage ../development/ocaml-modules/apron { };
 
+        apronext = callPackage ../development/ocaml-modules/apronext { };
+
         argon2 = callPackage ../development/ocaml-modules/argon2 { };
 
         arg-complete = callPackage ../development/ocaml-modules/arg-complete { };

From ef4335d4017c0f1dae2837456d6f205bb1c12504 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Jul 2026 08:25:40 +0200
Subject: [PATCH 0923/1386] ocamlPackages.picasso: init at 0.4

---
 .../ocaml-modules/picasso/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/picasso/default.nix

diff --git a/pkgs/development/ocaml-modules/picasso/default.nix b/pkgs/development/ocaml-modules/picasso/default.nix
new file mode 100644
index 000000000000..b67dce0fee10
--- /dev/null
+++ b/pkgs/development/ocaml-modules/picasso/default.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  apronext,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "picasso";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "ghilesZ";
+    repo = "picasso";
+    tag = finalAttrs.version;
+    hash = "sha256-VYrN77IVXPdzPV1CNe5N4D2jgrVIHJFMvfRP6cQq/eI=";
+  };
+
+  propagatedBuildInputs = [ apronext ];
+
+  meta = {
+    description = "An Abstract element drawing library";
+    license = lib.licenses.lgpl2Plus;
+    homepage = "https://github.com/ghilesZ/picasso";
+  };
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index aa39bdfb9244..0ae533c78035 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1765,6 +1765,8 @@ let
 
         piaf = callPackage ../development/ocaml-modules/piaf { };
 
+        picasso = callPackage ../development/ocaml-modules/picasso { };
+
         piqi = callPackage ../development/ocaml-modules/piqi { };
 
         piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };

From 335ff4070b2d7100f238e4433539b1ff3b4142f6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Jul 2026 08:25:43 +0200
Subject: [PATCH 0924/1386] ocamlPackages.libabsolute: init at 0.3

---
 .../ocaml-modules/libabsolute/default.nix     | 32 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/libabsolute/default.nix

diff --git a/pkgs/development/ocaml-modules/libabsolute/default.nix b/pkgs/development/ocaml-modules/libabsolute/default.nix
new file mode 100644
index 000000000000..478022b3ba72
--- /dev/null
+++ b/pkgs/development/ocaml-modules/libabsolute/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  menhir,
+  apronext,
+  picasso,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "libabsolute";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "mpelleau";
+    repo = "absolute";
+    tag = finalAttrs.version;
+    hash = "sha256-q2QxqZJn71MODJ1+Yf9m33qu8xERTqExMANqgk7aksQ=";
+  };
+
+  nativeBuildInputs = [ menhir ];
+
+  propagatedBuildInputs = [
+    apronext
+    picasso
+  ];
+  meta = {
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://github.com/mpelleau/AbSolute";
+    description = "A constraint programming library based on abstract domains";
+  };
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0ae533c78035..faf7fc054217 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1127,6 +1127,8 @@ let
 
         letters = callPackage ../development/ocaml-modules/letters { };
 
+        libabsolute = callPackage ../development/ocaml-modules/libabsolute { };
+
         libc = callPackage ../development/ocaml-modules/libc { };
 
         lilv = callPackage ../development/ocaml-modules/lilv {

From 8e340636622809bc81a0e0725e13568f7f836a0d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Jul 2026 08:25:46 +0200
Subject: [PATCH 0925/1386] absolute: init at 0.3

---
 pkgs/by-name/ab/absolute/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/ab/absolute/package.nix

diff --git a/pkgs/by-name/ab/absolute/package.nix b/pkgs/by-name/ab/absolute/package.nix
new file mode 100644
index 000000000000..b1f3a53cb152
--- /dev/null
+++ b/pkgs/by-name/ab/absolute/package.nix
@@ -0,0 +1,18 @@
+{ lib, ocamlPackages }:
+
+let
+  inherit (ocamlPackages) buildDunePackage libabsolute;
+in
+
+buildDunePackage {
+  pname = "absolute";
+  inherit (libabsolute) src version;
+
+  __structuredAttrs = true;
+
+  buildInputs = [ libabsolute ];
+
+  meta = libabsolute.meta // {
+    description = "A constraint solver based on abstract domains from the theory of abstract interpretation";
+  };
+}

From 918f4e6affec27ae7fa4aa4e47e035b94d8f8ca4 Mon Sep 17 00:00:00 2001
From: Noah Biewesch <dev@noahbiewesch.com>
Date: Wed, 15 Jul 2026 15:25:03 +0200
Subject: [PATCH 0926/1386] syncthing: add noahbiewesch as maintainer

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

diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix
index 20238288794d..709ef9512178 100644
--- a/pkgs/by-name/sy/syncthing/package.nix
+++ b/pkgs/by-name/sy/syncthing/package.nix
@@ -119,6 +119,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       joko
+      noahbiewesch
       peterhoeg
       zainkergaye
     ];

From 54c3d1eda6a5e18ec85b3bda6e078ab527025497 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:29:56 +0000
Subject: [PATCH 0927/1386] python3Packages.niquests: 3.20.0 -> 3.20.1

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

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index 162539ae98cf..cc20a284f81c 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.20.0";
+  version = "3.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-9zBo59l/zDIMKnYX1jOMOCec+oRnCkqJjjJmjbAzoPM=";
+    hash = "sha256-ux0Nypp3gvf//vNyTt/BygkneEfX2Z3wHaLpbb3TGyI=";
   };
 
   build-system = [ hatchling ];

From b62690e6161b3e823da319591e5301471b219b8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:30:03 +0000
Subject: [PATCH 0928/1386] waytrogen: 0.9.8 -> 1.0.1

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

diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 6fe2a8531346..396d0742735d 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -32,18 +32,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
-  version = "0.9.8";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = finalAttrs.version;
-    hash = "sha256-Nf1qPIFlhQl5T3RYVK4GMinO2vOJDNoYBrrVY93VF0Q=";
+    hash = "sha256-3whabM2leDPZS276FRCC5q6XSKWCIisQ0HLM8l8T5WE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-EXP6Mt04Z+2ag2BhihzAtjwPGE82Ig6GoD1Vgor7oHc=";
+    hash = "sha256-5XgajiMJpiy7OzsrrsKwxC4dstvSj5JDU3Iw0zOnfMM=";
   };
 
   nativeBuildInputs = [

From 5c82b91e5923a55a86256c15ea4c3aa67c8681c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:36:28 +0000
Subject: [PATCH 0929/1386] forecast: 0-unstable-2026-01-27 ->
 0-unstable-2026-07-12

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

diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix
index bf90ea627b69..25db7b50a01d 100644
--- a/pkgs/by-name/fo/forecast/package.nix
+++ b/pkgs/by-name/fo/forecast/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "forecast";
-  version = "0-unstable-2026-01-27";
+  version = "0-unstable-2026-07-12";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "forecast";
-    rev = "b82babc843d5e9c58a6635d3b1941ac185ae4906";
-    hash = "sha256-QoZ854+2/4+VMZbOI/M167qjDPahtzbV/NH8Y46uBs8=";
+    rev = "0de1b7502979eb3704445c98ce8dbb7969e109da";
+    hash = "sha256-9IZDDIhZY+YC0SOie5z0Ed5UAvBcf+soZ0RRz8sr71w=";
   };
 
-  cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8=";
+  cargoHash = "sha256-F5AlYm9bzJJUrDiY712dbwpCR3lzvQNFKXHzIDG+TVQ=";
 
   nativeBuildInputs = [
     libcosmicAppHook

From a2b63a6ac7878870c1b5058830ce167c46d1ac49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 14:02:22 +0000
Subject: [PATCH 0930/1386] terraform-providers.fortinetdev_fortios: 1.24.1 ->
 1.25.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index bbd0d279a248..c9eeca710fe3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -427,13 +427,13 @@
     "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs="
   },
   "fortinetdev_fortios": {
-    "hash": "sha256-w7LxnOEAoeJKyicI8Bfd2yH+3oTz3ZVBnskbSEgZBO4=",
+    "hash": "sha256-etGi9KDbmET8Eh4DPJkNA/HbjR+1VUBADlf3MKWbqkc=",
     "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios",
     "owner": "fortinetdev",
     "repo": "terraform-provider-fortios",
-    "rev": "1.24.1",
+    "rev": "1.25.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-V+D/D+i1xbPp9IAfrAds2rNv5t/aXQxPwH9vY09DsMo="
+    "vendorHash": "sha256-ZU05thGO6uUsAxEi/aMQFxlQZ57okGfDEHx/+wNe+x8="
   },
   "gavinbunney_kubectl": {
     "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",

From b3fe0b9500dcdf49d577f42f58257f9a639e4a41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 14:02:43 +0000
Subject: [PATCH 0931/1386] mpvScripts.videoclip: 0.2-unstable-2026-05-31 ->
 0.2-unstable-2026-07-07

---
 pkgs/by-name/mp/mpv/scripts/videoclip.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mpv/scripts/videoclip.nix b/pkgs/by-name/mp/mpv/scripts/videoclip.nix
index 762bc7400eca..ee75757f57e8 100644
--- a/pkgs/by-name/mp/mpv/scripts/videoclip.nix
+++ b/pkgs/by-name/mp/mpv/scripts/videoclip.nix
@@ -10,13 +10,13 @@
 }:
 buildLua {
   pname = "videoclip";
-  version = "0.2-unstable-2026-05-31";
+  version = "0.2-unstable-2026-07-07";
 
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "videoclip";
-    rev = "d9a3e0966b238b824b86767956eb44a11ac367c6";
-    hash = "sha256-NZaflGehxoIf9eY3/p9WrKXXQj3x6GDZ6iMLeu5BhPc=";
+    rev = "979bae398da7ccd70cb2fb305c371b7af9259b10";
+    hash = "sha256-k3fxSeAjRZg4J5x5IQhKGYtUqfBE4heR1KNurGTElGs=";
   };
 
   patchPhase = ''

From 35a3fed95fbe14fc3b1f7e0565eec492133e2b18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 14:21:23 +0000
Subject: [PATCH 0932/1386] brutus: 1.6.1 -> 1.9.0

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

diff --git a/pkgs/by-name/br/brutus/package.nix b/pkgs/by-name/br/brutus/package.nix
index cb47e2affa73..bb38e4e4b14b 100644
--- a/pkgs/by-name/br/brutus/package.nix
+++ b/pkgs/by-name/br/brutus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "brutus";
-  version = "1.6.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "brutus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iZ0oUYlrcPxPGuJvHXqHX+R4dXKS7pLgZgNhBuBVWtc=";
+    hash = "sha256-tHTgKeQ37DsrrucrI8ZfgvdGy8Xrqs1RtOt/GLrmOk0=";
   };
 
-  vendorHash = "sha256-XpwwFz8PfyTksLD0SomC5BE0tzUL9D/qtBSed4mrsXQ=";
+  vendorHash = "sha256-scgSyLQvkTzG5bdW56bPO4raE+rLULHxOaFCu+DjyEE=";
 
   ldflags = [
     "-s"

From 070261f141ffcb36bdcb7d6d522d25defd90ad03 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 09:30:23 +0200
Subject: [PATCH 0933/1386] flannel: 0.28.6 -> 0.28.7

https://github.com/flannel-io/flannel/releases/tag/v0.28.7

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/fl/flannel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flannel/package.nix b/pkgs/by-name/fl/flannel/package.nix
index 34ed44d4c61c..d873f3e8c261 100644
--- a/pkgs/by-name/fl/flannel/package.nix
+++ b/pkgs/by-name/fl/flannel/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.28.6";
+  version = "0.28.7";
   rev = "v${version}";
 
   vendorHash = "sha256-io2xUh5jM2x7P01MIpPgLAVXC/CAL22zrC6kfi4uYFs=";
@@ -16,7 +16,7 @@ buildGoModule rec {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-djPi4dgG9iR7K5c9NhMVJI1xdBmCX39+G/zt6dDRZx8=";
+    sha256 = "sha256-K810ikYfDdOtOUTSGqeAwczxNO/XPB+2RbelHBc8tok=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];

From 3c8cce3f8ea4faad139d0170aa5146507c597705 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 14:37:38 +0000
Subject: [PATCH 0934/1386] devin-desktop: 3.4.22 -> 3.4.27

---
 pkgs/by-name/de/devin-desktop/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/de/devin-desktop/info.json b/pkgs/by-name/de/devin-desktop/info.json
index 38321f0ea022..592f3a25bdb2 100644
--- a/pkgs/by-name/de/devin-desktop/info.json
+++ b/pkgs/by-name/de/devin-desktop/info.json
@@ -1,14 +1,14 @@
 {
   "aarch64-darwin": {
-    "version": "3.4.22",
+    "version": "3.4.27",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-darwin-arm64-3.4.22.zip",
-    "sha256": "ed6f3bd022cbac6cef8757beeaafebf65641724a5e7897e4d62a03b87161627f"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-darwin-arm64-3.4.27.zip",
+    "sha256": "c42b0671c246ef295807e822809cb82dfe65831d4879d68f25334f754babec8d"
   },
   "x86_64-linux": {
-    "version": "3.4.22",
+    "version": "3.4.27",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-linux-x64-3.4.22.tar.gz",
-    "sha256": "02bfb58af6d898cc41337a761a34ae69f55f05c8c28e3611a5cf2c431610b072"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-linux-x64-3.4.27.tar.gz",
+    "sha256": "80850124b31331f63c24a201d1317bdacdfb438fb2bcc9b31c9b7a6391391619"
   }
 }

From ac529af6b74c654c92031438214d425318e333ba Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 15:45:50 +0200
Subject: [PATCH 0935/1386] mailmanPackages.hyperkitty: backport mistune fix

---
 pkgs/servers/mail/mailman/hyperkitty.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index e4a7ba3ecda4..d4c93f3d1922 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -35,6 +35,12 @@ buildPythonPackage (finalAttrs: {
       url = "https://gitlab.com/mailman/hyperkitty/-/commit/e815be11752ac6a3e839b155f0c43808619c56b0.patch";
       hash = "sha256-fsJyNsh3l5iR9WgsiEsHlptkN+nlWoop0m2STyucDEc=";
     })
+    # Fix test with mistune >= 3.3
+    (fetchpatch {
+      url = "https://gitlab.com/mailman/hyperkitty/-/commit/7e8aa0150d8dcaef66039db3a0205dfd4160a265.patch";
+      excludes = [ "pyproject.toml" ];
+      hash = "sha256-BpjnLugUU0nyn3XN0zZ0eEeK0sFd64GOUaQsen6fFyw=";
+    })
   ];
 
   prePatch = ''

From 7eef8e8044a69fe4b5d4d70c6f4a03ad059b840f Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Wed, 15 Jul 2026 10:11:26 -0400
Subject: [PATCH 0936/1386] keycloak-config-cli: 6.4.0 -> 6.5.1

Signed-off-by: Anish Pallati <i@anish.land>
---
 .../ke/keycloak-config-cli/package.nix        | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ke/keycloak-config-cli/package.nix b/pkgs/by-name/ke/keycloak-config-cli/package.nix
index df21c7e3715f..f599bfab35b2 100644
--- a/pkgs/by-name/ke/keycloak-config-cli/package.nix
+++ b/pkgs/by-name/ke/keycloak-config-cli/package.nix
@@ -5,25 +5,33 @@
   jre_headless,
   makeWrapper,
   nix-update-script,
+  versionCheckHook,
 }:
-maven.buildMavenPackage rec {
+maven.buildMavenPackage (finalAttrs: {
   pname = "keycloak-config-cli";
-  version = "6.4.0";
+  version = "6.5.1";
 
   src = fetchFromGitHub {
     owner = "adorsys";
     repo = "keycloak-config-cli";
-    tag = "v${version}";
-    hash = "sha256-Vg56Dz9U0eAJw+7u90MSZWmMIZttWYGXAwsXZsEfTj8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dSeLn9YaT0k6Mg8cxmoDoEtvjrzkyETvI4dt+q/Wj3A=";
   };
 
-  mvnHash = "sha256-tdh8hRqGXI3zuwy55dC3La9dm2naqeCEZT4qcw37iDI=";
+  mvnHash = "sha256-Ff9ra9ruPJ8PA0bmC8uU8PiNqjtJoR4U04veZAqZ3sM=";
 
-  # Tests use MockServer which needs to bind to a local port
-  __darwinAllowLocalNetworking = true;
+  # JavaScriptEvaluatorTest needs GraalVM's Truffle engine, which fails to
+  # initialize on the sandbox JDK (org.graalvm.polyglot.Engine$ImplHolder).
+  doCheck = false;
+
+  strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [ makeWrapper ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   installPhase = ''
     runHook preInstall
     install -Dm444 target/keycloak-config-cli.jar $out/share/keycloak-config-cli/keycloak-config-cli.jar
@@ -36,6 +44,7 @@ maven.buildMavenPackage rec {
 
   meta = {
     homepage = "https://github.com/adorsys/keycloak-config-cli";
+    changelog = "https://github.com/adorsys/keycloak-config-cli/releases/tag/v${finalAttrs.version}";
     description = "Import YAML/JSON-formatted configuration files into Keycloak";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
@@ -46,4 +55,4 @@ maven.buildMavenPackage rec {
     mainProgram = "keycloak-config-cli";
     platforms = jre_headless.meta.platforms;
   };
-}
+})

From 8350dd2945e605a93c924897ea4e58183aa38660 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Wed, 15 Jul 2026 16:38:40 +0200
Subject: [PATCH 0937/1386] vimPlugins.none-ls-extras-nvim: init at
 0-unstable-2026-06-06

https://github.com/nvimtools/none-ls-extras.nvim
---
 .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++
 .../applications/editors/vim/plugins/overrides.nix |  4 ++++
 .../editors/vim/plugins/vim-plugin-names           |  1 +
 3 files changed, 19 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 6b3394d59395..160819434898 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12140,6 +12140,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  none-ls-extras-nvim = buildVimPlugin {
+    pname = "none-ls-extras.nvim";
+    version = "0-unstable-2026-06-06";
+    src = fetchFromGitHub {
+      owner = "nvimtools";
+      repo = "none-ls-extras.nvim";
+      rev = "27681d797a26f1b4d6119296df42f5204c88a2dc";
+      hash = "sha256-GZLT8X1eLeSkiV5EN1nOkCQg5nwNATURi/KMj90i40I=";
+    };
+    meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/";
+    meta.license = getLicenseFromSpdxId "Unlicense";
+    meta.hydraPlatforms = [ ];
+  };
+
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
     version = "0-unstable-2026-06-02";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 1f59ee2cdc3d..5ccb9ddd6506 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3098,6 +3098,10 @@ assertNoAdditions {
     dependencies = [ self.nui-nvim ];
   };
 
+  none-ls-extras-nvim = super.none-ls-extras-nvim.overrideAttrs {
+    dependencies = [ self.none-ls-nvim ];
+  };
+
   none-ls-nvim = super.none-ls-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 45eca79a28a3..c50708c82eeb 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -865,6 +865,7 @@ https://github.com/aktersnurra/no-clown-fiesta.nvim/,,
 https://github.com/shortcuts/no-neck-pain.nvim/,,
 https://github.com/kartikp10/noctis.nvim/,,
 https://github.com/folke/noice.nvim/,,
+https://github.com/nvimtools/none-ls-extras.nvim/,,
 https://github.com/nvimtools/none-ls.nvim/,,
 https://github.com/nordtheme/vim/,,nord-vim
 https://github.com/shaunsingh/nord.nvim/,,

From f56e0dab274deaef6ebe4115c66f3087abdd7580 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Wed, 15 Jul 2026 15:57:58 +0200
Subject: [PATCH 0938/1386] nono: 0.61.0 -> 0.68.0

---
 pkgs/by-name/no/nono/package.nix | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix
index 79eef3783395..991c68597803 100644
--- a/pkgs/by-name/no/nono/package.nix
+++ b/pkgs/by-name/no/nono/package.nix
@@ -9,12 +9,13 @@
   dbus,
 
   writableTmpDirAsHomeHook,
+  gitMinimal,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nono";
-  version = "0.61.1";
+  version = "0.68.0";
 
   __darwinAllowLocalNetworking = true; # required for tests
 
@@ -22,9 +23,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "always-further";
     repo = "nono";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y5oMR5Vawf/1QUj3ACDdqAjKT+Q2gizRfKkal340EP8=";
+    hash = "sha256-RxVYatzKjv6LJ+M4Js+sTvg0hMnovXxtr6WxwFYF16Y=";
   };
-  cargoHash = "sha256-Oy/IqAK5ml1vu0eee+pF5pRjzk0Na/Fb04e1Mx0d924=";
+  cargoHash = "sha256-9gMhW2qt5gbf6x/uPLc4vl3rn6UdneoxRmWpeRqI4V0=";
 
   nativeBuildInputs = [
     pkg-config
@@ -36,12 +37,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeCheckInputs = [
     writableTmpDirAsHomeHook
+    gitMinimal
   ];
 
   checkFlags = map (t: "--skip=${t}") (
     [
       # fails to initialize the sandbox under '/build'
       "test_all_profiles_signal_mode_resolves"
+      "test_restrict_execute_does_not_break_rename_into_new_subdir"
       # panic
       "build_run_profile_patch_adds_override_deny_for_sensitive_file"
       "build_run_profile_patch_merges_read_and_write_to_allow_file"
@@ -56,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "rollback_signed_session_verifies_from_audit_dir_bundle"
 
       # nono-cli
-      # wants a script `cripts/test-list-aliases.sh`, `git`, and `.git` history
+      # wants a script `scripts/test-list-aliases.sh`, `git`, and `.git` history
       "alias_inventory_script_passes"
       # fails to initialize the sandbox under '/build'
       # has also failed due to running on darwin despite testing the linux only
@@ -70,6 +73,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "alias_inventory_rejects_unapproved_deprecated_module_reach_in"
       "lint_docs_accepts_clean_tree"
       "lint_docs_rejects_quoted_override_deny_outside_allowlist"
+      # need /bin/cat
+      "granted_path_exits_zero"
+      "env_credentials_with_command_policies_non_shim_entry_succeeds"
 
       # nono-proxy
       # fails to prepare TLS bundle inside build sandbox
@@ -77,6 +83,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "server::tests::test_route_diagnostics_summarises_each_route"
       "tls_intercept::bundle::tests::bundle_contains_ephemeral_and_system_roots"
       "tls_intercept::bundle::tests::bundle_file_has_restrictive_permissions"
+      # fail due to credential capture not configured
+      "proxy_runtime::tests::capture_helper_with_interaction_stdin_true_inherits_terminal_stdin"
+      "proxy_runtime::tests::capture_helper_with_stdio_true_receives_null_not_terminal_stdin"
+      "proxy_runtime::tests::proxy_credential_capture_backend_captures_and_caches"
+      "proxy_runtime::tests::proxy_credential_capture_backend_parses_json_headers"
+      "proxy_runtime::tests::proxy_credential_capture_backend_rejects_empty_stdout"
+      "proxy_runtime::tests::proxy_credential_capture_backend_sends_request_json_stdin"
+      "proxy_runtime::tests::proxy_credential_capture_backend_uses_path_cache_scope"
+      # panic
+      "server::tests::reactive_proxy_auth_retry_answered_after_407"
+      "server::tests::test_oauth_capture_routes_activate_intercept"
+      "server::tests::test_route_diagnostics_groups_credential_and_endpoint_routes"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # panics with "exact-path fallback must not recursively cover descendants"

From b519e653e2b331fba9cf17ac89ae3675a518792a Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 17:13:15 +0200
Subject: [PATCH 0939/1386] perlPackages.CryptOpenSSLX509: 1.915 -> 2.1.3

https://github.com/dsully/perl-crypt-openssl-x509/blob/2.1.3/Changes.md

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dfe9e57f7eb5..03b713f20ba9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7792,10 +7792,10 @@ with self;
 
   CryptOpenSSLX509 = buildPerlPackage {
     pname = "Crypt-OpenSSL-X509";
-    version = "1.915";
+    version = "2.1.3";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.915.tar.gz";
-      hash = "sha256-xNvBbE/CloV4I3v8MkWH/9eSSacQFQJlLbnjjUSJUX8=";
+      url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-2.1.3.tar.gz";
+      hash = "sha256-CtllF1dGroRrBRCwOKofltLduMhg/pfOpvvcegVfn54=";
     };
     env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
     env.NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto";

From cb712ce141051760a194ec4f3bf71caf27fc51bb Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Wed, 15 Jul 2026 17:18:40 +0200
Subject: [PATCH 0940/1386] python314Packages.guidata: enable python 3.14

Python 3.14 is supported since guidata 3.14.1
(https://github.com/PlotPyStack/guidata/issues/97).
---
 pkgs/development/python-modules/guidata/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index bb6d80bdd483..bcd80b043b26 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -41,9 +41,6 @@ buildPythonPackage rec {
     hash = "sha256-iUfZX51Ef1PY7roy9ER8hG34BAhCLs3Sagoasd5BT3E=";
   };
 
-  # https://github.com/PlotPyStack/guidata/issues/97
-  disabled = pythonAtLeast "3.14";
-
   build-system = [
     setuptools
   ];

From ff05afeac806a96d953bb74d2828c4dcf53933a7 Mon Sep 17 00:00:00 2001
From: 0x-xnum <81901593+0x-xnum@users.noreply.github.com>
Date: Wed, 15 Jul 2026 18:23:00 +0300
Subject: [PATCH 0941/1386] qtkeychain: fix build by updating cmake flag for
 Qt6 default

---
 pkgs/development/libraries/qtkeychain/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 37025c587d20..0388ab1bec8f 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
+    "-DBUILD_WITH_QT5=${if lib.versions.major qtbase.version == "5" then "ON" else "OFF"}"
     "-DQT_TRANSLATIONS_DIR=share/qt/translations"
   ];
 

From bb0a60a69359b43c53a5c49651559cf03046675f Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 15:26:17 +0000
Subject: [PATCH 0942/1386] aver: 0.26.0 -> 0.27.0

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

diff --git a/pkgs/by-name/av/aver/package.nix b/pkgs/by-name/av/aver/package.nix
index 2174d4d5f268..ab28492ef5f7 100644
--- a/pkgs/by-name/av/aver/package.nix
+++ b/pkgs/by-name/av/aver/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "aver";
-  version = "0.26.0";
+  version = "0.27.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "jasisz";
     repo = "aver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LeI6qy+z8azrrgoskRq/hsk5t0PDydQ/yJNxYIB7I68=";
+    hash = "sha256-jVXkHdTSTvHVKHe1jIYqISvm2oUolBWNLBxHt3KDpWk=";
   };
 
-  cargoHash = "sha256-Zqu56tBbKjWZmpRpPuK9JMexcajRcDzBW4AfTRAkPbs=";
+  cargoHash = "sha256-3ekeWs2o2TVe2SZgMKTGANTucSiR3aXaqOzJIaoAuK4=";
 
   cargoBuildFlags = [
     "--workspace"

From e399ccbc630a7f21b224fe1ac7bb8b509ae30544 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 15:31:03 +0000
Subject: [PATCH 0943/1386] hk: 1.50.0 -> 1.51.0

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

diff --git a/pkgs/by-name/hk/hk/package.nix b/pkgs/by-name/hk/hk/package.nix
index abe884cfe875..b8ed92271a0d 100644
--- a/pkgs/by-name/hk/hk/package.nix
+++ b/pkgs/by-name/hk/hk/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hk";
-  version = "1.50.0";
+  version = "1.51.0";
 
   __structuredAttrs = true;
 
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "jdx";
     repo = "hk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1sty3JUxiT4UDPmoqR6vql9bQcoSR+xfq3dQzT6u6rY=";
+    hash = "sha256-kCmujjvh2CACLrzqFal1CFc7RMzECBYsQ4W3ZnJGRV0=";
   };
 
-  cargoHash = "sha256-oUgAzO7kWVlbw1ZvcjqIdV78tvXQYlV5bwvOSucQvWE=";
+  cargoHash = "sha256-hICexfvE0swz+g/9r/vR/sG2DUAK5Fj0lDTrkuWujok=";
 
   nativeBuildInputs = [
     installShellFiles

From 77c95bfef4a931de61d231c7a9a098ae997b0768 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 15:38:00 +0000
Subject: [PATCH 0944/1386] python3Packages.linode-api: 5.45.0 -> 5.46.0

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

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index febcb0e5ac92..c9896d748284 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "5.45.0";
+  version = "5.46.0";
   pyproject = true;
 
   # Sources from Pypi exclude test fixtures
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "linode";
     repo = "python-linode-api";
     tag = "v${version}";
-    hash = "sha256-0FLF/LkU8SaR3itgMISbqOxmd4UZkGlTT3VDpmuv+QQ=";
+    hash = "sha256-d9VgHHbyEcFHy3bM2KpuwUN3Su7ABYqYRWL+nOZ1Xd4=";
   };
 
   build-system = [ setuptools ];

From bf9913fbaf1057e76df617f93fe34ae33dd4e484 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 15:39:07 +0000
Subject: [PATCH 0945/1386] zennotes-desktop: 2.13.2 -> 2.13.3

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

diff --git a/pkgs/by-name/ze/zennotes-desktop/package.nix b/pkgs/by-name/ze/zennotes-desktop/package.nix
index 2ec8888bca27..b153a483b5aa 100644
--- a/pkgs/by-name/ze/zennotes-desktop/package.nix
+++ b/pkgs/by-name/ze/zennotes-desktop/package.nix
@@ -13,14 +13,14 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "zennotes-desktop";
-  version = "2.13.2";
+  version = "2.13.3";
   npmDepsHash = "sha256-7dchbcGAZm+PlVsES76sYD9NOqeCulEKC7S0zLERvvY=";
 
   src = fetchFromGitHub {
     owner = "ZenNotes";
     repo = "zennotes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wazp3v6fV0gBh4ASlinhmA6SnGDmBvRcWFEXbENQUII=";
+    hash = "sha256-9/fvHSUf0rWwljhN/Vqoui7ZdGL6nvN6svM8iwYQF7A=";
   };
 
   npmWorkspace = "apps/desktop";

From b330fd0cc43f3ffb44d72c20437b0c5927cdd7b2 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 16:43:10 +0100
Subject: [PATCH 0946/1386] concord-tui: 2.4.0 -> 2.4.1

Diff: https://github.com/chojs23/concord/compare/v2.4.0...v2.4.1
---
 pkgs/by-name/co/concord-tui/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix
index 3ee01635380c..f2ea41311f2e 100644
--- a/pkgs/by-name/co/concord-tui/package.nix
+++ b/pkgs/by-name/co/concord-tui/package.nix
@@ -9,19 +9,20 @@
   stdenv,
   # TODO: Clean up on `staging`
   lld,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "concord-tui";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "chojs23";
     repo = "concord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/79Hq54qXWXLopPda6xiZ6892UpVoKXQad84QOXCTDM=";
+    hash = "sha256-3c5jxpJrBr6vYnbcJIYD06d932Da94hXUZA5FLa3kkU=";
   };
 
-  cargoHash = "sha256-Ihr4JM0hKEvJ9FMcQ5VPtemJjjPB5mXvAeDa4G0pGSo=";
+  cargoHash = "sha256-6iAyKsS+FoNCKkMvbL70vKSPoAaKQtUDiAQGaEMuxWk=";
 
   buildInputs = [
     opus
@@ -47,6 +48,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}";
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Feature-rich TUI client for Discord, written in Rust";
     homepage = "https://github.com/chojs23/concord";

From 3b3e87112a3fe1eef7db2564f77928e096a5986d Mon Sep 17 00:00:00 2001
From: staticdev <staticdev-support@proton.me>
Date: Wed, 15 Jul 2026 17:44:08 +0200
Subject: [PATCH 0947/1386] python3Packages.beets: add staticdev as maintainer

Assisted-by: Codex (GPT-5)
---
 pkgs/development/python-modules/beets/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 80bdd408fb56..f1662aeef83b 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -509,6 +509,7 @@ buildPythonPackage (finalAttrs: {
       doronbehar
       lovesegfault
       pjones
+      staticdev
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "beet";

From 67c199eae839c0a8bb0f45377337e5bb140922e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 15:56:12 +0000
Subject: [PATCH 0948/1386] linuxKernel.kernels.linux_zen: 7.1.2 -> 7.1.3

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 147503fe1c30..6cbfffe22095 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -12,13 +12,13 @@ let
   # override options if they need using lib.mkForce (that has 50 priority)
   mkKernelOverride = lib.mkOverride 90;
 
-  suffix = "zen1";
+  suffix = "zen2";
 in
 
 buildLinux (
   args
   // rec {
-    version = "7.1.2";
+    version = "7.1.3";
     pname = "linux-zen";
     modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
     isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
       owner = "zen-kernel";
       repo = "zen-kernel";
       rev = "v${version}-${suffix}";
-      sha256 = "0d02lgwl0x415xrbznsldd7j1krpzlnbd2ciis3shz8zhmbhfg1f";
+      sha256 = "0af939wq8gfgwrb4s3jjbkqh2pn3zkgk1w48m0hf5fc0qi8ify8x";
     };
 
     # This is based on the following source:

From a8707a255fd5b583662fed081ad00018a8f11f3a Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Tue, 9 Jun 2026 18:57:58 -0400
Subject: [PATCH 0949/1386] newsflash: remove old dependencies

---
 pkgs/by-name/ne/newsflash/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix
index 0398d5db457f..e251a41f888a 100644
--- a/pkgs/by-name/ne/newsflash/package.nix
+++ b/pkgs/by-name/ne/newsflash/package.nix
@@ -18,13 +18,11 @@
   gtksourceview5,
   libadwaita,
   libglycin,
-  libseccomp,
   libxml2,
   openssl,
   sqlite,
   webkitgtk_6_0,
   glib-networking,
-  librsvg,
   gst_all_1,
   nix-update-script,
 }:
@@ -79,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview5
     libadwaita
     libglycin
-    libseccomp
     libxml2
     openssl
     sqlite
@@ -87,9 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     # TLS support for loading external content in webkitgtk WebView
     glib-networking
-
-    # SVG support for gdk-pixbuf
-    librsvg
   ]
   ++ (with gst_all_1; [
     # Audio & video support for webkitgtk WebView

From a5263b578f685d1c8355589fdcf72e8dd4c26588 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 17 Nov 2025 19:16:17 -0500
Subject: [PATCH 0950/1386] newsflash: explicitly pass --build to patchShebangs

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

diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix
index e251a41f888a..b2faad9ac943 100644
--- a/pkgs/by-name/ne/newsflash/package.nix
+++ b/pkgs/by-name/ne/newsflash/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    patchShebangs build-aux/cargo.sh
+    patchShebangs --build build-aux/cargo.sh
     meson rewrite kwargs set project / version '${finalAttrs.version}'
     substituteInPlace src/meson.build --replace-fail \
       "'src' / rust_target / 'news_flash_gtk'" \

From 033f9a5352419e6e2b511fd9c9679ea28eedba13 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 15 Jul 2026 11:32:37 -0400
Subject: [PATCH 0951/1386] newsflash: 5.1.0 -> 5.2.3

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

diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix
index b2faad9ac943..653216ce4624 100644
--- a/pkgs/by-name/ne/newsflash/package.nix
+++ b/pkgs/by-name/ne/newsflash/package.nix
@@ -29,18 +29,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "newsflash";
-  version = "5.1.0";
+  version = "5.2.3";
 
   src = fetchFromGitLab {
     owner = "news-flash";
     repo = "news_flash_gtk";
     tag = "v.${finalAttrs.version}";
-    hash = "sha256-BfzrnTyMLFiM+aHtrppvl/j/fjB4TbEkbl/yHYOnXa8=";
+    hash = "sha256-EeB2DNXxvo7biIv426+dkCKbjn2uxyXgvA1FbKevaFQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-4z2RGelDhi4RmVQ/+Ba340Pm05x4ruaRYAtJ1HuRHqA=";
+    hash = "sha256-OPxMsNhdMSt8mLhsNIBTjggSL1f3bZMH/5shESDV6yE=";
   };
 
   postPatch = ''

From 396705c2bf8cb6d7ca03ffab08c79cea55843a6d Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 15 Jul 2026 12:03:19 -0400
Subject: [PATCH 0952/1386] versitygw: 1.6.0 -> 1.7.0

Changelog: https://github.com/versity/versitygw/releases/tag/v1.7.0
---
 pkgs/by-name/ve/versitygw/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix
index c362f2748fd6..a61d9bde0098 100644
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "versitygw";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "versity";
     repo = "versitygw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vy8wveTwK8lXpZlKyeUc/3qpQZ96vExJCfw/RiLt2Eo=";
+    hash = "sha256-O3rXqg0wSAb4YXxgXqf42oo9sJinZhZ1U6e5WCnvo9I=";
   };
 
-  vendorHash = "sha256-/vLR7XZWzzj35rXLj7EJ3H3WP0RX3qBqIn/PlkM/j/k=";
+  vendorHash = "sha256-8WrGFLIoXmHQmyFGhOjBAFkaYZ1xhx0aldpyZULfAL4=";
 
   subPackages = [ "./cmd/versitygw" ];
 

From c8dda69ca51ad663b3ecad8a0122a78052ebd94d Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 15 Jul 2026 12:03:38 -0400
Subject: [PATCH 0953/1386] versitygw: add adamcstephens as maintainer

---
 pkgs/by-name/ve/versitygw/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix
index a61d9bde0098..1b569b45971c 100644
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@@ -46,7 +46,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/versity/versitygw";
     changelog = "https://github.com/versity/versitygw/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ genga898 ];
+    maintainers = with lib.maintainers; [
+      adamcstephens
+      genga898
+    ];
     mainProgram = "versitygw";
   };
 })

From 0b12f5579d3d083e90e8feea3858eaeed7883719 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 16:21:42 +0000
Subject: [PATCH 0954/1386] kubernix: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix
index 991f5870f2d2..0d378eacb661 100644
--- a/pkgs/by-name/ku/kubernix/package.nix
+++ b/pkgs/by-name/ku/kubernix/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kubernix";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "saschagrunert";
     repo = "kubernix";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-CtY2HzDOtR//0aJhJtO4wrqUwvCkTLmemfNYyoYrl88=";
+    sha256 = "sha256-WHXhPa+U53Z8GTCpKYk2j4SnDxZX+E/rQUHUvOz7G6c=";
   };
 
-  cargoHash = "sha256-+bEwLg/S2TBCZLbNrQfA+FsftW4bb0XbIXtXGj+FO2A=";
+  cargoHash = "sha256-NQ0d7kk6nw1D/a57+nlrfjAr4gVKVjPrH59dcbKcII0=";
 
   # Tests require network access
   doCheck = false;

From bf164bedad5ee2fb8df02946990b0568024f88d4 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 8 Jul 2026 15:19:20 -0700
Subject: [PATCH 0955/1386] 
 python3Packages.opentelemetry-exporter-otlp-proto-grpc: disable
 timing-sensitive tests

---
 .../opentelemetry-exporter-otlp-proto-grpc/default.nix      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix
index 7a3633852d9a..b0dc9be85572 100644
--- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix
@@ -36,6 +36,12 @@ buildPythonPackage {
 
   enabledTestPaths = [ "tests" ];
 
+  disabledTests = [
+    # Timing-sensitive
+    "test_retry_info_is_respected"
+    "test_timeout_set_correctly"
+  ];
+
   pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ];
 
   __darwinAllowLocalNetworking = true;

From 66fa60f27e67da3b5e4c4ac1c69a7a499253de08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 16:34:33 +0000
Subject: [PATCH 0956/1386] 
 home-assistant-custom-lovelace-modules.custom-brand-icons: 2026.07.0 ->
 2026.07.1

---
 .../custom-lovelace-modules/custom-brand-icons/package.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix
index 8c8a48490df4..c8fc97bcc002 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "custom-brand-icons";
-  version = "2026.07.0";
+  version = "2026.07.1";
 
   src = fetchFromGitHub {
     owner = "elax46";
     repo = "custom-brand-icons";
     tag = finalAttrs.version;
-    hash = "sha256-fmvWUt3Q+9ydvHB7t8z3/9mCLuF/llpoUo6e8K2rn/g=";
+    hash = "sha256-nWoZ6tArSGmZY9pn2G/2jXGEM7ip8LGQ5+1FnYFI5SI=";
   };
 
-  npmDepsHash = "sha256-ZTl9+vXEBR3pvksaLWof8y1WnoL2tAL3KuPzZn7VjjE=";
+  npmDepsHash = "sha256-+Kn2WQ1MQMKTJ0He/k9NxUpoac9sB61zWRt2wha6c7g=";
 
   buildPhase = ''
     runHook preBuild

From 3e0bc9ea985af13ccc7804efc5dcc31657b4a0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 09:35:04 -0700
Subject: [PATCH 0957/1386] immich: 3.0.2 -> 3.0.3

Diff: https://github.com/immich-app/immich/compare/v3.0.2...v3.0.3

Changelog: https://github.com/immich-app/immich/releases/tag/v3.0.3
---
 pkgs/by-name/im/immich/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 08d71054ef6f..674172bd4291 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -115,13 +115,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DLDzICjhvIErVm15CLoLnd8WwQl+lcalXhz2xmWposA=";
+    hash = "sha256-20MxwDCU9+SyZDx7PkLSfbW+mTGxGqITQRl7EgzkmkA=";
   };
 
   pnpmDeps = fetchPnpmDeps {

From c46a8499e872f5b2829e0f4cddcbdddd52d83b3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 16:35:23 +0000
Subject: [PATCH 0958/1386] havn: 0.3.7 -> 0.3.8

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

diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index 731ac2e94f52..9b80f6bfde08 100644
--- a/pkgs/by-name/ha/havn/package.nix
+++ b/pkgs/by-name/ha/havn/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "havn";
-  version = "0.3.7";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "mrjackwills";
     repo = "havn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9xMrzRfnUA8GG+u255oBhdUWL7NACVtj50QwZuMM4yg=";
+    hash = "sha256-7VRYZK9QzKmhK4LPFRzf6QwgMwAC9aa6/+Fu/4SLQoo=";
   };
 
-  cargoHash = "sha256-Fu+AU46AY/96uwKqDQcQ9inp2VZAZnq0YxR8N6wcQ2M=";
+  cargoHash = "sha256-pGfuKfjU/J52GgX8VmnNi9LLRfhQJagVzADn1bkUSvI=";
 
   checkFlags = [
     # Skip tests that require network access

From 1d74d3537f0e50491152a7df2a3c0813a7a8996d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 16:42:55 +0000
Subject: [PATCH 0959/1386] gcsfuse: 3.10.0 -> 3.11.0

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

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 6eb0b0bf6f7a..b32232d2ac71 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gcsfuse";
-  version = "3.10.0";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6eaBMCw1FH+H3QwZBSDM3nr7qy4Sb23GguNKwcYdJJc=";
+    hash = "sha256-T+HzH8hdtCzYiXz6eA1IbGNZwAqvE2fLQkAqatV6nzY=";
   };
 
-  vendorHash = "sha256-iY0+iCIExTcYZP7ob1yAXd6zBhGMzK0pyFThAfgN4Yc=";
+  vendorHash = "sha256-olkKP8z6E+wYm8f5LMEZqWy/RDFlRJtts/zpJwJDoPc=";
 
   subPackages = [
     "."

From fff21ef8f43ee1d2e339eaf00dd3f8debf8876f5 Mon Sep 17 00:00:00 2001
From: Marc Bornand <dev.mbornand@systemb.ch>
Date: Wed, 15 Jul 2026 16:45:49 +0000
Subject: [PATCH 0960/1386] librewolf-unwrapped: 152.0.5-1 -> 152.0.6-1

---
 pkgs/by-name/li/librewolf-unwrapped/src.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json
index ee4e908f7de4..bcc4927bcbc6 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/src.json
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "152.0.5-1",
+  "packageVersion": "152.0.6-1",
   "source": {
-    "rev": "152.0.5-1",
-    "hash": "sha256-5f/JkPWOUlfxND9JrPJv9j7UZvfndxi5vLPWZNJwHzk="
+    "rev": "152.0.6-1",
+    "hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4="
   },
   "firefox": {
-    "version": "152.0.5",
-    "hash": "sha512-bPLcfyimo0MPKGbfTKNQY8ut8jTIKjT6ZR4C2QnldB5QzZhv7xvZfUhrUSRMtjmysQNRRog0e/f5T9FtJkzE8g=="
+    "version": "152.0.6",
+    "hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA=="
   }
 }

From b7fc3c938705685bac6dbf639147f7f59492ddd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 16:49:54 +0000
Subject: [PATCH 0961/1386] function-runner: 9.2.0 -> 9.2.1

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

diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix
index 4810ce602426..65c2870b8119 100644
--- a/pkgs/by-name/fu/function-runner/package.nix
+++ b/pkgs/by-name/fu/function-runner/package.nix
@@ -9,7 +9,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "function-runner";
-  version = "9.2.0";
+  version = "9.2.1";
 
   __structuredAttrs = true;
 
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Shopify";
     repo = "function-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+y4XQ4Oq4RdAMAD2mNtBAVb+8TqDbCNalXNo56UUOD4=";
+    hash = "sha256-IhlQEeKGWcE2lVhcLbOqUQU+DboxMDc/9eDlzlfcprg=";
   };
 
-  cargoHash = "sha256-2XkfABzi55J/uO/2zO5QLLNx8pIb+YqowNPdJeMNdDI=";
+  cargoHash = "sha256-mf1kIDsNIk5oXIuvki9zt3D7qJOUtPOvDC8jbLjCMtE=";
 
   nativeBuildInputs = [
     pkg-config

From 2974b4a36587e74ca22afa5c5ad16b7e0bb924d9 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Mon, 29 Jun 2026 17:53:59 +0200
Subject: [PATCH 0962/1386] mkroot-utils: init at 0.5.3

Version 0.5.3 uses separate FIFOs for tests so they can no longer
interleave during concurrent execution and should be consistent now.

Co-authored-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/mk/mkroot-utils/package.nix | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/mk/mkroot-utils/package.nix

diff --git a/pkgs/by-name/mk/mkroot-utils/package.nix b/pkgs/by-name/mk/mkroot-utils/package.nix
new file mode 100644
index 000000000000..dcc13d4285a5
--- /dev/null
+++ b/pkgs/by-name/mk/mkroot-utils/package.nix
@@ -0,0 +1,49 @@
+{
+  busybox,
+  cmake,
+  fakeroot,
+  fetchFromGitLab,
+  gitUpdater,
+  lib,
+  python3,
+  stdenv,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mkroot-utils";
+  version = "0.5.3";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "mkroot-utils";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BT0OSK6QzxCegj8cXQcBbdfxoj+GxfGfDkyry0JN4Jo=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
+
+  prePatch = ''
+    substituteInPlace CMakeLists.txt flash/flash.c pico/picoget.c --replace-fail '/bin/ash' '${lib.getExe' busybox "ash"}'
+    patchShebangs test
+  '';
+
+  nativeCheckInputs = [ fakeroot ];
+
+  doCheck = true;
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
+
+  meta = {
+    description = "Simple utilities to extend RunC and \"mkroot\"";
+    homepage = "https://gitlab.com/arpa2/mkroot-utils";
+    license = lib.licenses.bsd2;
+    teams = with lib.teams; [ ngi ];
+  };
+})

From bc982679f2068745ffecabcfc5954debe77129a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 16:56:05 +0000
Subject: [PATCH 0963/1386] python3Packages.vsure: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix
index f372bacd3055..9f271596bf9b 100644
--- a/pkgs/development/python-modules/vsure/default.nix
+++ b/pkgs/development/python-modules/vsure/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "vsure";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-FC2aRsfxBGO8HaEHGJWweKgZzz8UG/03oB/E+hOAe/w=";
+    hash = "sha256-OxvRt3Vn53lll8YhNBApi0GWo2AqZ5q3QZeWOjCKjDU=";
   };
 
   build-system = [ setuptools ];

From 0f62009ab2ac5a6ac70410393d8315d484308600 Mon Sep 17 00:00:00 2001
From: 0xgsvs <0xgsvs@gmail.com>
Date: Tue, 7 Jul 2026 21:40:39 +0530
Subject: [PATCH 0964/1386] anchor: fix cargo metadata discovery on darwin Nix
 sandboxes

---
 pkgs/by-name/an/anchor/package.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix
index 76b35e307594..bd8e0316c6da 100644
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,6 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-oEgWfklxjP8+TxrhDKJgcTsanpqJpEiHXJyir8neYj8=";
 
+  # Upstream patch to fix cargo metadata discovery on macOS Nix sandboxes.
+  # Replaces fragile subprocess-cwd approach with in-process manifest path
+  # resolution. Remove on next version bump (included in v1.1.3+).
+  # See: https://github.com/otter-sec/anchor/pull/4757
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/otter-sec/anchor/commit/25bf2112b67d84e5bc406d7eac2919c90d8e54ed.patch";
+      hash = "sha256-q5OGNoUGPuCNHgaZNo9fmUxqQnFH2MhRW4ZefX+Of0Y=";
+    })
+  ];
+
   # Only build the anchor-cli package
   cargoBuildFlags = [
     "-p"
@@ -31,16 +42,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "anchor-cli"
   ];
 
-  # These tests use tempdir + cargo metadata subprocess which fails on Darwin
-  # sandboxes due to getcwd() differences (XNU vs Linux). Tracked upstream at
-  # https://github.com/otter-sec/anchor/issues/4751
-  checkFlags = map (t: "--skip=${t}") (
-    lib.optionals stdenv.hostPlatform.isDarwin [
-      "program::tests::discover_solana_programs_finds_sibling_programs_from_nested_member"
-      "program::tests::discover_solana_programs_lists_all_members_from_nested_member"
-    ]
-  );
-
   meta = {
     description = "Solana Sealevel Framework";
     homepage = "https://github.com/otter-sec/anchor";

From 66ab755e38108669525796104d7ef9953d6164e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 17:15:46 +0000
Subject: [PATCH 0965/1386] gridtracker2: 2.260705.2 -> 2.260714.0

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

diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix
index 29e695afb3f9..bd45ad2b1ed2 100644
--- a/pkgs/by-name/gr/gridtracker2/package.nix
+++ b/pkgs/by-name/gr/gridtracker2/package.nix
@@ -11,13 +11,13 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "gridtracker2";
-  version = "2.260705.2";
+  version = "2.260714.0";
 
   src = fetchFromGitLab {
     owner = "gridtracker.org";
     repo = "gridtracker2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LYBzoxLCJqbGI8j9nBDFfo9PPTiVDpbT6hM4TJEab1s=";
+    hash = "sha256-ZY+p86wgjzVNALBt6+Gn68sZ6tNcsq5wo1QykZccPT0=";
   };
 
   npmDepsHash = "sha256-5h3bswjVf/8JHhwHRFTUfydN7XXtWbxNHTZ0mLL7RT8=";

From 7d9f7694cce940da40c0ff74f83ddc41bf4b84e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 17:27:20 +0000
Subject: [PATCH 0966/1386] python3Packages.moyopy: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix
index b4efbc71cf17..9ddaf463fe70 100644
--- a/pkgs/development/python-modules/moyopy/default.nix
+++ b/pkgs/development/python-modules/moyopy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "moyopy";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
     owner = "spglib";
     repo = "moyo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xDgkKwWZovHgkJH3Jcp7/Yz8oAySdDVEbrOCGIpdI4c=";
+    hash = "sha256-JtuezfTh7fkHW97t8BiBVi1a3vrc2+9qKjGYc0FgkAc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/moyopy";
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-xivPb07t7MPK09SCeXQqyycrI0WB+LgOB15pIA6cAkE=";
+    hash = "sha256-l9fi5XMX4Ut6LmnKt+HAA55QRQtZKAx544Xa5a3RqHY=";
   };
 
   build-system = [

From 97fcdddb09d657d711adb5d5729ba117921c2676 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 17:37:01 +0000
Subject: [PATCH 0967/1386] python3Packages.quantiphy: 2.22 -> 2.22.1

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

diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix
index bbb375870e76..7fabf9d6a452 100644
--- a/pkgs/development/python-modules/quantiphy/default.nix
+++ b/pkgs/development/python-modules/quantiphy/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "quantiphy";
-  version = "2.22";
+  version = "2.22.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "quantiphy";
     tag = "v${version}";
-    hash = "sha256-4kfuNi+5fO/WH6P+2UUWKOGYSOjAI3S9yOyCArccz+8=";
+    hash = "sha256-k6EZJI+7a7qRAKIJkddGTaR3CE9VIbF4J/WXzE9C+7o=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 9daa809fe83d13f2ae75a012d0a82ae0d06344f1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 15 Jul 2026 00:36:52 +0200
Subject: [PATCH 0968/1386] python3Packages.stone: 3.3.9 -> 3.5.2

---
 .../python-modules/stone/default.nix          | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix
index 7fc25bd40763..bc097a2b19e0 100644
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -8,33 +8,37 @@
   ply,
   pytestCheckHook,
   setuptools,
-  six,
+  setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "stone";
-  version = "3.3.9";
+  version = "3.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dropbox";
     repo = "stone";
-    tag = "v${version}";
-    hash = "sha256-3tUV2JrE3S2Tj/9aHvzfBTkIWUmWzkWNsVLr5yWRE/Q=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-05sAhyQx3IalHqNkSrJgRDJz85M331hF5Crc/gtP6jE=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "'pytest-runner == 5.3.2'," ""
+    # https://github.com/dropbox/stone/pull/373 pins setuptools-scm to <9,
+    # but that version is not in nixpkgs and it seems to work anyway?
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools-scm>=8,<9" "setuptools-scm"
   '';
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     jinja2
-    ply
-    six
     packaging
+    ply
   ];
 
   nativeCheckInputs = [
@@ -47,9 +51,9 @@ buildPythonPackage rec {
   meta = {
     description = "Official API Spec Language for Dropbox API V2";
     homepage = "https://github.com/dropbox/stone";
-    changelog = "https://github.com/dropbox/stone/releases/tag/${src.tag}";
+    changelog = "https://github.com/dropbox/stone/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "stone";
   };
-}
+})

From e3313e6d3458a4599bbb5015d3b1f625fc5aa199 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 15 Jul 2026 00:37:09 +0200
Subject: [PATCH 0969/1386] python3Packages.dropbox: 12.0.2 -> 12.2.0

---
 .../python-modules/dropbox/default.nix        | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index c4fd3dd51b3b..7e7b0788b6fd 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -2,9 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools_80,
+  setuptools,
   requests,
-  six,
   stone,
   mock,
   pytest-mock,
@@ -13,9 +12,9 @@
   sphinx-rtd-theme,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dropbox";
-  version = "12.0.2";
+  version = "12.2.0";
   pyproject = true;
 
   outputs = [
@@ -26,15 +25,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dropbox";
     repo = "dropbox-sdk-python";
-    tag = "v${version}";
-    hash = "sha256-9Fsh06V226vIyJhrlLkh9Xr4UGoEIISnIFCtuKqI218=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Hkfv9+nofc9PMCw7crF3bw4bOFlzbJCHTW8hGxc91Pc=";
   };
 
-  build-system = [ setuptools_80 ];
+  build-system = [ setuptools ];
 
   dependencies = [
     requests
-    six
     stone
   ];
 
@@ -44,11 +42,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "'pytest-runner==5.2.0'," ""
-  '';
-
   pythonImportsCheck = [ "dropbox" ];
 
   nativeBuildInputs = [
@@ -56,17 +49,11 @@ buildPythonPackage rec {
     sphinx-rtd-theme
   ];
 
-  # Version 12.0.0 re-introduced Python 2 support and set some very restrictive version bounds
-  # https://github.com/dropbox/dropbox-sdk-python/commit/75596daf316b4a806f18057e2797a15bdf83cf6d
-  # This will be the last major version to support Python 2, so version bounds might be more reasonable again in the future.
-  pythonRelaxDeps = [
-    "stone"
-  ];
-
   # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.
   disabledTests = [
-    "test_default_oauth2_urls"
     "test_bad_auth"
+    "test_bad_pins"
+    "test_bad_pins_session"
     "test_multi_auth"
     "test_refresh"
     "test_app_auth"
@@ -83,15 +70,14 @@ buildPythonPackage rec {
     "test_as_user"
     "test_as_admin"
     "test_clone_when_team_linked"
-    "test_bad_pins"
-    "test_bad_pins_session"
+    "test_upload_auto_content_hash"
   ];
 
   meta = {
     description = "Python library for Dropbox's HTTP-based Core and Datastore APIs";
     homepage = "https://github.com/dropbox/dropbox-sdk-python";
-    changelog = "https://github.com/dropbox/dropbox-sdk-python/releases/tag/${src.tag}";
+    changelog = "https://github.com/dropbox/dropbox-sdk-python/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sfrijters ];
   };
-}
+})

From efcdef32c3b747d2d7bd3d1afe55748805205558 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 15 Jul 2026 01:21:35 +0200
Subject: [PATCH 0970/1386] python3Packages.maestral: fix for dropbox 12.2.0

---
 pkgs/development/python-modules/maestral/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 027768672711..7872d821bc2c 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -41,6 +41,13 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-mYFiQL4FumJWP2y1u5tIo1CZL027J8/EIYqJQde7G/c=";
   };
 
+  postPatch = ''
+    # is_not_closed was removed from dropbox in https://github.com/dropbox/dropbox-sdk-python/pull/537
+    # Upstream has been archived so we cannot expect a fix - use this workaround to keep the package alive a bit longer
+    substituteInPlace src/maestral/errorhandling.py \
+      --replace-fail "elif session_lookup_error.is_not_closed():" "elif False:"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From 9d26adcd20f27f32644dced59cb01416922e99cd Mon Sep 17 00:00:00 2001
From: Eman Resu <elevenaka11@gmail.com>
Date: Wed, 15 Jul 2026 13:56:52 -0400
Subject: [PATCH 0971/1386] treewide: avoid using singleton lists for licenses

---
 .../editors/vscode/extensions/vadimcn.vscode-lldb/default.nix   | 2 +-
 pkgs/applications/graphics/gimp/plugins/default.nix             | 2 +-
 pkgs/by-name/ac/actool/package.nix                              | 2 +-
 pkgs/by-name/al/alephone/package.nix                            | 2 +-
 pkgs/by-name/an/angrr/package.nix                               | 2 +-
 pkgs/by-name/av/avalonia/package.nix                            | 2 +-
 pkgs/by-name/ba/bartender/package.nix                           | 2 +-
 pkgs/by-name/be/bespokesynth/package.nix                        | 2 +-
 pkgs/by-name/be/betterdisplay/package.nix                       | 2 +-
 pkgs/by-name/bo/bounty/package.nix                              | 2 +-
 pkgs/by-name/ca/cargo-sbom/package.nix                          | 2 +-
 pkgs/by-name/ca/cargo-shear/package.nix                         | 2 +-
 pkgs/by-name/ca/cargo-sonar/package.nix                         | 2 +-
 pkgs/by-name/ch/chow-kick/package.nix                           | 2 +-
 pkgs/by-name/ch/chrome-export/package.nix                       | 2 +-
 pkgs/by-name/ci/cinnamon/package.nix                            | 2 +-
 pkgs/by-name/ci/civetweb/package.nix                            | 2 +-
 pkgs/by-name/cl/claude-mergetool/package.nix                    | 2 +-
 pkgs/by-name/cl/click/package.nix                               | 2 +-
 pkgs/by-name/cl/cloudmonkey/package.nix                         | 2 +-
 pkgs/by-name/cn/cnstrokeorder/package.nix                       | 2 +-
 pkgs/by-name/co/cockpit-files/package.nix                       | 2 +-
 pkgs/by-name/co/cockpit-machines/package.nix                    | 2 +-
 pkgs/by-name/co/cockpit-podman/package.nix                      | 2 +-
 pkgs/by-name/co/codesearch/package.nix                          | 2 +-
 pkgs/by-name/cp/cpplint/package.nix                             | 2 +-
 pkgs/by-name/da/daisydisk/package.nix                           | 2 +-
 pkgs/by-name/de/deniseemu/package.nix                           | 2 +-
 pkgs/by-name/de/descent3/package.nix                            | 2 +-
 pkgs/by-name/de/deterministic-uname/package.nix                 | 2 +-
 pkgs/by-name/em/emmy-lua-code-style/package.nix                 | 2 +-
 pkgs/by-name/en/enpass-mac/package.nix                          | 2 +-
 pkgs/by-name/ev/evmdis/package.nix                              | 2 +-
 pkgs/by-name/fe/fedimint/package.nix                            | 2 +-
 pkgs/by-name/fl/flare/engine.nix                                | 2 +-
 pkgs/by-name/fl/flare/game.nix                                  | 2 +-
 pkgs/by-name/fl/flatcc/package.nix                              | 2 +-
 pkgs/by-name/fo/ford/package.nix                                | 2 +-
 pkgs/by-name/fo/fortls/package.nix                              | 2 +-
 pkgs/by-name/fo/fortran-language-server/package.nix             | 2 +-
 pkgs/by-name/fr/freepv/package.nix                              | 2 +-
 pkgs/by-name/fy/fyi/package.nix                                 | 2 +-
 pkgs/by-name/ge/geesefs/package.nix                             | 2 +-
 pkgs/by-name/gi/git-absorb/package.nix                          | 2 +-
 pkgs/by-name/gi/git-gr/package.nix                              | 2 +-
 pkgs/by-name/gi/git-metrics/package.nix                         | 2 +-
 pkgs/by-name/gi/git-point/package.nix                           | 2 +-
 pkgs/by-name/gi/git-prole/package.nix                           | 2 +-
 pkgs/by-name/gi/git-upstream/package.nix                        | 2 +-
 pkgs/by-name/gi/git-vanity-hash/package.nix                     | 2 +-
 pkgs/by-name/go/goofys/package.nix                              | 2 +-
 pkgs/by-name/gp/gpg-mdp/package.nix                             | 2 +-
 pkgs/by-name/gr/greenx/package.nix                              | 2 +-
 pkgs/by-name/gr/greybird/package.nix                            | 2 +-
 pkgs/by-name/gu/guilt/package.nix                               | 2 +-
 pkgs/by-name/ho/hotdoc/package.nix                              | 2 +-
 pkgs/by-name/ho/hover/package.nix                               | 2 +-
 pkgs/by-name/hu/hunspell/dictionaries.nix                       | 2 +-
 pkgs/by-name/ib/ibtool/package.nix                              | 2 +-
 pkgs/by-name/ik/ikill/package.nix                               | 2 +-
 pkgs/by-name/is/iso-flags/package.nix                           | 2 +-
 pkgs/by-name/ja/jackass/package.nix                             | 2 +-
 pkgs/by-name/ka/kanji-stroke-order-font/package.nix             | 2 +-
 pkgs/by-name/kx/kx-aspe-cli/package.nix                         | 2 +-
 pkgs/by-name/li/libamplsolver/package.nix                       | 2 +-
 pkgs/by-name/li/libgdsii/package.nix                            | 2 +-
 pkgs/by-name/li/libr3/package.nix                               | 2 +-
 pkgs/by-name/li/libz/package.nix                                | 2 +-
 pkgs/by-name/li/lief/package.nix                                | 2 +-
 pkgs/by-name/ls/lsb-release/package.nix                         | 2 +-
 pkgs/by-name/ma/marco/package.nix                               | 2 +-
 pkgs/by-name/ma/mate-calc/package.nix                           | 2 +-
 pkgs/by-name/ma/mate-polkit/package.nix                         | 2 +-
 pkgs/by-name/ma/mate-system-monitor/package.nix                 | 2 +-
 pkgs/by-name/ma/mate-tweak/package.nix                          | 2 +-
 pkgs/by-name/md/mdbook-open-on-gh/package.nix                   | 2 +-
 pkgs/by-name/md/mdbook/package.nix                              | 2 +-
 pkgs/by-name/mi/mimeo/package.nix                               | 2 +-
 pkgs/by-name/mi/misc-gitology/package.nix                       | 2 +-
 pkgs/by-name/mu/multipart-parser-c/package.nix                  | 2 +-
 pkgs/by-name/mu/multiqc/package.nix                             | 2 +-
 pkgs/by-name/mu/mustache-go/package.nix                         | 2 +-
 pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix              | 2 +-
 pkgs/by-name/ne/nexusmods-app/package.nix                       | 2 +-
 pkgs/by-name/ni/nim-atlas/package.nix                           | 2 +-
 pkgs/by-name/ni/nimdow/package.nix                              | 2 +-
 pkgs/by-name/ni/nitrokey-udev-rules/package.nix                 | 2 +-
 pkgs/by-name/ni/nix-your-shell/package.nix                      | 2 +-
 pkgs/by-name/ni/nixdoc/package.nix                              | 2 +-
 pkgs/by-name/nm/nmh/package.nix                                 | 2 +-
 pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix         | 2 +-
 pkgs/by-name/oc/oci2git/package.nix                             | 2 +-
 pkgs/by-name/op/openapv/package.nix                             | 2 +-
 pkgs/by-name/op/openorbitaloptimizer/package.nix                | 2 +-
 pkgs/by-name/op/opentelemetry-cpp/package.nix                   | 2 +-
 pkgs/by-name/op/openttd-ttf/package.nix                         | 2 +-
 pkgs/by-name/pe/pebble/package.nix                              | 2 +-
 pkgs/by-name/pg/pgtop/package.nix                               | 2 +-
 pkgs/by-name/pi/piped/package.nix                               | 2 +-
 pkgs/by-name/pk/pkarr/package.nix                               | 2 +-
 pkgs/by-name/pr/prek/package.nix                                | 2 +-
 pkgs/by-name/pr/prometheus-cpp/package.nix                      | 2 +-
 pkgs/by-name/px/pxattr/package.nix                              | 2 +-
 pkgs/by-name/py/python-caja/package.nix                         | 2 +-
 pkgs/by-name/ra/radicle-explorer/package.nix                    | 2 +-
 pkgs/by-name/rb/rblake2sum/package.nix                          | 2 +-
 pkgs/by-name/rb/rblake3sum/package.nix                          | 2 +-
 pkgs/by-name/rc/rc/package.nix                                  | 2 +-
 pkgs/by-name/ro/rode-central/package.nix                        | 2 +-
 pkgs/by-name/ru/rusti-cal/package.nix                           | 2 +-
 pkgs/by-name/sg/sgx-azure-dcap-client/package.nix               | 2 +-
 pkgs/by-name/sh/sha2wordlist/package.nix                        | 2 +-
 pkgs/by-name/si/silx/package.nix                                | 2 +-
 pkgs/by-name/si/simple-completion-language-server/package.nix   | 2 +-
 pkgs/by-name/si/sirula/package.nix                              | 2 +-
 pkgs/by-name/ss/sscg/package.nix                                | 2 +-
 pkgs/by-name/st/strip-ansi/package.nix                          | 2 +-
 pkgs/by-name/ta/tack/package.nix                                | 2 +-
 pkgs/by-name/ta/tarssh/package.nix                              | 2 +-
 pkgs/by-name/td/tdlib/package.nix                               | 2 +-
 pkgs/by-name/to/tox-node/package.nix                            | 2 +-
 pkgs/by-name/tr/trillian/package.nix                            | 2 +-
 pkgs/by-name/tu/tuistash/package.nix                            | 2 +-
 pkgs/by-name/uh/uhhyou-plugins-juce/package.nix                 | 2 +-
 pkgs/by-name/vi/virtio-win/package.nix                          | 2 +-
 pkgs/by-name/vp/vpl-gpu-rt/package.nix                          | 2 +-
 pkgs/by-name/vs/vst2-sdk/package.nix                            | 2 +-
 pkgs/by-name/vx/vxl/package.nix                                 | 2 +-
 pkgs/by-name/wi/win-spice/package.nix                           | 2 +-
 pkgs/by-name/yq/yq-go/package.nix                               | 2 +-
 pkgs/development/python-modules/aiosonos/default.nix            | 2 +-
 pkgs/development/python-modules/anyqt/default.nix               | 2 +-
 pkgs/development/python-modules/baycomp/default.nix             | 2 +-
 pkgs/development/python-modules/beets-importreplace/default.nix | 2 +-
 pkgs/development/python-modules/beets-ytimport/default.nix      | 2 +-
 .../development/python-modules/bundlewrap-teamvault/default.nix | 2 +-
 pkgs/development/python-modules/bundlewrap/default.nix          | 2 +-
 pkgs/development/python-modules/fabio/default.nix               | 2 +-
 pkgs/development/python-modules/geometric/default.nix           | 2 +-
 pkgs/development/python-modules/i2c-tools/default.nix           | 2 +-
 pkgs/development/python-modules/intervaltree/default.nix        | 2 +-
 pkgs/development/python-modules/lm-eval/default.nix             | 2 +-
 pkgs/development/python-modules/logging-tree/default.nix        | 2 +-
 pkgs/development/python-modules/luigi/default.nix               | 2 +-
 pkgs/development/python-modules/meson-python/default.nix        | 2 +-
 pkgs/development/python-modules/mplfinance/default.nix          | 2 +-
 pkgs/development/python-modules/packbits/default.nix            | 2 +-
 pkgs/development/python-modules/pyaskalono/default.nix          | 2 +-
 pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix  | 2 +-
 pkgs/development/python-modules/qasync/default.nix              | 2 +-
 .../development/python-modules/range-typed-integers/default.nix | 2 +-
 pkgs/development/python-modules/raven/default.nix               | 2 +-
 pkgs/development/python-modules/rfc7464/default.nix             | 2 +-
 pkgs/development/python-modules/serverfiles/default.nix         | 2 +-
 pkgs/development/python-modules/simpy/default.nix               | 2 +-
 pkgs/development/python-modules/stop-words/default.nix          | 2 +-
 pkgs/development/python-modules/torcheval/default.nix           | 2 +-
 pkgs/development/python-modules/tqdm-multiprocess/default.nix   | 2 +-
 pkgs/development/python-modules/trubar/default.nix              | 2 +-
 pkgs/development/python-modules/tstr/default.nix                | 2 +-
 .../python-modules/unicode-segmentation-rs/default.nix          | 2 +-
 pkgs/development/python-modules/vg/default.nix                  | 2 +-
 pkgs/development/python-modules/wand/default.nix                | 2 +-
 pkgs/development/python-modules/word2number/default.nix         | 2 +-
 pkgs/kde/misc/kdiagram/default.nix                              | 2 +-
 pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix            | 2 +-
 pkgs/kde/misc/marknote/default.nix                              | 2 +-
 pkgs/kde/misc/plasma-pass/default.nix                           | 2 +-
 pkgs/os-specific/darwin/by-name/ic/ICU/package.nix              | 2 +-
 pkgs/os-specific/linux/mstflint_access/default.nix              | 2 +-
 pkgs/os-specific/linux/ply/default.nix                          | 2 +-
 pkgs/os-specific/linux/sgx/psw/default.nix                      | 2 +-
 pkgs/os-specific/linux/system76-acpi/default.nix                | 2 +-
 pkgs/os-specific/linux/system76/default.nix                     | 2 +-
 pkgs/top-level/perl-packages.nix                                | 2 +-
 175 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index 51f89e1e87c3..7523d64c9ea6 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -180,7 +180,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Native debugger extension for VSCode based on LLDB";
     homepage = "https://github.com/vadimcn/vscode-lldb";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index cdbac84aaf3d..150a61aa1701 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -243,7 +243,7 @@ lib.makeScope pkgs.newScope (
         broken = lib.versionOlder gimp.version "3";
         description = "Suite of gimp plugins for texture synthesis";
         homepage = "https://github.com/bootchk/resynthesizer";
-        license = [ lib.licenses.gpl3Plus ];
+        license = lib.licenses.gpl3Plus;
       };
     };
 
diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix
index a33cf769d26a..92e38b436951 100644
--- a/pkgs/by-name/ac/actool/package.nix
+++ b/pkgs/by-name/ac/actool/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Apple's actool reimplementation";
     homepage = "https://github.com/viraptor/actool";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "actool";
     maintainers = [ lib.maintainers.viraptor ];
   };
diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix
index 42fb25a838dc..a0d7cb135ba0 100644
--- a/pkgs/by-name/al/alephone/package.nix
+++ b/pkgs/by-name/al/alephone/package.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
     mainProgram = "alephone";
     homepage = "https://alephone.lhowon.org/";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
   };
 
diff --git a/pkgs/by-name/an/angrr/package.nix b/pkgs/by-name/an/angrr/package.nix
index 0ef7b65f393d..c100ef488f36 100644
--- a/pkgs/by-name/an/angrr/package.nix
+++ b/pkgs/by-name/an/angrr/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Auto Nix GC Root Retention";
     homepage = "https://github.com/linyinfeng/angrr";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yinfeng ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "angrr";
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 91460fe1cc90..e017df48942d 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -203,7 +203,7 @@ stdenvNoCC.mkDerivation (
 
       meta = {
         homepage = "https://avaloniaui.net/";
-        license = [ lib.licenses.mit ];
+        license = lib.licenses.mit;
         maintainers = with lib.maintainers; [ corngood ];
         description = "Cross-platform UI framework for dotnet";
         sourceProvenance = with lib.sourceTypes; [
diff --git a/pkgs/by-name/ba/bartender/package.nix b/pkgs/by-name/ba/bartender/package.nix
index 67a14d429c5c..3b62a9c9020e 100644
--- a/pkgs/by-name/ba/bartender/package.nix
+++ b/pkgs/by-name/ba/bartender/package.nix
@@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     changelog = "https://downloads.macbartender.com/B2/updates/${
       builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }/rnotes.html";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [
       stepbrobd
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 36ed0ff97e27..4c2181fe9523 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Software modular synth with controllers support, scripting and VST";
     homepage = "https://www.bespokesynth.com/";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       astro
       tobiasBora
diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix
index de3ea22f032d..38f5ca39b283 100644
--- a/pkgs/by-name/be/betterdisplay/package.nix
+++ b/pkgs/by-name/be/betterdisplay/package.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more";
     homepage = "https://betterdisplay.pro/";
     changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/bo/bounty/package.nix b/pkgs/by-name/bo/bounty/package.nix
index 3f2a43d4e5ad..d16d4c6dc29d 100644
--- a/pkgs/by-name/bo/bounty/package.nix
+++ b/pkgs/by-name/bo/bounty/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "CLI tool for bountybot.dev";
     homepage = "https://github.com/ghbountybot/cli";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ andrewgazelka ];
     mainProgram = "bounty";
   };
diff --git a/pkgs/by-name/ca/cargo-sbom/package.nix b/pkgs/by-name/ca/cargo-sbom/package.nix
index de854436a5fb..3e6a9514067e 100644
--- a/pkgs/by-name/ca/cargo-sbom/package.nix
+++ b/pkgs/by-name/ca/cargo-sbom/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Create software bill of materials (SBOM) for Rust";
     homepage = "https://github.com/psastras/sbom-rs";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index 09de9e544fe2..ff89dd62390d 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "cargo-shear";
     homepage = "https://github.com/Boshen/cargo-shear";
     changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.cathalmullan ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix
index 1732402c8734..bd53a609c21d 100644
--- a/pkgs/by-name/ca/cargo-sonar/package.nix
+++ b/pkgs/by-name/ca/cargo-sonar/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Utility to produce some Sonar-compatible format from different Rust tools like cargo-clippy cargo-audit or cargo-outdated";
     mainProgram = "cargo-sonar";
     homepage = "https://gitlab.com/woshilapin/cargo-sonar";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.jonboh ];
   };
 })
diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index 729e7f93c03e..b85a99bba6e4 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/Chowdhury-DSP/ChowKick";
     description = "Kick synthesizer based on old-school drum machine circuits";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
     mainProgram = "ChowKick";
diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix
index 0228861b2edf..ba40c910fb6d 100644
--- a/pkgs/by-name/ch/chrome-export/package.nix
+++ b/pkgs/by-name/ch/chrome-export/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files";
     homepage = "https://github.com/bdesham/chrome-export";
-    license = [ lib.licenses.isc ];
+    license = lib.licenses.isc;
     maintainers = [ lib.maintainers.bdesham ];
     platforms = python3.meta.platforms;
   };
diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index cb28d2074460..b8dbff2dacee 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/linuxmint/cinnamon";
     description = "Cinnamon desktop environment";
-    license = [ lib.licenses.gpl2 ];
+    license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.cinnamon ];
   };
diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix
index 6736b11090e8..13c996fddcbf 100644
--- a/pkgs/by-name/ci/civetweb/package.nix
+++ b/pkgs/by-name/ci/civetweb/package.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Embedded C/C++ web server";
     mainProgram = "civetweb";
     homepage = "https://github.com/civetweb/civetweb";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/cl/claude-mergetool/package.nix b/pkgs/by-name/cl/claude-mergetool/package.nix
index f323cdc2ed54..29cf3dfd9a55 100644
--- a/pkgs/by-name/cl/claude-mergetool/package.nix
+++ b/pkgs/by-name/cl/claude-mergetool/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/9999years/claude-mergetool";
     changelog = "https://github.com/9999years/claude-mergetool/releases/tag/v${version}";
     description = "Resolve Git/jj merge conflicts automatically with claude-code";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "claude-mergetool";
   };
diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix
index 15f231edc31f..1afd7f01f9a9 100644
--- a/pkgs/by-name/cl/click/package.nix
+++ b/pkgs/by-name/cl/click/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Command Line Interactive Controller for Kubernetes";
     homepage = "https://github.com/databricks/click";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.mbode ];
     mainProgram = "click";
   };
diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix
index 34f60d86ea4b..b93780123a74 100644
--- a/pkgs/by-name/cl/cloudmonkey/package.nix
+++ b/pkgs/by-name/cl/cloudmonkey/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI for Apache CloudStack";
     homepage = "https://github.com/apache/cloudstack-cloudmonkey";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.womfoo ];
     mainProgram = "cloudstack-cloudmonkey";
   };
diff --git a/pkgs/by-name/cn/cnstrokeorder/package.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix
index 44d4d21b886f..02b0f35635cb 100644
--- a/pkgs/by-name/cn/cnstrokeorder/package.nix
+++ b/pkgs/by-name/cn/cnstrokeorder/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "Chinese font that shows stroke order for HSK 1-4";
     homepage = "http://rtega.be/chmn/index.php?subpage=68";
-    license = [ lib.licenses.arphicpl ];
+    license = lib.licenses.arphicpl;
     maintainers = with lib.maintainers; [ johnazoidberg ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix
index 60ad181b1230..e2d15ae8d224 100644
--- a/pkgs/by-name/co/cockpit-files/package.nix
+++ b/pkgs/by-name/co/cockpit-files/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cockpit-project/cockpit-files";
     changelog = "https://github.com/cockpit-project/cockpit-files/releases/tag/${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
     teams = [ lib.teams.cockpit ];
   };
 })
diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix
index b58acdbcee30..96f4fb87e736 100644
--- a/pkgs/by-name/co/cockpit-machines/package.nix
+++ b/pkgs/by-name/co/cockpit-machines/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cockpit-project/cockpit-machines";
     changelog = "https://github.com/cockpit-project/cockpit-machines/releases/tag/${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
     teams = [ lib.teams.cockpit ];
   };
 })
diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix
index 7a5278395eed..f2419ca2f855 100644
--- a/pkgs/by-name/co/cockpit-podman/package.nix
+++ b/pkgs/by-name/co/cockpit-podman/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cockpit-project/cockpit-podman";
     changelog = "https://github.com/cockpit-project/cockpit-podman/releases/tag/${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
     teams = [ lib.teams.cockpit ];
   };
 })
diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix
index bc55d87aaaa8..ef378b6f9396 100644
--- a/pkgs/by-name/co/codesearch/package.nix
+++ b/pkgs/by-name/co/codesearch/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Fast, indexed regexp search over large file trees";
     homepage = "https://github.com/google/codesearch";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ bennofs ];
   };
 })
diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix
index 35df50e7375c..44c42719e0bf 100644
--- a/pkgs/by-name/cp/cpplint/package.nix
+++ b/pkgs/by-name/cp/cpplint/package.nix
@@ -56,6 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Static code checker for C++";
     changelog = "https://github.com/cpplint/cpplint/releases/tag/${finalAttrs.version}";
     mainProgram = "cpplint";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix
index 784b352b8d82..3419cee31b3e 100644
--- a/pkgs/by-name/da/daisydisk/package.nix
+++ b/pkgs/by-name/da/daisydisk/package.nix
@@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Find out what’s taking up your disk space and recover it in the most efficient and easy way";
     homepage = "https://daisydiskapp.com/";
     changelog = "https://daisydiskapp.com/releases";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/de/deniseemu/package.nix b/pkgs/by-name/de/deniseemu/package.nix
index dfc536f64bec..4e2106e24685 100644
--- a/pkgs/by-name/de/deniseemu/package.nix
+++ b/pkgs/by-name/de/deniseemu/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://bitbucket.org/piciji/denise";
     downloadPage = "https://sourceforge.net/projects/deniseemu/";
     description = "C64 / Amiga Emulator";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.matthewcroughan ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/de/descent3/package.nix b/pkgs/by-name/de/descent3/package.nix
index 5027a8bc12e7..bf77dcebd4b1 100644
--- a/pkgs/by-name/de/descent3/package.nix
+++ b/pkgs/by-name/de/descent3/package.nix
@@ -15,7 +15,7 @@ runCommand "descent3-${descent3-unwrapped.version}"
     meta = descent3-unwrapped.meta // {
       # The code that produces the wrapper is in the Nixpkgs repo, and the
       # Nixpkgs repo is MIT Licensed.
-      license = [ lib.licenses.mit ];
+      license = lib.licenses.mit;
       longDescription = ''
         Playing Descent 3 using the Nix package manager is a little bit awkward
         at the moment. This wrapper makes it slightly less awkward. Here’s how
diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix
index f83c4ef9c0d5..7f2047400999 100644
--- a/pkgs/by-name/de/deterministic-uname/package.nix
+++ b/pkgs/by-name/de/deterministic-uname/package.nix
@@ -61,7 +61,7 @@ replaceVarsWith {
       not intercept these calls, builds made on different kernels will produce
       different results.
     '';
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ artturin ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/em/emmy-lua-code-style/package.nix b/pkgs/by-name/em/emmy-lua-code-style/package.nix
index 7cf1f72aafd1..e4597f81aadf 100644
--- a/pkgs/by-name/em/emmy-lua-code-style/package.nix
+++ b/pkgs/by-name/em/emmy-lua-code-style/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Fast, powerful, and feature-rich Lua formatting and checking tool";
     mainProgram = "CodeFormat";
     platforms = lib.platforms.unix;
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.nobbz ];
   };
 })
diff --git a/pkgs/by-name/en/enpass-mac/package.nix b/pkgs/by-name/en/enpass-mac/package.nix
index c03fd6eb77b1..34e3cfcdb9e9 100644
--- a/pkgs/by-name/en/enpass-mac/package.nix
+++ b/pkgs/by-name/en/enpass-mac/package.nix
@@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Choose your own safest place to store passwords";
     homepage = "https://www.enpass.io";
     changelog = "https://www.enpass.io/release-notes/macos-website-ver/";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ DimitarNestorov ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/ev/evmdis/package.nix b/pkgs/by-name/ev/evmdis/package.nix
index 5d028fc29d8f..c7d7fbff6166 100644
--- a/pkgs/by-name/ev/evmdis/package.nix
+++ b/pkgs/by-name/ev/evmdis/package.nix
@@ -27,7 +27,7 @@ buildGoModule {
     homepage = "https://github.com/Arachnid/evmdis";
     description = "Ethereum EVM disassembler";
     mainProgram = "evmdis";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ asymmetric ];
   };
 }
diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index 86dfd656f004..6b6e350358f2 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Federated E-Cash Mint";
     homepage = "https://github.com/fedimint/fedimint";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "fedimint-cli";
   };
diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix
index 8b9e26d8e2d4..55ed135f8d7e 100644
--- a/pkgs/by-name/fl/flare/engine.nix
+++ b/pkgs/by-name/fl/flare/engine.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
       aanderse
       McSinyx
     ];
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix
index c3868c8d2b3d..0ec86b74347b 100644
--- a/pkgs/by-name/fl/flare/game.nix
+++ b/pkgs/by-name/fl/flare/game.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
       aanderse
       McSinyx
     ];
-    license = [ lib.licenses.cc-by-sa-30 ];
+    license = lib.licenses.cc-by-sa-30;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix
index 23300be4a0e1..62d30133edb2 100644
--- a/pkgs/by-name/fl/flatcc/package.nix
+++ b/pkgs/by-name/fl/flatcc/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "flatcc";
     homepage = "https://github.com/dvidelabs/flatcc";
     changelog = "https://github.com/dvidelabs/flatcc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ onny ];
   };
 })
diff --git a/pkgs/by-name/fo/ford/package.nix b/pkgs/by-name/fo/ford/package.nix
index c2f5f3ebfd4c..3f2dcec9710b 100644
--- a/pkgs/by-name/fo/ford/package.nix
+++ b/pkgs/by-name/fo/ford/package.nix
@@ -58,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Fortran documentation system";
     mainProgram = "ford";
     homepage = "https://github.com/Fortran-FOSS-Programmers/ford";
-    license = [ lib.licenses.gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.sheepforce ];
   };
 })
diff --git a/pkgs/by-name/fo/fortls/package.nix b/pkgs/by-name/fo/fortls/package.nix
index d6b771aa8aa3..a08b22726716 100644
--- a/pkgs/by-name/fo/fortls/package.nix
+++ b/pkgs/by-name/fo/fortls/package.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Fortran Language Server";
     mainProgram = "fortls";
     homepage = "https://github.com/fortran-lang/fortls";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sheepforce ];
   };
 })
diff --git a/pkgs/by-name/fo/fortran-language-server/package.nix b/pkgs/by-name/fo/fortran-language-server/package.nix
index 383732e2e574..04a61238dd86 100644
--- a/pkgs/by-name/fo/fortran-language-server/package.nix
+++ b/pkgs/by-name/fo/fortran-language-server/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "FORTRAN Language Server for the Language Server Protocol";
     mainProgram = "fortls";
     homepage = "https://pypi.org/project/fortran-language-server/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sheepforce ];
   };
 })
diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix
index 8ccd3ff08afc..e37de84d89f9 100644
--- a/pkgs/by-name/fr/freepv/package.nix
+++ b/pkgs/by-name/fr/freepv/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Open source panorama viewer using GL";
     homepage = "https://freepv.sourceforge.net/";
-    license = [ lib.licenses.lgpl21 ];
+    license = lib.licenses.lgpl21;
   };
 })
diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix
index c8218a4e8c19..e1ea4eaed3e9 100644
--- a/pkgs/by-name/fy/fyi/package.nix
+++ b/pkgs/by-name/fy/fyi/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://codeberg.org/dnkl/fyi/releases/tag/${finalAttrs.version}";
     description = "Command line utility to create desktop notifications";
     homepage = "https://codeberg.org/dnkl/fyi";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "fyi";
     maintainers = with lib.maintainers; [ marnym ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix
index be5ea1e7a896..658c16b34943 100644
--- a/pkgs/by-name/ge/geesefs/package.nix
+++ b/pkgs/by-name/ge/geesefs/package.nix
@@ -27,7 +27,7 @@ buildGoModule {
   meta = {
     homepage = "https://github.com/yandex-cloud/geesefs";
     description = "Finally, a good FUSE FS implementation over S3";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.flokli ];
     platforms = lib.platforms.unix;
     mainProgram = "geesefs";
diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix
index 711a366e1d26..e2cc2d6c46df 100644
--- a/pkgs/by-name/gi/git-absorb/package.nix
+++ b/pkgs/by-name/gi/git-absorb/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/tummychow/git-absorb";
     description = "git commit --fixup, but automatic";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix
index fdfd2141f396..5fc3aa0fb75a 100644
--- a/pkgs/by-name/gi/git-gr/package.nix
+++ b/pkgs/by-name/gi/git-gr/package.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/9999years/git-gr";
     changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}";
     description = "Gerrit CLI client";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "git-gr";
   };
diff --git a/pkgs/by-name/gi/git-metrics/package.nix b/pkgs/by-name/gi/git-metrics/package.nix
index d5b1bb5b5590..1072b3574423 100644
--- a/pkgs/by-name/gi/git-metrics/package.nix
+++ b/pkgs/by-name/gi/git-metrics/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/jdrouet/git-metrics";
     description = "Git extension to be able to track metrics about your project, within the git repository";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix
index 1420708e1cbc..75482bdd8d41 100644
--- a/pkgs/by-name/gi/git-point/package.nix
+++ b/pkgs/by-name/gi/git-point/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
       lib.maintainers.qyriad
       lib.maintainers.philiptaron
     ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
     platforms = lib.platforms.all;
     mainProgram = "git-point";
diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix
index 42d96fef65ec..e23acdab7709 100644
--- a/pkgs/by-name/gi/git-prole/package.nix
+++ b/pkgs/by-name/gi/git-prole/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/9999years/git-prole";
     changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}";
     description = "`git-worktree(1)` manager";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "git-prole";
   };
diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix
index b63abd7f7981..c2a5f88777ab 100644
--- a/pkgs/by-name/gi/git-upstream/package.nix
+++ b/pkgs/by-name/gi/git-upstream/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/9999years/git-upstream";
     changelog = "https://github.com/9999years/git-upstream/releases/tag/v${finalAttrs.version}";
     description = "Shortcut for `git push --set-upstream`";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "git-upstream";
   };
diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix
index 6179ecc4a2cc..911893091641 100644
--- a/pkgs/by-name/gi/git-vanity-hash/package.nix
+++ b/pkgs/by-name/gi/git-vanity-hash/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
   meta = {
     homepage = "https://github.com/prasmussen/git-vanity-hash";
     description = "Tool for creating commit hashes with a specific prefix";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.kaction ];
     mainProgram = "git-vanity-hash";
   };
diff --git a/pkgs/by-name/go/goofys/package.nix b/pkgs/by-name/go/goofys/package.nix
index 0a678d455e2d..3bf49d7232a4 100644
--- a/pkgs/by-name/go/goofys/package.nix
+++ b/pkgs/by-name/go/goofys/package.nix
@@ -29,7 +29,7 @@ buildGoModule {
   meta = {
     homepage = "https://github.com/kahing/goofys";
     description = "High-performance, POSIX-ish Amazon S3 file system written in Go";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
     mainProgram = "goofys";
diff --git a/pkgs/by-name/gp/gpg-mdp/package.nix b/pkgs/by-name/gp/gpg-mdp/package.nix
index 522cbc8852df..e62916a04459 100644
--- a/pkgs/by-name/gp/gpg-mdp/package.nix
+++ b/pkgs/by-name/gp/gpg-mdp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://tamentis.com/projects/mdp/";
     changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.isc ];
+    license = lib.licenses.isc;
     description = "Manage your passwords with GnuPG and a text editor";
   };
 
diff --git a/pkgs/by-name/gr/greenx/package.nix b/pkgs/by-name/gr/greenx/package.nix
index fb360c6728b8..16c1f586823d 100644
--- a/pkgs/by-name/gr/greenx/package.nix
+++ b/pkgs/by-name/gr/greenx/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Library for Green’s function based electronic structure theory calculations";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     homepage = "https://github.com/nomad-coe/greenX";
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix
index 29bd35504195..f79e3ea6f623 100644
--- a/pkgs/by-name/gr/greybird/package.nix
+++ b/pkgs/by-name/gr/greybird/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Grey and blue theme from the Shimmer Project for GTK-based environments";
     homepage = "https://github.com/shimmerproject/Greybird";
-    license = [ lib.licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later
+    license = lib.licenses.gpl2Plus; # or alternatively: cc-by-nc-sa-30 or later
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix
index 53d4e1249f9d..d3c0688368fd 100644
--- a/pkgs/by-name/gu/guilt/package.nix
+++ b/pkgs/by-name/gu/guilt/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/jeffpc/guilt";
     maintainers = with lib.maintainers; [ javimerino ];
-    license = [ lib.licenses.gpl2 ];
+    license = lib.licenses.gpl2;
     platforms = lib.platforms.all;
     mainProgram = "guilt";
   };
diff --git a/pkgs/by-name/ho/hotdoc/package.nix b/pkgs/by-name/ho/hotdoc/package.nix
index 47862db4d978..26576ee89438 100644
--- a/pkgs/by-name/ho/hotdoc/package.nix
+++ b/pkgs/by-name/ho/hotdoc/package.nix
@@ -115,7 +115,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Tastiest API documentation system";
     homepage = "https://hotdoc.github.io/";
-    license = [ lib.licenses.lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix
index 90de28ebf09e..b2718923a68d 100644
--- a/pkgs/by-name/ho/hover/package.nix
+++ b/pkgs/by-name/ho/hover/package.nix
@@ -48,7 +48,7 @@ let
     meta = {
       description = "Build tool to run Flutter applications on desktop";
       homepage = "https://github.com/go-flutter-desktop/hover";
-      license = [ lib.licenses.bsd3 ];
+      license = lib.licenses.bsd3;
       platforms = lib.platforms.linux;
       maintainers = [ lib.maintainers.ericdallo ];
     };
diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 94eee9bece0f..45ab2f171315 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -884,7 +884,7 @@ rec {
     meta = {
       description = "Hunspell dictionary for Russian, updated version as used in Mozilla products";
       homepage = "https://github.com/Goudron/ru-spelling-dictionary";
-      license = [ lib.licenses.mpl20 ];
+      license = lib.licenses.mpl20;
     };
   };
 
diff --git a/pkgs/by-name/ib/ibtool/package.nix b/pkgs/by-name/ib/ibtool/package.nix
index 7729742bf4c5..9d87e11e4fe4 100644
--- a/pkgs/by-name/ib/ibtool/package.nix
+++ b/pkgs/by-name/ib/ibtool/package.nix
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Apple's ibtool reimplementation";
     homepage = "https://github.com/viraptor/ibtool";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "ibtool";
     maintainers = [ lib.maintainers.viraptor ];
   };
diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix
index 9c656b996fb8..1e19b3f531b9 100644
--- a/pkgs/by-name/ik/ikill/package.nix
+++ b/pkgs/by-name/ik/ikill/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Interactively kill running processes";
     homepage = "https://github.com/pombadev/ikill";
     maintainers = with lib.maintainers; [ zendo ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     mainProgram = "ikill";
   };
diff --git a/pkgs/by-name/is/iso-flags/package.nix b/pkgs/by-name/is/iso-flags/package.nix
index d66e64f1ca16..679cb5edf42e 100644
--- a/pkgs/by-name/is/iso-flags/package.nix
+++ b/pkgs/by-name/is/iso-flags/package.nix
@@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://github.com/joielechong/iso-country-flags-svg-collection";
     description = "248 country flag SVG & PNG icons with different icon styles";
-    license = [ lib.licenses.publicDomain ];
+    license = lib.licenses.publicDomain;
     platforms = lib.platforms.linux; # the output assets should work anywhere, but unsure about the tools to build them...
     maintainers = [ lib.maintainers.mkg20001 ];
   };
diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix
index 99bba6cbcca1..50e820a7235c 100644
--- a/pkgs/by-name/ja/jackass/package.nix
+++ b/pkgs/by-name/ja/jackass/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
       PowerUser64
       l1npengtul
     ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
index e33bac6c9e31..3f88eee860ec 100644
--- a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
+++ b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters";
     homepage = "https://www.kanji.uk/";
 
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       ptrhlm
       stephen-huan
diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix
index 54ff953c63d4..e7e9d5ac1f46 100644
--- a/pkgs/by-name/kx/kx-aspe-cli/package.nix
+++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Keyoxide profile generator CLI using ASPE";
     mainProgram = "kx-aspe";
     platforms = lib.platforms.linux;
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.nobbz ];
   };
 })
diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix
index e836cc9a5741..e96a3604f7ec 100644
--- a/pkgs/by-name/li/libamplsolver/package.nix
+++ b/pkgs/by-name/li/libamplsolver/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library of routines that help solvers work with AMPL";
     homepage = "https://ampl.com/netlib/ampl/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ aanderse ];
     # generates header at compile time
diff --git a/pkgs/by-name/li/libgdsii/package.nix b/pkgs/by-name/li/libgdsii/package.nix
index d7c011932808..7484d4837a3e 100644
--- a/pkgs/by-name/li/libgdsii/package.nix
+++ b/pkgs/by-name/li/libgdsii/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library and command-line utility for reading GDSII geometry files";
     mainProgram = "GDSIIConvert";
     homepage = "https://github.com/HomerReid/libGDSII";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       sheepforce
       markuskowa
diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix
index 1145b48362d9..647b91eb1f83 100644
--- a/pkgs/by-name/li/libr3/package.nix
+++ b/pkgs/by-name/li/libr3/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "High-performance path dispatching library";
     homepage = "https://github.com/c9s/r3";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 
 })
diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix
index 6e351e7bb43e..dfde91c55dfa 100644
--- a/pkgs/by-name/li/libz/package.nix
+++ b/pkgs/by-name/li/libz/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://sortix.org/libz/";
     description = "Clean fork of zlib";
-    license = [ lib.licenses.zlib ];
+    license = lib.licenses.zlib;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/lief/package.nix b/pkgs/by-name/li/lief/package.nix
index d91399f0d52e..4b87c777fb79 100644
--- a/pkgs/by-name/li/lief/package.nix
+++ b/pkgs/by-name/li/lief/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library to Instrument Executable Formats";
     homepage = "https://lief.quarkslab.com/";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     platforms = with lib.platforms; linux ++ darwin;
     maintainers = with lib.maintainers; [
       lassulus
diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix
index 4e5f82c2c8ab..a0d17aae335d 100644
--- a/pkgs/by-name/ls/lsb-release/package.nix
+++ b/pkgs/by-name/ls/lsb-release/package.nix
@@ -23,7 +23,7 @@ replaceVarsWith {
   meta = {
     description = "Prints certain LSB (Linux Standard Base) and Distribution information";
     mainProgram = "lsb_release";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ma/marco/package.nix b/pkgs/by-name/ma/marco/package.nix
index 296c681f6282..7e830bfa5c06 100644
--- a/pkgs/by-name/ma/marco/package.nix
+++ b/pkgs/by-name/ma/marco/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "MATE default window manager";
     homepage = "https://github.com/mate-desktop/marco";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-calc/package.nix b/pkgs/by-name/ma/mate-calc/package.nix
index 3488fd4ba96f..91f18026e381 100644
--- a/pkgs/by-name/ma/mate-calc/package.nix
+++ b/pkgs/by-name/ma/mate-calc/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Calculator for the MATE desktop";
     homepage = "https://mate-desktop.org";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-polkit/package.nix b/pkgs/by-name/ma/mate-polkit/package.nix
index 49b7269fae3e..363842c17ebc 100644
--- a/pkgs/by-name/ma/mate-polkit/package.nix
+++ b/pkgs/by-name/ma/mate-polkit/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Integrates polkit authentication for MATE desktop";
     homepage = "https://mate-desktop.org";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-system-monitor/package.nix b/pkgs/by-name/ma/mate-system-monitor/package.nix
index bc8715962c5e..06ece55fd14b 100644
--- a/pkgs/by-name/ma/mate-system-monitor/package.nix
+++ b/pkgs/by-name/ma/mate-system-monitor/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "System monitor for the MATE desktop";
     mainProgram = "mate-system-monitor";
     homepage = "https://mate-desktop.org";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-tweak/package.nix b/pkgs/by-name/ma/mate-tweak/package.nix
index 63cc32afbd25..ee347085be71 100644
--- a/pkgs/by-name/ma/mate-tweak/package.nix
+++ b/pkgs/by-name/ma/mate-tweak/package.nix
@@ -85,7 +85,7 @@ python3Packages.buildPythonApplication rec {
     description = "Tweak tool for the MATE Desktop";
     homepage = "https://github.com/ubuntu-mate/mate-tweak";
     changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
index d922a63a13b8..841918c42094 100644
--- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix
+++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "mdbook preprocessor to add a open-on-github link on every page";
     mainProgram = "mdbook-open-on-gh";
     homepage = "https://github.com/badboy/mdbook-open-on-gh";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
 })
diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index fa23ac200d96..cceebdbc719a 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "mdbook";
     homepage = "https://github.com/rust-lang/mdBook";
     changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       Frostman
       matthiasbeyer
diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix
index 5edbcdaab098..4ac69cb3519a 100644
--- a/pkgs/by-name/mi/mimeo/package.nix
+++ b/pkgs/by-name/mi/mimeo/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication {
   meta = {
     description = "Open files by MIME-type or file name using regular expressions";
     homepage = "https://xyne.dev/projects/mimeo/";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.rycee ];
     platforms = lib.platforms.unix;
     mainProgram = "mimeo";
diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix
index 2b6c9f735544..df4c21bfb68b 100644
--- a/pkgs/by-name/mi/misc-gitology/package.nix
+++ b/pkgs/by-name/mi/misc-gitology/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Assortment of scripts around Git";
     homepage = "https://github.com/da-x/misc-gitology";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers._9999years ];
   };
 
diff --git a/pkgs/by-name/mu/multipart-parser-c/package.nix b/pkgs/by-name/mu/multipart-parser-c/package.nix
index 5406e880379e..482167366e09 100644
--- a/pkgs/by-name/mu/multipart-parser-c/package.nix
+++ b/pkgs/by-name/mu/multipart-parser-c/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Http multipart parser implemented in C";
     homepage = "https://github.com/iafonov/multipart-parser-c";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 
 }
diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix
index 320da0f89667..b8acb3350220 100644
--- a/pkgs/by-name/mu/multiqc/package.nix
+++ b/pkgs/by-name/mu/multiqc/package.nix
@@ -114,7 +114,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     '';
     homepage = "https://multiqc.info";
     changelog = "https://github.com/MultiQC/MultiQC/releases/tag/v${finalAttrs.version}/";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.apraga ];
     mainProgram = "multiqc";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix
index 509484983afa..2e88898d9693 100644
--- a/pkgs/by-name/mu/mustache-go/package.nix
+++ b/pkgs/by-name/mu/mustache-go/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/cbroglie/mustache";
     description = "Mustache template language in Go";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Zimmi48 ];
     mainProgram = "mustache";
   };
diff --git a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
index d0bc1b54563b..ee4e267442a0 100644
--- a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
+++ b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.viraptor ];
     description = "Neural Amp Modeler LV2 plugin implementation";
     homepage = finalAttrs.src.meta.homepage;
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
   };
 })
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 67f424342b6a..0f60677bb40c 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -197,7 +197,7 @@ buildDotnetModule (finalAttrs: {
     mainProgram = "NexusMods.App";
     homepage = "https://github.com/Nexus-Mods/NexusMods.App";
     changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.tag}";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       l0b0
       MattSturgeon
diff --git a/pkgs/by-name/ni/nim-atlas/package.nix b/pkgs/by-name/ni/nim-atlas/package.nix
index 4c8d92b3e095..bc35b46ba46d 100644
--- a/pkgs/by-name/ni/nim-atlas/package.nix
+++ b/pkgs/by-name/ni/nim-atlas/package.nix
@@ -23,7 +23,7 @@ buildNimPackage (
     meta = final.src.meta // {
       description = "Nim package cloner";
       mainProgram = "atlas";
-      license = [ lib.licenses.mit ];
+      license = lib.licenses.mit;
     };
   }
 )
diff --git a/pkgs/by-name/ni/nimdow/package.nix b/pkgs/by-name/ni/nimdow/package.nix
index 4e11d9a0d11d..475a5b7061d0 100644
--- a/pkgs/by-name/ni/nimdow/package.nix
+++ b/pkgs/by-name/ni/nimdow/package.nix
@@ -46,7 +46,7 @@ buildNimPackage (finalAttrs: {
     finalAttrs.src.meta // {
       description = "Nim based tiling window manager";
       platforms = lib.platforms.linux;
-      license = [ lib.licenses.gpl2 ];
+      license = lib.licenses.gpl2;
       maintainers = [ lib.maintainers.marcusramberg ];
       mainProgram = "nimdow";
     };
diff --git a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
index ee66ef3a3618..5bb74b7f114d 100644
--- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
+++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "udev rules for Nitrokey devices";
     homepage = "https://github.com/Nitrokey/nitrokey-udev-rules";
-    license = [ lib.licenses.cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [
       robinkrahl
     ];
diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
index da3cc7c51d86..3dedca30b6e2 100644
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "`nix` and `nix-shell` wrapper for shells other than `bash`";
     homepage = "https://github.com/MercuryTechnologies/nix-your-shell";
     changelog = "https://github.com/MercuryTechnologies/nix-your-shell/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _9999years ];
   };
 })
diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix
index 3d6c90120f14..0bb18b86aacd 100644
--- a/pkgs/by-name/ni/nixdoc/package.nix
+++ b/pkgs/by-name/ni/nixdoc/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Generate documentation for Nix functions";
     mainProgram = "nixdoc";
     homepage = "https://github.com/nix-community/nixdoc";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
       infinisil
       hsjobeki
diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 49c9f935a20f..9ab44d38ce02 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://nmh.nongnu.org/";
     downloadPage = "https://download.savannah.nongnu.org/releases/nmh/";
     changelog = "https://savannah.nongnu.org/news/?group=nmh";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     longDescription = ''
       This is the nmh mail user agent (reader/sender), a command-line based
       mail reader that is powerful and extensible.  nmh is an excellent choice
diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
index 1cc052beeeee..3c2be5e1c90f 100644
--- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
+++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Monochrome emoji font";
     homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji";
-    license = [ lib.licenses.ofl ];
+    license = lib.licenses.ofl;
     maintainers = [ lib.maintainers.nicoo ];
 
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/oc/oci2git/package.nix b/pkgs/by-name/oc/oci2git/package.nix
index 67de8e4ab9e2..e62c45995245 100644
--- a/pkgs/by-name/oc/oci2git/package.nix
+++ b/pkgs/by-name/oc/oci2git/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Introspecting Docker images as easy as using Git";
     homepage = "https://github.com/Virviil/oci2git";
     changelog = "https://github.com/Virviil/oci2git/releases/tag/v${finalAttrs.version}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.kpbaks ];
     mainProgram = "oci2git";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix
index 27d31127a004..949b98b7dbac 100644
--- a/pkgs/by-name/op/openapv/package.nix
+++ b/pkgs/by-name/op/openapv/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/AcademySoftwareFoundation/openapv/releases/tag/v${finalAttrs.version}";
     description = "Reference implementation of the APV codec";
     homepage = "https://github.com/AcademySoftwareFoundation/openapv";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ pyrox0 ];
   };
 })
diff --git a/pkgs/by-name/op/openorbitaloptimizer/package.nix b/pkgs/by-name/op/openorbitaloptimizer/package.nix
index e7e74680acca..6b608bf94f66 100644
--- a/pkgs/by-name/op/openorbitaloptimizer/package.nix
+++ b/pkgs/by-name/op/openorbitaloptimizer/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Common orbital optimisation algorithms for quantum chemistry";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     homepage = "https://github.com/susilehtola/OpenOrbitalOptimizer";
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index e144e405b3a0..4bd91de3da4c 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "OpenTelemetry C++ Client Library";
     homepage = "https://github.com/open-telemetry/opentelemetry-cpp";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       jfroche
       panicgh
diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix
index 29c995ee948f..9aa45a2a1315 100644
--- a/pkgs/by-name/op/openttd-ttf/package.nix
+++ b/pkgs/by-name/op/openttd-ttf/package.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/zephyris/openttd-ttf";
     changelog = "https://github.com/zephyris/openttd-ttf/releases/tag/${finalAttrs.version}";
     description = "TrueType typefaces for text in a pixel art style, designed for use in OpenTTD";
-    license = [ lib.licenses.gpl2 ];
+    license = lib.licenses.gpl2;
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.sfrijters ];
   };
diff --git a/pkgs/by-name/pe/pebble/package.nix b/pkgs/by-name/pe/pebble/package.nix
index 94cb097f5dfc..418e499bd84a 100644
--- a/pkgs/by-name/pe/pebble/package.nix
+++ b/pkgs/by-name/pe/pebble/package.nix
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/letsencrypt/pebble";
     description = "Small RFC 8555 ACME test server";
     longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
-    license = [ lib.licenses.mpl20 ];
+    license = lib.licenses.mpl20;
     mainProgram = "pebble";
     teams = [ lib.teams.acme ];
   };
diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix
index fdb3153caf5f..3f868bbca6d8 100644
--- a/pkgs/by-name/pg/pgtop/package.nix
+++ b/pkgs/by-name/pg/pgtop/package.nix
@@ -31,6 +31,6 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/cosimo/pgtop";
     changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}";
     maintainers = [ lib.maintainers.hagl ];
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index aab4f2408d10..4891ae99b3ce 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -48,7 +48,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/TeamPiped/Piped";
     description = "Efficient and privacy-friendly YouTube frontend";
     maintainers = [ ];
-    license = [ lib.licenses.agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
   };
 
 }
diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index fa5c8352b03c..f709cd6f4a17 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Public Key Addressable Resource Records (sovereign TLDs) ";
     homepage = "https://github.com/pubky/pkarr";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "pkarr-server";
   };
diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index b55fcf3467ba..886b6b5b971a 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Better `pre-commit`, re-engineered in Rust ";
     mainProgram = "prek";
     changelog = "https://github.com/j178/prek/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.thunze ];
   };
 })
diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix
index d656565f7bee..88fb261a8415 100644
--- a/pkgs/by-name/pr/prometheus-cpp/package.nix
+++ b/pkgs/by-name/pr/prometheus-cpp/package.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Prometheus Client Library for Modern C++";
     homepage = "https://github.com/jupp0r/prometheus-cpp";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/px/pxattr/package.nix b/pkgs/by-name/px/pxattr/package.nix
index 9d08f7b0d58e..a687b2514461 100644
--- a/pkgs/by-name/px/pxattr/package.nix
+++ b/pkgs/by-name/px/pxattr/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.lesbonscomptes.com/pxattr/index.html";
     description = "Provides a single interface to extended file attributes";
     maintainers = [ ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     mainProgram = "pxattr";
   };
diff --git a/pkgs/by-name/py/python-caja/package.nix b/pkgs/by-name/py/python-caja/package.nix
index b06000ba2e13..f7a09d2358a0 100644
--- a/pkgs/by-name/py/python-caja/package.nix
+++ b/pkgs/by-name/py/python-caja/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Python binding for Caja components";
     homepage = "https://github.com/mate-desktop/python-caja";
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 7689932d4b7d..05ef22bf9596 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -14,7 +14,7 @@ let
     repo = "twemoji";
     tag = "v14.0.2";
     hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI=";
-    meta.license = [ lib.licenses.cc-by-40 ];
+    meta.license = lib.licenses.cc-by-40;
   };
 in
 
diff --git a/pkgs/by-name/rb/rblake2sum/package.nix b/pkgs/by-name/rb/rblake2sum/package.nix
index ca1d0ba0762e..94432adaf920 100644
--- a/pkgs/by-name/rb/rblake2sum/package.nix
+++ b/pkgs/by-name/rb/rblake2sum/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Recursive blake2 digest (hash) of a file-system path";
     homepage = "https://github.com/crev-dev/rblake2sum";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "rblake2sum";
   };
diff --git a/pkgs/by-name/rb/rblake3sum/package.nix b/pkgs/by-name/rb/rblake3sum/package.nix
index 041e24adfa2b..fffab405a351 100644
--- a/pkgs/by-name/rb/rblake3sum/package.nix
+++ b/pkgs/by-name/rb/rblake3sum/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Recursive blake3 digest (hash) of a file-system path";
     homepage = "https://github.com/rustshop/rblake3sum";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dpc ];
     mainProgram = "rblake3sum";
   };
diff --git a/pkgs/by-name/rc/rc/package.nix b/pkgs/by-name/rc/rc/package.nix
index 65d4a9e94dcb..2ab49b10190a 100644
--- a/pkgs/by-name/rc/rc/package.nix
+++ b/pkgs/by-name/rc/rc/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/rakitzis/rc";
     description = "Plan 9 shell";
-    license = [ lib.licenses.zlib ];
+    license = lib.licenses.zlib;
     mainProgram = "rc";
     maintainers = with lib.maintainers; [ ramkromberg ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ro/rode-central/package.nix b/pkgs/by-name/ro/rode-central/package.nix
index ce00b49fd866..8a33cb664e56 100644
--- a/pkgs/by-name/ro/rode-central/package.nix
+++ b/pkgs/by-name/ro/rode-central/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Companion app for configuring compatible RØDE devices, unlocking advanced features, enabling or disabling functions and updating firmware";
     homepage = "https://rode.com/en-us/apps/rode-central";
     changelog = "https://rode.com/en-us/release-notes/rode-central";
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ ethancedwards8 ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix
index 80021d927b1d..1321e9efee9d 100644
--- a/pkgs/by-name/ru/rusti-cal/package.nix
+++ b/pkgs/by-name/ru/rusti-cal/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Minimal command line calendar, similar to cal";
     mainProgram = "rusti-cal";
     homepage = "https://github.com/arthurhenrique/rusti-cal";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.detegr ];
   };
 })
diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
index f43d216c0bad..9136f196575f 100644
--- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
+++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
@@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
       veehaitch
     ];
     platforms = [ "x86_64-linux" ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/sh/sha2wordlist/package.nix b/pkgs/by-name/sh/sha2wordlist/package.nix
index 89a79652d495..9b13df97c108 100644
--- a/pkgs/by-name/sh/sha2wordlist/package.nix
+++ b/pkgs/by-name/sh/sha2wordlist/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     description = "Display SHA-256 as PGP words";
     homepage = "https://github.com/kirei/sha2wordlist";
     maintainers = with lib.maintainers; [ baloo ];
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     platforms = lib.platforms.all;
     mainProgram = "sha2wordlist";
   };
diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix
index 3680545dafe8..831d13db6fff 100644
--- a/pkgs/by-name/si/silx/package.nix
+++ b/pkgs/by-name/si/silx/package.nix
@@ -34,7 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     changelog = "https://github.com/silx-kit/silx/blob/main/CHANGELOG.rst";
     description = "Software to support data assessment, reduction and analysis at synchrotron radiation facilities";
     homepage = "https://github.com/silx-kit/silx";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.pmiddend ];
     mainProgram = "silx";
   };
diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix
index f2cd825097f3..22602c56ae39 100644
--- a/pkgs/by-name/si/simple-completion-language-server/package.nix
+++ b/pkgs/by-name/si/simple-completion-language-server/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Language server to enable word completion and snippets for Helix editor";
     homepage = "https://github.com/estin/simple-completion-language-server";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.kpbaks ];
     mainProgram = "simple-completion-language-server";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix
index 3497d5b3b4ec..b920a1d9400b 100644
--- a/pkgs/by-name/si/sirula/package.nix
+++ b/pkgs/by-name/si/sirula/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Simple app launcher for wayland written in rust";
     homepage = "https://github.com/DorianRudolph/sirula";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.atagen ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix
index ee6ebf08e052..b5e566793798 100644
--- a/pkgs/by-name/ss/sscg/package.nix
+++ b/pkgs/by-name/ss/sscg/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple Signed Certificate Generator";
     homepage = "https://github.com/sgallagher/sscg";
     changelog = "https://github.com/sgallagher/sscg/blob/sscg-${finalAttrs.version}";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.lucasew ];
     mainProgram = "sscg";
   };
diff --git a/pkgs/by-name/st/strip-ansi/package.nix b/pkgs/by-name/st/strip-ansi/package.nix
index f3b4a2bc106f..5234d420567d 100644
--- a/pkgs/by-name/st/strip-ansi/package.nix
+++ b/pkgs/by-name/st/strip-ansi/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   meta = {
     homepage = "https://github.com/KSXGitHub/strip-ansi-cli";
     description = "Strip ANSI escape sequences from text";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers._9999years ];
     mainProgram = "strip-ansi";
   };
diff --git a/pkgs/by-name/ta/tack/package.nix b/pkgs/by-name/ta/tack/package.nix
index 6b4d448cb70b..2d721b691f76 100644
--- a/pkgs/by-name/ta/tack/package.nix
+++ b/pkgs/by-name/ta/tack/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/manic-systems/tack";
     description = "flake-like toml nix pins, lazily fetched and transformed";
     mainProgram = "tack";
-    license = [ lib.licenses.eupl12 ];
+    license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [
       amaanq
       atagen
diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix
index 883077cf6167..ce49bc4e3199 100644
--- a/pkgs/by-name/ta/tarssh/package.nix
+++ b/pkgs/by-name/ta/tarssh/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Simple SSH tarpit inspired by endlessh";
     homepage = "https://github.com/Freaky/tarssh";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sohalt ];
     platforms = lib.platforms.unix;
     mainProgram = "tarssh";
diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index e8a96d5ad13b..9fb8828d6d60 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Cross-platform library for building Telegram clients";
     homepage = "https://core.telegram.org/tdlib/";
-    license = [ lib.licenses.boost ];
+    license = lib.licenses.boost;
     platforms = lib.platforms.unix;
     maintainers = [
       lib.maintainers.vyorkin
diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix
index 23e54726ee64..b32442d36504 100644
--- a/pkgs/by-name/to/tox-node/package.nix
+++ b/pkgs/by-name/to/tox-node/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Server application to run tox node written in pure Rust";
     homepage = "https://github.com/tox-rs/tox";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       suhr
diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix
index eba2bd270803..810028a124f6 100644
--- a/pkgs/by-name/tr/trillian/package.nix
+++ b/pkgs/by-name/tr/trillian/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/google/trillian";
     description = "Transparent, highly scalable and cryptographically verifiable data store";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/tu/tuistash/package.nix b/pkgs/by-name/tu/tuistash/package.nix
index e8501de2845c..f5dc085c2585 100644
--- a/pkgs/by-name/tu/tuistash/package.nix
+++ b/pkgs/by-name/tu/tuistash/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Terminal User Interface for Logstash";
     homepage = "https://github.com/edmocosta/tuistash";
     changelog = "https://github.com/edmocosta/tuistash/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.kpbaks ];
     mainProgram = "tuistash";
   };
diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
index 5474f2b31caf..e857beb564c3 100644
--- a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/ryukau/UhhyouPluginsJuce";
     description = "A collection of VST3 effect plugins";
-    license = [ lib.licenses.agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ magnetophon ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix
index e7efbd8f26aa..d0dc8831dac3 100644
--- a/pkgs/by-name/vi/virtio-win/package.nix
+++ b/pkgs/by-name/vi/virtio-win/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Windows VirtIO Drivers";
     homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html";
     changelog = "https://fedorapeople.org/groups/virt/virtio-win/CHANGELOG";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ anthonyroussel ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index 83bb7cac0df3..262f788b358e 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "oneAPI Video Processing Library Intel GPU implementation";
     homepage = "https://github.com/intel/vpl-gpu-rt";
     changelog = "https://github.com/intel/vpl-gpu-rt/releases/tag/${finalAttrs.src.rev}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [
       evanrichter
diff --git a/pkgs/by-name/vs/vst2-sdk/package.nix b/pkgs/by-name/vs/vst2-sdk/package.nix
index 3f7986224c77..963b3ed36e73 100644
--- a/pkgs/by-name/vs/vst2-sdk/package.nix
+++ b/pkgs/by-name/vs/vst2-sdk/package.nix
@@ -21,6 +21,6 @@ fetchzip {
       VST2 is proprietary, and deprecated by Steinberg.
       As such, it should only be used for legacy reasons.
     '';
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/by-name/vx/vxl/package.nix b/pkgs/by-name/vx/vxl/package.nix
index 66b394e582b5..fda48482e834 100644
--- a/pkgs/by-name/vx/vxl/package.nix
+++ b/pkgs/by-name/vx/vxl/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://vxl.sourceforge.net";
     # license appears contradictory; see https://github.com/vxl/vxl/issues/752
     # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch)
-    license = [ lib.licenses.unfree ];
+    license = lib.licenses.unfree;
     maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
diff --git a/pkgs/by-name/wi/win-spice/package.nix b/pkgs/by-name/wi/win-spice/package.nix
index 42001872fadb..7727d02339f2 100644
--- a/pkgs/by-name/wi/win-spice/package.nix
+++ b/pkgs/by-name/wi/win-spice/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Windows SPICE Drivers";
     homepage = "https://www.spice-space.org/";
-    license = [ lib.licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod
+    license = lib.licenses.asl20; # See https://github.com/vrozenfe/qxl-dod
     maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix
index 358a57af01d3..0b704772c8a9 100644
--- a/pkgs/by-name/yq/yq-go/package.nix
+++ b/pkgs/by-name/yq/yq-go/package.nix
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://mikefarah.gitbook.io/yq/";
     changelog = "https://github.com/mikefarah/yq/raw/${finalAttrs.src.tag}/release_notes.txt";
     mainProgram = "yq";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       lewo
       prince213
diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix
index f72014c4dec4..be3a89e709e2 100644
--- a/pkgs/development/python-modules/aiosonos/default.nix
+++ b/pkgs/development/python-modules/aiosonos/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: {
     description = "Async python library to communicate with Sonos devices";
     homepage = "https://github.com/music-assistant/aiosonos";
     changelog = "https://github.com/music-assistant/aiosonos/releases/tag/${finalAttrs.src.tag}";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.autrimpo ];
   };
 })
diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix
index a5bde7eecedd..ac0767293417 100644
--- a/pkgs/development/python-modules/anyqt/default.nix
+++ b/pkgs/development/python-modules/anyqt/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage (finalAttrs: {
     description = "PyQt/PySide compatibility layer";
     homepage = "https://github.com/ales-erjavec/anyqt";
     changelog = "https://github.com/ales-erjavec/anyqt/releases/tag/${finalAttrs.version}";
-    license = [ lib.licenses.gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/baycomp/default.nix b/pkgs/development/python-modules/baycomp/default.nix
index 0cc1c12743f2..06d982616bdd 100644
--- a/pkgs/development/python-modules/baycomp/default.nix
+++ b/pkgs/development/python-modules/baycomp/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Library for Bayesian comparison of classifiers";
     homepage = "https://github.com/janezd/baycomp";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/beets-importreplace/default.nix b/pkgs/development/python-modules/beets-importreplace/default.nix
index d5216530c8b8..c9e403086caa 100644
--- a/pkgs/development/python-modules/beets-importreplace/default.nix
+++ b/pkgs/development/python-modules/beets-importreplace/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: {
     description = "Plugin for beets to perform regex replacements during import";
     homepage = "https://github.com/edgars-supe/beets-importreplace";
     maintainers = with lib.maintainers; [ pyrox0 ];
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })
diff --git a/pkgs/development/python-modules/beets-ytimport/default.nix b/pkgs/development/python-modules/beets-ytimport/default.nix
index 9b1de1ea6de0..96bc33466dd5 100644
--- a/pkgs/development/python-modules/beets-ytimport/default.nix
+++ b/pkgs/development/python-modules/beets-ytimport/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Beets plugin to import music from Youtube and SoundCloud";
     homepage = "https://github.com/mgoltzsche/beets-ytimport";
     maintainers = with lib.maintainers; [ pyrox0 ];
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
index cdff1290a573..eade96fee469 100644
--- a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
+++ b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/trehn/bundlewrap-teamvault";
     description = "Pull secrets from TeamVault into your BundleWrap repo";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix
index 25e44e8c4a22..8ca0a2f5b01d 100644
--- a/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/pkgs/development/python-modules/bundlewrap/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage (finalAttrs: {
     description = "Easy, Concise and Decentralized Config management with Python";
     changelog = "https://github.com/bundlewrap/bundlewrap/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     mainProgram = "bw";
-    license = [ lib.licenses.gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ wamserma ];
   };
 })
diff --git a/pkgs/development/python-modules/fabio/default.nix b/pkgs/development/python-modules/fabio/default.nix
index 38b6f00bedb4..41bb14718f87 100644
--- a/pkgs/development/python-modules/fabio/default.nix
+++ b/pkgs/development/python-modules/fabio/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/silx-kit/fabio/blob/main/doc/source/Changelog.rst";
     description = "I/O library for images produced by 2D X-ray detector";
     homepage = "https://github.com/silx-kit/fabio";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.pmiddend ];
   };
 
diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix
index 08301b669d5c..c0d3d2b766da 100644
--- a/pkgs/development/python-modules/geometric/default.nix
+++ b/pkgs/development/python-modules/geometric/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Geometry optimization code for molecular structures";
     mainProgram = "geometric-optimize";
     homepage = "https://github.com/leeping/geomeTRIC";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.markuskowa ];
   };
 }
diff --git a/pkgs/development/python-modules/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix
index b6d21e76923b..2563da9b3181 100644
--- a/pkgs/development/python-modules/i2c-tools/default.nix
+++ b/pkgs/development/python-modules/i2c-tools/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
 
     description = "Wrapper for i2c-tools' smbus stuff";
     # from py-smbus/smbusmodule.c
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
index d5fce46a7cba..fee96111b4bc 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Editable interval tree data structure for Python 2 and 3";
     homepage = "https://github.com/chaimleib/intervaltree";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.bennofs ];
   };
 }
diff --git a/pkgs/development/python-modules/lm-eval/default.nix b/pkgs/development/python-modules/lm-eval/default.nix
index fb863b2add6f..268986754351 100644
--- a/pkgs/development/python-modules/lm-eval/default.nix
+++ b/pkgs/development/python-modules/lm-eval/default.nix
@@ -179,7 +179,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/EleutherAI/lm-evaluation-harness/releases/tag/${finalAttrs.src.tag}";
     description = "Framework for few-shot evaluation of language models";
     homepage = "https://github.com/EleutherAI/lm-evaluation-harness";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.booxter ];
   };
 })
diff --git a/pkgs/development/python-modules/logging-tree/default.nix b/pkgs/development/python-modules/logging-tree/default.nix
index 3fff50fa2757..be87d9821fb4 100644
--- a/pkgs/development/python-modules/logging-tree/default.nix
+++ b/pkgs/development/python-modules/logging-tree/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Debug Python logging problems by printing out the tree of handlers you have defined";
     homepage = "https://github.com/brandon-rhodes/logging_tree";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.rskew ];
   };
 })
diff --git a/pkgs/development/python-modules/luigi/default.nix b/pkgs/development/python-modules/luigi/default.nix
index eee8fc8b6f73..b13cb826c42a 100644
--- a/pkgs/development/python-modules/luigi/default.nix
+++ b/pkgs/development/python-modules/luigi/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage (finalAttrs: {
     '';
     homepage = "https://github.com/spotify/luigi";
     changelog = "https://github.com/spotify/luigi/releases/tag/${finalAttrs.version}";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index 28f726541f1a..4ed430f34689 100644
--- a/pkgs/development/python-modules/meson-python/default.nix
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -69,7 +69,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/mesonbuild/meson-python/blob/${version}/CHANGELOG.rst";
     description = "Meson Python build backend (PEP 517)";
     homepage = "https://github.com/mesonbuild/meson-python";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
     teams = [ lib.teams.python ];
   };
diff --git a/pkgs/development/python-modules/mplfinance/default.nix b/pkgs/development/python-modules/mplfinance/default.nix
index 26f55b5a4fa4..81b68e2f2fc3 100644
--- a/pkgs/development/python-modules/mplfinance/default.nix
+++ b/pkgs/development/python-modules/mplfinance/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
   meta = {
     description = "Matplotlib utilities for the visualization, and visual analysis, of financial data";
     homepage = "https://github.com/matplotlib/mplfinance";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix
index 8d9507b2cd16..e6e9cffceb8b 100644
--- a/pkgs/development/python-modules/packbits/default.nix
+++ b/pkgs/development/python-modules/packbits/default.nix
@@ -17,6 +17,6 @@ buildPythonPackage rec {
   meta = {
     description = "PackBits encoder/decoder for Python";
     homepage = "https://github.com/psd-tools/packbits";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pyaskalono/default.nix b/pkgs/development/python-modules/pyaskalono/default.nix
index 4107badf2fc2..0ab4a5078eab 100644
--- a/pkgs/development/python-modules/pyaskalono/default.nix
+++ b/pkgs/development/python-modules/pyaskalono/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python wrapper for askalono";
     homepage = "https://github.com/kumekay/pyaskalono/";
     changelog = "https://github.com/kumekay/pyaskalono/releases/tag/v${version}";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ erictapen ];
   };
 }
diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
index 02a303788162..8a256d8e0b8d 100644
--- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     description = "J2K and JP2 plugin for pylibjpeg";
     homepage = "https://github.com/pydicom/pylibjpeg-openjpeg";
     changelog = "https://github.com/pydicom/pylibjpeg-openjpeg/releases/tag/${src.tag}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
     # darwin: numerous test failures, test dependency pydicom is marked as unsupported
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix
index 110ecca557c0..db54bb345ed2 100644
--- a/pkgs/development/python-modules/qasync/default.nix
+++ b/pkgs/development/python-modules/qasync/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "Allows coroutines to be used in PyQt/PySide applications by providing an implementation of the PEP 3156 event-loop";
     homepage = "https://github.com/CabbageDevelopment/qasync";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/range-typed-integers/default.nix b/pkgs/development/python-modules/range-typed-integers/default.nix
index 735b328f5604..7e65bcf9b2bc 100644
--- a/pkgs/development/python-modules/range-typed-integers/default.nix
+++ b/pkgs/development/python-modules/range-typed-integers/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Package provides integer types that have a specific range of valid values";
     homepage = "https://github.com/theCapypara/range-typed-integers";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ marius851000 ];
   };
 }
diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index 1e8dde519a34..c60859c4ca77 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Legacy Python client for Sentry (getsentry.com) — replaced by sentry-python";
     mainProgram = "raven";
     homepage = "https://github.com/getsentry/raven-python";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix
index b14108fa1064..80e1d3a590e9 100644
--- a/pkgs/development/python-modules/rfc7464/default.nix
+++ b/pkgs/development/python-modules/rfc7464/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/moshez/rfc7464";
     description = "RFC 7464 is a proposed standard for streaming JSON documents";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ shlevy ];
   };
 }
diff --git a/pkgs/development/python-modules/serverfiles/default.nix b/pkgs/development/python-modules/serverfiles/default.nix
index d591c23b88c1..9e7c4204eee9 100644
--- a/pkgs/development/python-modules/serverfiles/default.nix
+++ b/pkgs/development/python-modules/serverfiles/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Utility that accesses files on a HTTP server and stores them locally for reuse";
     homepage = "https://github.com/biolab/serverfiles";
-    license = [ lib.licenses.gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix
index d042bbde7d4f..235a80d747c3 100644
--- a/pkgs/development/python-modules/simpy/default.nix
+++ b/pkgs/development/python-modules/simpy/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/simpx/simpy";
     homepage = "https://simpy.readthedocs.io/en/${version}/";
     description = "Process-based discrete-event simulation framework based on standard Python";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       shlevy
     ];
diff --git a/pkgs/development/python-modules/stop-words/default.nix b/pkgs/development/python-modules/stop-words/default.nix
index 996f9745fb0d..48466975bb9c 100644
--- a/pkgs/development/python-modules/stop-words/default.nix
+++ b/pkgs/development/python-modules/stop-words/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Get list of common stop words in various languages in Python";
     homepage = "https://github.com/Alir3z4/python-stop-words";
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ lavafroth ];
   };
 }
diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix
index 12e28344f615..ee1f23c50bf9 100644
--- a/pkgs/development/python-modules/torcheval/default.nix
+++ b/pkgs/development/python-modules/torcheval/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage {
     changelog = "https://github.com/meta-pytorch/torcheval/releases/tag/${version}";
 
     platforms = lib.platforms.unix;
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.bengsparks ];
   };
 }
diff --git a/pkgs/development/python-modules/tqdm-multiprocess/default.nix b/pkgs/development/python-modules/tqdm-multiprocess/default.nix
index e01b5cc0fa0f..34b80ec4deea 100644
--- a/pkgs/development/python-modules/tqdm-multiprocess/default.nix
+++ b/pkgs/development/python-modules/tqdm-multiprocess/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage {
   meta = {
     description = "Support multiple worker processes, each with multiple tqdm progress bars, displaying them cleanly through the main process";
     homepage = "https://github.com/EleutherAI/tqdm-multiprocess";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.booxter ];
   };
 }
diff --git a/pkgs/development/python-modules/trubar/default.nix b/pkgs/development/python-modules/trubar/default.nix
index 6ef9e9c2f649..3c75addcebff 100644
--- a/pkgs/development/python-modules/trubar/default.nix
+++ b/pkgs/development/python-modules/trubar/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Utility for translation of strings and f-strings in Python files";
     homepage = "https://github.com/janezd/trubar";
     changelog = "https://github.com/janezd/trubar/releases/tag/${version}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tstr/default.nix b/pkgs/development/python-modules/tstr/default.nix
index cc1eb41c788b..648822f433a7 100644
--- a/pkgs/development/python-modules/tstr/default.nix
+++ b/pkgs/development/python-modules/tstr/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Backports of various template string utilities";
     homepage = "https://github.com/ilotoki0804/tstr";
-    license = [ lib.licenses.asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
index 59208abaee74..36faccdf9852 100644
--- a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
+++ b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     description = "Python bindings for the Rust unicode-segmentation and unicode-width crates";
     homepage = "https://github.com/WeblateOrg/unicode-segmentation-rs/";
     changelog = "https://github.com/WeblateOrg/unicode-segmentation-rs/releases/tag/${src.tag}";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ erictapen ];
   };
 }
diff --git a/pkgs/development/python-modules/vg/default.nix b/pkgs/development/python-modules/vg/default.nix
index 478cb259250b..6ac879128c12 100644
--- a/pkgs/development/python-modules/vg/default.nix
+++ b/pkgs/development/python-modules/vg/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Linear algebra for humans: a very good vector-geometry and linear-algebra toolbelt";
     homepage = "https://github.com/lace/vg";
     changelog = "https://github.com/lace/vg/blob/${version}/CHANGELOG.md";
-    license = [ lib.licenses.bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix
index 47f6a52a0bcf..f12f3643ae2c 100644
--- a/pkgs/development/python-modules/wand/default.nix
+++ b/pkgs/development/python-modules/wand/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     changelog = "https://docs.wand-py.org/en/${version}/changes.html";
     description = "Ctypes-based simple MagickWand API binding for Python";
     homepage = "http://wand-py.org/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/word2number/default.nix b/pkgs/development/python-modules/word2number/default.nix
index 0d5d92686d4d..43a70204b35c 100644
--- a/pkgs/development/python-modules/word2number/default.nix
+++ b/pkgs/development/python-modules/word2number/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/akshaynagpal/w2n/releases/tag/${version}";
     description = "Convert number words (eg. twenty one) to numeric digits (21)";
     homepage = "http://w2n.readthedocs.io/";
-    license = [ lib.licenses.mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.booxter ];
   };
 }
diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix
index 48355004b761..553b78f0de80 100644
--- a/pkgs/kde/misc/kdiagram/default.nix
+++ b/pkgs/kde/misc/kdiagram/default.nix
@@ -19,5 +19,5 @@ mkKdeDerivation rec {
     qtsvg
   ];
 
-  meta.license = [ lib.licenses.gpl2Only ];
+  meta.license = lib.licenses.gpl2Only;
 }
diff --git a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix
index aead489e80d4..d523ecb7d37c 100644
--- a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix
+++ b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix
@@ -15,5 +15,5 @@ mkKdeDerivation rec {
 
   extraNativeBuildInputs = [ doxygen ];
 
-  meta.license = [ lib.licenses.gpl3Plus ];
+  meta.license = lib.licenses.gpl3Plus;
 }
diff --git a/pkgs/kde/misc/marknote/default.nix b/pkgs/kde/misc/marknote/default.nix
index b2698552c457..554ac2a8ba0c 100644
--- a/pkgs/kde/misc/marknote/default.nix
+++ b/pkgs/kde/misc/marknote/default.nix
@@ -23,5 +23,5 @@ mkKdeDerivation rec {
     kxmlgui
   ];
 
-  meta.license = [ lib.licenses.gpl2Plus ];
+  meta.license = lib.licenses.gpl2Plus;
 }
diff --git a/pkgs/kde/misc/plasma-pass/default.nix b/pkgs/kde/misc/plasma-pass/default.nix
index 579d0cbe4676..f953ac313123 100644
--- a/pkgs/kde/misc/plasma-pass/default.nix
+++ b/pkgs/kde/misc/plasma-pass/default.nix
@@ -20,5 +20,5 @@ mkKdeDerivation rec {
     qgpgme
   ];
 
-  meta.license = [ lib.licenses.lgpl21Plus ];
+  meta.license = lib.licenses.lgpl21Plus;
 }
diff --git a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix
index 300dd48f27f3..935dfd277a8d 100644
--- a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix
+++ b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix
@@ -85,7 +85,7 @@ let
 
     meta = {
       description = "Unicode and globalization support library with Apple customizations";
-      license = [ lib.licenses.icu ];
+      license = lib.licenses.icu;
       teams = [ lib.teams.darwin ];
       platforms = lib.platforms.darwin;
       pkgConfigModules = [
diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix
index a13b4c9d43f7..b2c6a3c87831 100644
--- a/pkgs/os-specific/linux/mstflint_access/default.nix
+++ b/pkgs/os-specific/linux/mstflint_access/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Kernel module for Nvidia NIC firmware update";
     homepage = "https://github.com/Mellanox/mstflint";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ thillux ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 1959088b3436..72c3e812ddf1 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Dynamic tracing in Linux";
     mainProgram = "ply";
     homepage = "https://wkz.github.io/ply/";
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       mic92
       snu
diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix
index 534a9e98f13d..738406006b2a 100644
--- a/pkgs/os-specific/linux/sgx/psw/default.nix
+++ b/pkgs/os-specific/linux/sgx/psw/default.nix
@@ -277,6 +277,6 @@ stdenv.mkDerivation rec {
       citadelcore
     ];
     platforms = [ "x86_64-linux" ];
-    license = [ lib.licenses.bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix
index 181695a948ed..1d75eca019da 100644
--- a/pkgs/os-specific/linux/system76-acpi/default.nix
+++ b/pkgs/os-specific/linux/system76-acpi/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     maintainers = with lib.maintainers; [ ahoneybun ];
-    license = [ lib.licenses.gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = [
       "i686-linux"
       "x86_64-linux"
diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index aaf33eb2eff4..5e18d1ff39cb 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     maintainers = with lib.maintainers; [ ahoneybun ];
-    license = [ lib.licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = [
       "i686-linux"
       "x86_64-linux"
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dfe9e57f7eb5..5b7534c412b6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -38734,7 +38734,7 @@ with self;
     meta = {
       description = "Bindings allowing Xapian to be used from Perl";
       homepage = "https://xapian.org";
-      license = [ lib.licenses.gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 

From a425506cd54d66b631b45a9de6028cee6f9948f7 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 26 Jun 2026 16:45:37 -0400
Subject: [PATCH 0972/1386] various: fix license breakages

---
 .../resholve/python2-modules/bootstrapped-pip/default.nix | 8 +++++++-
 pkgs/servers/http/nginx/generic.nix                       | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix
index 112ec66578bb..ba871295aa05 100644
--- a/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix
@@ -80,7 +80,13 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Version of pip used for bootstrapping";
-    license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license);
+    license = lib.unique (
+      [
+        pip.meta.license
+        wheel.meta.license
+      ]
+      ++ setuptools.meta.license
+    );
     homepage = pip.meta.homepage;
   };
 }
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 9344a7310b45..52e09101fb9e 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -312,7 +312,7 @@ stdenv.mkDerivation {
         description = "Reverse proxy and lightweight webserver";
         mainProgram = "nginx";
         homepage = "https://nginx.org";
-        license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: m.meta.license) modules;
+        license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: lib.toList m.meta.license) modules;
         broken = lib.any (m: m.meta.broken or false) modules;
         platforms = lib.platforms.all;
         maintainers = with lib.maintainers; [

From f2a08900ba6cff55bf6f9090849a87ac7d35ca5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 18:00:06 +0000
Subject: [PATCH 0973/1386] distgen: 2.3 -> 2.4

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

diff --git a/pkgs/by-name/di/distgen/package.nix b/pkgs/by-name/di/distgen/package.nix
index 90d85f3f986d..a0016d48d390 100644
--- a/pkgs/by-name/di/distgen/package.nix
+++ b/pkgs/by-name/di/distgen/package.nix
@@ -6,12 +6,12 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "distgen";
-  version = "2.3";
+  version = "2.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-EDRCGf4laHZs//E3w5FxlkuTfbVLxnaGmQF/xjwaKDQ=";
+    hash = "sha256-4XaZF4WmGhoGgQ3KlggIWLHAypZYA8QpkN7ARMijoPs=";
   };
 
   build-system = with python3.pkgs; [

From ff094f60ad091f581efeaf15b159445408475bc3 Mon Sep 17 00:00:00 2001
From: Eman Resu <elevenaka11@gmail.com>
Date: Wed, 15 Jul 2026 14:04:39 -0400
Subject: [PATCH 0974/1386] treewide: replace more singleton license lists

---
 .../editors/your-editor/default.nix           |   2 +-
 pkgs/applications/emulators/wine/base.nix     |   2 +-
 pkgs/applications/emulators/wine/fonts.nix    |   2 +-
 .../graphics/gimp/plugins/default.nix         |   2 +-
 .../inkscape/extensions/inkstitch/default.nix |   2 +-
 .../cluster/helm/plugins/helm-mapkubeapis.nix |   2 +-
 .../controller-topology-project/default.nix   |   2 +-
 .../obs-studio/plugins/distroav/default.nix   |   2 +-
 pkgs/by-name/ad/adbtuifm/package.nix          |   2 +-
 pkgs/by-name/ad/adenum/package.nix            |   2 +-
 pkgs/by-name/ad/adreaper/package.nix          |   2 +-
 pkgs/by-name/ai/aiodnsbrute/package.nix       |   2 +-
 pkgs/by-name/ai/airbuddy/package.nix          |   2 +-
 pkgs/by-name/am/amber/package.nix             |   2 +-
 pkgs/by-name/am/amfora/package.nix            |   2 +-
 pkgs/by-name/an/animatch/package.nix          |   2 +-
 pkgs/by-name/an/anki-sync-server/package.nix  |   2 +-
 pkgs/by-name/an/ansi/package.nix              |   2 +-
 pkgs/by-name/an/ante/package.nix              |   2 +-
 pkgs/by-name/an/antiprism/package.nix         |   2 +-
 pkgs/by-name/ap/apache-flex-sdk/package.nix   |   2 +-
 pkgs/by-name/ap/apksigcopier/package.nix      |   2 +-
 pkgs/by-name/ap/apt-offline/package.nix       |   2 +-
 pkgs/by-name/ap/apt-swarm/package.nix         |   2 +-
 pkgs/by-name/ap/apt/package.nix               |   2 +-
 pkgs/by-name/ar/aranym/package.nix            |   2 +-
 pkgs/by-name/ar/aritim-dark/package.nix       |   2 +-
 pkgs/by-name/ar/arouteserver/package.nix      |   2 +-
 pkgs/by-name/ar/arpoison/package.nix          |   2 +-
 pkgs/by-name/ar/arsenal/package.nix           |   2 +-
 pkgs/by-name/as/as-tree/package.nix           |   2 +-
 .../by-name/as/asciinema-scenario/package.nix |   2 +-
 pkgs/by-name/as/asciinema/package.nix         |   2 +-
 pkgs/by-name/as/asn/package.nix               |   2 +-
 pkgs/by-name/as/assetfinder/package.nix       |   2 +-
 pkgs/by-name/at/atari800/package.nix          |   2 +-
 pkgs/by-name/at/ataripp/package.nix           |   2 +-
 pkgs/by-name/at/atomic-swap/package.nix       |   2 +-
 pkgs/by-name/au/aurea/package.nix             |   2 +-
 pkgs/by-name/au/autokey/package.nix           |   2 +-
 pkgs/by-name/ba/badgemagic-app/package.nix    |   2 +-
 pkgs/by-name/ba/badrobot/package.nix          |   2 +-
 pkgs/by-name/ba/barrage/package.nix           |   2 +-
 pkgs/by-name/ba/bashate/package.nix           |   2 +-
 .../be/beancount-language-server/package.nix  |   2 +-
 pkgs/by-name/be/bee/package.nix               |   2 +-
 pkgs/by-name/be/bettercap/package.nix         |   2 +-
 pkgs/by-name/bi/bic/package.nix               |   2 +-
 pkgs/by-name/bi/bit/package.nix               |   2 +-
 pkgs/by-name/bl/blaze/package.nix             |   2 +-
 pkgs/by-name/bl/blendfarm/package.nix         |   2 +-
 pkgs/by-name/bl/blink1-tool/package.nix       |   2 +-
 pkgs/by-name/bl/blockattack/package.nix       |   2 +-
 pkgs/by-name/bl/bluez-alsa/package.nix        |   2 +-
 pkgs/by-name/bl/bluez-tools/package.nix       |   2 +-
 pkgs/by-name/bo/boltbrowser/package.nix       |   2 +-
 pkgs/by-name/br/brook/package.nix             |   2 +-
 pkgs/by-name/br/broot/package.nix             |   2 +-
 pkgs/by-name/bt/btfdump/package.nix           |   2 +-
 pkgs/by-name/bu/bugdom/package.nix            |   2 +-
 pkgs/by-name/by/bytecode-viewer/package.nix   |   2 +-
 pkgs/by-name/ca/cantoolz/package.nix          |   2 +-
 pkgs/by-name/ca/cargo-bolero/package.nix      |   2 +-
 pkgs/by-name/ca/cargo-bump/package.nix        |   2 +-
 pkgs/by-name/ca/cargo-hf2/package.nix         |   2 +-
 pkgs/by-name/ca/cargo-leptos/package.nix      |   2 +-
 pkgs/by-name/ca/cargo-license/package.nix     |   2 +-
 pkgs/by-name/ca/cargo-pgo/package.nix         |   2 +-
 pkgs/by-name/ca/cargo-rdme/package.nix        |   2 +-
 pkgs/by-name/ca/cargo-risczero/package.nix    |   2 +-
 pkgs/by-name/ca/cargo-rr/package.nix          |   2 +-
 pkgs/by-name/ca/cargo-typify/package.nix      |   2 +-
 pkgs/by-name/ca/cargo-wipe/package.nix        |   2 +-
 pkgs/by-name/ca/cargo-xwin/package.nix        |   2 +-
 .../ca/cassandra-cpp-driver/package.nix       |   2 +-
 pkgs/by-name/ca/cat9/package.nix              |   2 +-
 pkgs/by-name/ca/catdocx/package.nix           |   2 +-
 pkgs/by-name/cb/cbconvert/package.nix         |   2 +-
 pkgs/by-name/cb/cbonsai/package.nix           |   2 +-
 pkgs/by-name/cd/cdk-go/package.nix            |   2 +-
 pkgs/by-name/ce/celestegame/celeste.nix       |   2 +-
 pkgs/by-name/cf/cfripper/package.nix          |   2 +-
 pkgs/by-name/cf/cfspeedtest/package.nix       |   2 +-
 pkgs/by-name/cg/cgns/package.nix              |   2 +-
 pkgs/by-name/ch/chemacs2/package.nix          |   2 +-
 pkgs/by-name/ch/cherry-studio/package.nix     |   2 +-
 pkgs/by-name/ch/cholmod-extra/package.nix     |   2 +-
 pkgs/by-name/ch/chopchop/package.nix          |   2 +-
 pkgs/by-name/ch/chow-phaser/package.nix       |   2 +-
 pkgs/by-name/ch/chow-tape-model/package.nix   |   2 +-
 pkgs/by-name/ci/cicero-tui/package.nix        |   2 +-
 pkgs/by-name/ci/cirrusgo/package.nix          |   2 +-
 pkgs/by-name/cl/clapgrep/package.nix          |   2 +-
 pkgs/by-name/cl/cloudbrute/package.nix        |   2 +-
 pkgs/by-name/cm/cmc/package.nix               |   2 +-
 pkgs/by-name/co/coconutbattery/package.nix    |   2 +-
 pkgs/by-name/co/codeberg-cli/package.nix      |   2 +-
 pkgs/by-name/co/colorgrind/package.nix        |   2 +-
 pkgs/by-name/co/colorized-logs/package.nix    |   2 +-
 pkgs/by-name/co/colstr/package.nix            |   2 +-
 pkgs/by-name/co/commix/package.nix            |   2 +-
 .../co/composer-require-checker/package.nix   |   2 +-
 pkgs/by-name/co/conda/package.nix             |   2 +-
 pkgs/by-name/co/confluencepot/package.nix     |   2 +-
 pkgs/by-name/co/convco/package.nix            |   2 +-
 pkgs/by-name/co/coturn/package.nix            |   2 +-
 pkgs/by-name/co/coze/package.nix              |   2 +-
 pkgs/by-name/cr/crackql/package.nix           |   2 +-
 pkgs/by-name/cr/cratedb/package.nix           |   2 +-
 pkgs/by-name/cr/crates-lsp/package.nix        |   2 +-
 pkgs/by-name/cr/crates-tui/package.nix        |   2 +-
 pkgs/by-name/cr/crc32c/package.nix            |   2 +-
 pkgs/by-name/cr/crlfuzz/package.nix           |   2 +-
 pkgs/by-name/cr/crunch/package.nix            |   2 +-
 pkgs/by-name/cu/cubelify/package.nix          |   2 +-
 pkgs/by-name/cy/cyclonedds/package.nix        |   2 +-
 pkgs/by-name/cy/cyrus-imapd/package.nix       |   2 +-
 pkgs/by-name/cz/czkawka/package.nix           |   2 +-
 pkgs/by-name/da/darkly/package.nix            |   2 +-
 pkgs/by-name/dc/dcrctl/package.nix            |   2 +-
 pkgs/by-name/dc/dcrd/package.nix              |   2 +-
 pkgs/by-name/dc/dcrwallet/package.nix         |   2 +-
 pkgs/by-name/dd/ddsmt/package.nix             |   2 +-
 pkgs/by-name/di/dict-cc-py/package.nix        |   2 +-
 pkgs/by-name/di/diffedit3/package.nix         |   2 +-
 pkgs/by-name/di/diffr/package.nix             |   2 +-
 pkgs/by-name/di/dirb/package.nix              |   2 +-
 pkgs/by-name/di/dismap/package.nix            |   2 +-
 pkgs/by-name/di/diswall/package.nix           |   2 +-
 pkgs/by-name/dm/dmenu-rs/package.nix          |   2 +-
 pkgs/by-name/dn/dnsmon-go/package.nix         |   2 +-
 pkgs/by-name/dn/dnstwist/package.nix          |   2 +-
 pkgs/by-name/do/doh-proxy-rust/package.nix    |   2 +-
 pkgs/by-name/dp/dput-ng/package.nix           |   2 +-
 pkgs/by-name/du/dua/package.nix               |   2 +-
 pkgs/by-name/du/dummyhttp/package.nix         |   2 +-
 pkgs/by-name/du/dupe-krill/package.nix        |   2 +-
 pkgs/by-name/du/durden/package.nix            |   2 +-
 .../dw/dwt1-shell-color-scripts/package.nix   |   2 +-
 pkgs/by-name/e-/e-imzo-manager/package.nix    |   2 +-
 pkgs/by-name/ea/ea/package.nix                |   2 +-
 pkgs/by-name/ea/each/package.nix              |   2 +-
 pkgs/by-name/ec/ecdsatool/package.nix         |   2 +-
 pkgs/by-name/ed/eduke32/package.nix           |   2 +-
 pkgs/by-name/ef/effitask/package.nix          |   2 +-
 pkgs/by-name/el/elf2uf2-rs/package.nix        |   2 +-
 pkgs/by-name/el/elfx86exts/package.nix        |   2 +-
 pkgs/by-name/em/emacspeak/package.nix         |   2 +-
 pkgs/by-name/em/email/package.nix             |   2 +-
 pkgs/by-name/en/engauge-digitizer/package.nix |   2 +-
 pkgs/by-name/en/enum4linux-ng/package.nix     |   2 +-
 pkgs/by-name/er/erofs-utils/package.nix       |   2 +-
 pkgs/by-name/er/erosmb/package.nix            |   2 +-
 pkgs/by-name/es/esphome/dashboard.nix         |   2 +-
 pkgs/by-name/et/ete-unwrapped/package.nix     |   2 +-
 pkgs/by-name/et/etlegacy-assets/package.nix   |   2 +-
 .../by-name/et/etlegacy-unwrapped/package.nix |   2 +-
 pkgs/by-name/ev/evans/package.nix             |   2 +-
 pkgs/by-name/ev/everest-bin/package.nix       |   2 +-
 pkgs/by-name/ev/everest/package.nix           |   2 +-
 pkgs/by-name/ev/evremap/package.nix           |   2 +-
 .../ex/external-editor-revived/package.nix    |   2 +-
 pkgs/by-name/ex/extrude/package.nix           |   2 +-
 pkgs/by-name/fa/falkor/package.nix            |   2 +-
 pkgs/by-name/fc/fceux/package.nix             |   2 +-
 pkgs/by-name/fe/febio-studio/package.nix      |   2 +-
 pkgs/by-name/fe/febio/package.nix             |   2 +-
 pkgs/by-name/fe/fermyon-spin/package.nix      |   2 +-
 pkgs/by-name/fl/flac2mp3/package.nix          |   2 +-
 pkgs/by-name/fl/flashprog/package.nix         |   2 +-
 .../fl/flat-remix-icon-theme/package.nix      |   2 +-
 pkgs/by-name/fl/flawfinder/package.nix        |   2 +-
 pkgs/by-name/fl/flclash/package.nix           |   2 +-
 pkgs/by-name/fl/flowblade/package.nix         |   2 +-
 pkgs/by-name/fm/fm-go/package.nix             |   2 +-
 pkgs/by-name/fo/font-config-info/package.nix  |   2 +-
 pkgs/by-name/fo/fontfor/package.nix           |   2 +-
 pkgs/by-name/fo/fotema/package.nix            |   2 +-
 pkgs/by-name/fp/fprettify/package.nix         |   2 +-
 pkgs/by-name/fr/fre/package.nix               |   2 +-
 pkgs/by-name/fr/free42/package.nix            |   2 +-
 pkgs/by-name/fr/frodo4/package.nix            |   2 +-
 pkgs/by-name/fr/frugally-deep/package.nix     |   2 +-
 .../fu/functiontrace-server/package.nix       |   2 +-
 pkgs/by-name/fu/furnace/package.nix           |   2 +-
 pkgs/by-name/fu/fuzzdb/package.nix            |   2 +-
 pkgs/by-name/fw/fwanalyzer/package.nix        |   2 +-
 pkgs/by-name/ga/galaxis/package.nix           |   2 +-
 pkgs/by-name/ga/game-rs/package.nix           |   2 +-
 pkgs/by-name/gd/gdu/package.nix               |   2 +-
 pkgs/by-name/ge/geoipupdate/package.nix       |   2 +-
 pkgs/by-name/ge/gerbolyze/package.nix         |   4 +-
 pkgs/by-name/ge/geticons/package.nix          |   2 +-
 pkgs/by-name/gg/gg-jj/package.nix             |   2 +-
 pkgs/by-name/gh/ghdorker/package.nix          |   2 +-
 pkgs/by-name/gi/gir-rs/package.nix            |   2 +-
 .../gi/git-credential-manager/package.nix     |   2 +-
 pkgs/by-name/gi/git-privacy/package.nix       |   2 +-
 pkgs/by-name/gi/git-workspace/package.nix     |   2 +-
 pkgs/by-name/gi/gitjacker/package.nix         |   2 +-
 pkgs/by-name/gi/gitlab-timelogs/package.nix   |   2 +-
 pkgs/by-name/gi/gitte/package.nix             |   2 +-
 pkgs/by-name/gi/gittyup/package.nix           |   2 +-
 .../gl/global-platform-pro/package.nix        |   2 +-
 pkgs/by-name/gn/gnomecast/package.nix         |   2 +-
 pkgs/by-name/gn/gnu-shepherd/package.nix      |   2 +-
 pkgs/by-name/go/go-audit/package.nix          |   2 +-
 pkgs/by-name/go/go-cve-search/package.nix     |   2 +-
 pkgs/by-name/go/go-licenses/package.nix       |   2 +-
 pkgs/by-name/go/go365/package.nix             |   2 +-
 pkgs/by-name/go/gobi_loader/package.nix       |   2 +-
 pkgs/by-name/go/goeland/package.nix           |   2 +-
 pkgs/by-name/go/gogdl/package.nix             |   2 +-
 pkgs/by-name/go/gomapenum/package.nix         |   2 +-
 pkgs/by-name/go/gomobile/package.nix          |   2 +-
 pkgs/by-name/go/google-cloud-cpp/package.nix  |   2 +-
 pkgs/by-name/go/gopeed/package.nix            |   2 +-
 pkgs/by-name/gp/gptcommit/package.nix         |   2 +-
 pkgs/by-name/gp/gptscript/package.nix         |   2 +-
 pkgs/by-name/gr/grafx2/package.nix            |   2 +-
 pkgs/by-name/gr/graph-cli/package.nix         |   2 +-
 pkgs/by-name/gr/graphicsmagick/package.nix    |   2 +-
 pkgs/by-name/gr/grobi/package.nix             |   2 +-
 pkgs/by-name/gr/grype/package.nix             |   2 +-
 pkgs/by-name/gs/gswatcher/package.nix         |   2 +-
 pkgs/by-name/gt/gt/package.nix                |   2 +-
 pkgs/by-name/gt/gtk-session-lock/package.nix  |   2 +-
 pkgs/by-name/gu/gui-for-singbox/package.nix   |   2 +-
 pkgs/by-name/ha/halfempty/package.nix         |   2 +-
 pkgs/by-name/ha/harminv/package.nix           |   2 +-
 pkgs/by-name/ha/hax11/package.nix             |   2 +-
 pkgs/by-name/he/hebbot/package.nix            |   2 +-
 pkgs/by-name/he/hecate/package.nix            |   2 +-
 pkgs/by-name/he/heh/package.nix               |   2 +-
 pkgs/by-name/hf/hfinger/package.nix           |   2 +-
 pkgs/by-name/hi/high-tide/package.nix         |   2 +-
 pkgs/by-name/hi/hivemind/package.nix          |   2 +-
 pkgs/by-name/ht/htmltest/package.nix          |   2 +-
 pkgs/by-name/ht/httpdump/package.nix          |   2 +-
 pkgs/by-name/hu/humility/package.nix          |   2 +-
 pkgs/by-name/hu/hunspell/dictionaries.nix     |  14 +-
 pkgs/by-name/hy/hydra-cli/package.nix         |   2 +-
 pkgs/by-name/ic/icesprog/package.nix          |   2 +-
 pkgs/by-name/if/ifwifi/package.nix            |   2 +-
 pkgs/by-name/ii/iir1/package.nix              |   2 +-
 pkgs/by-name/im/imapdedup/package.nix         |   2 +-
 pkgs/by-name/im/imhex/package.nix             |   2 +-
 pkgs/by-name/in/inql/package.nix              |   2 +-
 .../in/internalallthethings/package.nix       |   2 +-
 pkgs/by-name/in/invidious-router/package.nix  |   2 +-
 pkgs/by-name/io/ioc-scan/package.nix          |   2 +-
 pkgs/by-name/ip/ipinfo/package.nix            |   2 +-
 pkgs/by-name/it/ite-backlight/package.nix     |   2 +-
 pkgs/by-name/ja/jasper/package.nix            |   2 +-
 pkgs/by-name/jn/jnv/package.nix               |   2 +-
 pkgs/by-name/jo/jocalsend/package.nix         |   2 +-
 .../ka/kak-tree-sitter-unwrapped/package.nix  |   2 +-
 pkgs/by-name/ka/kassert/package.nix           |   2 +-
 pkgs/by-name/ki/kiterunner/package.nix        |   2 +-
 pkgs/by-name/ki/kitty-img/package.nix         |   2 +-
 pkgs/by-name/kl/klayout/package.nix           |   2 +-
 pkgs/by-name/ko/koodousfinder/package.nix     |   2 +-
 pkgs/by-name/ko/kord/package.nix              |   2 +-
 pkgs/by-name/kr/krapslog/package.nix          |   2 +-
 pkgs/by-name/ks/kshutdown/package.nix         |   2 +-
 pkgs/by-name/ku/kubeaudit/package.nix         |   2 +-
 pkgs/by-name/ku/kubeclarity/package.nix       |   2 +-
 .../by-name/ku/kubernetes-polaris/package.nix |   2 +-
 pkgs/by-name/ku/kubernix/package.nix          |   2 +-
 pkgs/by-name/ku/kubesec/package.nix           |   2 +-
 pkgs/by-name/ku/kubie/package.nix             |   2 +-
 pkgs/by-name/la/labwc/package.nix             |   2 +-
 pkgs/by-name/la/lapce/package.nix             |   2 +-
 pkgs/by-name/la/laze/package.nix              |   2 +-
 pkgs/by-name/la/lazyjournal/package.nix       |   2 +-
 pkgs/by-name/lb/lbreakout2/package.nix        |   2 +-
 pkgs/by-name/lc/lcalc/package.nix             |   2 +-
 pkgs/by-name/ld/ldapmonitor/package.nix       |   2 +-
 pkgs/by-name/le/ledmon/package.nix            |   2 +-
 pkgs/by-name/le/lemmy-help/package.nix        |   2 +-
 pkgs/by-name/li/libagar/package.nix           |   2 +-
 pkgs/by-name/li/libagar_test/package.nix      |   2 +-
 pkgs/by-name/li/libajantv2/package.nix        |   2 +-
 pkgs/by-name/li/libbacktrace/package.nix      |   2 +-
 pkgs/by-name/li/libdatachannel/package.nix    |   2 +-
 pkgs/by-name/li/libedit/package.nix           |   2 +-
 pkgs/by-name/li/libjpeg-tools/package.nix     |   2 +-
 pkgs/by-name/li/libmpdclient/package.nix      |   2 +-
 pkgs/by-name/li/libmt32emu/package.nix        |   2 +-
 pkgs/by-name/li/libnghttp2_asio/package.nix   |   2 +-
 pkgs/by-name/li/libnvme/package.nix           |   2 +-
 pkgs/by-name/li/libopenshot-audio/package.nix |   2 +-
 pkgs/by-name/li/libopenshot/package.nix       |   2 +-
 pkgs/by-name/li/librespot/package.nix         |   2 +-
 pkgs/by-name/li/libsidplayfp/package.nix      |   2 +-
 pkgs/by-name/li/libspng/package.nix           |   2 +-
 pkgs/by-name/li/libssh2/package.nix           |   2 +-
 pkgs/by-name/li/libversion/package.nix        |   2 +-
 pkgs/by-name/li/libvori/package.nix           |   2 +-
 pkgs/by-name/li/libyang/package.nix           |   2 +-
 pkgs/by-name/li/lightning/package.nix         |   2 +-
 pkgs/by-name/li/linvstmanager/package.nix     |   2 +-
 pkgs/by-name/li/live555/package.nix           |   2 +-
 pkgs/by-name/ll/lla/package.nix               |   2 +-
 pkgs/by-name/lm/lmp/package.nix               |   2 +-
 pkgs/by-name/lo/loksh/package.nix             |   2 +-
 pkgs/by-name/lp/lpairs2/package.nix           |   2 +-
 pkgs/by-name/ls/lspmux/package.nix            |   2 +-
 pkgs/by-name/lt/ltris/package.nix             |   2 +-
 pkgs/by-name/lu/lunar-client/package.nix      |   2 +-
 pkgs/by-name/lu/luwen/package.nix             |   2 +-
 pkgs/by-name/lz/lzsa/package.nix              |   2 +-
 pkgs/by-name/ma/macchina/package.nix          |   2 +-
 pkgs/by-name/ma/maker-panel/package.nix       |   2 +-
 pkgs/by-name/ma/mangayomi/package.nix         |   2 +-
 pkgs/by-name/ma/mangojuice/package.nix        |   2 +-
 .../ma/mate-sensors-applet/package.nix        |   2 +-
 pkgs/by-name/ma/mate-user-share/package.nix   |   2 +-
 pkgs/by-name/ma/matterbridge/package.nix      |   2 +-
 pkgs/by-name/mc/mcap-cli/package.nix          |   2 +-
 pkgs/by-name/md/md4c/package.nix              |   2 +-
 pkgs/by-name/md/mdsh/package.nix              |   2 +-
 pkgs/by-name/me/melonds/package.nix           |   2 +-
 pkgs/by-name/me/messer-slim/package.nix       |   2 +-
 pkgs/by-name/mg/mgba/package.nix              |   2 +-
 pkgs/by-name/mi/mimikatz/package.nix          |   2 +-
 pkgs/by-name/mi/minijinja/package.nix         |   2 +-
 pkgs/by-name/mi/miniserve/package.nix         |   2 +-
 pkgs/by-name/mi/mixxc/package.nix             |   2 +-
 pkgs/by-name/mo/mole/package.nix              |   2 +-
 pkgs/by-name/mo/molotov/package.nix           |   2 +-
 pkgs/by-name/mo/mongodb-ce/package.nix        |   2 +-
 .../mo/morewaita-icon-theme/package.nix       |   2 +-
 pkgs/by-name/mo/moshi/package.nix             |   2 +-
 pkgs/by-name/mo/motif/package.nix             |   2 +-
 pkgs/by-name/mo/mousam/package.nix            |   2 +-
 pkgs/by-name/mo/mov-cli/package.nix           |   2 +-
 .../by-name/mo/mozcdic-ut-neologd/package.nix |   2 +-
 .../mo/mozcdic-ut-sudachidict/package.nix     |   2 +-
 pkgs/by-name/mo/mozo/package.nix              |   2 +-
 pkgs/by-name/mt/mt32emu-qt/package.nix        |   2 +-
 pkgs/by-name/mt/mt32emu-smf2wav/package.nix   |   2 +-
 pkgs/by-name/mu/multimarkdown/package.nix     |   2 +-
 pkgs/by-name/mu/muso/package.nix              |   2 +-
 pkgs/by-name/na/nats-top/package.nix          |   2 +-
 pkgs/by-name/nb/nbutools/package.nix          |   2 +-
 pkgs/by-name/ne/netsniff-ng/package.nix       |   2 +-
 pkgs/by-name/nf/nflz/package.nix              |   2 +-
 pkgs/by-name/nf/nfpm/package.nix              |   2 +-
 pkgs/by-name/ni/ninjas2/package.nix           |   2 +-
 .../ni/nix-index-unwrapped/package.nix        |   2 +-
 pkgs/by-name/ni/nix-playground/package.nix    |   2 +-
 .../ni/nix-query-tree-viewer/package.nix      |   2 +-
 pkgs/by-name/ni/nix-visualize/package.nix     |   2 +-
 pkgs/by-name/ni/nixtamal/package.nix          |   2 +-
 pkgs/by-name/no/nohang/package.nix            |   2 +-
 pkgs/by-name/no/nomacs/package.nix            |   2 +-
 pkgs/by-name/no/nosqli/package.nix            |   2 +-
 pkgs/by-name/no/novelwriter/package.nix       |   2 +-
 pkgs/by-name/ns/nsc/package.nix               |   2 +-
 pkgs/by-name/nt/ntfs2btrfs/package.nix        |   2 +-
 pkgs/by-name/nt/ntlmrecon/package.nix         |   2 +-
 pkgs/by-name/nv/nv-codec-headers/package.nix  |   2 +-
 pkgs/by-name/nv/nvfancontrol/package.nix      |   2 +-
 pkgs/by-name/nw/nwg-drawer/package.nix        |   2 +-
 pkgs/by-name/nz/nzportable/assets.nix         |   2 +-
 pkgs/by-name/oe/oed/package.nix               |   2 +-
 pkgs/by-name/oh/oh-my-git/package.nix         |   2 +-
 pkgs/by-name/on/oneko/package.nix             |   2 +-
 pkgs/by-name/op/opencomposite/package.nix     |   2 +-
 pkgs/by-name/op/openh264/package.nix          |   2 +-
 pkgs/by-name/op/openshot-qt/package.nix       |   2 +-
 pkgs/by-name/op/openvino/package.nix          |   2 +-
 pkgs/by-name/op/ophcrack/package.nix          |   2 +-
 pkgs/by-name/ou/oui/package.nix               |   2 +-
 pkgs/by-name/ov/overmind/package.nix          |   2 +-
 pkgs/by-name/pa/paging-calculator/package.nix |   2 +-
 pkgs/by-name/pa/pandoc-imagine/package.nix    |   2 +-
 pkgs/by-name/pa/paperview/package.nix         |   2 +-
 pkgs/by-name/pa/papilo/package.nix            |   2 +-
 pkgs/by-name/pa/pasco/package.nix             |   2 +-
 pkgs/by-name/pa/passwdqc/package.nix          |   2 +-
 .../pa/payloadsallthethings/package.nix       |   2 +-
 pkgs/by-name/pc/pc/package.nix                |   2 +-
 pkgs/by-name/pd/pdfcrack/package.nix          |   2 +-
 pkgs/by-name/pd/pdfid/package.nix             |   2 +-
 pkgs/by-name/pe/perseus-cli/package.nix       |   2 +-
 pkgs/by-name/pe/pest-ide-tools/package.nix    |   2 +-
 pkgs/by-name/pf/pfixtools/package.nix         |   2 +-
 pkgs/by-name/pi/pict-rs/package.nix           |   2 +-
 pkgs/by-name/pi/pigeon/package.nix            |   2 +-
 pkgs/by-name/pi/pijul/package.nix             |   2 +-
 pkgs/by-name/pi/pik/package.nix               |   2 +-
 pkgs/by-name/pi/pinegrow/package.nix          |   2 +-
 pkgs/by-name/pi/pipeworld/package.nix         |   2 +-
 pkgs/by-name/pl/plus42/package.nix            |   2 +-
 pkgs/by-name/po/pop-hp-wallpapers/package.nix |   2 +-
 pkgs/by-name/po/pouf/package.nix              |   2 +-
 pkgs/by-name/po/powersploit/package.nix       |   2 +-
 pkgs/by-name/po/powertabeditor/package.nix    |   2 +-
 pkgs/by-name/pr/precice/package.nix           |   2 +-
 pkgs/by-name/pr/prettyping/package.nix        |   2 +-
 pkgs/by-name/pr/prio/package.nix              |   2 +-
 .../pr/prometheus-xmpp-alerts/package.nix     |   2 +-
 pkgs/by-name/pr/protege/package.nix           |   2 +-
 pkgs/by-name/pr/proxysql/package.nix          |   2 +-
 pkgs/by-name/pu/pufferpanel/package.nix       |   2 +-
 pkgs/by-name/pu/pulldown-cmark/package.nix    |   2 +-
 pkgs/by-name/pu/pulsarctl/package.nix         |   2 +-
 pkgs/by-name/pu/pulumi-bin/package.nix        |   2 +-
 pkgs/by-name/pw/pwdsafety/package.nix         |   2 +-
 pkgs/by-name/py/pyp/package.nix               |   2 +-
 pkgs/by-name/py/pyspread/package.nix          |   2 +-
 pkgs/by-name/py/pyznap/package.nix            |   2 +-
 pkgs/by-name/ql/qlog/package.nix              |   2 +-
 pkgs/by-name/qm/qmk_hid/package.nix           |   2 +-
 pkgs/by-name/qo/qogir-icon-theme/package.nix  |   2 +-
 pkgs/by-name/qo/qovery-cli/package.nix        |   2 +-
 pkgs/by-name/qu/quark-engine/package.nix      |   2 +-
 pkgs/by-name/qu/quicksand/package.nix         |   2 +-
 pkgs/by-name/ra/raffi/package.nix             |   2 +-
 pkgs/by-name/ra/rankwidth/package.nix         |   2 +-
 pkgs/by-name/rc/rcp/package.nix               |   2 +-
 .../package.nix                               |   2 +-
 pkgs/by-name/re/re-derq/package.nix           |   2 +-
 pkgs/by-name/re/re-intentbuilderc/package.nix |   2 +-
 pkgs/by-name/re/re-plistbuddy/package.nix     |   2 +-
 pkgs/by-name/re/readsb/package.nix            |   2 +-
 pkgs/by-name/re/reap/package.nix              |   2 +-
 pkgs/by-name/re/red-trul/package.nix          |   2 +-
 pkgs/by-name/re/redlist/package.nix           |   2 +-
 pkgs/by-name/re/refine/package.nix            |   2 +-
 pkgs/by-name/re/refurb/package.nix            |   2 +-
 pkgs/by-name/re/reindeer/package.nix          |   2 +-
 pkgs/by-name/re/rename/package.nix            |   2 +-
 pkgs/by-name/re/resnap/package.nix            |   2 +-
 pkgs/by-name/re/resorter/package.nix          |   2 +-
 pkgs/by-name/re/restic-integrity/package.nix  |   2 +-
 pkgs/by-name/ri/ripgrep-all/package.nix       |   2 +-
 pkgs/by-name/ro/ron-lsp/package.nix           |   2 +-
 pkgs/by-name/rq/rq/package.nix                |   2 +-
 pkgs/by-name/ru/ruler/package.nix             |   2 +-
 pkgs/by-name/ru/russ/package.nix              |   2 +-
 pkgs/by-name/sa/saber/package.nix             |   2 +-
 pkgs/by-name/sc/scalpel/package.nix           |   2 +-
 pkgs/by-name/sc/scilla/package.nix            |   2 +-
 pkgs/by-name/sc/scipopt-soplex/package.nix    |   2 +-
 pkgs/by-name/sc/scponly/package.nix           |   2 +-
 pkgs/by-name/sc/scryer-prolog/package.nix     |   2 +-
 pkgs/by-name/sd/sdlookup/package.nix          |   2 +-
 pkgs/by-name/se/seabios/package.nix           |   2 +-
 pkgs/by-name/se/secp256k1/package.nix         |   2 +-
 pkgs/by-name/se/secretscanner/package.nix     |   2 +-
 pkgs/by-name/se/secretspec/package.nix        |   2 +-
 pkgs/by-name/se/serie/package.nix             |   2 +-
 pkgs/by-name/se/serpent/package.nix           |   2 +-
 pkgs/by-name/sh/sh4d0wup/package.nix          |   2 +-
 pkgs/by-name/sh/sheldon/package.nix           |   2 +-
 pkgs/by-name/sh/shelldap/package.nix          |   2 +-
 pkgs/by-name/sh/shotgun/package.nix           |   2 +-
 pkgs/by-name/si/sidplayfp/package.nix         |   2 +-
 pkgs/by-name/si/simde/package.nix             |   2 +-
 pkgs/by-name/si/simple-live-app/package.nix   |   2 +-
 pkgs/by-name/si/sipvicious/package.nix        |   2 +-
 pkgs/by-name/si/sish/package.nix              |   2 +-
 pkgs/by-name/sk/skrooge/package.nix           |   2 +-
 pkgs/by-name/sl/slint-lsp/package.nix         |   2 +-
 pkgs/by-name/sl/slowhttptest/package.nix      |   2 +-
 pkgs/by-name/sl/sly/package.nix               |   2 +-
 pkgs/by-name/sm/smbscan/package.nix           |   2 +-
 pkgs/by-name/sm/smoked-salmon/package.nix     |   2 +-
 pkgs/by-name/sn/sn0int/package.nix            |   2 +-
 pkgs/by-name/sn/snowcrash/package.nix         |   2 +-
 pkgs/by-name/sn/snowmachine/package.nix       |   2 +-
 pkgs/by-name/so/socat/package.nix             |   2 +-
 pkgs/by-name/so/soplex/package.nix            |   2 +-
 pkgs/by-name/sp/spyre/package.nix             |   2 +-
 pkgs/by-name/sp/spytrap-adb/package.nix       |   2 +-
 pkgs/by-name/sq/squawk/package.nix            |   2 +-
 pkgs/by-name/sr/srisum/package.nix            |   2 +-
 .../ss/ssh-askpass-fullscreen/package.nix     |   2 +-
 pkgs/by-name/ss/sshchecker/package.nix        |   2 +-
 pkgs/by-name/ss/sssnake/package.nix           |   2 +-
 pkgs/by-name/st/stacktile/package.nix         |   2 +-
 pkgs/by-name/st/stacs/package.nix             |   2 +-
 pkgs/by-name/st/stamp/package.nix             |   2 +-
 pkgs/by-name/st/stdmanpages/package.nix       |   2 +-
 pkgs/by-name/st/steamguard-cli/package.nix    |   2 +-
 pkgs/by-name/st/stegseek/package.nix          |   2 +-
 pkgs/by-name/st/stella/package.nix            |   2 +-
 pkgs/by-name/st/stevia/package.nix            |   2 +-
 pkgs/by-name/st/stressapptest/package.nix     |   2 +-
 pkgs/by-name/st/stripe-cli/package.nix        |   2 +-
 pkgs/by-name/st/stylance-cli/package.nix      |   2 +-
 pkgs/by-name/su/subfont/package.nix           |   2 +-
 pkgs/by-name/su/subjs/package.nix             |   2 +-
 pkgs/by-name/sv/svxlink/package.nix           |   2 +-
 pkgs/by-name/sw/swaggerhole/package.nix       |   2 +-
 pkgs/by-name/sw/swapview/package.nix          |   2 +-
 pkgs/by-name/sw/swayrbar/package.nix          |   2 +-
 pkgs/by-name/sy/syft/package.nix              |   2 +-
 pkgs/by-name/sy/synchrony/package.nix         |   2 +-
 .../package.nix                               |   2 +-
 pkgs/by-name/t-/t-rec/package.nix             |   2 +-
 pkgs/by-name/ta/taskwarrior-tui/package.nix   |   2 +-
 pkgs/by-name/te/tecla/package.nix             |   2 +-
 .../by-name/te/tectonic-unwrapped/package.nix |   2 +-
 pkgs/by-name/te/termusic/package.nix          |   2 +-
 pkgs/by-name/te/terrascan/package.nix         |   2 +-
 pkgs/by-name/te/tewisay/package.nix           |   2 +-
 pkgs/by-name/th/the-way/package.nix           |   2 +-
 pkgs/by-name/th/theme-jade1/package.nix       |   2 +-
 pkgs/by-name/th/theme-obsidian2/package.nix   |   2 +-
 pkgs/by-name/th/thumper/package.nix           |   2 +-
 pkgs/by-name/ti/timetagger_cli/package.nix    |   2 +-
 pkgs/by-name/ti/tinty/package.nix             |   2 +-
 pkgs/by-name/ti/tiny-rdm/package.nix          |   2 +-
 pkgs/by-name/ti/tinycc/package.nix            |   2 +-
 pkgs/by-name/ti/tinyxml-2/package.nix         |   2 +-
 pkgs/by-name/ti/tiscamera/package.nix         |   2 +-
 pkgs/by-name/tl/tlaplus-toolbox/package.nix   |   2 +-
 pkgs/by-name/to/tokio-console/package.nix     |   2 +-
 pkgs/by-name/to/tomato-c/package.nix          |   2 +-
 pkgs/by-name/to/tomboy-ng/package.nix         |   2 +-
 pkgs/by-name/to/toml2json/package.nix         |   2 +-
 pkgs/by-name/to/toss/package.nix              |   2 +-
 pkgs/by-name/tp/tpm-luks/package.nix          |   2 +-
 pkgs/by-name/tr/traitor/package.nix           |   2 +-
 pkgs/by-name/tr/triton-llvm/package.nix       |   2 +-
 pkgs/by-name/tr/trufflehog/package.nix        |   2 +-
 pkgs/by-name/tr/trunk-ng/package.nix          |   2 +-
 pkgs/by-name/tr/trunk/package.nix             |   2 +-
 pkgs/by-name/tr/trustymail/package.nix        |   2 +-
 pkgs/by-name/tr/try/package.nix               |   2 +-
 pkgs/by-name/tt/tt-burnin/package.nix         |   2 +-
 pkgs/by-name/tt/tt-logger/package.nix         |   2 +-
 pkgs/by-name/tt/tt-metal/package.nix          |   2 +-
 pkgs/by-name/tt/tt-smi/package.nix            |   2 +-
 pkgs/by-name/tt/tt-system-tools/package.nix   |   2 +-
 pkgs/by-name/tt/tt-topology/package.nix       |   2 +-
 pkgs/by-name/tt/tt-umd/package.nix            |   2 +-
 pkgs/by-name/tt/ttdl/package.nix              |   2 +-
 pkgs/by-name/tt/ttfb/package.nix              |   2 +-
 pkgs/by-name/tu/tuifeed/package.nix           |   2 +-
 pkgs/by-name/tu/tuliprox/package.nix          |   2 +-
 pkgs/by-name/tw/twolame/package.nix           |   2 +-
 pkgs/by-name/ud/uddup/package.nix             |   2 +-
 pkgs/by-name/ue/uefisettings/package.nix      |   2 +-
 pkgs/by-name/um/umpire/package.nix            |   2 +-
 pkgs/by-name/un/units/package.nix             |   2 +-
 pkgs/by-name/un/unp/package.nix               |   2 +-
 pkgs/by-name/ur/urlhunter/package.nix         |   2 +-
 pkgs/by-name/ur/uroboros/package.nix          |   2 +-
 pkgs/by-name/v2/v2ray/package.nix             |   2 +-
 pkgs/by-name/v2/v2rayn/package.nix            |   2 +-
 pkgs/by-name/va/vangers/clunk.nix             |   2 +-
 pkgs/by-name/va/vangers/package.nix           |   2 +-
 pkgs/by-name/va/vanillatd/package.nix         |   2 +-
 pkgs/by-name/va/vapoursynth-eedi3/package.nix |   2 +-
 .../va/vapoursynth-nnedi3cl/package.nix       |   2 +-
 pkgs/by-name/vd/vdo/package.nix               |   2 +-
 pkgs/by-name/ve/venera/package.nix            |   2 +-
 pkgs/by-name/ve/verifpal/package.nix          |   2 +-
 pkgs/by-name/vi/vimcats/package.nix           |   2 +-
 pkgs/by-name/vi/vimix-icon-theme/package.nix  |   2 +-
 pkgs/by-name/vi/viskores/package.nix          |   2 +-
 pkgs/by-name/vk/vkd3d-proton/package.nix      |   2 +-
 pkgs/by-name/vk/vkd3d/package.nix             |   2 +-
 pkgs/by-name/vk/vkmark/package.nix            |   2 +-
 pkgs/by-name/vo/voicevox-core/package.nix     |   2 +-
 pkgs/by-name/vo/volta/package.nix             |   2 +-
 pkgs/by-name/vt/vt323/package.nix             |   2 +-
 pkgs/by-name/vy/vym/package.nix               |   2 +-
 pkgs/by-name/vz/vzic/package.nix              |   2 +-
 pkgs/by-name/wa/waagent/package.nix           |   2 +-
 pkgs/by-name/wa/wambo/package.nix             |   2 +-
 pkgs/by-name/wa/wapm/package.nix              |   2 +-
 pkgs/by-name/wa/wasmedge/package.nix          |   2 +-
 pkgs/by-name/wa/wasynth/package.nix           |   2 +-
 pkgs/by-name/wa/watchexec/package.nix         |   2 +-
 pkgs/by-name/wa/waydroid-helper/package.nix   |   2 +-
 pkgs/by-name/wa/wayland-logout/package.nix    |   2 +-
 pkgs/by-name/wc/wchisp/package.nix            |   2 +-
 pkgs/by-name/we/weathr/package.nix            |   2 +-
 pkgs/by-name/we/webcamoid/package.nix         |   2 +-
 pkgs/by-name/we/weylus/package.nix            |   2 +-
 pkgs/by-name/wi/wifi-qr/package.nix           |   2 +-
 pkgs/by-name/wi/wikiman/package.nix           |   2 +-
 pkgs/by-name/wi/windsend-rs/package.nix       |   2 +-
 pkgs/by-name/wi/windsend/package.nix          |   2 +-
 pkgs/by-name/wi/wio/package.nix               |   2 +-
 pkgs/by-name/wl/wlogout/package.nix           |   2 +-
 pkgs/by-name/wo/worker/package.nix            |   2 +-
 pkgs/by-name/wo/worldpainter/package.nix      |   2 +-
 pkgs/by-name/wo/wox/package.nix               |   2 +-
 pkgs/by-name/wp/wprecon/package.nix           |   2 +-
 pkgs/by-name/ws/wsjtx/package.nix             |   2 +-
 pkgs/by-name/xa/xarcan/package.nix            |   2 +-
 pkgs/by-name/xc/xcode-install/package.nix     |   2 +-
 pkgs/by-name/xd/xdiskusage/package.nix        |   2 +-
 pkgs/by-name/xe/xedit/package.nix             |   2 +-
 .../xl/xlibinput-calibrator/package.nix       |   2 +-
 pkgs/by-name/xo/xonsh/unwrapped.nix           |   2 +-
 pkgs/by-name/xr/xray/package.nix              |   2 +-
 pkgs/by-name/xs/xscope/package.nix            |   2 +-
 pkgs/by-name/xt/xterm/package.nix             |   2 +-
 pkgs/by-name/xu/xunit-viewer/package.nix      |   2 +-
 pkgs/by-name/ya/yaml2json/package.nix         |   2 +-
 pkgs/by-name/ya/yay/package.nix               |   2 +-
 pkgs/by-name/yg/yggdrasil-ng/package.nix      |   2 +-
 pkgs/by-name/yt/ytree/package.nix             |   2 +-
 pkgs/by-name/zd/zdns/package.nix              |   2 +-
 pkgs/by-name/ze/zellij-unwrapped/package.nix  |   2 +-
 pkgs/by-name/ze/zesarux/package.nix           |   2 +-
 pkgs/by-name/zn/zn_poly/package.nix           |   2 +-
 pkgs/by-name/zo/zoxide/package.nix            |   2 +-
 pkgs/by-name/zp/zpaqfranz/package.nix         |   2 +-
 .../desktops/enlightenment/evisum/default.nix |   2 +-
 .../lomiri-calendar-app/default.nix           |   2 +-
 .../lomiri/data/lomiri-wallpapers/default.nix |   2 +-
 .../androidndk-pkgs/androidndk-pkgs.nix       |   2 +-
 .../compilers/gcc/ng/common/common-let.nix    |   2 +-
 .../compilers/opensmalltalk-vm/default.nix    |   2 +-
 .../hare-compress/default.nix                 |   2 +-
 .../hare-third-party/hare-http/default.nix    |   2 +-
 .../hare-third-party/hare-json/default.nix    |   2 +-
 .../hare-third-party/hare-png/default.nix     |   2 +-
 .../hare-third-party/hare-ssh/default.nix     |   2 +-
 .../hare-third-party/hare-xml/default.nix     |   2 +-
 .../development/interpreters/kerf/default.nix |   2 +-
 .../libraries/hyphen/dictionaries.nix         |   2 +-
 pkgs/development/libraries/librsb/default.nix |   2 +-
 pkgs/development/libraries/mesa/common.nix    |   2 +-
 .../development/libraries/poppler/default.nix |   2 +-
 .../resholve/python2-modules/pip/default.nix  |   2 +-
 .../python2-modules/wheel/default.nix         |   2 +-
 pkgs/development/misc/resholve/resholve.nix   |   2 +-
 .../domain-local-await/default.nix            |   2 +-
 .../development/ocaml-modules/eio/default.nix |   2 +-
 .../ocaml-modules/iomux/default.nix           |   2 +-
 .../ocaml-modules/lwt_eio/default.nix         |   2 +-
 pkgs/development/ocaml-modules/menhir/lib.nix |   2 +-
 pkgs/development/ocaml-modules/menhir/sdk.nix |   2 +-
 .../ocaml-modules/ppx_yojson_conv/default.nix |   2 +-
 .../ocaml-modules/thread-table/default.nix    |   2 +-
 .../ocaml-modules/xxhash/default.nix          |   2 +-
 .../octave-modules/octclip/default.nix        |   2 +-
 .../perl-modules/Bio-Ext-Align/default.nix    |   2 +-
 .../perl-modules/Percona-Toolkit/default.nix  |   2 +-
 .../development/perl-modules/Po4a/default.nix |   2 +-
 .../perl-modules/Tirex/default.nix            |   2 +-
 .../WWW-YoutubeViewer/default.nix             |   2 +-
 .../php-packages/maxminddb/default.nix        |   2 +-
 .../php-packages/pdlib/default.nix            |   2 +-
 .../adafruit-pureio/default.nix               |   2 +-
 .../python-modules/adax/default.nix           |   2 +-
 .../python-modules/addict/default.nix         |   2 +-
 .../python-modules/adext/default.nix          |   2 +-
 .../python-modules/aesedb/default.nix         |   2 +-
 .../python-modules/agate-dbf/default.nix      |   2 +-
 .../python-modules/agate-sql/default.nix      |   2 +-
 .../python-modules/aggregate6/default.nix     |   2 +-
 .../python-modules/aiobiketrax/default.nix    |   2 +-
 .../python-modules/aiobroadlink/default.nix   |   2 +-
 .../python-modules/aioeafm/default.nix        |   2 +-
 .../python-modules/aioeagle/default.nix       |   2 +-
 .../python-modules/aioemonitor/default.nix    |   2 +-
 .../python-modules/aiohttp-wsgi/default.nix   |   2 +-
 .../python-modules/aiokef/default.nix         |   2 +-
 .../python-modules/aiolimiter/default.nix     |   2 +-
 .../python-modules/aiolookin/default.nix      |   2 +-
 .../aiomultiprocess/default.nix               |   2 +-
 .../python-modules/aionotion/default.nix      |   2 +-
 .../python-modules/aiopg/default.nix          |   2 +-
 .../python-modules/aiopulse/default.nix       |   2 +-
 .../python-modules/aiopvpc/default.nix        |   2 +-
 .../python-modules/aiopyarr/default.nix       |   2 +-
 .../python-modules/aiopylgtv/default.nix      |   2 +-
 .../python-modules/aiorecollect/default.nix   |   2 +-
 .../python-modules/aioridwell/default.nix     |   2 +-
 .../python-modules/aiosignal/default.nix      |   2 +-
 .../python-modules/aioskybell/default.nix     |   2 +-
 .../python-modules/aiosql/default.nix         |   2 +-
 .../python-modules/aiowatttime/default.nix    |   2 +-
 .../python-modules/aioweenect/default.nix     |   2 +-
 .../python-modules/aiowinreg/default.nix      |   2 +-
 .../python-modules/airly/default.nix          |   2 +-
 .../python-modules/airtouch4pyapi/default.nix |   2 +-
 .../aladdin-connect/default.nix               |   2 +-
 .../python-modules/amberelectric/default.nix  |   2 +-
 .../python-modules/amqtt/default.nix          |   2 +-
 .../python-modules/angrcli/default.nix        |   2 +-
 .../python-modules/angrop/default.nix         |   2 +-
 .../python-modules/aqualogic/default.nix      |   2 +-
 .../arabic-reshaper/default.nix               |   2 +-
 .../python-modules/arris-tg2492lg/default.nix |   2 +-
 .../python-modules/asyncarve/default.nix      |   2 +-
 .../python-modules/asyncio-dgram/default.nix  |   2 +-
 .../python-modules/atc-ble/default.nix        |   2 +-
 .../python-modules/atopile/default.nix        |   2 +-
 .../python-modules/autoit-ripper/default.nix  |   2 +-
 .../python-modules/awesomeversion/default.nix |   2 +-
 .../backports-strenum/default.nix             |   2 +-
 .../python-modules/bagit/default.nix          |   2 +-
 .../python-modules/base36/default.nix         |   2 +-
 .../python-modules/bc-jsonpath-ng/default.nix |   2 +-
 .../beancount-black/default.nix               |   2 +-
 .../beancount-parser/default.nix              |   2 +-
 .../beancount-periodic/default.nix            |   2 +-
 .../python-modules/beanhub-cli/default.nix    |   2 +-
 .../beanhub-extract/default.nix               |   2 +-
 .../python-modules/beanhub-forms/default.nix  |   2 +-
 .../python-modules/beautifultable/default.nix |   2 +-
 .../python-modules/bech32/default.nix         |   2 +-
 .../python-modules/beets-audible/default.nix  |   2 +-
 .../python-modules/berkeleydb/default.nix     |   2 +-
 .../binho-host-adapter/default.nix            |   2 +-
 .../python-modules/bip-utils/default.nix      |   2 +-
 .../python-modules/bip32/default.nix          |   2 +-
 .../python-modules/blockchain/default.nix     |   2 +-
 .../python-modules/bluepy-devices/default.nix |   2 +-
 .../bluetooth-auto-recovery/default.nix       |   2 +-
 .../python-modules/branca/default.nix         |   2 +-
 .../brottsplatskartan/default.nix             |   2 +-
 .../python-modules/btsocket/default.nix       |   2 +-
 .../python-modules/cart/default.nix           |   2 +-
 .../python-modules/cattrs/default.nix         |   2 +-
 .../python-modules/certbot/default.nix        |   2 +-
 .../python-modules/chirpstack-api/default.nix |   2 +-
 .../python-modules/circuitbreaker/default.nix |   2 +-
 .../python-modules/cmd2/default.nix           |   2 +-
 .../python-modules/coffea/default.nix         |   2 +-
 .../python-modules/commandparse/default.nix   |   2 +-
 .../python-modules/confight/default.nix       |   2 +-
 .../python-modules/connect-box/default.nix    |   2 +-
 .../connection-pool/default.nix               |   2 +-
 .../python-modules/connio/default.nix         |   2 +-
 .../python-modules/correctionlib/default.nix  |   2 +-
 .../python-modules/corsair-scan/default.nix   |   2 +-
 .../python-modules/cramjam/default.nix        |   2 +-
 .../crownstone-core/default.nix               |   2 +-
 .../python-modules/crownstone-sse/default.nix |   2 +-
 .../crownstone-uart/default.nix               |   2 +-
 .../python-modules/crysp/default.nix          |   2 +-
 .../python-modules/cson/default.nix           |   2 +-
 .../python-modules/csrmesh/default.nix        |   2 +-
 .../python-modules/daff/default.nix           |   2 +-
 .../python-modules/dask-histogram/default.nix |   2 +-
 .../python-modules/datafusion/default.nix     |   2 +-
 .../python-modules/dbfread/default.nix        |   2 +-
 .../python-modules/diffsync/default.nix       |   2 +-
 .../python-modules/dingz/default.nix          |   2 +-
 .../python-modules/dirty-equals/default.nix   |   2 +-
 .../django-guardian/default.nix               |   2 +-
 .../django-js-asset/default.nix               |   2 +-
 .../python-modules/django-mptt/default.nix    |   2 +-
 .../django-webpack-loader/default.nix         |   2 +-
 .../python-modules/dns-lexicon/default.nix    |   2 +-
 .../python-modules/dotmap/default.nix         |   2 +-
 .../python-modules/dremel3dpy/default.nix     |   2 +-
 .../python-modules/dsmr-parser/default.nix    |   2 +-
 .../python-modules/duden/default.nix          |   2 +-
 .../python-modules/dwdwfsapi/default.nix      |   2 +-
 .../python-modules/eagle100/default.nix       |   2 +-
 .../python-modules/ecoaliface/default.nix     |   2 +-
 .../python-modules/ecs-logging/default.nix    |   2 +-
 .../python-modules/editdistance/default.nix   |   2 +-
 .../python-modules/eiswarnung/default.nix     |   2 +-
 .../python-modules/elmax-api/default.nix      |   2 +-
 .../python-modules/elmax/default.nix          |   2 +-
 .../python-modules/energyzero/default.nix     |   2 +-
 .../python-modules/enlighten/default.nix      |   2 +-
 .../python-modules/eradicate/default.nix      |   2 +-
 .../eufylife-ble-client/default.nix           |   2 +-
 .../python-modules/exceptiongroup/default.nix |   2 +-
 .../python-modules/expects/default.nix        |   2 +-
 .../python-modules/exrex/default.nix          |   2 +-
 .../python-modules/fakeredis/default.nix      |   2 +-
 .../fastapi-github-oidc/default.nix           |   2 +-
 .../python-modules/fe25519/default.nix        |   2 +-
 .../python-modules/fixerio/default.nix        |   2 +-
 .../python-modules/flashtext/default.nix      |   2 +-
 .../python-modules/flask-cors/default.nix     |   2 +-
 .../python-modules/fnvhash/default.nix        |   2 +-
 .../python-modules/folium/default.nix         |   2 +-
 .../python-modules/fordpass/default.nix       |   2 +-
 .../python-modules/fortiosapi/default.nix     |   2 +-
 .../python-modules/foundationdb/default.nix   |   2 +-
 .../python-modules/fpyutils/default.nix       |   2 +-
 .../python-modules/fullmoon/default.nix       |   2 +-
 .../python-modules/gassist-text/default.nix   |   2 +-
 .../python-modules/ge25519/default.nix        |   2 +-
 .../genome-collector/default.nix              |   2 +-
 .../python-modules/geojson-client/default.nix |   2 +-
 .../python-modules/geopy/default.nix          |   2 +-
 .../python-modules/georss-client/default.nix  |   2 +-
 .../georss-generic-client/default.nix         |   2 +-
 .../georss-ign-sismologia-client/default.nix  |   2 +-
 .../default.nix                               |   2 +-
 .../default.nix                               |   2 +-
 .../default.nix                               |   2 +-
 .../georss-tfs-incidents-client/default.nix   |   2 +-
 .../georss-wa-dfes-client/default.nix         |   2 +-
 .../python-modules/google-crc32c/default.nix  |   2 +-
 .../python-modules/google/default.nix         |   2 +-
 .../python-modules/govee-led-wez/default.nix  |   2 +-
 .../python-modules/gps3/default.nix           |   2 +-
 .../python-modules/grequests/default.nix      |   2 +-
 .../grpcio-channelz/default.nix               |   2 +-
 .../grpcio-health-checking/default.nix        |   2 +-
 .../grpcio-reflection/default.nix             |   2 +-
 .../python-modules/grpcio-testing/default.nix |   2 +-
 .../python-modules/hachoir/default.nix        |   2 +-
 .../python-modules/haversine/default.nix      |   2 +-
 .../python-modules/headerparser/default.nix   |   2 +-
 .../python-modules/hid/default.nix            |   2 +-
 .../python-modules/hikvision/default.nix      |   2 +-
 .../python-modules/hkavr/default.nix          |   2 +-
 .../python-modules/html-sanitizer/default.nix |   2 +-
 .../python-modules/httpserver/default.nix     |   2 +-
 .../python-modules/hwi/default.nix            |   2 +-
 .../python-modules/hydrawiser/default.nix     |   2 +-
 .../python-modules/iammeter/default.nix       |   2 +-
 .../python-modules/iceportal/default.nix      |   2 +-
 .../python-modules/icmplib/default.nix        |   2 +-
 .../python-modules/imagesize/default.nix      |   2 +-
 .../python-modules/imantics/default.nix       |   2 +-
 .../python-modules/immutables/default.nix     |   2 +-
 .../python-modules/ismartgate/default.nix     |   2 +-
 .../python-modules/iso4217/default.nix        |   2 +-
 .../python-modules/iso8601/default.nix        |   2 +-
 .../python-modules/jobspy/default.nix         |   2 +-
 .../jsonpath-python/default.nix               |   2 +-
 .../jupyterhub-tmpauthenticator/default.nix   |   2 +-
 .../python-modules/jupyterlab-git/default.nix |   2 +-
 .../python-modules/justbackoff/default.nix    |   2 +-
 .../karton-asciimagic/default.nix             |   2 +-
 .../karton-autoit-ripper/default.nix          |   2 +-
 .../karton-config-extractor/default.nix       |   2 +-
 .../karton-dashboard/default.nix              |   2 +-
 .../karton-mwdb-reporter/default.nix          |   2 +-
 .../karton-yaramatcher/default.nix            |   2 +-
 .../kicadcliwrapper/default.nix               |   2 +-
 .../lazy-object-proxy/default.nix             |   2 +-
 .../python-modules/led-ble/default.nix        |   2 +-
 .../python-modules/libpurecool/default.nix    |   2 +-
 .../python-modules/limiter/default.nix        |   2 +-
 .../python-modules/linuxfd/default.nix        |   2 +-
 .../python-modules/luhn/default.nix           |   2 +-
 .../python-modules/lupupy/default.nix         |   2 +-
 .../python-modules/malduck/default.nix        |   2 +-
 .../python-modules/mbddns/default.nix         |   2 +-
 .../python-modules/mcuuid/default.nix         |   2 +-
 .../python-modules/md-toc/default.nix         |   2 +-
 .../python-modules/meross-iot/default.nix     |   2 +-
 .../python-modules/messagebird/default.nix    |   2 +-
 .../python-modules/metar/default.nix          |   2 +-
 .../python-modules/metawear/default.nix       |   2 +-
 .../python-modules/meteoalertapi/default.nix  |   2 +-
 .../python-modules/miniful/default.nix        |   2 +-
 .../python-modules/mmcv/default.nix           |   2 +-
 .../python-modules/mmengine/default.nix       |   2 +-
 .../python-modules/mongoquery/default.nix     |   2 +-
 .../python-modules/moonraker-api/default.nix  |   2 +-
 .../python-modules/motionblinds/default.nix   |   2 +-
 .../motioneye-client/default.nix              |   2 +-
 .../python-modules/mplhep/default.nix         |   2 +-
 .../python-modules/mplleaflet/default.nix     |   2 +-
 .../python-modules/msldap/default.nix         |   2 +-
 .../python-modules/mulpyplexer/default.nix    |   2 +-
 .../python-modules/mutesync/default.nix       |   2 +-
 .../python-modules/mypy-boto3/default.nix     |   2 +-
 .../python-modules/name-that-hash/default.nix |   2 +-
 .../python-modules/nats-python/default.nix    |   2 +-
 .../python-modules/nbclassic/default.nix      |   2 +-
 .../python-modules/netifaces2/default.nix     |   2 +-
 .../nettigo-air-monitor/default.nix           |   2 +-
 .../python-modules/niluclient/default.nix     |   2 +-
 .../python-modules/nkdfu/default.nix          |   2 +-
 .../python-modules/nmapthon2/default.nix      |   2 +-
 .../python-modules/notus-scanner/default.nix  |   2 +-
 .../python-modules/omnikinverter/default.nix  |   2 +-
 .../python-modules/omnilogic/default.nix      |   2 +-
 .../python-modules/ondilo/default.nix         |   2 +-
 .../onnxconverter-common/default.nix          |   2 +-
 .../onnxruntime-tools/default.nix             |   2 +-
 .../python-modules/oocsi/default.nix          |   2 +-
 .../python-modules/open-garage/default.nix    |   2 +-
 .../python-modules/openerz-api/default.nix    |   2 +-
 .../python-modules/openevsewifi/default.nix   |   2 +-
 .../python-modules/openhomedevice/default.nix |   2 +-
 .../python-modules/opensimplex/default.nix    |   2 +-
 .../openwrt-ubus-rpc/default.nix              |   2 +-
 .../python-modules/orvibo/default.nix         |   2 +-
 .../python-modules/ospd/default.nix           |   2 +-
 .../paranoid-crypto/default.nix               |   2 +-
 .../python-modules/partd/default.nix          |   2 +-
 .../python-modules/pathlib2/default.nix       |   2 +-
 .../python-modules/pcodedmp/default.nix       |   2 +-
 .../python-modules/peaqevcore/default.nix     |   2 +-
 .../python-modules/peco/default.nix           |   2 +-
 .../python-modules/pencompy/default.nix       |   2 +-
 .../python-modules/pg8000/default.nix         |   2 +-
 .../python-modules/pip/default.nix            |   2 +-
 .../python-modules/pixelmatch/default.nix     |   2 +-
 .../python-modules/pkce/default.nix           |   2 +-
 .../python-modules/plugwise/default.nix       |   2 +-
 .../python-modules/policyuniverse/default.nix |   2 +-
 .../python-modules/pontos/default.nix         |   2 +-
 .../python-modules/poolsense/default.nix      |   2 +-
 .../python-modules/prefixed/default.nix       |   2 +-
 .../python-modules/protoletariat/default.nix  |   2 +-
 .../python-modules/proxy-py/default.nix       |   2 +-
 .../python-modules/psycopg2cffi/default.nix   |   2 +-
 .../pubnubsub-handler/default.nix             |   2 +-
 .../python-modules/py-nightscout/default.nix  |   2 +-
 .../python-modules/py-ubjson/default.nix      |   2 +-
 .../python-modules/pyairvisual/default.nix    |   2 +-
 .../python-modules/pyblackbird/default.nix    |   2 +-
 .../python-modules/pycec/default.nix          |   2 +-
 .../python-modules/pycep-parser/default.nix   |   2 +-
 .../python-modules/pycfdns/default.nix        |   2 +-
 .../python-modules/pychannels/default.nix     |   2 +-
 .../python-modules/pyclimacell/default.nix    |   2 +-
 .../python-modules/pycomfoconnect/default.nix |   2 +-
 .../python-modules/pycups/default.nix         |   2 +-
 .../python-modules/pydal/default.nix          |   2 +-
 .../python-modules/pydanfossair/default.nix   |   2 +-
 .../python-modules/pydoods/default.nix        |   2 +-
 .../python-modules/pyefergy/default.nix       |   2 +-
 .../python-modules/pyeight/default.nix        |   2 +-
 .../python-modules/pyembroidery/default.nix   |   2 +-
 .../python-modules/pyeverlights/default.nix   |   2 +-
 .../python-modules/pyevilgenius/default.nix   |   2 +-
 .../python-modules/pyfibaro/default.nix       |   2 +-
 .../python-modules/pyfido/default.nix         |   2 +-
 .../python-modules/pyflexit/default.nix       |   2 +-
 .../python-modules/pyflic/default.nix         |   2 +-
 .../python-modules/pyflume/default.nix        |   2 +-
 .../python-modules/pygame-gui/default.nix     |   2 +-
 .../python-modules/pygeocodio/default.nix     |   2 +-
 .../python-modules/pygmars/default.nix        |   2 +-
 .../python-modules/pygount/default.nix        |   2 +-
 .../python-modules/pyhaversion/default.nix    |   2 +-
 .../python-modules/pyhomepilot/default.nix    |   2 +-
 .../python-modules/pyhumps/default.nix        |   2 +-
 .../python-modules/pyi2cflash/default.nix     |   2 +-
 .../python-modules/pyialarm/default.nix       |   2 +-
 .../python-modules/pyinsteon/default.nix      |   2 +-
 .../python-modules/pyiqvia/default.nix        |   2 +-
 .../python-modules/pykira/default.nix         |   2 +-
 .../python-modules/pykostalpiko/default.nix   |   2 +-
 .../python-modules/pykulersky/default.nix     |   2 +-
 .../python-modules/pylacrosse/default.nix     |   2 +-
 .../python-modules/pylgnetcast/default.nix    |   2 +-
 .../python-modules/pylnk3/default.nix         |   2 +-
 .../python-modules/pyluwen/default.nix        |   2 +-
 .../python-modules/pymailgunner/default.nix   |   2 +-
 .../python-modules/pymata-express/default.nix |   2 +-
 .../python-modules/pymediaroom/default.nix    |   2 +-
 .../python-modules/pymemcache/default.nix     |   2 +-
 .../python-modules/pymeteireann/default.nix   |   2 +-
 .../python-modules/pymitv/default.nix         |   2 +-
 .../python-modules/pymunk/default.nix         |   2 +-
 .../python-modules/pynello/default.nix        |   2 +-
 .../python-modules/pynentry/default.nix       |   2 +-
 .../python-modules/pynetgear/default.nix      |   2 +-
 .../python-modules/pynuki/default.nix         |   2 +-
 .../python-modules/pynut2/default.nix         |   2 +-
 .../python-modules/pynws/default.nix          |   2 +-
 .../python-modules/pynx584/default.nix        |   2 +-
 .../python-modules/pyombi/default.nix         |   2 +-
 .../python-modules/pyopenuv/default.nix       |   2 +-
 .../pyoutbreaksnearme/default.nix             |   2 +-
 .../python-modules/pypca/default.nix          |   2 +-
 .../python-modules/pyprosegur/default.nix     |   2 +-
 .../python-modules/pyprusalink/default.nix    |   2 +-
 .../python-modules/pyric/default.nix          |   2 +-
 .../python-modules/pyrisco/default.nix        |   2 +-
 .../python-modules/pysaj/default.nix          |   2 +-
 .../python-modules/pyskyqremote/default.nix   |   2 +-
 .../python-modules/pysmappee/default.nix      |   2 +-
 .../python-modules/pysmartthings/default.nix  |   2 +-
 .../python-modules/pysmbc/default.nix         |   2 +-
 .../python-modules/pysmt/default.nix          |   2 +-
 .../python-modules/pysnmplib/default.nix      |   2 +-
 .../python-modules/pysnooz/default.nix        |   2 +-
 .../python-modules/pysoma/default.nix         |   2 +-
 .../python-modules/pyspcwebgw/default.nix     |   2 +-
 .../python-modules/pyswitchbee/default.nix    |   2 +-
 .../python-modules/pytankerkoenig/default.nix |   2 +-
 .../python-modules/pytap2/default.nix         |   2 +-
 .../python-modules/pytautulli/default.nix     |   2 +-
 .../pytest-httpserver/default.nix             |   2 +-
 .../pytest-pytestrail/default.nix             |   2 +-
 .../python-modules/pytest-raises/default.nix  |   2 +-
 .../pytest-raisesregexp/default.nix           |   2 +-
 .../python-modules/pytest-vcr/default.nix     |   2 +-
 .../python-bitcoinlib/default.nix             |   2 +-
 .../python-modules/python-box/default.nix     |   2 +-
 .../python-decouple/default.nix               |   2 +-
 .../python-digitalocean/default.nix           |   2 +-
 .../python-modules/python-ev3dev2/default.nix |   2 +-
 .../python-fullykiosk/default.nix             |   2 +-
 .../python-modules/python-gammu/default.nix   |   2 +-
 .../python-http-client/default.nix            |   2 +-
 .../python-modules/python-i18n/default.nix    |   2 +-
 .../python-modules/python-nmap/default.nix    |   2 +-
 .../python-modules/python-pidfile/default.nix |   2 +-
 .../python-rabbitair/default.nix              |   2 +-
 .../python-secp256k1-cardano/default.nix      |   2 +-
 .../python-socketio/default.nix               |   2 +-
 .../python-modules/python-status/default.nix  |   2 +-
 .../python-twitch-client/default.nix          |   2 +-
 .../python-modules/python-velbus/default.nix  |   2 +-
 .../python-modules/python-whois/default.nix   |   2 +-
 .../python-modules/python-wink/default.nix    |   2 +-
 .../python-modules/python-yate/default.nix    |   2 +-
 .../python-modules/pythonegardia/default.nix  |   2 +-
 .../python-modules/pytile/default.nix         |   2 +-
 .../python-modules/pytrafikverket/default.nix |   2 +-
 .../python-modules/pytransportnsw/default.nix |   2 +-
 .../python-modules/pytricia/default.nix       |   2 +-
 .../python-modules/pyuseragents/default.nix   |   2 +-
 .../python-modules/pyvolumio/default.nix      |   2 +-
 .../python-modules/pywaterkotte/default.nix   |   2 +-
 .../pyweatherflowrest/default.nix             |   2 +-
 .../python-modules/pywilight/default.nix      |   2 +-
 .../python-modules/pyx/default.nix            |   2 +-
 .../python-modules/pyxeoma/default.nix        |   2 +-
 .../pyxiaomigateway/default.nix               |   2 +-
 .../python-modules/pyyaml-env-tag/default.nix |   2 +-
 .../python-modules/pyzerproc/default.nix      |   2 +-
 .../quantum-gateway/default.nix               |   2 +-
 .../python-modules/rachiopy/default.nix       |   2 +-
 .../python-modules/radiotherm/default.nix     |   2 +-
 .../python-modules/rapidocr/default.nix       |   2 +-
 .../python-modules/ratelimit/default.nix      |   2 +-
 .../readme-renderer/default.nix               |   2 +-
 .../python-modules/regenmaschine/default.nix  |   2 +-
 .../python-modules/remi/default.nix           |   2 +-
 .../requests-futures/default.nix              |   2 +-
 .../requests-oauthlib/default.nix             |   2 +-
 .../requests-pkcs12/default.nix               |   2 +-
 .../retry-decorator/default.nix               |   2 +-
 .../python-modules/rjpl/default.nix           |   2 +-
 .../python-modules/roonapi/default.nix        |   2 +-
 .../python-modules/rpyc/default.nix           |   2 +-
 .../python-modules/ruyaml/default.nix         |   2 +-
 .../python-modules/schiene/default.nix        |   2 +-
 .../scikit-build-core/default.nix             |   2 +-
 .../python-modules/screenlogicpy/default.nix  |   2 +-
 .../python-modules/sdds/default.nix           |   2 +-
 .../python-modules/seaborn/default.nix        |   2 +-
 .../python-modules/seatconnect/default.nix    |   2 +-
 .../python-modules/seccomp/default.nix        |   2 +-
 .../python-modules/secp256k1/default.nix      |   2 +-
 .../python-modules/semaphore-bot/default.nix  |   2 +-
 .../sensor-state-data/default.nix             |   2 +-
 .../python-modules/sensorpush-ble/default.nix |   2 +-
 .../python-modules/serialio/default.nix       |   2 +-
 .../python-modules/setuptools/80.nix          |   2 +-
 .../python-modules/setuptools/default.nix     |   2 +-
 .../python-modules/seventeentrack/default.nix |   2 +-
 .../python-modules/simpful/default.nix        |   2 +-
 .../simple-rest-client/default.nix            |   2 +-
 .../python-modules/simplehound/default.nix    |   2 +-
 .../python-modules/skl2onnx/default.nix       |   2 +-
 .../python-modules/skodaconnect/default.nix   |   2 +-
 .../python-modules/sleepyq/default.nix        |   2 +-
 .../python-modules/smhi-pkg/default.nix       |   2 +-
 .../python-modules/socialscan/default.nix     |   2 +-
 .../python-modules/sockio/default.nix         |   2 +-
 .../sortedcollections/default.nix             |   2 +-
 .../python-modules/sounddevice/default.nix    |   2 +-
 .../python-modules/speg/default.nix           |   2 +-
 .../sphinx-autobuild/default.nix              |   2 +-
 .../sphinxcontrib-plantuml/default.nix        |   2 +-
 .../python-modules/spur/default.nix           |   2 +-
 .../python-modules/spyse-python/default.nix   |   2 +-
 .../python-modules/srvlookup/default.nix      |   2 +-
 .../python-modules/staticmap/default.nix      |   2 +-
 .../python-modules/stdiomask/default.nix      |   2 +-
 .../python-modules/stopit/default.nix         |   2 +-
 .../streamlabswater/default.nix               |   2 +-
 .../python-modules/strenum/default.nix        |   2 +-
 .../python-modules/striprtf/default.nix       |   2 +-
 .../python-modules/subzerod/default.nix       |   2 +-
 .../syslog-rfc5424-formatter/default.nix      |   2 +-
 .../python-modules/tahoma-api/default.nix     |   2 +-
 .../python-modules/tailer/default.nix         |   2 +-
 .../python-modules/termplotlib/default.nix    |   2 +-
 .../python-modules/teslajsonpy/default.nix    |   2 +-
 .../python-modules/testbook/default.nix       |   2 +-
 .../python-modules/testrail-api/default.nix   |   2 +-
 .../python-modules/timeago/default.nix        |   2 +-
 .../python-modules/tmb/default.nix            |   2 +-
 .../python-modules/tololib/default.nix        |   2 +-
 .../python-modules/toonapi/default.nix        |   2 +-
 .../python-modules/torrequest/default.nix     |   2 +-
 .../python-modules/tqdm/default.nix           |   2 +-
 .../python-modules/translatepy/default.nix    |   2 +-
 .../python-modules/translitcodec/default.nix  |   2 +-
 .../python-modules/tt-flash/default.nix       |   2 +-
 .../tt-tools-common/default.nix               |   2 +-
 .../python-modules/ttach/default.nix          |   2 +-
 .../python-modules/ttstokenizer/default.nix   |   2 +-
 .../tuya-iot-py-sdk/default.nix               |   2 +-
 .../python-modules/tuyaha/default.nix         |   2 +-
 .../python-modules/twinkly-client/default.nix |   2 +-
 .../python-modules/twitterapi/default.nix     |   2 +-
 .../python-modules/types-docopt/default.nix   |   2 +-
 .../python-modules/ueagle/default.nix         |   2 +-
 .../python-modules/ulid-transform/default.nix |   2 +-
 .../python-modules/umalqurra/default.nix      |   2 +-
 .../python-modules/umodbus/default.nix        |   2 +-
 .../python-modules/upnpy/default.nix          |   2 +-
 .../uptime-kuma-api/default.nix               |   2 +-
 .../uptime-kuma-monitor/default.nix           |   2 +-
 .../python-modules/usb-devices/default.nix    |   2 +-
 .../python-modules/utils/default.nix          |   2 +-
 .../python-modules/vector/default.nix         |   2 +-
 .../venstarcolortouch/default.nix             |   2 +-
 .../python-modules/vt-py/default.nix          |   2 +-
 .../python-modules/waqiasync/default.nix      |   2 +-
 .../python-modules/warble/default.nix         |   2 +-
 .../python-modules/warrant-lite/default.nix   |   2 +-
 .../python-modules/webexteamssdk/default.nix  |   2 +-
 .../python-modules/webrtcvad/default.nix      |   2 +-
 .../python-modules/webthing/default.nix       |   2 +-
 .../python-modules/wfuzz/default.nix          |   2 +-
 .../python-modules/wget/default.nix           |   2 +-
 .../python-modules/wheel/default.nix          |   2 +-
 .../python-modules/whois/default.nix          |   2 +-
 .../python-modules/wiffi/default.nix          |   2 +-
 .../python-modules/winacl/default.nix         |   2 +-
 .../python-modules/winsspi/default.nix        |   2 +-
 .../python-modules/xmind/default.nix          |   2 +-
 .../python-modules/xmljson/default.nix        |   2 +-
 .../xpath-expressions/default.nix             |   2 +-
 .../yalesmartalarmclient/default.nix          |   2 +-
 .../python-modules/yalexs/default.nix         |   2 +-
 .../python-modules/youless-api/default.nix    |   2 +-
 .../python-modules/zwave-me-ws/default.nix    |   2 +-
 .../rocm-modules/amdsmi/default.nix           |   2 +-
 .../rocm-modules/aqlprofile/default.nix       |   2 +-
 pkgs/development/rocm-modules/clr/default.nix |   2 +-
 .../rocm-modules/composable_kernel/base.nix   |   2 +-
 .../composable_kernel/ck4inductor.nix         |   2 +-
 .../development/rocm-modules/half/default.nix |   2 +-
 .../rocm-modules/hip-common/default.nix       |   2 +-
 .../rocm-modules/hipblas-common/default.nix   |   2 +-
 .../rocm-modules/hipblas/default.nix          |   2 +-
 .../rocm-modules/hipblaslt/default.nix        |   2 +-
 .../rocm-modules/hipcc/default.nix            |   2 +-
 .../rocm-modules/hipcub/default.nix           |   2 +-
 .../rocm-modules/hipfft/default.nix           |   2 +-
 .../rocm-modules/hipfort/default.nix          |   2 +-
 .../rocm-modules/hipify/default.nix           |   2 +-
 .../rocm-modules/hiprand/default.nix          |   2 +-
 .../rocm-modules/hipsolver/default.nix        |   2 +-
 .../rocm-modules/hipsparse/default.nix        |   2 +-
 .../rocm-modules/hipsparselt/default.nix      |   2 +-
 .../rocm-modules/migraphx/default.nix         |   2 +-
 .../rocm-modules/miopen/default.nix           |   2 +-
 .../rocm-modules/mivisionx/default.nix        |   2 +-
 pkgs/development/rocm-modules/rdc/default.nix |   2 +-
 .../rocm-modules/rocalution/default.nix       |   2 +-
 .../rocm-modules/rocblas/default.nix          |   2 +-
 .../rocm-modules/rocdbgapi/default.nix        |   2 +-
 .../rocm-modules/rocfft/default.nix           |   2 +-
 .../rocm-bandwidth-test/default.nix           |   2 +-
 .../rocm-modules/rocm-core/default.nix        |   2 +-
 .../rocm-modules/rocm-runtime/default.nix     |   2 +-
 .../rocm-modules/rocm-smi/default.nix         |   2 +-
 .../rocm-modules/rocmlir/default.nix          |   2 +-
 .../rocm-modules/rocprim/default.nix          |   2 +-
 .../rocprof-trace-decoder/default.nix         |   2 +-
 .../rocprofiler-register/default.nix          |   2 +-
 .../rocm-modules/rocprofiler/default.nix      |   2 +-
 .../rocm-modules/rocr-debug-agent/default.nix |   2 +-
 .../rocm-modules/rocrand/default.nix          |   2 +-
 .../rocm-modules/rocshmem/default.nix         |   2 +-
 .../rocm-modules/rocsolver/default.nix        |   2 +-
 .../rocm-modules/rocsparse/default.nix        |   2 +-
 .../rocm-modules/rocthrust/default.nix        |   2 +-
 .../rocm-modules/roctracer/default.nix        |   2 +-
 .../rocm-modules/rocwmma/default.nix          |   2 +-
 pkgs/development/rocm-modules/rpp/default.nix |   2 +-
 .../rocm-modules/tensile/default.nix          |   2 +-
 .../tflint-plugins/tflint-ruleset-aws.nix     |   2 +-
 .../tflint-plugins/tflint-ruleset-google.nix  |   2 +-
 .../buildkite-test-collector-rust/default.nix |   2 +-
 .../tools/rust/bindgen/unwrapped.nix          |   2 +-
 pkgs/kde/misc/kio-fuse/default.nix            |   2 +-
 pkgs/kde/misc/phonon-vlc/default.nix          |   2 +-
 pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix  |   2 +-
 pkgs/os-specific/linux/nct6687d/default.nix   |   2 +-
 pkgs/os-specific/linux/rtw89/default.nix      |   2 +-
 pkgs/os-specific/linux/tt-kmd/default.nix     |   2 +-
 .../custom-components/bodymiscale/package.nix |   2 +-
 pkgs/servers/http/nginx/modules.nix           |  98 +--
 .../check_interfaces/default.nix              |   2 +-
 .../manubulon-snmp-plugins/default.nix        |   2 +-
 .../openbsd_snmp3_check/default.nix           |   2 +-
 pkgs/tools/compression/zstd/default.nix       |   2 +-
 pkgs/tools/misc/bat-extras/modules/core.nix   |   2 +-
 .../tools/networking/telepresence/default.nix |   2 +-
 pkgs/tools/text/mdcat/default.nix             |   2 +-
 pkgs/top-level/perl-packages.nix              | 610 +++++++++---------
 1210 files changed, 1569 insertions(+), 1569 deletions(-)

diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix
index 60ef8d53553b..bee347a92d7c 100644
--- a/pkgs/applications/editors/your-editor/default.nix
+++ b/pkgs/applications/editors/your-editor/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Small and simple terminal editor core that is meant to be extended through a powerful plugin architecture";
     homepage = "https://your-editor.org/";
     changelog = "https://github.com/your-editor/yed/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     mainProgram = "yed";
   };
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 465fc428cfd6..776dceef6050 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -365,7 +365,7 @@ stdenv.mkDerivation (
     meta = {
       inherit version;
       homepage = "https://www.winehq.org/";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
       sourceProvenance = with lib.sourceTypes; [
         fromSource
         binaryNativeCode # mono, gecko
diff --git a/pkgs/applications/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix
index 94b2d74440a4..3ed188a42705 100644
--- a/pkgs/applications/emulators/wine/fonts.nix
+++ b/pkgs/applications/emulators/wine/fonts.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Microsoft replacement fonts by the Wine project";
     homepage = "https://wiki.winehq.org/Create_Fonts";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       avnik
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 150a61aa1701..a2decfce52cd 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -209,7 +209,7 @@ lib.makeScope pkgs.newScope (
         broken = gimp.apiVersion != "2.0";
         description = "GIMP plug-in to do the fourier transform";
         homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier";
-        license = with lib.licenses; [ gpl3Plus ];
+        license = lib.licenses.gpl3Plus;
       };
     };
 
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index 0024092cfcd5..65151cb3192b 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -101,7 +101,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Inkscape extension for machine embroidery design";
     homepage = "https://inkstitch.org/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       tropf
       pluiedev
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
index 7a57f58bef6c..8ba869bfb2ec 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
   meta = {
     description = "Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs";
     homepage = "https://github.com/helm/helm-mapkubeapis";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aos ];
   };
 }
diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index d53b26671d3e..6c138f1f9f05 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -35,7 +35,7 @@ let
     meta = {
       homepage = "https://github.com/kodi-game/controller-topology-project";
       description = "Models how controllers connect to and map to each other for all gaming history";
-      license = with lib.licenses; [ odbl ];
+      license = lib.licenses.odbl;
       teams = [ lib.teams.kodi ];
     };
   };
diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix
index f24a89c61bc3..c223220a29f2 100644
--- a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Network A/V plugin for OBS Studio (formerly obs-ndi)";
     homepage = "https://github.com/DistroAV/DistroAV";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ globule655 ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix
index 233bb5a818d3..3fa01b1e20b2 100644
--- a/pkgs/by-name/ad/adbtuifm/package.nix
+++ b/pkgs/by-name/ad/adbtuifm/package.nix
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     description = "TUI-based file manager for the Android Debug Bridge";
     homepage = "https://github.com/darkhz/adbtuifm";
     changelog = "https://github.com/darkhz/adbtuifm/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ daru-san ];
     mainProgram = "adbtuifm";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/ad/adenum/package.nix b/pkgs/by-name/ad/adenum/package.nix
index c44a4e2d37bf..ca4b5d811ce8 100644
--- a/pkgs/by-name/ad/adenum/package.nix
+++ b/pkgs/by-name/ad/adenum/package.nix
@@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication {
     description = "Tool to find misconfiguration through LDAP";
     mainProgram = "adenum";
     homepage = "https://github.com/SecuProject/ADenum";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ad/adreaper/package.nix b/pkgs/by-name/ad/adreaper/package.nix
index 806fd1a78eda..29f7e2641905 100644
--- a/pkgs/by-name/ad/adreaper/package.nix
+++ b/pkgs/by-name/ad/adreaper/package.nix
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/m0n1x90/ADReaper/releases/tag/ADReaperv${finalAttrs.version}";
     # Upstream doesn't have a license yet
     # https://github.com/AidenPearce369/ADReaper/issues/2
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ADReaper";
   };
diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix
index 63b463daa275..6477b8e65f23 100644
--- a/pkgs/by-name/ai/aiodnsbrute/package.nix
+++ b/pkgs/by-name/ai/aiodnsbrute/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "aiodnsbrute";
     homepage = "https://github.com/blark/aiodnsbrute";
     changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ai/airbuddy/package.nix b/pkgs/by-name/ai/airbuddy/package.nix
index 50c5a10791af..f8d6d9a63372 100644
--- a/pkgs/by-name/ai/airbuddy/package.nix
+++ b/pkgs/by-name/ai/airbuddy/package.nix
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     homepage = "https://v2.airbuddy.app";
     changelog = "https://support.airbuddy.app/articles/airbuddy-2-changelog";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix
index ada5d438294a..fbf9a722854a 100644
--- a/pkgs/by-name/am/amber/package.nix
+++ b/pkgs/by-name/am/amber/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Code search-and-replace tool";
     homepage = "https://github.com/dalance/amber";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.bdesham ];
   };
 })
diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix
index 6733bff81d39..a82f3c7446db 100644
--- a/pkgs/by-name/am/amfora/package.nix
+++ b/pkgs/by-name/am/amfora/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     description = "Fancy terminal browser for the Gemini protocol";
     mainProgram = "amfora";
     homepage = "https://github.com/makew0rld/amfora";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ deifactor ];
     changelog = "https://github.com/makew0rld/amfora/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix
index e727a92f87b0..332be7b42c7a 100644
--- a/pkgs/by-name/an/animatch/package.nix
+++ b/pkgs/by-name/an/animatch/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/HolyPangolin/animatch/";
     description = "Cute match three game for the Librem 5 smartphone";
     mainProgram = "animatch";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ colinsane ];
   };
 })
diff --git a/pkgs/by-name/an/anki-sync-server/package.nix b/pkgs/by-name/an/anki-sync-server/package.nix
index 826ff0c21135..994e798115ce 100644
--- a/pkgs/by-name/an/anki-sync-server/package.nix
+++ b/pkgs/by-name/an/anki-sync-server/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Standalone official anki sync server";
     homepage = "https://apps.ankiweb.net";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ martinetd ];
     mainProgram = "anki-sync-server";
   };
diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix
index fd2d0f4b8c5a..41a314206716 100644
--- a/pkgs/by-name/an/ansi/package.nix
+++ b/pkgs/by-name/an/ansi/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       the colors and styles, such as bold or italic.
     '';
     homepage = "https://github.com/phip1611/ansi-escape-sequences-cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
     mainProgram = "ansi";
   };
diff --git a/pkgs/by-name/an/ante/package.nix b/pkgs/by-name/an/ante/package.nix
index 0368755b9997..f0f678af344a 100644
--- a/pkgs/by-name/an/ante/package.nix
+++ b/pkgs/by-name/an/ante/package.nix
@@ -70,7 +70,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://antelang.org/";
     description = "Low-level functional language for exploring refinement types, lifetime inference, and algebraic effects";
     mainProgram = "ante";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ehllie ];
   };
 }
diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix
index afe7bb297fd5..2ae40853178a 100644
--- a/pkgs/by-name/an/antiprism/package.nix
+++ b/pkgs/by-name/an/antiprism/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.antiprism.com";
     description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ap/apache-flex-sdk/package.nix b/pkgs/by-name/ap/apache-flex-sdk/package.nix
index 4c5b18d5abe0..5d603721f3bb 100644
--- a/pkgs/by-name/ap/apache-flex-sdk/package.nix
+++ b/pkgs/by-name/ap/apache-flex-sdk/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Flex SDK for Adobe Flash / ActionScript";
     homepage = "https://flex.apache.org/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dywedir ];
   };
 })
diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix
index cd8aafdff6d3..ba13328dafff 100644
--- a/pkgs/by-name/ap/apksigcopier/package.nix
+++ b/pkgs/by-name/ap/apksigcopier/package.nix
@@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec {
       * compare two APKs with different signatures (requires apksigner)
     '';
     homepage = "https://github.com/obfusk/apksigcopier";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ obfusk ];
   };
 }
diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix
index 86a1be8b6343..e5fadb2c6740 100644
--- a/pkgs/by-name/ap/apt-offline/package.nix
+++ b/pkgs/by-name/ap/apt-offline/package.nix
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication {
   meta = {
     homepage = "https://github.com/rickysarraf/apt-offline";
     description = "Offline APT package manager";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "apt-offline";
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/ap/apt-swarm/package.nix b/pkgs/by-name/ap/apt-swarm/package.nix
index a6e2617b87a4..c15d3ea6a693 100644
--- a/pkgs/by-name/ap/apt-swarm/package.nix
+++ b/pkgs/by-name/ap/apt-swarm/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/kpcyrd/apt-swarm";
     changelog = "https://github.com/kpcyrd/apt-swarm/releases/tag/v${finalAttrs.version}";
     mainProgram = "apt-swarm";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kpcyrd ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index ee0a854d6c20..670b90d7d8ff 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://salsa.debian.org/apt-team/apt";
     description = "Command-line package management tools used on Debian-based systems";
     changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "apt";
     maintainers = with lib.maintainers; [ VZstless ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 3585c8938eb8..58ffd92cc258 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       and direct access to various host resources including sound, disk drives,
       optical storage devices (CD/DVD-ROMs), parallel port and more.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "aranym";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ar/aritim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix
index e57692cddc64..011dbbeb459c 100644
--- a/pkgs/by-name/ar/aritim-dark/package.nix
+++ b/pkgs/by-name/ar/aritim-dark/package.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Dark theme deeply inspired by the Ayu Dark color palette";
     homepage = "https://github.com/Mrcuve0/Aritim-Dark";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.pasqui23 ];
   };
diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix
index 465367e1db1b..3a5999b6ead6 100644
--- a/pkgs/by-name/ar/arouteserver/package.nix
+++ b/pkgs/by-name/ar/arouteserver/package.nix
@@ -60,7 +60,7 @@ python3Packages.buildPythonPackage rec {
     mainProgram = "arouteserver";
     homepage = "https://github.com/pierky/arouteserver";
     changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       marcel
       johannwagner
diff --git a/pkgs/by-name/ar/arpoison/package.nix b/pkgs/by-name/ar/arpoison/package.nix
index c75964942e7b..7f3228a9888b 100644
--- a/pkgs/by-name/ar/arpoison/package.nix
+++ b/pkgs/by-name/ar/arpoison/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "UNIX arp cache update utility";
     homepage = "http://www.arpoison.net/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.michalrus ];
     platforms = lib.platforms.unix;
     mainProgram = "arpoison";
diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix
index cbf26e54ed2b..ac65eb8721b2 100644
--- a/pkgs/by-name/ar/arsenal/package.nix
+++ b/pkgs/by-name/ar/arsenal/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool to generate commands for security and network tools";
     homepage = "https://github.com/Orange-Cyberdefense/arsenal";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "arsenal";
   };
diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix
index 150cd1d3c079..e8f8cde8739e 100644
--- a/pkgs/by-name/as/as-tree/package.nix
+++ b/pkgs/by-name/as/as-tree/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Print a list of paths as a tree of paths";
     homepage = "https://github.com/jez/as-tree";
-    license = with lib.licenses; [ blueOak100 ];
+    license = lib.licenses.blueOak100;
     maintainers = with lib.maintainers; [ jshholland ];
     mainProgram = "as-tree";
   };
diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix
index 4b4e869f0119..475a5c480686 100644
--- a/pkgs/by-name/as/asciinema-scenario/package.nix
+++ b/pkgs/by-name/as/asciinema-scenario/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Create asciinema videos from a text file";
     homepage = "https://github.com/garbas/asciinema-scenario/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "asciinema-scenario";
   };
 })
diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix
index 9b690bf3b8c6..4f4fab462d49 100644
--- a/pkgs/by-name/as/asciinema/package.nix
+++ b/pkgs/by-name/as/asciinema/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       computer users working with the command-line, such as developers or
       system administrators.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "asciinema";
     maintainers = with lib.maintainers; [
       jiriks74
diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix
index e809b7c29697..860a90dab0d5 100644
--- a/pkgs/by-name/as/asn/package.nix
+++ b/pkgs/by-name/as/asn/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/nitefood/asn";
     changelog = "https://github.com/nitefood/asn/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ devhell ];
     mainProgram = "asn";
   };
diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix
index 3dc1ceeca593..66122ca9293f 100644
--- a/pkgs/by-name/as/assetfinder/package.nix
+++ b/pkgs/by-name/as/assetfinder/package.nix
@@ -31,6 +31,6 @@ buildGoModule (finalAttrs: {
       fromSource
       binaryNativeCode
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix
index e19b8730b8a0..43f567993849 100644
--- a/pkgs/by-name/at/atari800/package.nix
+++ b/pkgs/by-name/at/atari800/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
       WinCE, Sega Dreamcast, Android and other systems supported by the SDL
       library.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index fde9cae8f43a..34e3bd45e998 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       will compile on a variety of systems (Linux, Solaris, Irix).
     '';
     maintainers = [ ];
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix
index 37c1125600bb..81b630af0585 100644
--- a/pkgs/by-name/at/atomic-swap/package.nix
+++ b/pkgs/by-name/at/atomic-swap/package.nix
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/AthanorLabs/atomic-swap";
     changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${finalAttrs.version}";
     description = "ETH-XMR atomic swap implementation";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [
       happysalada
       lord-valen
diff --git a/pkgs/by-name/au/aurea/package.nix b/pkgs/by-name/au/aurea/package.nix
index 903190036cf1..0bad074fe21a 100644
--- a/pkgs/by-name/au/aurea/package.nix
+++ b/pkgs/by-name/au/aurea/package.nix
@@ -63,7 +63,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/CleoMenezesJr/Aurea";
     mainProgram = "aurea";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix
index f20e3906ea1e..4722e7557404 100644
--- a/pkgs/by-name/au/autokey/package.nix
+++ b/pkgs/by-name/au/autokey/package.nix
@@ -96,7 +96,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Desktop automation utility for Linux and X11";
     homepage = "https://github.com/autokey/autokey";
     changelog = "https://github.com/autokey/autokey/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ iamanaws ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ba/badgemagic-app/package.nix b/pkgs/by-name/ba/badgemagic-app/package.nix
index 09f219b86173..c914b0cdec1e 100644
--- a/pkgs/by-name/ba/badgemagic-app/package.nix
+++ b/pkgs/by-name/ba/badgemagic-app/package.nix
@@ -23,7 +23,7 @@ flutter338.buildFlutterApplication {
   meta = {
     description = "Badge Magic with LEDs - mobile and desktop app";
     homepage = "https://github.com/fossasia/badgemagic-app";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.matthewcroughan ];
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix
index 628c41978e11..6cc9b8a2af68 100644
--- a/pkgs/by-name/ba/badrobot/package.nix
+++ b/pkgs/by-name/ba/badrobot/package.nix
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
       likelihood that a compromised Operator would be able to obtain full
       cluster permissions.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       jk
     ];
diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix
index 93ad9db5a828..ebbe395f37cf 100644
--- a/pkgs/by-name/ba/barrage/package.nix
+++ b/pkgs/by-name/ba/barrage/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://lgames.sourceforge.io/Barrage/";
     description = "Destructive action game";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "barrage";
     maintainers = [ ];
     inherit (SDL.meta) platforms;
diff --git a/pkgs/by-name/ba/bashate/package.nix b/pkgs/by-name/ba/bashate/package.nix
index e405b8f66799..d0ee31928130 100644
--- a/pkgs/by-name/ba/bashate/package.nix
+++ b/pkgs/by-name/ba/bashate/package.nix
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
     description = "Style enforcement for bash programs";
     mainProgram = "bashate";
     homepage = "https://opendev.org/openstack/bashate";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     teams = [ lib.teams.openstack ];
   };
diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix
index 882f15ea9ebb..2f34771dceb8 100644
--- a/pkgs/by-name/be/beancount-language-server/package.nix
+++ b/pkgs/by-name/be/beancount-language-server/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Language Server Protocol (LSP) for beancount files";
     mainProgram = "beancount-language-server";
     homepage = "https://github.com/polarmutex/beancount-language-server";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ polarmutex ];
   };
 })
diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix
index d1e380341837..4a59f8d2bf50 100644
--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@@ -51,7 +51,7 @@ buildGoModule (finalAttrs: {
 
       Bee is a Swarm node implementation, written in Go.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix
index 2cbeff80b3a8..394cf90956a9 100644
--- a/pkgs/by-name/be/bettercap/package.nix
+++ b/pkgs/by-name/be/bettercap/package.nix
@@ -43,7 +43,7 @@ buildGoModule (finalAttrs: {
       in realtime, sniff for credentials and much more.
     '';
     homepage = "https://www.bettercap.org/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "bettercap";
     # Broken on darwin for Go toolchain > 1.22, with error:
     # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'
diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix
index 2279faf537e1..130894cd6d09 100644
--- a/pkgs/by-name/bi/bic/package.nix
+++ b/pkgs/by-name/bi/bic/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
       bic This a project that allows developers to explore and test C-APIs using a
       read eval print loop, also known as a REPL.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     homepage = "https://github.com/hexagonal-sun/bic";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ hexagonal-sun ];
diff --git a/pkgs/by-name/bi/bit/package.nix b/pkgs/by-name/bi/bit/package.nix
index ad1a371f33e3..09945a711270 100644
--- a/pkgs/by-name/bi/bit/package.nix
+++ b/pkgs/by-name/bi/bit/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Command-line tool for git";
     homepage = "https://github.com/chriswalz/bit";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "bit";
   };
diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix
index 2901db3175cd..345e5d6912b0 100644
--- a/pkgs/by-name/bl/blaze/package.nix
+++ b/pkgs/by-name/bl/blaze/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "High performance C++ math library";
     homepage = "https://bitbucket.org/blaze-lib/blaze";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index de227c59e8d6..a96e67f8f949 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -134,7 +134,7 @@ buildDotnetModule rec {
   meta = {
     description = "Open-source, cross-platform, stand-alone, Network Renderer for Blender";
     homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ gador ];
     mainProgram = "blendfarm-nix";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix
index 2894ddac25e3..36ddfee0a476 100644
--- a/pkgs/by-name/bl/blink1-tool/package.nix
+++ b/pkgs/by-name/bl/blink1-tool/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Command line client for the blink(1) notification light";
     homepage = "https://blink1.thingm.com/";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     maintainers = with lib.maintainers; [ cransom ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "blink1-tool";
diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix
index aafab547514c..0d8d99da8cc9 100644
--- a/pkgs/by-name/bl/blockattack/package.nix
+++ b/pkgs/by-name/bl/blockattack/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Open source clone of Panel de Pon (aka Tetris Attack)";
     broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "blockattack";
     maintainers = [ ];
     inherit (SDL2.meta) platforms;
diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix
index 3bdce7e545e1..41fe72114c04 100644
--- a/pkgs/by-name/bl/bluez-alsa/package.nix
+++ b/pkgs/by-name/bl/bluez-alsa/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
       BluezALSA if you disable `bluetooth-discover` and `bluez5-discover`
       modules in PA and configure it to play/capture sound over `bluealsa` PCM.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "bluealsa";
     maintainers = with lib.maintainers; [ oxij ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/bl/bluez-tools/package.nix b/pkgs/by-name/bl/bluez-tools/package.nix
index 66ddbe928818..e252d03e6278 100644
--- a/pkgs/by-name/bl/bluez-tools/package.nix
+++ b/pkgs/by-name/bl/bluez-tools/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/khvzak/bluez-tools";
     description = "Set of tools to manage bluetooth devices for linux";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "bt-agent";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix
index 85393e32c2ae..7b152f3fb3b0 100644
--- a/pkgs/by-name/bo/boltbrowser/package.nix
+++ b/pkgs/by-name/bo/boltbrowser/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI Browser for BoltDB files";
     homepage = "https://github.com/br0xen/boltbrowser";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "boltbrowser";
   };
diff --git a/pkgs/by-name/br/brook/package.nix b/pkgs/by-name/br/brook/package.nix
index afbf3e191c48..7e8f9e8b7f6f 100644
--- a/pkgs/by-name/br/brook/package.nix
+++ b/pkgs/by-name/br/brook/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/txthinking/brook";
     description = "Cross-platform Proxy/VPN software";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ xrelkd ];
     mainProgram = "brook";
   };
diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index 2dc1d3488e50..086ceaf8cb2e 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://dystroy.org/broot/";
     changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ dywedir ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "broot";
   };
 })
diff --git a/pkgs/by-name/bt/btfdump/package.nix b/pkgs/by-name/bt/btfdump/package.nix
index f90f3fa12b1c..f7b97a1c6d83 100644
--- a/pkgs/by-name/bt/btfdump/package.nix
+++ b/pkgs/by-name/bt/btfdump/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     description = "BTF introspection tool";
     mainProgram = "btf";
     homepage = "https://github.com/anakryiko/btfdump";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix
index c2f40e2c262e..abb1511068bb 100644
--- a/pkgs/by-name/bu/bugdom/package.nix
+++ b/pkgs/by-name/bu/bugdom/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems";
     homepage = "https://github.com/jorio/Bugdom";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     maintainers = with lib.maintainers; [ lux ];
     mainProgram = "Bugdom";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix
index dfcbb86ecf0b..2fc9eef6c4d4 100644
--- a/pkgs/by-name/by/bytecode-viewer/package.nix
+++ b/pkgs/by-name/by/bytecode-viewer/package.nix
@@ -79,6 +79,6 @@ maven.buildMavenPackage rec {
       fromSource
       binaryBytecode # deps
     ];
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
   };
 }
diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix
index a037c3ebcd63..03216ec9042e 100644
--- a/pkgs/by-name/ca/cantoolz/package.nix
+++ b/pkgs/by-name/ca/cantoolz/package.nix
@@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       implemented with a new module.
     '';
     homepage = "https://github.com/CANToolz/CANToolz";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix
index 55e26723c9c4..1c51065e51ad 100644
--- a/pkgs/by-name/ca/cargo-bolero/package.nix
+++ b/pkgs/by-name/ca/cargo-bolero/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fuzzing and property testing front-end framework for Rust";
     mainProgram = "cargo-bolero";
     homepage = "https://github.com/camshaft/bolero";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ekleog ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix
index 91920e40d5cf..9894060b4f45 100644
--- a/pkgs/by-name/ca/cargo-bump/package.nix
+++ b/pkgs/by-name/ca/cargo-bump/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Increments the version number of the current project";
     mainProgram = "cargo-bump";
     homepage = "https://github.com/wraithan/cargo-bump";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ cafkafk ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix
index 9127e8b0e084..b22742de046a 100644
--- a/pkgs/by-name/ca/cargo-hf2/package.nix
+++ b/pkgs/by-name/ca/cargo-hf2/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders";
     mainProgram = "cargo-hf2";
     homepage = "https://lib.rs/crates/cargo-hf2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ astrobeastie ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index c60351525f4c..c76f676ff335 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "cargo-leptos";
     homepage = "https://github.com/leptos-rs/cargo-leptos";
     changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ benwis ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix
index ff18e5aaa5f2..0fa1ba42cf61 100644
--- a/pkgs/by-name/ca/cargo-license/package.nix
+++ b/pkgs/by-name/ca/cargo-license/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo subcommand to see license of dependencies";
     mainProgram = "cargo-license";
     homepage = "https://github.com/onur/cargo-license";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       basvandijk
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix
index a687cb48b53b..c6804f22d59b 100644
--- a/pkgs/by-name/ca/cargo-pgo/package.nix
+++ b/pkgs/by-name/ca/cargo-pgo/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Cargo subcommand for optimizing Rust binaries/libraries with PGO and BOLT";
     homepage = "https://github.com/kobzol/cargo-pgo";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dannixon ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index f1a23f8fdd44..6cea4afc2800 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "cargo-rdme";
     homepage = "https://github.com/orium/cargo-rdme";
     changelog = "https://github.com/orium/cargo-rdme/blob/v${finalAttrs.version}/release-notes.md";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       GoldsteinE
       chrjabs
diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix
index 00e182b435ed..275fae3c4e6b 100644
--- a/pkgs/by-name/ca/cargo-risczero/package.nix
+++ b/pkgs/by-name/ca/cargo-risczero/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo extension to help create, manage, and test RISC Zero projects";
     mainProgram = "cargo-risczero";
     homepage = "https://risczero.com";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix
index f7bd9d935d2b..df879f130c1e 100644
--- a/pkgs/by-name/ca/cargo-rr/package.nix
+++ b/pkgs/by-name/ca/cargo-rr/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger";
     mainProgram = "cargo-rr";
     homepage = "https://github.com/dzfranklin/cargo-rr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       otavio
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix
index b292a4632890..74b0a06aadeb 100644
--- a/pkgs/by-name/ca/cargo-typify/package.nix
+++ b/pkgs/by-name/ca/cargo-typify/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "JSON Schema to Rust type converter";
     homepage = "https://github.com/oxidecomputer/typify";
     changelog = "https://github.com/oxidecomputer/typify/blob/${finalAttrs.src.tag}/CHANGELOG.adoc";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ iamanaws ];
     mainProgram = "cargo-typify";
   };
diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix
index 37c4c4ad8273..f93ade472283 100644
--- a/pkgs/by-name/ca/cargo-wipe/package.nix
+++ b/pkgs/by-name/ca/cargo-wipe/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders'';
     mainProgram = "cargo-wipe";
     homepage = "https://github.com/mihai-dinculescu/cargo-wipe";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ otavio ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index a29905cec257..4786535a02d2 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cross compile Cargo project to Windows MSVC target with ease";
     mainProgram = "cargo-xwin";
     homepage = "https://github.com/rust-cross/cargo-xwin";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ shivaraj-bh ];
   };
 })
diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
index 0e7b52c9a7de..09b794d61339 100644
--- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
+++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
       library for Apache Cassandra 2.1+ using exclusively Cassandra’s
       binary protocol and Cassandra Query Language v3.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.x86_64;
     homepage = "https://docs.datastax.com/en/developer/cpp-driver/";
     maintainers = [ lib.maintainers.npatsakula ];
diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix
index a06a11131ab4..58c97ca231fd 100644
--- a/pkgs/by-name/ca/cat9/package.nix
+++ b/pkgs/by-name/ca/cat9/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/letoram/cat9";
     description = "User shell for LASH";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ca/catdocx/package.nix b/pkgs/by-name/ca/catdocx/package.nix
index 69be98201e9d..5c2de4fb9c35 100644
--- a/pkgs/by-name/ca/catdocx/package.nix
+++ b/pkgs/by-name/ca/catdocx/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "Extracts plain text from docx files";
     mainProgram = "catdocx";
     homepage = "https://github.com/jncraton/catdocx";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.michalrus ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix
index 90ce62162bf3..6cdc7255a448 100644
--- a/pkgs/by-name/cb/cbconvert/package.nix
+++ b/pkgs/by-name/cb/cbconvert/package.nix
@@ -54,7 +54,7 @@ buildGoModule (finalAttrs: {
     description = "Comic Book converter";
     homepage = "https://github.com/gen2brain/cbconvert";
     changelog = "https://github.com/gen2brain/cbconvert/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "cbconvert";
diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix
index ef13aaee2050..104b3045a3a1 100644
--- a/pkgs/by-name/cb/cbonsai/package.nix
+++ b/pkgs/by-name/cb/cbonsai/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Grow bonsai trees in your terminal";
     mainProgram = "cbonsai";
     homepage = "https://gitlab.com/jallbrit/cbonsai";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix
index 3774c2a61ecf..87ba783893a7 100644
--- a/pkgs/by-name/cd/cdk-go/package.nix
+++ b/pkgs/by-name/cd/cdk-go/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     description = "Container penetration toolkit";
     homepage = "https://github.com/cdk-team/CDK";
     changelog = "https://github.com/cdk-team/CDK/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cdk";
     broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
diff --git a/pkgs/by-name/ce/celestegame/celeste.nix b/pkgs/by-name/ce/celestegame/celeste.nix
index 2c7900602d20..3b34646f3f64 100644
--- a/pkgs/by-name/ce/celestegame/celeste.nix
+++ b/pkgs/by-name/ce/celestegame/celeste.nix
@@ -162,7 +162,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     inherit downloadPage description;
     homepage = "https://www.celestegame.com";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     platforms = [
diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix
index 93e0ce49fcf0..ea58101d841f 100644
--- a/pkgs/by-name/cf/cfripper/package.nix
+++ b/pkgs/by-name/cf/cfripper/package.nix
@@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool for analysing CloudFormation templates";
     homepage = "https://github.com/Skyscanner/cfripper";
     changelog = "https://github.com/Skyscanner/cfripper/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cfripper";
   };
diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix
index 17a7e90df2e3..d79ccec67afd 100644
--- a/pkgs/by-name/cf/cfspeedtest/package.nix
+++ b/pkgs/by-name/cf/cfspeedtest/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Unofficial CLI for speed.cloudflare.com";
     homepage = "https://github.com/code-inflation/cfspeedtest";
     changelog = "https://github.com/code-inflation/cfspeedtest/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       colemickens
       stepbrobd
diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix
index 817d5f39431f..2de3a487d504 100644
--- a/pkgs/by-name/cg/cgns/package.nix
+++ b/pkgs/by-name/cg/cgns/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://cgns.github.io";
     downloadPage = "https://github.com/cgns/cgns";
     changelog = "https://github.com/cgns/cgns/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ zlib ];
+    license = lib.licenses.zlib;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
   };
diff --git a/pkgs/by-name/ch/chemacs2/package.nix b/pkgs/by-name/ch/chemacs2/package.nix
index 9bce24384d04..662e33d4e960 100644
--- a/pkgs/by-name/ch/chemacs2/package.nix
+++ b/pkgs/by-name/ch/chemacs2/package.nix
@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
       Think of it as a bootloader for Emacs.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 62eaa2812c3f..26a8791fd2e2 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -159,6 +159,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cherry-studio";
     platforms = with lib.platforms; linux ++ darwin;
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
   };
 })
diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix
index 5426acb9b724..ce1c7c1534bc 100644
--- a/pkgs/by-name/ch/cholmod-extra/package.nix
+++ b/pkgs/by-name/ch/cholmod-extra/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/jluttine/cholmod-extra";
     description = "Set of additional routines for SuiteSparse CHOLMOD Module";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ jluttine ];
     platforms = with lib.platforms; unix;
   };
diff --git a/pkgs/by-name/ch/chopchop/package.nix b/pkgs/by-name/ch/chopchop/package.nix
index 4767b31ac7d1..70f9fc7902e2 100644
--- a/pkgs/by-name/ch/chopchop/package.nix
+++ b/pkgs/by-name/ch/chopchop/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI to search for sensitive services/files/folders";
     homepage = "https://github.com/michelin/ChopChop";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix
index 79375f699547..a2859996588c 100644
--- a/pkgs/by-name/ch/chow-phaser/package.nix
+++ b/pkgs/by-name/ch/chow-phaser/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/jatinchowdhury18/ChowPhaser";
     description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "ChowPhaserStereo";
     maintainers = with lib.maintainers; [ magnetophon ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index 630bd0732071..56b4b1ce1ee8 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel";
     description = "Physical modelling signal processing for analog tape recording. LV2, VST3, CLAP, and standalone";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ magnetophon ];
     platforms = lib.platforms.linux;
     # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'?
diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix
index 793e4438d2d6..88ea58c6dd68 100644
--- a/pkgs/by-name/ci/cicero-tui/package.nix
+++ b/pkgs/by-name/ci/cicero-tui/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Unicode tool with a terminal user interface";
     homepage = "https://github.com/eyeplum/cicero-tui";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     mainProgram = "cicero";
   };
diff --git a/pkgs/by-name/ci/cirrusgo/package.nix b/pkgs/by-name/ci/cirrusgo/package.nix
index d02de5a3adbe..49674d8004e5 100644
--- a/pkgs/by-name/ci/cirrusgo/package.nix
+++ b/pkgs/by-name/ci/cirrusgo/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "Tool to scan SAAS and PAAS applications";
     mainProgram = "cirrusgo";
     homepage = "https://github.com/Ph33rr/cirrusgo";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix
index f64e4e7df6e0..31325d53b528 100644
--- a/pkgs/by-name/cl/clapgrep/package.nix
+++ b/pkgs/by-name/cl/clapgrep/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Search through all your files";
     homepage = "https://github.com/luleyleo/clapgrep";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "clapgrep";
diff --git a/pkgs/by-name/cl/cloudbrute/package.nix b/pkgs/by-name/cl/cloudbrute/package.nix
index f56d867aa8d5..381e9540ae66 100644
--- a/pkgs/by-name/cl/cloudbrute/package.nix
+++ b/pkgs/by-name/cl/cloudbrute/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
       Alibaba, Vultr, Linode).
     '';
     homepage = "https://github.com/0xsha/CloudBrute";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/cm/cmc/package.nix b/pkgs/by-name/cm/cmc/package.nix
index 07e0370365d0..dde599bdddd6 100644
--- a/pkgs/by-name/cm/cmc/package.nix
+++ b/pkgs/by-name/cm/cmc/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/TimidRobot/cmc";
     description = "Manages SSH ControlMaster sessions";
     mainProgram = "cmc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ chordtoll ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix
index 687f839e3d81..55aae766e567 100644
--- a/pkgs/by-name/co/coconutbattery/package.nix
+++ b/pkgs/by-name/co/coconutbattery/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       It shows you live information about the battery quality in your Mac, iPhone and iPad.
     '';
     homepage = "https://www.coconut-flavour.com/coconutbattery";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix
index 9ab51d274a81..7abab8e37b30 100644
--- a/pkgs/by-name/co/codeberg-cli/package.nix
+++ b/pkgs/by-name/co/codeberg-cli/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI Tool for Codeberg similar to gh and glab";
     homepage = "https://codeberg.org/Aviac/codeberg-cli";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ robwalt ];
     mainProgram = "berg";
   };
diff --git a/pkgs/by-name/co/colorgrind/package.nix b/pkgs/by-name/co/colorgrind/package.nix
index 70b9ce0d16e4..649a57ea10d9 100644
--- a/pkgs/by-name/co/colorgrind/package.nix
+++ b/pkgs/by-name/co/colorgrind/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Perl wrapper for Valgrind with ANSI escape code colored output";
     homepage = "http://renatocf.github.io/colorgrind/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "colorgrind";
   };
diff --git a/pkgs/by-name/co/colorized-logs/package.nix b/pkgs/by-name/co/colorized-logs/package.nix
index f08531461b96..48987505dff2 100644
--- a/pkgs/by-name/co/colorized-logs/package.nix
+++ b/pkgs/by-name/co/colorized-logs/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tools for logs with ANSI color";
     homepage = "https://github.com/kilobyte/colorized-logs";
     changelog = "https://github.com/kilobyte/colorized-logs/blob/v${finalAttrs.version}/ChangeLog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ CobaltCause ];
   };
diff --git a/pkgs/by-name/co/colstr/package.nix b/pkgs/by-name/co/colstr/package.nix
index 1d5b693b9f2b..716c8126acd9 100644
--- a/pkgs/by-name/co/colstr/package.nix
+++ b/pkgs/by-name/co/colstr/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Deterministically output each input argument in a color assigned to it";
     homepage = "https://git.sleeping.town/wonder/colstr";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ annaaurora ];
     mainProgram = "colstr";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/co/commix/package.nix b/pkgs/by-name/co/commix/package.nix
index 3c46fb420986..b218a18532d5 100644
--- a/pkgs/by-name/co/commix/package.nix
+++ b/pkgs/by-name/co/commix/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "commix";
     homepage = "https://github.com/commixproject/commix";
     changelog = "https://github.com/commixproject/commix/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index 4a32672c5deb..8eef375c54b3 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -25,7 +25,7 @@ php.buildComposerProject2 (finalAttrs: {
     description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies";
     homepage = "https://github.com/maglnet/ComposerRequireChecker/";
     changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "composer-require-checker";
     maintainers = [ lib.maintainers.patka ];
   };
diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix
index 16f5322bb1b3..8bd71cb42b5e 100644
--- a/pkgs/by-name/co/conda/package.nix
+++ b/pkgs/by-name/co/conda/package.nix
@@ -143,7 +143,7 @@ buildFHSEnv {
       "aarch64-linux"
       "x86_64-linux"
     ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jluttine ];
   };
 }
diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix
index 87732ffe870b..a5bfaaa3c2fe 100644
--- a/pkgs/by-name/co/confluencepot/package.nix
+++ b/pkgs/by-name/co/confluencepot/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
       ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated
       and remote OGNL injection vulnerability (CVE-2022-26134).
     '';
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "confluencepot";
   };
diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 9bd51a9efc5b..30a0eea2d75f 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Conventional commit cli";
     mainProgram = "convco";
     homepage = "https://github.com/convco/convco";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       hoverbear
       cafkafk
diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix
index 142647a7f086..24eaad35921a 100644
--- a/pkgs/by-name/co/coturn/package.nix
+++ b/pkgs/by-name/co/coturn/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "TURN server";
     homepage = "https://coturn.net/";
     changelog = "https://github.com/coturn/coturn/blob/${finalAttrs.version}/ChangeLog";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ _0x4A6F ];
     broken = stdenv.hostPlatform.isDarwin; # 2018-10-21
diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix
index 07ebefa970c2..a2019e841897 100644
--- a/pkgs/by-name/co/coze/package.nix
+++ b/pkgs/by-name/co/coze/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     description = "CLI client for Coze, a cryptographic JSON messaging specification";
     mainProgram = "coze";
     homepage = "https://github.com/Cyphrme/CozeCLI";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ qbit ];
   };
 })
diff --git a/pkgs/by-name/cr/crackql/package.nix b/pkgs/by-name/cr/crackql/package.nix
index b3474f3f65c8..7860eb4fe424 100644
--- a/pkgs/by-name/cr/crackql/package.nix
+++ b/pkgs/by-name/cr/crackql/package.nix
@@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication {
     description = "GraphQL password brute-force and fuzzing utility";
     mainProgram = "crackql";
     homepage = "https://github.com/nicholasaleks/CrackQL";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix
index 8119c0d7f7fd..1f652d880999 100644
--- a/pkgs/by-name/cr/cratedb/package.nix
+++ b/pkgs/by-name/cr/cratedb/package.nix
@@ -72,7 +72,7 @@ maven.buildMavenPackage {
     '';
     homepage = "https://cratedb.com/database";
     changelog = "https://cratedb.com/docs/crate/reference/en/latest/appendices/release-notes/${version}.html";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = with lib.platforms; unix ++ windows;
     # FIXME: Somehow dependencies are platform-dependent. Somehow.
     broken = stdenvNoCC.hostPlatform.system != "x86_64-linux";
diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix
index c297cebaf644..89d7825796a7 100644
--- a/pkgs/by-name/cr/crates-lsp/package.nix
+++ b/pkgs/by-name/cr/crates-lsp/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Language Server implementation for Cargo.toml";
     homepage = "https://github.com/MathiasPius/crates-lsp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
 
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix
index f601887ddc7f..73b770101fbc 100644
--- a/pkgs/by-name/cr/crates-tui/package.nix
+++ b/pkgs/by-name/cr/crates-tui/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "TUI for exploring crates.io using Ratatui";
     homepage = "https://github.com/ratatui/crates-tui";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     # See Cargo.toml: workspaces.metadata.dist.targets
     # Other platforms may work but YMMV
     platforms = [
diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix
index 221e67c07488..e34105895448 100644
--- a/pkgs/by-name/cr/crc32c/package.nix
+++ b/pkgs/by-name/cr/crc32c/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/google/crc32c";
     description = "CRC32C implementation with support for CPU-specific acceleration instructions";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ cpcloud ];
   };
 })
diff --git a/pkgs/by-name/cr/crlfuzz/package.nix b/pkgs/by-name/cr/crlfuzz/package.nix
index b30c3b4c3b05..6115ffa3a269 100644
--- a/pkgs/by-name/cr/crlfuzz/package.nix
+++ b/pkgs/by-name/cr/crlfuzz/package.nix
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     description = "Tool to scan for CRLF vulnerability";
     mainProgram = "crlfuzz";
     homepage = "https://github.com/dwisiswant0/crlfuzz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/cr/crunch/package.nix b/pkgs/by-name/cr/crunch/package.nix
index 067a5e3a6644..0b328ac4dcb0 100644
--- a/pkgs/by-name/cr/crunch/package.nix
+++ b/pkgs/by-name/cr/crunch/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "crunch";
     homepage = "https://sourceforge.net/projects/crunch-wordlist/";
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix
index d4f08b49ddb5..40ffb90e59ca 100644
--- a/pkgs/by-name/cu/cubelify/package.nix
+++ b/pkgs/by-name/cu/cubelify/package.nix
@@ -33,7 +33,7 @@ appimageTools.wrapType2 rec {
   meta = {
     description = "Powerful and feature-rich Hypixel anti-sniping stats overlay";
     homepage = "https://cubelify.com/";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     mainProgram = "cubelify";
     maintainers = with lib.maintainers; [ yunfachi ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix
index ec54083be952..1e1c1dd38acb 100644
--- a/pkgs/by-name/cy/cyclonedds/package.nix
+++ b/pkgs/by-name/cy/cyclonedds/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Eclipse Cyclone DDS project";
     homepage = "https://cyclonedds.io/";
-    license = with lib.licenses; [ epl20 ];
+    license = lib.licenses.epl20;
     maintainers = with lib.maintainers; [ bachp ];
   };
 })
diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index 8e95b5a449a5..29227eeab376 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.cyrusimap.org";
     description = "Email, contacts and calendar server";
     changelog = "https://www.cyrusimap.org/imap/download/release-notes/${lib.versions.majorMinor finalAttrs.version}/x/${finalAttrs.version}.html";
-    license = with lib.licenses; [ bsdOriginal ];
+    license = lib.licenses.bsdOriginal;
     mainProgram = "cyradm";
     maintainers = with lib.maintainers; [
       moraxyc
diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix
index 5c226e630e4e..1fd27332a6de 100644
--- a/pkgs/by-name/cz/czkawka/package.nix
+++ b/pkgs/by-name/cz/czkawka/package.nix
@@ -126,7 +126,7 @@ let
       homepage = "https://github.com/qarmin/czkawka";
       description = "Simple, fast and easy to use app to remove unnecessary files from your computer";
       changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "czkawka_gui";
       maintainers = with lib.maintainers; [
         yanganto
diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix
index 9dad017633cf..b2fc28ac9e5f 100644
--- a/pkgs/by-name/da/darkly/package.nix
+++ b/pkgs/by-name/da/darkly/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Bali10050/Darkly";
     changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "darkly-settings6";
   };
diff --git a/pkgs/by-name/dc/dcrctl/package.nix b/pkgs/by-name/dc/dcrctl/package.nix
index 053a60b5121f..dddad707dab3 100644
--- a/pkgs/by-name/dc/dcrctl/package.nix
+++ b/pkgs/by-name/dc/dcrctl/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://decred.org";
     description = "Secure Decred wallet daemon written in Go (golang)";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = [ ];
     mainProgram = "dcrctl";
   };
diff --git a/pkgs/by-name/dc/dcrd/package.nix b/pkgs/by-name/dc/dcrd/package.nix
index e69ffc91c3d1..1f349723c597 100644
--- a/pkgs/by-name/dc/dcrd/package.nix
+++ b/pkgs/by-name/dc/dcrd/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://decred.org";
     description = "Decred daemon in Go (golang)";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ juaningan ];
   };
 })
diff --git a/pkgs/by-name/dc/dcrwallet/package.nix b/pkgs/by-name/dc/dcrwallet/package.nix
index 10a9b712bbee..81f24d57ea57 100644
--- a/pkgs/by-name/dc/dcrwallet/package.nix
+++ b/pkgs/by-name/dc/dcrwallet/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://decred.org";
     description = "Secure Decred wallet daemon written in Go (golang)";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ juaningan ];
     mainProgram = "dcrwallet";
   };
diff --git a/pkgs/by-name/dd/ddsmt/package.nix b/pkgs/by-name/dd/ddsmt/package.nix
index 22e4cf83a734..810c774b93aa 100644
--- a/pkgs/by-name/dd/ddsmt/package.nix
+++ b/pkgs/by-name/dd/ddsmt/package.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication {
   meta = {
     description = "Delta debugger for SMT benchmarks in SMT-LIB v2";
     homepage = "https://ddsmt.readthedocs.io/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/di/dict-cc-py/package.nix b/pkgs/by-name/di/dict-cc-py/package.nix
index 77f97174f87d..ab871a5c5310 100644
--- a/pkgs/by-name/di/dict-cc-py/package.nix
+++ b/pkgs/by-name/di/dict-cc-py/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonPackage {
     description = "Unofficial command line client for dict.cc";
     mainProgram = "dict.cc.py";
     homepage = "https://github.com/rbaron/dict.cc.py";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix
index b82cd45dc91a..95eba3db3711 100644
--- a/pkgs/by-name/di/diffedit3/package.nix
+++ b/pkgs/by-name/di/diffedit3/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/ilyagr/diffedit3";
     description = "3-pane diff editor";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "diffedit3";
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
diff --git a/pkgs/by-name/di/diffr/package.nix b/pkgs/by-name/di/diffr/package.nix
index 10ecfdd6f64a..8f67ff8645cd 100644
--- a/pkgs/by-name/di/diffr/package.nix
+++ b/pkgs/by-name/di/diffr/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Yet another diff highlighting tool";
     mainProgram = "diffr";
     homepage = "https://github.com/mookid/diffr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/di/dirb/package.nix b/pkgs/by-name/di/dirb/package.nix
index dbf59823052d..7b8eed782016 100644
--- a/pkgs/by-name/di/dirb/package.nix
+++ b/pkgs/by-name/di/dirb/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Web content scanner";
     homepage = "https://dirb.sourceforge.net/";
     maintainers = with lib.maintainers; [ bennofs ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/di/dismap/package.nix b/pkgs/by-name/di/dismap/package.nix
index 064e0c4bb23b..7f595788b3b0 100644
--- a/pkgs/by-name/di/dismap/package.nix
+++ b/pkgs/by-name/di/dismap/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "Asset discovery and identification tools";
     mainProgram = "dismap";
     homepage = "https://github.com/zhzyker/dismap";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix
index ec5ebaebf32c..273b0be8a4c4 100644
--- a/pkgs/by-name/di/diswall/package.nix
+++ b/pkgs/by-name/di/diswall/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       intruder to get any system information.
     '';
     homepage = "https://www.diswall.stream";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ izorkin ];
     mainProgram = "diswall";
   };
diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix
index 70ac55438b09..993749044cfc 100644
--- a/pkgs/by-name/dm/dmenu-rs/package.nix
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
       "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support"
       + lib.optionalString enablePlugins ", with all upstream plugins enabled";
     homepage = "https://github.com/Shizcow/dmenu-rs";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ benjaminedwardwebb ];
     platforms = lib.platforms.linux;
     broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
diff --git a/pkgs/by-name/dn/dnsmon-go/package.nix b/pkgs/by-name/dn/dnsmon-go/package.nix
index 9fa7ae6bd15d..2757812bf968 100644
--- a/pkgs/by-name/dn/dnsmon-go/package.nix
+++ b/pkgs/by-name/dn/dnsmon-go/package.nix
@@ -25,7 +25,7 @@ buildGoModule {
   meta = {
     description = "Tool to collect DNS traffic";
     homepage = "https://github.com/jonpulsifer/dnsmon-go";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dnsmon-go";
   };
diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix
index 99e4d20638d4..135402b4d8de 100644
--- a/pkgs/by-name/dn/dnstwist/package.nix
+++ b/pkgs/by-name/dn/dnstwist/package.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Domain name permutation engine for detecting homograph phishing attacks";
     homepage = "https://github.com/elceef/dnstwist";
     changelog = "https://github.com/elceef/dnstwist/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dnstwist";
   };
diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix
index 18aaa31e1614..1d55facdf152 100644
--- a/pkgs/by-name/do/doh-proxy-rust/package.nix
+++ b/pkgs/by-name/do/doh-proxy-rust/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/jedisct1/doh-server";
     description = "Fast, mature, secure DoH server proxy written in Rust";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ stephank ];
     mainProgram = "doh-proxy";
   };
diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix
index 7caf42e88a6a..7b62937839db 100644
--- a/pkgs/by-name/dp/dput-ng/package.nix
+++ b/pkgs/by-name/dp/dput-ng/package.nix
@@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Next-generation Debian package upload tool";
     homepage = "https://dput.readthedocs.io/en/latest/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "dput";
diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 60685251dcf5..8ab3e8ed629b 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tool to conveniently learn about the disk usage of directories";
     homepage = "https://github.com/Byron/dua-cli";
     changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       killercup
       defelo
diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix
index d148a7579701..d3eee27af110 100644
--- a/pkgs/by-name/du/dummyhttp/package.nix
+++ b/pkgs/by-name/du/dummyhttp/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Super simple HTTP server that replies a fixed body with a fixed response code";
     homepage = "https://github.com/svenstaro/dummyhttp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "dummyhttp";
   };
diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix
index a975ccf16da1..c42c2a51afcd 100644
--- a/pkgs/by-name/du/dupe-krill/package.nix
+++ b/pkgs/by-name/du/dupe-krill/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Fast file deduplicator";
     homepage = "https://github.com/kornelski/dupe-krill";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ urbas ];
     mainProgram = "dupe-krill";
   };
diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix
index 57ec7ed07277..9c55d8718774 100644
--- a/pkgs/by-name/du/durden/package.nix
+++ b/pkgs/by-name/du/durden/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       features in Arcan, and as a very competent entry to the advanced-user side
       of the desktop environment spectrum.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
index 013557a892fb..ddc4e794bf60 100644
--- a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
+++ b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://gitlab.com/dwt1/shell-color-scripts";
     description = "Collection of shell color scripts collected by dt (Derek Taylor)";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "colorscript";
diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix
index 23e3a43b7a0b..07764992fc81 100644
--- a/pkgs/by-name/e-/e-imzo-manager/package.nix
+++ b/pkgs/by-name/e-/e-imzo-manager/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.oss.uzinfocom.uz/xinux/e-imzo-manager";
     mainProgram = "E-IMZO-Manager";
     description = "GTK application for managing E-IMZO keys";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       orzklv
diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix
index 107c19da4cc9..2bed9e08e2a7 100644
--- a/pkgs/by-name/ea/ea/package.nix
+++ b/pkgs/by-name/ea/ea/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Makes file paths from CLI output actionable";
     homepage = "https://github.com/dduan/ea";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ deejayem ];
     mainProgram = "ea";
   };
diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix
index b2bd7c2b65e7..d16a519959bd 100644
--- a/pkgs/by-name/ea/each/package.nix
+++ b/pkgs/by-name/ea/each/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line tool for processing CSV, JSON and other structured data";
     mainProgram = "each";
     homepage = "https://github.com/arraypad/each";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ thiagokokada ];
   };
 })
diff --git a/pkgs/by-name/ec/ecdsatool/package.nix b/pkgs/by-name/ec/ecdsatool/package.nix
index 4110f5f4a4d3..b9a90e88f595 100644
--- a/pkgs/by-name/ec/ecdsatool/package.nix
+++ b/pkgs/by-name/ec/ecdsatool/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     description = "Create and manipulate ECC NISTP256 keypairs";
     mainProgram = "ecdsatool";
     homepage = "https://github.com/kaniini/ecdsatool/";
-    license = with lib.licenses; [ free ];
+    license = lib.licenses.free;
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index afd2cb120202..ad46cb0fcbf8 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Enhanced port of Duke Nukem 3D for various platforms";
     homepage = "https://eduke32.com";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       qubitnano
     ];
diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix
index 7fc694d37356..11ea7bf263fe 100644
--- a/pkgs/by-name/ef/effitask/package.nix
+++ b/pkgs/by-name/ef/effitask/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/todotxt-rs/effitask";
     maintainers = with lib.maintainers; [ davidak ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "effitask";
   };
 })
diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix
index 434781557bcb..a5e240ffaa25 100644
--- a/pkgs/by-name/el/elf2uf2-rs/package.nix
+++ b/pkgs/by-name/el/elf2uf2-rs/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Convert ELF files to UF2 for USB Flashing Bootloaders";
     mainProgram = "elf2uf2-rs";
     homepage = "https://github.com/JoNil/elf2uf2-rs";
-    license = with lib.licenses; [ bsd0 ];
+    license = lib.licenses.bsd0;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
       polygon
diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix
index 657b6a2ff6b8..b123e6e16c9f 100644
--- a/pkgs/by-name/el/elfx86exts/package.nix
+++ b/pkgs/by-name/el/elfx86exts/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/pkgw/elfx86exts";
     maintainers = with lib.maintainers; [ rmcgibbo ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "elfx86exts";
   };
 })
diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix
index a0bc83a38c07..f171cd5bf800 100644
--- a/pkgs/by-name/em/emacspeak/package.nix
+++ b/pkgs/by-name/em/emacspeak/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/tvraman/emacspeak/";
     description = "Emacs extension that provides spoken output";
     changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "emacspeak";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/em/email/package.nix b/pkgs/by-name/em/email/package.nix
index 9aba58c1d25f..4ab0524bc94b 100644
--- a/pkgs/by-name/em/email/package.nix
+++ b/pkgs/by-name/em/email/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Command line SMTP client";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     homepage = "https://deanproxy.com/code";
     platforms = lib.platforms.unix;
     mainProgram = "email";
diff --git a/pkgs/by-name/en/engauge-digitizer/package.nix b/pkgs/by-name/en/engauge-digitizer/package.nix
index c331bdaa9c95..b8f331deae1d 100644
--- a/pkgs/by-name/en/engauge-digitizer/package.nix
+++ b/pkgs/by-name/en/engauge-digitizer/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Engauge Digitizer is a tool for recovering graph data from an image file";
     mainProgram = "engauge";
     homepage = "https://markummitchell.github.io/engauge-digitizer";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
   };
diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix
index d77b60db798d..00ea0ff0f690 100644
--- a/pkgs/by-name/en/enum4linux-ng/package.nix
+++ b/pkgs/by-name/en/enum4linux-ng/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     '';
     homepage = "https://github.com/cddmp/enum4linux-ng";
     changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "enum4linux-ng";
   };
diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index 868184eafe4e..e7f6e7a7bd21 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/";
     description = "Userspace utilities for linux-erofs file system";
     changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       nikstur
       jmbaur
diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix
index 45a519260591..145516f799fe 100644
--- a/pkgs/by-name/er/erosmb/package.nix
+++ b/pkgs/by-name/er/erosmb/package.nix
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "SMB network scanner";
     homepage = "https://github.com/viktor02/EroSmb";
     changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "erosmb";
   };
diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix
index 180acf1ef55c..0359539d239a 100644
--- a/pkgs/by-name/es/esphome/dashboard.nix
+++ b/pkgs/by-name/es/esphome/dashboard.nix
@@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "ESPHome dashboard";
     homepage = "https://esphome.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ hexa ];
   };
 })
diff --git a/pkgs/by-name/et/ete-unwrapped/package.nix b/pkgs/by-name/et/ete-unwrapped/package.nix
index 1b396ad00ce0..c8f8479f8b5d 100644
--- a/pkgs/by-name/et/ete-unwrapped/package.nix
+++ b/pkgs/by-name/et/ete-unwrapped/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Improved Wolfenstein: Enemy Territory Engine";
     homepage = "https://github.com/etfdevs/ETe";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       ashleyghooper
       drupol
diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix
index f4443287a060..d0259a237b2d 100644
--- a/pkgs/by-name/et/etlegacy-assets/package.nix
+++ b/pkgs/by-name/et/etlegacy-assets/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   meta = {
     description = "ET: Legacy assets only";
     homepage = "https://etlegacy.com";
-    license = with lib.licenses; [ cc-by-nc-sa-30 ];
+    license = lib.licenses.cc-by-nc-sa-30;
     longDescription = ''
       ET: Legacy, an open source project fully compatible client and server
       for the popular online FPS game Wolfenstein: Enemy Territory - whose
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index 73b9e82e8e6e..25b878fa6369 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation {
   meta = {
     description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license";
     homepage = "https://etlegacy.com";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     longDescription = ''
       ET: Legacy, an open source project fully compatible client and server
       for the popular online FPS game Wolfenstein: Enemy Territory - whose
diff --git a/pkgs/by-name/ev/evans/package.nix b/pkgs/by-name/ev/evans/package.nix
index c7f8e974a554..5d66dfad7e8f 100644
--- a/pkgs/by-name/ev/evans/package.nix
+++ b/pkgs/by-name/ev/evans/package.nix
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     description = "More expressive universal gRPC client";
     mainProgram = "evans";
     homepage = "https://evans.syfm.me/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ diogox ];
   };
 })
diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index 2d0ba6e4a1a3..5fc06ee6949c 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation {
   '';
   meta = {
     description = "Celeste mod loader (don't install; use celestegame instead)";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index b05e536acf03..1fb0046ebd02 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -102,7 +102,7 @@ buildDotnetModule {
 
   meta = {
     description = "Celeste mod loader (don't install; use celestegame instead)";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix
index 37f4f2679a46..580a63f3c2e7 100644
--- a/pkgs/by-name/ev/evremap/package.nix
+++ b/pkgs/by-name/ev/evremap/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage {
     description = "Keyboard input remapper for Linux/Wayland systems";
     homepage = "https://github.com/wez/evremap";
     maintainers = with lib.maintainers; [ pluiedev ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "evremap";
   };
 }
diff --git a/pkgs/by-name/ex/external-editor-revived/package.nix b/pkgs/by-name/ex/external-editor-revived/package.nix
index 29f29d11471f..57be8c4ead17 100644
--- a/pkgs/by-name/ex/external-editor-revived/package.nix
+++ b/pkgs/by-name/ex/external-editor-revived/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Native messaging host for the Thunderbird addon allowing to edit mails in external programs";
     homepage = "https://github.com/Frederick888/external-editor-revived";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ mofrim ];
     mainProgram = "external-editor-revived";
   };
diff --git a/pkgs/by-name/ex/extrude/package.nix b/pkgs/by-name/ex/extrude/package.nix
index 2612f6629a0e..973a3381fe2e 100644
--- a/pkgs/by-name/ex/extrude/package.nix
+++ b/pkgs/by-name/ex/extrude/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "Tool to analyse binaries for missing security features";
     mainProgram = "extrude";
     homepage = "https://github.com/liamg/extrude";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/fa/falkor/package.nix b/pkgs/by-name/fa/falkor/package.nix
index 3bcf0da92424..900257712a8d 100644
--- a/pkgs/by-name/fa/falkor/package.nix
+++ b/pkgs/by-name/fa/falkor/package.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Electron-based gaming hub";
     homepage = "https://github.com/Team-Falkor/falkor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ icedborn ];
     platforms = [ "x86_64-linux" ];
     hydraPlatforms = [ ];
diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix
index 4cf042e1d37d..659c2398c982 100644
--- a/pkgs/by-name/fc/fceux/package.nix
+++ b/pkgs/by-name/fc/fceux/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.fceux.com";
     description = "Nintendo Entertainment System (NES) Emulator";
     changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "fceux";
     maintainers = with lib.maintainers; [ kuflierl ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
index 09613f96e9b3..4e8f0c929665 100644
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "FEBio Suite Solver";
     mainProgram = "FEBioStudio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://febio.org/";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ Scriptkiddi ];
diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix
index 28427d15792b..96acb051ab6c 100644
--- a/pkgs/by-name/fe/febio/package.nix
+++ b/pkgs/by-name/fe/febio/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Software tool for nonlinear finite element analysis in biomechanics and biophysics";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://febio.org/";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ Scriptkiddi ];
diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
index 44a7f6761d0c..8a4c23dbf960 100644
--- a/pkgs/by-name/fe/fermyon-spin/package.nix
+++ b/pkgs/by-name/fe/fermyon-spin/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly";
     homepage = "https://github.com/spinframework/spin";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "spin";
     maintainers = [ ];
     platforms = builtins.attrNames packageHashes;
diff --git a/pkgs/by-name/fl/flac2mp3/package.nix b/pkgs/by-name/fl/flac2mp3/package.nix
index 8d2ef887ec22..33ce91412280 100644
--- a/pkgs/by-name/fl/flac2mp3/package.nix
+++ b/pkgs/by-name/fl/flac2mp3/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tool to convert audio files from flac to mp3 format including the copying of tags";
     homepage = "https://github.com/robinbowes/flac2mp3";
     changelog = "https://github.com/robinbowes/flac2mp3/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 })
diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix
index 3f7d9aa58be8..96baeb034583 100644
--- a/pkgs/by-name/fl/flashprog/package.nix
+++ b/pkgs/by-name/fl/flashprog/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://flashprog.org";
     description = "Utility for reading, writing, erasing and verifying flash ROM chips";
     changelog = "https://flashprog.org/wiki/Flashprog/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [
       felixsinger
       funkeleinhorn
diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
index eb89a4959e9f..410a02fe5734 100644
--- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
+++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Flat remix is a pretty simple icon theme inspired on material design";
     homepage = "https://drasite.com/flat-remix";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux
     platforms = lib.platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix
index dfbf11197fce..658c6c30740e 100644
--- a/pkgs/by-name/fl/flawfinder/package.nix
+++ b/pkgs/by-name/fl/flawfinder/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool to examines C/C++ source code for security flaws";
     mainProgram = "flawfinder";
     homepage = "https://dwheeler.com/flawfinder/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 5efb29de1a11..85f3e0d8f4f0 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -31,7 +31,7 @@ let
   meta = {
     description = "Proxy client based on ClashMeta, simple and easy to use";
     homepage = "https://github.com/chen08209/FlClash";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ VZstless ];
   };
 
diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix
index c69c98bd04f9..344a23a7c4c6 100644
--- a/pkgs/by-name/fl/flowblade/package.nix
+++ b/pkgs/by-name/fl/flowblade/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Multitrack Non-Linear Video Editor";
     homepage = "https://jliljebl.github.io/flowblade/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ polygon ];
     mainProgram = "flowblade";
diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix
index 568b37d94345..e7a1e2b32a09 100644
--- a/pkgs/by-name/fm/fm-go/package.nix
+++ b/pkgs/by-name/fm/fm-go/package.nix
@@ -22,7 +22,7 @@ let
       homepage = "https://github.com/mistakenelf/fm";
       description = "Terminal based file manager";
       changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "fm";
       maintainers = [ ];
     };
diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix
index 9ee14d3d1762..688c62d2854a 100644
--- a/pkgs/by-name/fo/font-config-info/package.nix
+++ b/pkgs/by-name/fo/font-config-info/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Prints a Linux system's font configuration";
     homepage = "https://github.com/derat/font-config-info";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ romildo ];
     mainProgram = "font-config-info";
diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix
index 4b52ad8f006a..99a8d5b0ec20 100644
--- a/pkgs/by-name/fo/fontfor/package.nix
+++ b/pkgs/by-name/fo/fontfor/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Find fonts which can show a specified character and preview them in browser";
     homepage = "https://github.com/7sDream/fontfor";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     mainProgram = "fontfor";
   };
diff --git a/pkgs/by-name/fo/fotema/package.nix b/pkgs/by-name/fo/fotema/package.nix
index 723d9ab9d6aa..272bfd80ab1f 100644
--- a/pkgs/by-name/fo/fotema/package.nix
+++ b/pkgs/by-name/fo/fotema/package.nix
@@ -102,7 +102,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Photo gallery for Linux";
     homepage = "https://github.com/blissd/fotema";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "fotema";
diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix
index 7eceee491925..e3b73c8ca265 100644
--- a/pkgs/by-name/fp/fprettify/package.nix
+++ b/pkgs/by-name/fp/fprettify/package.nix
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Auto-formatter for modern Fortran code that imposes strict whitespace formatting, written in Python";
     mainProgram = "fprettify";
     homepage = "https://pypi.org/project/fprettify/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix
index 78eec456b62e..ae6b16cf83a4 100644
--- a/pkgs/by-name/fr/fre/package.nix
+++ b/pkgs/by-name/fr/fre/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI tool for tracking your most-used directories and files";
     homepage = "https://github.com/camdencheek/fre";
     changelog = "https://github.com/camdencheek/fre/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gaykitty ];
     mainProgram = "fre";
   };
diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index a38818417b30..96a639a3260c 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://thomasokken.com/free42/";
     changelog = "https://thomasokken.com/free42/history.html";
     description = "Software clone of the HP-42S calculator";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ elfenermarcell ];
     mainProgram = "free42dec";
     platforms = with lib.platforms; unix;
diff --git a/pkgs/by-name/fr/frodo4/package.nix b/pkgs/by-name/fr/frodo4/package.nix
index a4d37b3a3e3d..9f49ba742498 100644
--- a/pkgs/by-name/fr/frodo4/package.nix
+++ b/pkgs/by-name/fr/frodo4/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/cebix/frodo4";
     description = "C64 emulator with emphasis on graphical accuracy";
     mainProgram = "Frodo";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ chordtoll ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix
index c7861f0995a9..900bbb1b3995 100644
--- a/pkgs/by-name/fr/frugally-deep/package.nix
+++ b/pkgs/by-name/fr/frugally-deep/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Header-only library for using Keras (TensorFlow) models in C++";
     homepage = "https://github.com/Dobiasd/frugally-deep";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix
index 0584ab933271..95583d1fab82 100644
--- a/pkgs/by-name/fu/functiontrace-server/package.nix
+++ b/pkgs/by-name/fu/functiontrace-server/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Server for FunctionTrace, a graphical Python profiler";
     homepage = "https://functiontrace.com";
-    license = with lib.licenses; [ prosperity30 ];
+    license = lib.licenses.prosperity30;
     maintainers = with lib.maintainers; [ tehmatt ];
   };
 }
diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix
index 0591915c2523..5a37b6718bf3 100644
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Multi-system chiptune tracker compatible with DefleMask modules";
     homepage = "https://github.com/tildearrow/furnace";
     changelog = "https://github.com/tildearrow/furnace/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.all;
     mainProgram = "furnace";
diff --git a/pkgs/by-name/fu/fuzzdb/package.nix b/pkgs/by-name/fu/fuzzdb/package.nix
index 4ca1eb4cb191..bb67c638b5c3 100644
--- a/pkgs/by-name/fu/fuzzdb/package.nix
+++ b/pkgs/by-name/fu/fuzzdb/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Comprehensive collection of attack patterns and predictable resource names used for security testing and fuzzing application";
     homepage = "https://github.com/fuzzdb-project/fuzzdb";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/fw/fwanalyzer/package.nix b/pkgs/by-name/fw/fwanalyzer/package.nix
index 6460d68cb5ac..330e29854586 100644
--- a/pkgs/by-name/fw/fwanalyzer/package.nix
+++ b/pkgs/by-name/fw/fwanalyzer/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Tool to analyze filesystem images";
     homepage = "https://github.com/cruise-automation/fwanalyzer";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "fwanalyzer";
   };
diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix
index c25ae4dfc9cf..e404df1eaadb 100644
--- a/pkgs/by-name/ga/galaxis/package.nix
+++ b/pkgs/by-name/ga/galaxis/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
       game's simpler deductions.
     '';
     homepage = "http://catb.org/~esr/galaxis/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "galaxis";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix
index 7c0a7cfe0598..9cf7b03f00ed 100644
--- a/pkgs/by-name/ga/game-rs/package.nix
+++ b/pkgs/by-name/ga/game-rs/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Minimal CLI game launcher for linux";
     homepage = "https://github.com/amanse/game-rs";
     changelog = "https://github.com/Amanse/game-rs/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ amanse ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix
index 622769eafb27..e03a4ec1db9d 100644
--- a/pkgs/by-name/gd/gdu/package.nix
+++ b/pkgs/by-name/gd/gdu/package.nix
@@ -63,7 +63,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/dundee/gdu";
     changelog = "https://github.com/dundee/gdu/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
       zowoq
diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix
index 210c27fd5198..7ee20c77422c 100644
--- a/pkgs/by-name/ge/geoipupdate/package.nix
+++ b/pkgs/by-name/ge/geoipupdate/package.nix
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Automatic GeoIP database updater";
     homepage = "https://github.com/maxmind/geoipupdate";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       das_j
       helsinki-Jo
diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index 690e38ca3313..a5a13ccc60c1 100644
--- a/pkgs/by-name/ge/gerbolyze/package.nix
+++ b/pkgs/by-name/ge/gerbolyze/package.nix
@@ -32,7 +32,7 @@ let
     meta = {
       description = "SVG-flatten SVG downconverter";
       homepage = "https://github.com/jaseg/gerbolyze";
-      license = with lib.licenses; [ agpl3Plus ];
+      license = lib.licenses.agpl3Plus;
       maintainers = with lib.maintainers; [ wulfsta ];
       mainProgram = "svg-flatten";
       platforms = lib.platforms.linux;
@@ -91,7 +91,7 @@ python3Packages.buildPythonApplication {
   meta = {
     description = "Directly render SVG overlays into Gerber and Excellon files";
     homepage = "https://github.com/jaseg/gerbolyze";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ wulfsta ];
     mainProgram = "gerbolyze";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix
index 8d50d39c9325..1ca57bd976f8 100644
--- a/pkgs/by-name/ge/geticons/package.nix
+++ b/pkgs/by-name/ge/geticons/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI utility to get icons for apps on your system or other generic icons by name";
     mainProgram = "geticons";
     homepage = "https://git.sr.ht/~zethra/geticons";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
   };
 })
diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix
index 69e7aa478d9f..4d1a93bce638 100644
--- a/pkgs/by-name/gg/gg-jj/package.nix
+++ b/pkgs/by-name/gg/gg-jj/package.nix
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "GUI for the version control system Jujutsu";
     homepage = "https://github.com/gulbanana/gg";
     changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     inherit (cargo-tauri.hook.meta) platforms;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "gg";
diff --git a/pkgs/by-name/gh/ghdorker/package.nix b/pkgs/by-name/gh/ghdorker/package.nix
index 96c5bf424647..d0ac4064bca7 100644
--- a/pkgs/by-name/gh/ghdorker/package.nix
+++ b/pkgs/by-name/gh/ghdorker/package.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Extensible GitHub dorking tool";
     mainProgram = "ghdorker";
     homepage = "https://github.com/dtaivpp/ghdorker";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix
index 5bb5ce06c398..a4b16ffd69f6 100644
--- a/pkgs/by-name/gi/gir-rs/package.nix
+++ b/pkgs/by-name/gi/gir-rs/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Tool to generate rust bindings and user API for glib-based libraries";
     homepage = "https://github.com/gtk-rs/gir/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ anish ];
     mainProgram = "gir";
   };
diff --git a/pkgs/by-name/gi/git-credential-manager/package.nix b/pkgs/by-name/gi/git-credential-manager/package.nix
index 71cddaeae4cf..bcefa224c2cd 100644
--- a/pkgs/by-name/gi/git-credential-manager/package.nix
+++ b/pkgs/by-name/gi/git-credential-manager/package.nix
@@ -58,7 +58,7 @@ buildDotnetModule rec {
   meta = {
     description = "Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services";
     homepage = "https://github.com/git-ecosystem/git-credential-manager";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ _999eagle ];
     longDescription = ''
diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix
index 21a2b06b9188..ecd8ed84e55c 100644
--- a/pkgs/by-name/gi/git-privacy/package.nix
+++ b/pkgs/by-name/gi/git-privacy/package.nix
@@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool to redact Git author and committer dates";
     homepage = "https://github.com/EMPRI-DEVOPS/git-privacy";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "git-privacy";
   };
diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix
index 4e8a50ce7305..3c7615de3170 100644
--- a/pkgs/by-name/gi/git-workspace/package.nix
+++ b/pkgs/by-name/gi/git-workspace/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Sync personal and work git repositories from multiple providers";
     homepage = "https://github.com/orf/git-workspace";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ misuzu ];
     mainProgram = "git-workspace";
   };
diff --git a/pkgs/by-name/gi/gitjacker/package.nix b/pkgs/by-name/gi/gitjacker/package.nix
index e97fc4f7e786..ac3f19c6b720 100644
--- a/pkgs/by-name/gi/gitjacker/package.nix
+++ b/pkgs/by-name/gi/gitjacker/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
       even where directory listings are disabled.
     '';
     homepage = "https://github.com/liamg/gitjacker";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix
index 5df5d02c4620..d508ca6946d2 100644
--- a/pkgs/by-name/gi/gitlab-timelogs/package.nix
+++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/gitlab-timelogs";
     changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       blitz
       phip1611
diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix
index 301d404677d9..f6e6d0192c24 100644
--- a/pkgs/by-name/gi/gitte/package.nix
+++ b/pkgs/by-name/gi/gitte/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://codeberg.org/ckruse/Gitte";
     mainProgram = "gitte";
     description = "GTK4/libadwaita Git client";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       ckruse
diff --git a/pkgs/by-name/gi/gittyup/package.nix b/pkgs/by-name/gi/gittyup/package.nix
index 92e92539c16c..cc83cfa7fe7a 100644
--- a/pkgs/by-name/gi/gittyup/package.nix
+++ b/pkgs/by-name/gi/gittyup/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Graphical Git client designed to help you understand and manage your source code history";
     homepage = "https://murmele.github.io/Gittyup";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fliegendewurst
       phijor
diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix
index 67d99f61406f..a6e44b81cadb 100644
--- a/pkgs/by-name/gl/global-platform-pro/package.nix
+++ b/pkgs/by-name/gl/global-platform-pro/package.nix
@@ -87,7 +87,7 @@ maven.buildMavenPackage rec {
       fromSource
       binaryBytecode # deps
     ];
-    license = with lib.licenses; [ lgpl3 ];
+    license = lib.licenses.lgpl3;
     mainProgram = "gp";
   };
 }
diff --git a/pkgs/by-name/gn/gnomecast/package.nix b/pkgs/by-name/gn/gnomecast/package.nix
index 0cd942d37a7d..52c4764a50fe 100644
--- a/pkgs/by-name/gn/gnomecast/package.nix
+++ b/pkgs/by-name/gn/gnomecast/package.nix
@@ -49,7 +49,7 @@ buildPythonApplication {
   meta = {
     description = "Native Linux GUI for Chromecasting local files";
     homepage = "https://github.com/keredson/gnomecast";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "gnomecast";
   };
diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix
index 3b8be6079788..9a1635b415bf 100644
--- a/pkgs/by-name/gn/gnu-shepherd/package.nix
+++ b/pkgs/by-name/gn/gnu-shepherd/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.gnu.org/software/shepherd/";
     description = "Service manager that looks after the herd of system services";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ kloenk ];
   };
diff --git a/pkgs/by-name/go/go-audit/package.nix b/pkgs/by-name/go/go-audit/package.nix
index 5688247ca788..bead40959749 100644
--- a/pkgs/by-name/go/go-audit/package.nix
+++ b/pkgs/by-name/go/go-audit/package.nix
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Alternative to the auditd daemon";
     homepage = "https://github.com/slackhq/go-audit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
     mainProgram = "go-audit";
diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix
index 307f9b5f2d3d..cea8622b7ef1 100644
--- a/pkgs/by-name/go/go-cve-search/package.nix
+++ b/pkgs/by-name/go/go-cve-search/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/s-index/go-cve-search";
     changelog = "https://github.com/s-index/go-cve-search/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix
index bab6b8313b4c..ff47e3c966a8 100644
--- a/pkgs/by-name/go/go-licenses/package.nix
+++ b/pkgs/by-name/go/go-licenses/package.nix
@@ -50,7 +50,7 @@ buildGoModule (finalAttrs: {
     description = "Reports on the licenses used by a Go package and its dependencies";
     mainProgram = "go-licenses";
     homepage = "https://github.com/google/go-licenses";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ Luflosi ];
   };
 })
diff --git a/pkgs/by-name/go/go365/package.nix b/pkgs/by-name/go/go365/package.nix
index 86e06f8ad4cd..c55fce455215 100644
--- a/pkgs/by-name/go/go365/package.nix
+++ b/pkgs/by-name/go/go365/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     description = "Office 365 enumeration tool";
     homepage = "https://github.com/optiv/Go365";
     changelog = "https://github.com/optiv/Go365/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "Go365";
   };
diff --git a/pkgs/by-name/go/gobi_loader/package.nix b/pkgs/by-name/go/gobi_loader/package.nix
index 13f44029265a..96cb504b090b 100644
--- a/pkgs/by-name/go/gobi_loader/package.nix
+++ b/pkgs/by-name/go/gobi_loader/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Firmware loader for Qualcomm Gobi USB chipsets";
     homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ _0x4A6F ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index 4cc79004aea0..9788a3810bec 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/slurdge/goeland";
     changelog = "https://github.com/slurdge/goeland/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sweenu ];
   };
 })
diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix
index 3c5df2a78ba0..85547311f399 100644
--- a/pkgs/by-name/go/gogdl/package.nix
+++ b/pkgs/by-name/go/gogdl/package.nix
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "GOG Downloading module for Heroic Games Launcher";
     mainProgram = "gogdl";
     homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/go/gomapenum/package.nix b/pkgs/by-name/go/gomapenum/package.nix
index 2247aa56a9be..7dc199b84350 100644
--- a/pkgs/by-name/go/gomapenum/package.nix
+++ b/pkgs/by-name/go/gomapenum/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     description = "Tools for user enumeration and password bruteforce";
     mainProgram = "gomapenum";
     homepage = "https://github.com/nodauf/GoMapEnum";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/go/gomobile/package.nix b/pkgs/by-name/go/gomobile/package.nix
index 4b00da7f414b..f25c06b753b0 100644
--- a/pkgs/by-name/go/gomobile/package.nix
+++ b/pkgs/by-name/go/gomobile/package.nix
@@ -71,7 +71,7 @@ buildGoModule {
   meta = {
     description = "Tool for building and running mobile apps written in Go";
     homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jakubgs ];
   };
 }
diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix
index cf3d824a9fd6..a2919dea36d1 100644
--- a/pkgs/by-name/go/google-cloud-cpp/package.nix
+++ b/pkgs/by-name/go/google-cloud-cpp/package.nix
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
   requiredSystemFeatures = [ "big-parallel" ];
 
   meta = {
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     homepage = "https://github.com/googleapis/google-cloud-cpp";
     description = "C++ Idiomatic Clients for Google Cloud Platform services";
     changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index 527cf0124410..25c743f62e52 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -21,7 +21,7 @@ let
   metaCommon = {
     description = "Modern download manager";
     homepage = "https://github.com/GopeedLab/gopeed";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix
index 9a923674f43b..dfcf46a392f1 100644
--- a/pkgs/by-name/gp/gptcommit/package.nix
+++ b/pkgs/by-name/gp/gptcommit/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3";
     mainProgram = "gptcommit";
     homepage = "https://github.com/zurawiki/gptcommit";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = with lib.platforms; all;
   };
diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix
index 50f7936a9211..4a992d5fbdee 100644
--- a/pkgs/by-name/gp/gptscript/package.nix
+++ b/pkgs/by-name/gp/gptscript/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/gptscript-ai/gptscript";
     changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${finalAttrs.version}";
     description = "Build AI assistants that interact with your systems";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jamiemagee ];
     mainProgram = "gptscript";
   };
diff --git a/pkgs/by-name/gr/grafx2/package.nix b/pkgs/by-name/gr/grafx2/package.nix
index 9574fd771c43..a7505811a3f9 100644
--- a/pkgs/by-name/gr/grafx2/package.nix
+++ b/pkgs/by-name/gr/grafx2/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
       The program is mostly developed on Haiku, Linux and Windows, but is also
       portable on many other platforms.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "grafx2-sdl";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/gr/graph-cli/package.nix b/pkgs/by-name/gr/graph-cli/package.nix
index 720ec87b7a87..d9d046488eb7 100644
--- a/pkgs/by-name/gr/graph-cli/package.nix
+++ b/pkgs/by-name/gr/graph-cli/package.nix
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "CLI to create graphs from CSV files";
     homepage = "https://github.com/mcastorina/graph-cli/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ leungbk ];
     mainProgram = "graph";
   };
diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix
index ef76fb84d481..4c9ab79b4938 100644
--- a/pkgs/by-name/gr/graphicsmagick/package.nix
+++ b/pkgs/by-name/gr/graphicsmagick/package.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
       including important formats like DPX, GIF, JPEG, JPEG-2000, JXL, PNG, PDF,
       PNM, TIFF, and WebP.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ambossmann ];
     mainProgram = "gm";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/gr/grobi/package.nix b/pkgs/by-name/gr/grobi/package.nix
index ff198cf8db35..553b08f25e73 100644
--- a/pkgs/by-name/gr/grobi/package.nix
+++ b/pkgs/by-name/gr/grobi/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/fd0/grobi";
     description = "Automatically configure monitors/outputs for Xorg via RANDR";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     platforms = lib.platforms.linux;
     mainProgram = "grobi";
   };
diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index a55a869ba160..2fd707cefe94 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -136,7 +136,7 @@ buildGoModule (finalAttrs: {
       As a vulnerability scanner grype is able to scan the contents of a
       container image or filesystem to find known vulnerabilities.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fab
       jk
diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix
index bafe4c812f8c..539633bde6d4 100644
--- a/pkgs/by-name/gs/gswatcher/package.nix
+++ b/pkgs/by-name/gs/gswatcher/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simple game server monitor and administrative tool";
     homepage = "https://github.com/lxndr/gswatcher";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
diff --git a/pkgs/by-name/gt/gt/package.nix b/pkgs/by-name/gt/gt/package.nix
index fd62a2b45d99..1eb3dbf13f10 100644
--- a/pkgs/by-name/gt/gt/package.nix
+++ b/pkgs/by-name/gt/gt/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Linux command line tool for setting up USB gadgets using configfs";
     homepage = "https://github.com/linux-usb-gadgets/gt";
     mainProgram = "gt";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/gt/gtk-session-lock/package.nix b/pkgs/by-name/gt/gtk-session-lock/package.nix
index f84b82e5bf28..35640bc2cc2e 100644
--- a/pkgs/by-name/gt/gtk-session-lock/package.nix
+++ b/pkgs/by-name/gt/gtk-session-lock/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     # The author stated "GTK Session Lock is licensed under the GNU General
     # Public License version 3.0 or any later version approved by me (Cu3PO42)."
     # Since we don't know if the author will approve later versions, we mark gpl3Only
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.platforms.unix;
     badPlatforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index 11b2ef7cf184..8245518cc16e 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -32,7 +32,7 @@ let
   metaCommon = {
     homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox";
     hydraPlatforms = [ ]; # https://gui-for-cores.github.io/guide/#note
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ vollate ];
   };
 
diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix
index f0550d84e6f9..b8307f554b38 100644
--- a/pkgs/by-name/ha/halfempty/package.nix
+++ b/pkgs/by-name/ha/halfempty/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "halfempty";
     homepage = "https://github.com/googleprojectzero/halfempty/";
     maintainers = with lib.maintainers; [ fpletz ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix
index c60ee2b20dff..663bff3c62b5 100644
--- a/pkgs/by-name/ha/harminv/package.nix
+++ b/pkgs/by-name/ha/harminv/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids";
     homepage = "https://github.com/NanoComp/harminv";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       sheepforce
       markuskowa
diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix
index b3abacbe9fb4..33b586be1186 100644
--- a/pkgs/by-name/ha/hax11/package.nix
+++ b/pkgs/by-name/ha/hax11/package.nix
@@ -47,7 +47,7 @@ multiStdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/CyberShadow/hax11";
     description = "Hackbrary to Hook and Augment X11 protocol calls";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ cybershadow ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix
index bb2469185630..fe4cc079fd7f 100644
--- a/pkgs/by-name/he/hebbot/package.nix
+++ b/pkgs/by-name/he/hebbot/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Matrix bot which can generate \"This Week in X\" like blog posts ";
     homepage = "https://github.com/haecker-felix/hebbot";
     changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v2.1";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     mainProgram = "hebbot";
     maintainers = with lib.maintainers; [ a-kenji ];
   };
diff --git a/pkgs/by-name/he/hecate/package.nix b/pkgs/by-name/he/hecate/package.nix
index 00ff0afaccea..d4c37415ed26 100644
--- a/pkgs/by-name/he/hecate/package.nix
+++ b/pkgs/by-name/he/hecate/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     inherit (finalAttrs.src.meta) homepage;
     description = "Terminal hex editor";
     longDescription = "The Hex Editor From Hell!";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ramkromberg ];
     mainProgram = "hecate";
   };
diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix
index a2d9475ab0ec..64e141311d02 100644
--- a/pkgs/by-name/he/heh/package.nix
+++ b/pkgs/by-name/he/heh/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     description = "Cross-platform terminal UI used for modifying file data in hex or ASCII";
     homepage = "https://github.com/ndd7xv/heh";
     changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ piturnah ];
     mainProgram = "heh";
   };
diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix
index 92989dc1325f..585b0416a84d 100644
--- a/pkgs/by-name/hf/hfinger/package.nix
+++ b/pkgs/by-name/hf/hfinger/package.nix
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "hfinger";
     homepage = "https://github.com/CERT-Polska/hfinger";
     changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index 1916aaca9438..91ceebb4eefb 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -73,7 +73,7 @@ python313Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Libadwaita TIDAL client for Linux";
     homepage = "https://github.com/Nokse22/high-tide";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "high-tide";
     maintainers = with lib.maintainers; [
       drafolin
diff --git a/pkgs/by-name/hi/hivemind/package.nix b/pkgs/by-name/hi/hivemind/package.nix
index 6fd8813dc659..1b0d4315fc2f 100644
--- a/pkgs/by-name/hi/hivemind/package.nix
+++ b/pkgs/by-name/hi/hivemind/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://github.com/DarthSim/";
     description = "Process manager for Procfile-based applications";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sveitser ];
     mainProgram = "hivemind";
   };
diff --git a/pkgs/by-name/ht/htmltest/package.nix b/pkgs/by-name/ht/htmltest/package.nix
index ff0d289a345e..968a21ddb2bb 100644
--- a/pkgs/by-name/ht/htmltest/package.nix
+++ b/pkgs/by-name/ht/htmltest/package.nix
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
       links, images, scripts references work, your alt tags are filled in, etc.
     '';
     homepage = "https://github.com/wjdp/htmltest";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ht/httpdump/package.nix b/pkgs/by-name/ht/httpdump/package.nix
index 352e4d14425c..9285923c7f7e 100644
--- a/pkgs/by-name/ht/httpdump/package.nix
+++ b/pkgs/by-name/ht/httpdump/package.nix
@@ -29,7 +29,7 @@ buildGoModule {
     description = "Parse and display HTTP traffic from network device or pcap file";
     mainProgram = "httpdump";
     homepage = "https://github.com/hsiafan/httpdump";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix
index 93a032cc52a4..2dfa7dd81007 100644
--- a/pkgs/by-name/hu/humility/package.nix
+++ b/pkgs/by-name/hu/humility/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage {
     description = "Debugger for Hubris";
     mainProgram = "humility";
     homepage = "https://github.com/oxidecomputer/humility";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ therishidesai ];
   };
 }
diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 45ab2f171315..9ca7e0e7a303 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -896,7 +896,7 @@ rec {
     dictFileName = "cs_CZ";
     shortDescription = "Czech (Czechia)";
     readmeFile = "README_cs.txt";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
   };
 
   # SLOVAK
@@ -988,7 +988,7 @@ rec {
     dictFileName = "he_IL";
     shortDescription = "Hebrew (Israel)";
     readmeFile = "README_he_IL.txt";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
   };
 
   # THAI
@@ -1008,7 +1008,7 @@ rec {
     meta = {
       description = "Hunspell dictionary for Central Thai (Thailand)";
       homepage = "https://github.com/SyafiqHadzir/Hunspell-TH";
-      license = with lib.licenses; [ gpl3 ];
+      license = lib.licenses.gpl3;
       maintainers = with lib.maintainers; [ toastal ]; # looking for a native speaker
       platforms = lib.platforms.all;
     };
@@ -1053,7 +1053,7 @@ rec {
     sourceRoot = "no";
     readmeFile = "README_hyph_NO.txt";
     shortDescription = "Norwegian Bokmål (Norway)";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 
   nn_NO = nn-no;
@@ -1063,7 +1063,7 @@ rec {
     sourceRoot = "no";
     readmeFile = "README_hyph_NO.txt";
     shortDescription = "Norwegian Nynorsk (Norway)";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 
   # TOKI PONA
@@ -1121,7 +1121,7 @@ rec {
     dictFileName = "pt_BR";
     shortDescription = "Portuguese (Brazil)";
     readmeFile = "README_pt_BR.txt";
-    license = with lib.licenses; [ lgpl3 ];
+    license = lib.licenses.lgpl3;
   };
 
   pt_PT = pt-pt;
@@ -1194,7 +1194,7 @@ rec {
     meta = {
       description = "Hunspell dictionary for ${shortDescription} from rospell";
       homepage = "https://sourceforge.net/projects/rospell/";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with lib.maintainers; [ Andy3153 ];
     };
   };
diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix
index 549b5eec7d49..8464c3962d9b 100644
--- a/pkgs/by-name/hy/hydra-cli/package.nix
+++ b/pkgs/by-name/hy/hydra-cli/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Client for the Hydra CI";
     mainProgram = "hydra-cli";
     homepage = "https://github.com/nlewo/hydra-cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       lewo
       aleksana
diff --git a/pkgs/by-name/ic/icesprog/package.nix b/pkgs/by-name/ic/icesprog/package.nix
index a453534f7820..ed02168f6275 100644
--- a/pkgs/by-name/ic/icesprog/package.nix
+++ b/pkgs/by-name/ic/icesprog/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "iCESugar FPGA flash utility";
     mainProgram = "icesprog";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ RossComputerGuy ];
     homepage = "https://github.com/wuxx/icesugar";
   };
diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix
index dd5cba23547a..f1413bb283e7 100644
--- a/pkgs/by-name/if/ifwifi/package.nix
+++ b/pkgs/by-name/if/ifwifi/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       project that gave me almost everything I wanted to create this tool.
     '';
     homepage = "https://github.com/araujobsd/ifwifi";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     # networkmanager doesn't work on darwin
     # even though the `wifiscanner` crate would work
diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix
index 2eb083070b3a..fb523df04a70 100644
--- a/pkgs/by-name/ii/iir1/package.nix
+++ b/pkgs/by-name/ii/iir1/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "DSP IIR realtime filter library written in C++";
     downloadPage = "https://github.com/berndporr/iir1";
     changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix
index b275569cb47d..8b620e6b1656 100644
--- a/pkgs/by-name/im/imapdedup/package.nix
+++ b/pkgs/by-name/im/imapdedup/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Duplicate email message remover";
     homepage = "https://github.com/quentinsf/IMAPdedup";
     maintainers = with lib.maintainers; [ sigmanificient ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     mainProgram = "imapdedup";
   };
 })
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index 0ce61eea2f86..bc7fc486fa8c 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM";
     homepage = "https://github.com/WerWolv/ImHex";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       kashw2
       cafkafk
diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix
index eeee417289da..1e0114e58d65 100644
--- a/pkgs/by-name/in/inql/package.nix
+++ b/pkgs/by-name/in/inql/package.nix
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "inql";
     homepage = "https://github.com/doyensec/inql";
     changelog = "https://github.com/doyensec/inql/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/in/internalallthethings/package.nix b/pkgs/by-name/in/internalallthethings/package.nix
index 2a0ea15a2d81..8bac7efd957b 100644
--- a/pkgs/by-name/in/internalallthethings/package.nix
+++ b/pkgs/by-name/in/internalallthethings/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://github.com/swisskyrepo/InternalAllTheThings";
     description = "Active Directory and Internal Pentest Cheatsheets";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ felbinger ];
     platforms = mkdocs.meta.platforms;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix
index 970efb5a1724..3aba1da93f59 100644
--- a/pkgs/by-name/in/invidious-router/package.nix
+++ b/pkgs/by-name/in/invidious-router/package.nix
@@ -27,7 +27,7 @@ buildGoModule {
   meta = {
     homepage = "https://gitlab.com/gaincoder/invidious-router";
     description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sils ];
     mainProgram = "invidious-router";
   };
diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix
index 49efb35b8aad..f05ef0c01569 100644
--- a/pkgs/by-name/io/ioc-scan/package.nix
+++ b/pkgs/by-name/io/ioc-scan/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool to search a filesystem for indicators of compromise (IoC)";
     homepage = "https://github.com/cisagov/ioc-scanner";
     changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix
index c536cd9ac917..9e21184c787b 100644
--- a/pkgs/by-name/ip/ipinfo/package.nix
+++ b/pkgs/by-name/ip/ipinfo/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
     description = "Command Line Interface for the IPinfo API";
     homepage = "https://github.com/ipinfo/cli";
     changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix
index ca2b9ad8b246..65b8a1fb9ec4 100644
--- a/pkgs/by-name/it/ite-backlight/package.nix
+++ b/pkgs/by-name/it/ite-backlight/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       This project aims to provide a set of simple utilities for controlling ITE 8291
       keyboard backlight controllers.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://github.com/hexagonal-sun/ite-backlight";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ hexagonal-sun ];
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index 62f51d330e8a..eafddf6b27f5 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
       was chosen primarily due to the availability of C development environments
       for most computing platforms when JasPer was first developed, circa 1999.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "jasper";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index 8d3603432001..96bc793e1172 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Interactive JSON filter using jq";
     mainProgram = "jnv";
     homepage = "https://github.com/ynqa/jnv";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       nealfennimore
       nshalman
diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix
index ad86d22c6a19..6597f1be5bb7 100644
--- a/pkgs/by-name/jo/jocalsend/package.nix
+++ b/pkgs/by-name/jo/jocalsend/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://git.kittencollective.com/nebkor/joecalsend";
     description = "Rust terminal client for Localsend";
     changelog = "https://git.kittencollective.com/nebkor/joecalsend/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ unfreeRedistributable ];
+    license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [ Cameo007 ];
     mainProgram = "jocalsend";
   };
diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
index c5bd601b5317..cd7e05c817dd 100644
--- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
+++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter";
     description = "Server that interfaces tree-sitter with kakoune";
     mainProgram = "kak-tree-sitter";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ lelgenio ];
   };
 })
diff --git a/pkgs/by-name/ka/kassert/package.nix b/pkgs/by-name/ka/kassert/package.nix
index dd796b047373..9ffdccde0198 100644
--- a/pkgs/by-name/ka/kassert/package.nix
+++ b/pkgs/by-name/ka/kassert/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://kamping-site.github.io/kassert/";
     downloadPage = "https://github.com/kamping-site/kassert";
     changelog = "https://github.com/kamping-site/kasser/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
   };
diff --git a/pkgs/by-name/ki/kiterunner/package.nix b/pkgs/by-name/ki/kiterunner/package.nix
index c30a8e139085..1cb256d51c69 100644
--- a/pkgs/by-name/ki/kiterunner/package.nix
+++ b/pkgs/by-name/ki/kiterunner/package.nix
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
       and endpoints in modern applications.
     '';
     homepage = "https://github.com/assetnote/kiterunner";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix
index 96a6da300e1e..a7ede19a6bde 100644
--- a/pkgs/by-name/ki/kitty-img/package.nix
+++ b/pkgs/by-name/ki/kitty-img/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Print images inline in kitty";
     homepage = "https://git.sr.ht/~zethra/kitty-img";
     changelog = "https://git.sr.ht/~zethra/kitty-img/refs/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gaykitty ];
     mainProgram = "kitty-img";
   };
diff --git a/pkgs/by-name/kl/klayout/package.nix b/pkgs/by-name/kl/klayout/package.nix
index 6b842a645514..7e6ff18cc50b 100644
--- a/pkgs/by-name/kl/klayout/package.nix
+++ b/pkgs/by-name/kl/klayout/package.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "High performance layout viewer and editor with support for GDS and OASIS";
     mainProgram = "klayout";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     homepage = "https://www.klayout.de/";
     changelog = "https://www.klayout.de/development.html#${finalAttrs.version}";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix
index 093e90987527..7e987f65c3dc 100644
--- a/pkgs/by-name/ko/koodousfinder/package.nix
+++ b/pkgs/by-name/ko/koodousfinder/package.nix
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Tool to allows users to search for and analyze Android apps";
     homepage = "https://github.com/HuntDownProject/KoodousFinder";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix
index 0d0cec62fd1a..bff91f9bb568 100644
--- a/pkgs/by-name/ko/kord/package.nix
+++ b/pkgs/by-name/ko/kord/package.nix
@@ -55,6 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Music theory binary and library for Rust";
     homepage = "https://github.com/twitchax/kord";
     maintainers = with lib.maintainers; [ kidsan ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix
index c13ff620d55e..4dac61c7d625 100644
--- a/pkgs/by-name/kr/krapslog/package.nix
+++ b/pkgs/by-name/kr/krapslog/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Visualize a log file with sparklines";
     homepage = "https://github.com/acj/krapslog-rs";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yanganto ];
     mainProgram = "krapslog";
   };
diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix
index f1956581dfc0..2fce0f755dbf 100644
--- a/pkgs/by-name/ks/kshutdown/package.nix
+++ b/pkgs/by-name/ks/kshutdown/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://kshutdown.sourceforge.io/";
     description = "Graphical shutdown utility for Linux and Windows";
     mainProgram = "kshutdown";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ eymeric ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ku/kubeaudit/package.nix b/pkgs/by-name/ku/kubeaudit/package.nix
index f476f7ed6e87..c38a64f577f0 100644
--- a/pkgs/by-name/ku/kubeaudit/package.nix
+++ b/pkgs/by-name/ku/kubeaudit/package.nix
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     description = "Audit tool for Kubernetes";
     homepage = "https://github.com/Shopify/kubeaudit";
     changelog = "https://github.com/Shopify/kubeaudit/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "kubeaudit";
   };
diff --git a/pkgs/by-name/ku/kubeclarity/package.nix b/pkgs/by-name/ku/kubeclarity/package.nix
index d39a9619315f..8121a6ee324e 100644
--- a/pkgs/by-name/ku/kubeclarity/package.nix
+++ b/pkgs/by-name/ku/kubeclarity/package.nix
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/openclarity/kubeclarity";
     changelog = "https://github.com/openclarity/kubeclarity/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix
index 2e6b3cf8e50e..5ab1d74f6189 100644
--- a/pkgs/by-name/ku/kubernetes-polaris/package.nix
+++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
     description = "Validate and remediate Kubernetes resources to ensure configuration best practices are followed";
     mainProgram = "polaris";
     homepage = "https://www.fairwinds.com/polaris";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ longer ];
   };
 })
diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix
index 991f5870f2d2..4eae332f35a5 100644
--- a/pkgs/by-name/ku/kubernix/package.nix
+++ b/pkgs/by-name/ku/kubernix/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Single dependency Kubernetes clusters for local testing, experimenting and development";
     mainProgram = "kubernix";
     homepage = "https://github.com/saschagrunert/kubernix";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ saschagrunert ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ku/kubesec/package.nix b/pkgs/by-name/ku/kubesec/package.nix
index 6ceb33e5ec66..bbfdb5fd052e 100644
--- a/pkgs/by-name/ku/kubesec/package.nix
+++ b/pkgs/by-name/ku/kubesec/package.nix
@@ -52,7 +52,7 @@ buildGoModule (finalAttrs: {
     mainProgram = "kubesec";
     homepage = "https://github.com/controlplaneio/kubesec";
     changelog = "https://github.com/controlplaneio/kubesec/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fab
       jk
diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix
index 988291d230e2..f3e27bb26eb2 100644
--- a/pkgs/by-name/ku/kubie/package.nix
+++ b/pkgs/by-name/ku/kubie/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Shell independent context and namespace switcher for kubectl";
     mainProgram = "kubie";
     homepage = "https://github.com/kubie-org/kubie";
-    license = with lib.licenses; [ zlib ];
+    license = lib.licenses.zlib;
     maintainers = with lib.maintainers; [ illiusdope ];
   };
 })
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index b34cfffa956b..44de740f5c71 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/labwc/labwc";
     description = "Wayland stacking compositor, inspired by Openbox";
     changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "labwc";
     maintainers = [ ];
     inherit (wayland.meta) platforms;
diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix
index f94a88f9bbb5..c4d0d084ae36 100644
--- a/pkgs/by-name/la/lapce/package.nix
+++ b/pkgs/by-name/la/lapce/package.nix
@@ -107,7 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Lightning-fast and Powerful Code Editor written in Rust";
     homepage = "https://github.com/lapce/lapce";
     changelog = "https://github.com/lapce/lapce/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "lapce";
   };
 })
diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix
index 0d2803e1ff8d..d673643ed58b 100644
--- a/pkgs/by-name/la/laze/package.nix
+++ b/pkgs/by-name/la/laze/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "laze";
     homepage = "https://github.com/kaspar030/laze";
     changelog = "https://github.com/kaspar030/laze/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dannixon ];
   };
 })
diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix
index 7a5b014e8ed7..cd613e21cbc5 100644
--- a/pkgs/by-name/la/lazyjournal/package.nix
+++ b/pkgs/by-name/la/lazyjournal/package.nix
@@ -34,7 +34,7 @@ buildGoModule {
   meta = {
     description = "TUI for journalctl, file system logs, as well as Docker and Podman containers";
     homepage = "https://github.com/Lifailon/lazyjournal";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = with lib.platforms; unix ++ windows;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "lazyjournal";
diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix
index 22f4500376a9..cc6aa9ccaf75 100644
--- a/pkgs/by-name/lb/lbreakout2/package.nix
+++ b/pkgs/by-name/lb/lbreakout2/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "http://lgames.sourceforge.net/LBreakout2/";
     description = "Breakout clone from the LGames series";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "lbreakout2";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix
index 8ca3e7d23956..e29277b96f37 100644
--- a/pkgs/by-name/lc/lcalc/package.nix
+++ b/pkgs/by-name/lc/lcalc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/sagemath/lcalc";
     description = "Program for calculating with L-functions";
     mainProgram = "lcalc";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
     teams = [ lib.teams.sage ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix
index 051d50ff5c82..26556ceeffe9 100644
--- a/pkgs/by-name/ld/ldapmonitor/package.nix
+++ b/pkgs/by-name/ld/ldapmonitor/package.nix
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "ldapmonitor";
     homepage = "https://github.com/p0dalirius/LDAPmonitor";
     changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix
index 9a69b171b3b0..d6eed318eeea 100644
--- a/pkgs/by-name/le/ledmon/package.nix
+++ b/pkgs/by-name/le/ledmon/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/md-raid-utilities/ledmon";
     description = "Enclosure LED Utilities";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ sorki ];
   };
 })
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 88fcb34d5ddb..0336a0551d61 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/numToStr/lemmy-help";
     changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "lemmy-help";
   };
diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix
index 5994aa44a756..b8999c144cc8 100644
--- a/pkgs/by-name/li/libagar/package.nix
+++ b/pkgs/by-name/li/libagar/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Cross-platform GUI toolkit";
     homepage = "http://libagar.org/index.html";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ramkromberg ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/li/libagar_test/package.nix b/pkgs/by-name/li/libagar_test/package.nix
index 2fd663cdb654..210aee5180ae 100644
--- a/pkgs/by-name/li/libagar_test/package.nix
+++ b/pkgs/by-name/li/libagar_test/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     description = "Tests for libagar";
     mainProgram = "agartest";
     homepage = "http://libagar.org/index.html";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ramkromberg ];
     platforms = lib.platforms.linux;
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix
index aad9624acc98..a09fdff502df 100644
--- a/pkgs/by-name/li/libajantv2/package.nix
+++ b/pkgs/by-name/li/libajantv2/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against";
     homepage = "https://github.com/aja-video/libajantv2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.lukegb ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/li/libbacktrace/package.nix b/pkgs/by-name/li/libbacktrace/package.nix
index 8ae11fe8a786..0e4f30d052ba 100644
--- a/pkgs/by-name/li/libbacktrace/package.nix
+++ b/pkgs/by-name/li/libbacktrace/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation {
     description = "C library that may be linked into a C/C++ program to produce symbolic backtraces";
     homepage = "https://github.com/ianlancetaylor/libbacktrace";
     maintainers = with lib.maintainers; [ twey ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix
index f0f60aac75b3..b356fa9334c8 100644
--- a/pkgs/by-name/li/libdatachannel/package.nix
+++ b/pkgs/by-name/li/libdatachannel/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets";
     homepage = "https://libdatachannel.org/";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ erdnaxe ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index 11712e641d99..b74e107981a8 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
       provides generic line editing, history, and tokenization functions,
       similar to those found in GNU Readline.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ corngood ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/li/libjpeg-tools/package.nix b/pkgs/by-name/li/libjpeg-tools/package.nix
index 02b166817efe..53082642fc2d 100644
--- a/pkgs/by-name/li/libjpeg-tools/package.nix
+++ b/pkgs/by-name/li/libjpeg-tools/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A complete implementation of 10918-1 (JPEG) coming from jpeg.org (the ISO group) with extensions for HDR, lossless and alpha channel coding standardized as ISO/IEC 18477 (JPEG XT)";
     homepage = "https://github.com/thorfdbg/libjpeg";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     changelog = "https://github.com/thorfdbg/libjpeg/README.history";
     maintainers = with lib.maintainers; [ bcdarwin ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix
index eb80534dbfe3..48ae8a2a6df4 100644
--- a/pkgs/by-name/li/libmpdclient/package.nix
+++ b/pkgs/by-name/li/libmpdclient/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Client library for MPD (music player daemon)";
     homepage = "https://www.musicpd.org/libs/libmpdclient/";
     changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libmt32emu/package.nix b/pkgs/by-name/li/libmt32emu/package.nix
index df69448aca61..85f3fbe184f4 100644
--- a/pkgs/by-name/li/libmt32emu/package.nix
+++ b/pkgs/by-name/li/libmt32emu/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.unix; # Not tested on ReactOS yet :)
   };
diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix
index 152d8c0615f6..693716a7920d 100644
--- a/pkgs/by-name/li/libnghttp2_asio/package.nix
+++ b/pkgs/by-name/li/libnghttp2_asio/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
       OpenSSL. libnghttp2_asio provides both client and server APIs.
     '';
     homepage = "https://github.com/nghttp2/nghttp2-asio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ izorkin ];
   };
 }
diff --git a/pkgs/by-name/li/libnvme/package.nix b/pkgs/by-name/li/libnvme/package.nix
index f58a2d176c04..aaa5214ad200 100644
--- a/pkgs/by-name/li/libnvme/package.nix
+++ b/pkgs/by-name/li/libnvme/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C Library for NVM Express on Linux";
     homepage = "https://github.com/linux-nvme/libnvme";
     maintainers = with lib.maintainers; [ vifino ];
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/li/libopenshot-audio/package.nix b/pkgs/by-name/li/libopenshot-audio/package.nix
index 7288bf804841..b8816e679f1c 100644
--- a/pkgs/by-name/li/libopenshot-audio/package.nix
+++ b/pkgs/by-name/li/libopenshot-audio/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
       high-quality editing and playback of audio, and is based on the amazing
       JUCE library.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libopenshot/package.nix b/pkgs/by-name/li/libopenshot/package.nix
index 4d9bdabc6166..1eec1eaf174e 100644
--- a/pkgs/by-name/li/libopenshot/package.nix
+++ b/pkgs/by-name/li/libopenshot/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
       delivering high quality video editing, animation, and playback solutions
       to the world. API currently supports C++, Python, and Ruby.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/librespot/package.nix b/pkgs/by-name/li/librespot/package.nix
index 24dd76fd0f1d..8c4a3e7f498f 100644
--- a/pkgs/by-name/li/librespot/package.nix
+++ b/pkgs/by-name/li/librespot/package.nix
@@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "librespot";
     homepage = "https://github.com/librespot-org/librespot";
     changelog = "https://github.com/librespot-org/librespot/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bennofs ];
   };
 })
diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index dab256cfe4ad..2699b6a91c1a 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/libsidplayfp/libsidplayfp";
     changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       ramkromberg
       OPNA2608
diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix
index eb7b69bcbd27..24315abdb844 100644
--- a/pkgs/by-name/li/libspng/package.nix
+++ b/pkgs/by-name/li/libspng/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simple, modern libpng alternative";
     homepage = "https://libspng.org/";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ humancalico ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix
index 1e987379f73c..7a48067d111d 100644
--- a/pkgs/by-name/li/libssh2/package.nix
+++ b/pkgs/by-name/li/libssh2/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Client-side C library implementing the SSH2 protocol";
     homepage = "https://www.libssh2.org";
     platforms = lib.platforms.all;
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 })
diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix
index ba5c0d1ee3db..e9fe43fd2337 100644
--- a/pkgs/by-name/li/libversion/package.nix
+++ b/pkgs/by-name/li/libversion/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Advanced version string comparison library";
     homepage = "https://github.com/repology/libversion";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ryantm ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libvori/package.nix b/pkgs/by-name/li/libvori/package.nix
index 42c00efae9f8..8cc74b367f03 100644
--- a/pkgs/by-name/li/libvori/package.nix
+++ b/pkgs/by-name/li/libvori/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library for Voronoi integration of electron densities";
     homepage = "https://brehm-research.de/libvori.php";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.sheepforce ];
   };
diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 85ef0f7499e1..1838497f1208 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
       sysrepo or FRRouting projects.
     '';
     homepage = "https://github.com/CESNET/libyang";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ woffs ];
   };
diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix
index 086ac44f3d53..90646f340256 100644
--- a/pkgs/by-name/li/lightning/package.nix
+++ b/pkgs/by-name/li/lightning/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       standardized RISC instruction set inspired by the MIPS and SPARC chips.
     '';
     maintainers = [ ];
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # failing tests
   };
diff --git a/pkgs/by-name/li/linvstmanager/package.nix b/pkgs/by-name/li/linvstmanager/package.nix
index 5358d1d975d7..e3ddcdd758c5 100644
--- a/pkgs/by-name/li/linvstmanager/package.nix
+++ b/pkgs/by-name/li/linvstmanager/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Graphical companion application for various bridges like LinVst, etc";
     mainProgram = "linvstmanager";
     homepage = "https://github.com/Goli4thus/linvstmanager";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ GabrielDougherty ];
   };
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix
index e1ba10303089..114959d2ae80 100644
--- a/pkgs/by-name/li/live555/package.nix
+++ b/pkgs/by-name/li/live555/package.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.live555.com/liveMedia/";
     description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
     changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix
index 9d8c38b2578c..094ab30f08a3 100644
--- a/pkgs/by-name/ll/lla/package.nix
+++ b/pkgs/by-name/ll/lla/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://lla.chaqchase.com";
     changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     platforms = lib.platforms.unix;
     mainProgram = "lla";
diff --git a/pkgs/by-name/lm/lmp/package.nix b/pkgs/by-name/lm/lmp/package.nix
index 3fa1b52eefdf..883894c3b63c 100644
--- a/pkgs/by-name/lm/lmp/package.nix
+++ b/pkgs/by-name/lm/lmp/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Scanning and validation toolkit for the Log4J vulnerability";
     homepage = "https://github.com/0xInfection/LogMePwn";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "lmp";
   };
diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index 44d02a14f928..771c3b88d54a 100644
--- a/pkgs/by-name/lo/loksh/package.nix
+++ b/pkgs/by-name/lo/loksh/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
       vulnerabilities and makes loksh a good fit for resource-constrained
       systems.
     '';
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ cameronnemo ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix
index ce1248cd2e26..d2dc5c3851bb 100644
--- a/pkgs/by-name/lp/lpairs2/package.nix
+++ b/pkgs/by-name/lp/lpairs2/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "http://lgames.sourceforge.net/LPairs/";
     description = "Matching the pairs - a typical Memory Game";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "lpairs2";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix
index 5e3fce8ce39d..a539ba227f48 100644
--- a/pkgs/by-name/ls/lspmux/package.nix
+++ b/pkgs/by-name/ls/lspmux/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Share one language server instance between multiple LSP clients to save resources";
     mainProgram = "lspmux";
     homepage = "https://codeberg.org/p2502/lspmux";
-    license = with lib.licenses; [ eupl12 ];
+    license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [ mrcjkb ];
   };
 })
diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix
index 15c2107a06ea..58abf38148b4 100644
--- a/pkgs/by-name/lt/ltris/package.nix
+++ b/pkgs/by-name/lt/ltris/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://lgames.sourceforge.io/LTris/";
     description = "Tetris clone from the LGames series";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "ltris2";
     maintainers = with lib.maintainers; [ marcin-serwin ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 7714186e91c0..889b646cff91 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -34,7 +34,7 @@ appimageTools.wrapType2 rec {
   meta = {
     description = "Free Minecraft client with mods, cosmetics, and performance boost";
     homepage = "https://www.lunarclient.com/";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     mainProgram = "lunarclient";
     maintainers = with lib.maintainers; [
       Technical27
diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix
index 35dc01452d8d..f9a80ad2fa3c 100644
--- a/pkgs/by-name/lu/luwen/package.nix
+++ b/pkgs/by-name/lu/luwen/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tenstorrent system interface tools";
     homepage = "https://github.com/tenstorrent/luwen";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix
index ef06433c7860..4b5312125ea0 100644
--- a/pkgs/by-name/lz/lzsa/package.nix
+++ b/pkgs/by-name/lz/lzsa/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/emmanuel-marty/lzsa";
     description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros";
     mainProgram = "lzsa";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index 0e3b98afaf39..54d2cb46757f 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fast, minimal and customizable system information fetcher";
     homepage = "https://github.com/Macchina-CLI/macchina";
     changelog = "https://github.com/Macchina-CLI/macchina/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       _414owen
       progrm_jarvis
diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix
index 8d6d830396e0..77e76344ed32 100644
--- a/pkgs/by-name/ma/maker-panel/package.nix
+++ b/pkgs/by-name/ma/maker-panel/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Make mechanical PCBs by combining shapes together";
     homepage = "https://github.com/twitchyliquid64/maker-panel";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index dd6f25130177..867070e8222e 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -27,7 +27,7 @@ let
     changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}";
     description = "Reading manga, novels, and watching animes";
     homepage = "https://github.com/kodjodevf/mangayomi";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index 2c664aa2506c..85baeb2c27be 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Convenient alternative to GOverlay for setting up MangoHud";
     homepage = "https://github.com/radiolamp/mangojuice";
     changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       pluiedev
diff --git a/pkgs/by-name/ma/mate-sensors-applet/package.nix b/pkgs/by-name/ma/mate-sensors-applet/package.nix
index 536b3c3251fa..a8496deb4f96 100644
--- a/pkgs/by-name/ma/mate-sensors-applet/package.nix
+++ b/pkgs/by-name/ma/mate-sensors-applet/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/mate-desktop/mate-sensors-applet";
     description = "MATE panel applet for hardware sensors";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/mate-user-share/package.nix b/pkgs/by-name/ma/mate-user-share/package.nix
index f3e0b3846e5d..8a3acda40b02 100644
--- a/pkgs/by-name/ma/mate-user-share/package.nix
+++ b/pkgs/by-name/ma/mate-user-share/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "User level public file sharing for the MATE desktop";
     mainProgram = "mate-file-share-properties";
     homepage = "https://github.com/mate-desktop/mate-user-share";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/ma/matterbridge/package.nix b/pkgs/by-name/ma/matterbridge/package.nix
index d847c02f3aa2..edad78b29a8e 100644
--- a/pkgs/by-name/ma/matterbridge/package.nix
+++ b/pkgs/by-name/ma/matterbridge/package.nix
@@ -22,7 +22,7 @@ buildGoModule {
   meta = {
     description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam";
     homepage = "https://github.com/42wim/matterbridge";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ryantm ];
     mainProgram = "matterbridge";
   };
diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix
index 65fcd91a4a4b..96aa8e76e35e 100644
--- a/pkgs/by-name/mc/mcap-cli/package.nix
+++ b/pkgs/by-name/mc/mcap-cli/package.nix
@@ -77,7 +77,7 @@ buildGoModule {
   meta = {
     description = "MCAP CLI tool to inspect and fix MCAP files";
     homepage = "https://github.com/foxglove/mcap";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       therishidesai
     ];
diff --git a/pkgs/by-name/md/md4c/package.nix b/pkgs/by-name/md/md4c/package.nix
index 32fad6ff5a2a..5447b89d4fb5 100644
--- a/pkgs/by-name/md/md4c/package.nix
+++ b/pkgs/by-name/md/md4c/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
       - Permissive license: MD4C is available under the MIT license.
     '';
     changelog = "https://github.com/mity/md4c/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "md2html";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix
index e5bb0805e79e..297a02e2d957 100644
--- a/pkgs/by-name/md/mdsh/package.nix
+++ b/pkgs/by-name/md/mdsh/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Markdown shell pre-processor";
     homepage = "https://github.com/zimbatm/mdsh";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ zimbatm ];
     mainProgram = "mdsh";
   };
diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix
index 4403f9ff44eb..7e1f67e99c3b 100644
--- a/pkgs/by-name/me/melonds/package.nix
+++ b/pkgs/by-name/me/melonds/package.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
       - (WIP) GBA slot add-ons
       - and more are planned!
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "melonDS";
     maintainers = with lib.maintainers; [
       artemist
diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix
index 93f74a7820e9..84ab01605fae 100644
--- a/pkgs/by-name/me/messer-slim/package.nix
+++ b/pkgs/by-name/me/messer-slim/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Evolutionary simulation framework";
     homepage = "https://messerlab.org/slim/";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ bzizou ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix
index 100ef2405845..651badb289a7 100644
--- a/pkgs/by-name/mg/mgba/package.nix
+++ b/pkgs/by-name/mg/mgba/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
       not support.
     '';
     changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     mainProgram = "mgba";
     maintainers = with lib.maintainers; [ Gliczy ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/mi/mimikatz/package.nix b/pkgs/by-name/mi/mimikatz/package.nix
index 665ea7f82975..320ff1c76db9 100644
--- a/pkgs/by-name/mi/mimikatz/package.nix
+++ b/pkgs/by-name/mi/mimikatz/package.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/gentilkiwi/mimikatz";
     description = "Little tool to play with Windows security";
-    license = with lib.licenses; [ cc-by-40 ];
+    license = lib.licenses.cc-by-40;
     maintainers = [ ];
     platforms = lib.platforms.all;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index 9c03a3de2a9d..346726ba5716 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Command Line Utility to render MiniJinja/Jinja2 templates";
     homepage = "https://github.com/mitsuhiko/minijinja";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ psibi ];
     changelog = "https://github.com/mitsuhiko/minijinja/blob/${finalAttrs.version}/CHANGELOG.md";
     mainProgram = "minijinja-cli";
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 56bb57953d04..895e3cc33cee 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI tool to serve files and directories over HTTP";
     homepage = "https://github.com/svenstaro/miniserve";
     changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       defelo
     ];
diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix
index 7e302d0369f8..d84b7b683227 100644
--- a/pkgs/by-name/mi/mixxc/package.nix
+++ b/pkgs/by-name/mi/mixxc/package.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Minimalistic and customizable volume mixer";
     homepage = "https://github.com/Elvyria/mixxc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ daru-san ];
     mainProgram = "mixxc";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/mo/mole/package.nix b/pkgs/by-name/mo/mole/package.nix
index f704747b45ad..cee2fd9ac470 100644
--- a/pkgs/by-name/mo/mole/package.nix
+++ b/pkgs/by-name/mo/mole/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI application to create SSH tunnels";
     homepage = "https://github.com/davrodpin/mole";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17
     mainProgram = "mole";
diff --git a/pkgs/by-name/mo/molotov/package.nix b/pkgs/by-name/mo/molotov/package.nix
index c7c018ec04db..39453f9aa5ec 100644
--- a/pkgs/by-name/mo/molotov/package.nix
+++ b/pkgs/by-name/mo/molotov/package.nix
@@ -26,7 +26,7 @@ appimageTools.wrapType2 {
   meta = {
     description = "French TV service";
     homepage = "https://www.molotov.tv/";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ apeyroux ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "molotov";
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index 5a7fe772b5e5..98fa4e646dd0 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.2/";
     description = "MongoDB is a general purpose, document-based, distributed database";
     homepage = "https://www.mongodb.com/";
-    license = with lib.licenses; [ sspl ];
+    license = lib.licenses.sspl;
     longDescription = ''
       MongoDB CE (Community Edition) is a general purpose, document-based, distributed database.
       It is designed to be flexible and easy to use, with the ability to store data of any structure.
diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
index 82413b29852c..0cc65fc43082 100644
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Adwaita style extra icons theme for Gnome Shell";
     homepage = "https://github.com/somepaulo/MoreWaita";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       pkosel
diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix
index 964f47f06c9d..2e269857d4f8 100644
--- a/pkgs/by-name/mo/moshi/package.nix
+++ b/pkgs/by-name/mo/moshi/package.nix
@@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/kyutai-labs/moshi";
     # The rust implementation is licensed under Apache
     # https://github.com/kyutai-labs/moshi/tree/main/rust#license
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     platforms = lib.platforms.all;
     mainProgram = "moshi-cli";
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index e26a574a4372..13fb70496167 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://motif.ics.com";
     description = "Unix standard widget-toolkit and window-manager";
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ qyliss ];
     broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16";
   };
diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix
index 6ae21ef082b4..95be139e716b 100644
--- a/pkgs/by-name/mo/mousam/package.nix
+++ b/pkgs/by-name/mo/mousam/package.nix
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Beautiful and lightweight weather app based on Python and GTK4";
     homepage = "https://amit9838.github.io/mousam";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "mousam";
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix
index 6c7167681675..4460f24724e3 100644
--- a/pkgs/by-name/mo/mov-cli/package.nix
+++ b/pkgs/by-name/mo/mov-cli/package.nix
@@ -61,7 +61,7 @@ python3.pkgs.buildPythonPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/mov-cli/mov-cli";
     description = "Cli tool to browse and watch movies";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "mov-cli";
     maintainers = with lib.maintainers; [ baitinq ];
   };
diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix
index 0486eb081bc2..7ed7ef095446 100644
--- a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Dictionary converted from mecab-ipadic-NEologd for Mozc";
     homepage = "https://github.com/utuhiro78/mozcdic-ut-neologd";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pineapplehunter ];
     platforms = lib.platforms.all;
     # this does not need to be separately built
diff --git a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
index 749fab6a8b55..f7eccc0b4062 100644
--- a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Dictionary converted from SudachiDict for Mozc";
     homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pineapplehunter ];
     platforms = lib.platforms.all;
     # this does not need to be separately built
diff --git a/pkgs/by-name/mo/mozo/package.nix b/pkgs/by-name/mo/mozo/package.nix
index f90066f4e1fe..c6c23e26894a 100644
--- a/pkgs/by-name/mo/mozo/package.nix
+++ b/pkgs/by-name/mo/mozo/package.nix
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "MATE Desktop menu editor";
     mainProgram = "mozo";
     homepage = "https://github.com/mate-desktop/mozo";
-    license = with lib.licenses; [ lgpl2Plus ];
+    license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
diff --git a/pkgs/by-name/mt/mt32emu-qt/package.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix
index b30c7f30aa3e..e379da4976d4 100644
--- a/pkgs/by-name/mt/mt32emu-qt/package.nix
+++ b/pkgs/by-name/mt/mt32emu-qt/package.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
       synthesis and conversion of pre-recorded SMF files to WAVE making use of
       the mt32emu library and the Qt framework.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
index b694f4fa7ee0..81af98a1a7b4 100644
--- a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
+++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://munt.sourceforge.net/";
     description = "Produces a WAVE file from a Standard MIDI file (SMF)";
     mainProgram = "mt32emu-smf2wav";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix
index 503ab3da9236..249d6ee7b7e3 100644
--- a/pkgs/by-name/mu/multimarkdown/package.nix
+++ b/pkgs/by-name/mu/multimarkdown/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
       - glossary entries (LaTeX only)
       - document metadata (e.g. title, author, date, etc.)
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.all;
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/mu/muso/package.nix b/pkgs/by-name/mu/muso/package.nix
index 76ec9e605175..727f2725624e 100644
--- a/pkgs/by-name/mu/muso/package.nix
+++ b/pkgs/by-name/mu/muso/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage {
     description = "Automatic music sorter (based on ID3 tags)";
     mainProgram = "muso";
     homepage = "https://github.com/quebin31/muso";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ crertel ];
   };
 }
diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix
index 18fdd1b7dd0a..1be44955424d 100644
--- a/pkgs/by-name/na/nats-top/package.nix
+++ b/pkgs/by-name/na/nats-top/package.nix
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
     description = "top-like tool for monitoring NATS servers";
     homepage = "https://github.com/nats-io/nats-top";
     changelog = "https://github.com/nats-io/nats-top/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nats-top";
   };
diff --git a/pkgs/by-name/nb/nbutools/package.nix b/pkgs/by-name/nb/nbutools/package.nix
index 0c96e540bea2..e34468024fca 100644
--- a/pkgs/by-name/nb/nbutools/package.nix
+++ b/pkgs/by-name/nb/nbutools/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Tools for offensive security of NetBackup infrastructures";
     homepage = "https://github.com/airbus-seclab/nbutools";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix
index 8f6438b9adbd..fb8a4014b730 100644
--- a/pkgs/by-name/ne/netsniff-ng/package.nix
+++ b/pkgs/by-name/ne/netsniff-ng/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
       development and analysis, debugging, auditing or network reconnaissance.
     '';
     homepage = "http://netsniff-ng.org/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix
index 43196b9c0ff2..09f11ba1de8b 100644
--- a/pkgs/by-name/nf/nflz/package.nix
+++ b/pkgs/by-name/nf/nflz/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       belong to a set of ordered files. An example are photos from a camera.
     '';
     homepage = "https://github.com/phip1611/nflz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
     mainProgram = "nflz";
   };
diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index c5d196bcaca0..1fab8eb455e6 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
       techknowlogick
       caarlos0
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "nfpm";
   };
 })
diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix
index 149a6c2c02e7..eb5d27294012 100644
--- a/pkgs/by-name/ni/ninjas2/package.nix
+++ b/pkgs/by-name/ni/ninjas2/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/clearly-broken-software/ninjas2";
     description = "Sample slicer plugin for LV2, VST, and jack standalone";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
     mainProgram = "ninjas2";
diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 060f79e0ff17..8492d81443fa 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Files database for nixpkgs";
     homepage = "https://github.com/nix-community/nix-index";
     changelog = "https://github.com/nix-community/nix-index/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       bennofs
       ncfavier
diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix
index b816714ee882..8beb4f1a4438 100644
--- a/pkgs/by-name/ni/nix-playground/package.nix
+++ b/pkgs/by-name/ni/nix-playground/package.nix
@@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "np";
     homepage = "https://github.com/LaunchPlatform/nix-playground";
     changelog = "https://github.com/LaunchPlatform/nix-playground/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
   };
 })
diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
index dfb27ae232a6..f0f85837d794 100644
--- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
+++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "GTK viewer for the output of `nix store --query --tree`";
     mainProgram = "nix-query-tree-viewer";
     homepage = "https://github.com/cdepillabout/nix-query-tree-viewer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ cdepillabout ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ni/nix-visualize/package.nix b/pkgs/by-name/ni/nix-visualize/package.nix
index c031036333ca..c81babd85732 100644
--- a/pkgs/by-name/ni/nix-visualize/package.nix
+++ b/pkgs/by-name/ni/nix-visualize/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication {
     description = "Generate dependency graphs of a given nix package";
     mainProgram = "nix-visualize";
     homepage = "https://github.com/craigmbooth/nix-visualize";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ henrirosten ];
   };
 }
diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index 09a6e4687fe7..4e3a206bcb08 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -144,7 +144,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
   };
 
   meta = {
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
     mainProgram = "nixtamal";
     outputsToInstall = [
diff --git a/pkgs/by-name/no/nohang/package.nix b/pkgs/by-name/no/nohang/package.nix
index 3b9e01a12043..aacbd3c14357 100644
--- a/pkgs/by-name/no/nohang/package.nix
+++ b/pkgs/by-name/no/nohang/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/hakavlad/nohang";
     description = "Sophisticated low memory handler for Linux";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "nohang";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ Dev380 ];
diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix
index 2ec5f4154826..423622825096 100644
--- a/pkgs/by-name/no/nomacs/package.nix
+++ b/pkgs/by-name/no/nomacs/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       between images.
     '';
     changelog = "https://github.com/nomacs/nomacs/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "nomacs";
     maintainers = with lib.maintainers; [
       mindavi
diff --git a/pkgs/by-name/no/nosqli/package.nix b/pkgs/by-name/no/nosqli/package.nix
index 2bf5a55ec61d..154e3d6d51dc 100644
--- a/pkgs/by-name/no/nosqli/package.nix
+++ b/pkgs/by-name/no/nosqli/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "NoSql Injection tool for finding vulnerable websites using MongoDB";
     mainProgram = "nosqli";
     homepage = "https://github.com/Charlie-belmer/nosqli";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix
index bfa500012e6a..0a8e6a4da2a6 100644
--- a/pkgs/by-name/no/novelwriter/package.nix
+++ b/pkgs/by-name/no/novelwriter/package.nix
@@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication {
     description = "Open source plain text editor designed for writing novels";
     homepage = "https://novelwriter.io";
     changelog = "https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "novelwriter";
 
diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix
index 7b4371ea366c..2138cf274aba 100644
--- a/pkgs/by-name/ns/nsc/package.nix
+++ b/pkgs/by-name/ns/nsc/package.nix
@@ -56,7 +56,7 @@ buildGoModule rec {
   meta = {
     description = "Tool for creating NATS account and user access configurations";
     homepage = "https://github.com/nats-io/nsc";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ cbrewster ];
     mainProgram = "nsc";
   };
diff --git a/pkgs/by-name/nt/ntfs2btrfs/package.nix b/pkgs/by-name/nt/ntfs2btrfs/package.nix
index 7ad2579512c4..730eb51e9912 100644
--- a/pkgs/by-name/nt/ntfs2btrfs/package.nix
+++ b/pkgs/by-name/nt/ntfs2btrfs/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "CLI tool which does in-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs";
     homepage = "https://github.com/maharmstone/ntfs2btrfs";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ j1nxie ];
     mainProgram = "ntfs2btrfs";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix
index 17f1ae8bbcd1..1a0f8a9b7161 100644
--- a/pkgs/by-name/nt/ntlmrecon/package.nix
+++ b/pkgs/by-name/nt/ntlmrecon/package.nix
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "ntlmrecon";
     homepage = "https://github.com/pwnfoo/NTLMRecon";
     changelog = "https://github.com/pwnfoo/NTLMRecon/releases/tag/v-${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/nv/nv-codec-headers/package.nix b/pkgs/by-name/nv/nv-codec-headers/package.nix
index 1e0ae0656ebc..5aaad8a20871 100644
--- a/pkgs/by-name/nv/nv-codec-headers/package.nix
+++ b/pkgs/by-name/nv/nv-codec-headers/package.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation {
     description = "FFmpeg version of headers for NVENC - major version ${pick.version}";
     homepage = "https://ffmpeg.org/";
     downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/nv/nvfancontrol/package.nix b/pkgs/by-name/nv/nvfancontrol/package.nix
index 1d79639b80bd..bded96ad5490 100644
--- a/pkgs/by-name/nv/nvfancontrol/package.nix
+++ b/pkgs/by-name/nv/nvfancontrol/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
     description = "Nvidia dynamic fan control for Linux";
     homepage = "https://github.com/foucault/nvfancontrol";
     changelog = "https://github.com/foucault/nvfancontrol/releases/tag/${version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ devins2518 ];
     mainProgram = "nvfancontrol";
diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix
index 342e6566c2b3..d62dc4c9b861 100644
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -63,7 +63,7 @@ buildGoModule {
     description = "Application drawer for sway Wayland compositor";
     homepage = "https://github.com/nwg-piotr/nwg-drawer";
     changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     mainProgram = "nwg-drawer";
     maintainers = [ ];
     platforms = with lib.platforms; linux;
diff --git a/pkgs/by-name/nz/nzportable/assets.nix b/pkgs/by-name/nz/nzportable/assets.nix
index 3161c24a7af5..3474f8145f8d 100644
--- a/pkgs/by-name/nz/nzportable/assets.nix
+++ b/pkgs/by-name/nz/nzportable/assets.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Game asset repository for Nazi Zombies: Portable";
     homepage = "https://github.com/nzp-team/assets";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
diff --git a/pkgs/by-name/oe/oed/package.nix b/pkgs/by-name/oe/oed/package.nix
index fe96dc2f906a..fc47875ee2d8 100644
--- a/pkgs/by-name/oe/oed/package.nix
+++ b/pkgs/by-name/oe/oed/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Portable ed editor from OpenBSD";
     homepage = "https://github.com/ibara/oed";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     mainProgram = "ed";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix
index 26cfeef71534..6915d8dc4d51 100644
--- a/pkgs/by-name/oh/oh-my-git/package.nix
+++ b/pkgs/by-name/oh/oh-my-git/package.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
     homepage = "https://ohmygit.org/";
     description = "Interactive Git learning game";
     mainProgram = "oh-my-git";
-    license = with lib.licenses; [ blueOak100 ];
+    license = lib.licenses.blueOak100;
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ jojosch ];
   };
diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix
index c43f40b3fac6..6f28b27d4172 100644
--- a/pkgs/by-name/on/oneko/package.nix
+++ b/pkgs/by-name/on/oneko/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
       When the cat is done catching the mouse, it starts sleeping.
     '';
     homepage = "https://github.com/IreneKnapp/oneko";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [
       xaverdh
       irenes
diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix
index 1afa20c3e3e8..6a05be08e1c8 100644
--- a/pkgs/by-name/op/opencomposite/package.nix
+++ b/pkgs/by-name/op/opencomposite/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Reimplementation of OpenVR, translating calls to OpenXR";
     homepage = "https://gitlab.com/znixian/OpenOVR";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Scrumplex ];
     # This can realistically only work on systems that support OpenXR Loader
     inherit (openxr-loader.meta) platforms;
diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix
index 3e0d12e14257..4c2d79ec60f2 100644
--- a/pkgs/by-name/op/openh264/package.nix
+++ b/pkgs/by-name/op/openh264/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.openh264.org";
     description = "Codec library which supports H.264 encoding and decoding";
     changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     # See meson.build
     platforms =
diff --git a/pkgs/by-name/op/openshot-qt/package.nix b/pkgs/by-name/op/openshot-qt/package.nix
index 7e84ad63bed9..ae7e4b63b647 100644
--- a/pkgs/by-name/op/openshot-qt/package.nix
+++ b/pkgs/by-name/op/openshot-qt/package.nix
@@ -68,7 +68,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       and effects, and then export your film to DVD, YouTube, Vimeo, Xbox 360,
       and many other common formats.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "openshot-qt";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
index 73557961b21b..581d9b007c14 100644
--- a/pkgs/by-name/op/openvino/package.nix
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -189,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
       It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*.
     '';
     homepage = "https://docs.openvinotoolkit.org/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk
   };
diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix
index 31b341415cc0..fd67f0d24f03 100644
--- a/pkgs/by-name/op/ophcrack/package.nix
+++ b/pkgs/by-name/op/ophcrack/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Free Windows password cracker based on rainbow tables";
     homepage = "https://ophcrack.sourceforge.io";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ tochiaha ];
     mainProgram = "ophcrack";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix
index 3856b9158101..0b673e975f59 100644
--- a/pkgs/by-name/ou/oui/package.nix
+++ b/pkgs/by-name/ou/oui/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "MAC Address CLI Toolkit";
     homepage = "https://github.com/thatmattlove/oui";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ johannwagner ];
     mainProgram = "oui";
   };
diff --git a/pkgs/by-name/ov/overmind/package.nix b/pkgs/by-name/ov/overmind/package.nix
index 618a13d7e12a..96edb1fdadf6 100644
--- a/pkgs/by-name/ov/overmind/package.nix
+++ b/pkgs/by-name/ov/overmind/package.nix
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/DarthSim/overmind";
     description = "Process manager for Procfile-based applications and tmux";
     mainProgram = "overmind";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix
index 6fd238e3b66d..e904bb1cb9c1 100644
--- a/pkgs/by-name/pa/paging-calculator/package.nix
+++ b/pkgs/by-name/pa/paging-calculator/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/paging-calculator";
     changelog = "https://github.com/phip1611/paging-calculator/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
   };
 })
diff --git a/pkgs/by-name/pa/pandoc-imagine/package.nix b/pkgs/by-name/pa/pandoc-imagine/package.nix
index aed98010d7f3..7678dc6d1342 100644
--- a/pkgs/by-name/pa/pandoc-imagine/package.nix
+++ b/pkgs/by-name/pa/pandoc-imagine/package.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
       A pandoc filter that will turn code blocks tagged with certain classes
       into images or ASCII art
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "pandoc-imagine";
   };
diff --git a/pkgs/by-name/pa/paperview/package.nix b/pkgs/by-name/pa/paperview/package.nix
index 174f9bd2065a..b51b637214f8 100644
--- a/pkgs/by-name/pa/paperview/package.nix
+++ b/pkgs/by-name/pa/paperview/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     description = "High performance X11 animated wallpaper setter";
     homepage = "https://github.com/glouw/paperview";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
     mainProgram = "paperview";
   };
diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix
index 6320d10a0928..5f45db7930fb 100644
--- a/pkgs/by-name/pa/papilo/package.nix
+++ b/pkgs/by-name/pa/papilo/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://scipopt.org/";
     description = "Parallel Presolve for Integer and Linear Optimization";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     mainProgram = "papilo";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pa/pasco/package.nix b/pkgs/by-name/pa/pasco/package.nix
index 5b6fbd09840b..ee51bc04b9a8 100644
--- a/pkgs/by-name/pa/pasco/package.nix
+++ b/pkgs/by-name/pa/pasco/package.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sourceforge.net/projects/fast/files/Pasco/";
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix
index 5188b6640223..e0d48f7361e9 100644
--- a/pkgs/by-name/pa/passwdqc/package.nix
+++ b/pkgs/by-name/pa/passwdqc/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.openwall.com/passwdqc/";
     description = "Passphrase strength checking and enforcement";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     mainProgram = "passwdqc";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pa/payloadsallthethings/package.nix b/pkgs/by-name/pa/payloadsallthethings/package.nix
index e3402065b523..ec3575891007 100644
--- a/pkgs/by-name/pa/payloadsallthethings/package.nix
+++ b/pkgs/by-name/pa/payloadsallthethings/package.nix
@@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     homepage = "https://github.com/swisskyrepo/PayloadsAllTheThings";
     description = "List of useful payloads and bypass for Web Application Security and Pentest/CTF";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       shard7
       felbinger
diff --git a/pkgs/by-name/pc/pc/package.nix b/pkgs/by-name/pc/pc/package.nix
index d8bf35a59b51..090065346d4f 100644
--- a/pkgs/by-name/pc/pc/package.nix
+++ b/pkgs/by-name/pc/pc/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Programmer's calculator";
     homepage = "https://git.sr.ht/~ft/pc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ moody ];
     platforms = lib.platforms.unix;
     mainProgram = "pc";
diff --git a/pkgs/by-name/pd/pdfcrack/package.nix b/pkgs/by-name/pd/pdfcrack/package.nix
index 67fbe8cc8f33..9369fefa6cb5 100644
--- a/pkgs/by-name/pd/pdfcrack/package.nix
+++ b/pkgs/by-name/pd/pdfcrack/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://pdfcrack.sourceforge.net/";
     description = "Small command line driven tool for recovering passwords and content from PDF files";
     mainProgram = "pdfcrack";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ qoelet ];
   };
diff --git a/pkgs/by-name/pd/pdfid/package.nix b/pkgs/by-name/pd/pdfid/package.nix
index ace3467577e6..67d233a12a47 100644
--- a/pkgs/by-name/pd/pdfid/package.nix
+++ b/pkgs/by-name/pd/pdfid/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Scan a file to look for certain PDF keywords";
     homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
-    license = with lib.licenses; [ free ];
+    license = lib.licenses.free;
     mainProgram = "pdfid";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pe/perseus-cli/package.nix b/pkgs/by-name/pe/perseus-cli/package.nix
index 0de27545fe47..2579f9b6d830 100644
--- a/pkgs/by-name/pe/perseus-cli/package.nix
+++ b/pkgs/by-name/pe/perseus-cli/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://framesurge.sh/perseus/en-US";
     description = "High-level web development framework for Rust with full support for server-side rendering and static generation";
     maintainers = with lib.maintainers; [ max-niederman ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "perseus";
   };
 })
diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix
index 2352fb12ddeb..2e2aa95bdc85 100644
--- a/pkgs/by-name/pe/pest-ide-tools/package.nix
+++ b/pkgs/by-name/pe/pest-ide-tools/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "IDE support for Pest, via the LSP";
     homepage = "https://pest.rs";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ nickhu ];
     mainProgram = "pest-language-server";
   };
diff --git a/pkgs/by-name/pf/pfixtools/package.nix b/pkgs/by-name/pf/pfixtools/package.nix
index 1733aadb6ec6..910df7af3da1 100644
--- a/pkgs/by-name/pf/pfixtools/package.nix
+++ b/pkgs/by-name/pf/pfixtools/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Collection of postfix-related tools";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     homepage = "https://github.com/Fruneau/pfixtools";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jerith666 ];
diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix
index f7525ec4500f..5bdf1e096728 100644
--- a/pkgs/by-name/pi/pict-rs/package.nix
+++ b/pkgs/by-name/pi/pict-rs/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Simple image hosting service";
     mainProgram = "pict-rs";
     homepage = "https://git.asonix.dog/asonix/pict-rs";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 })
diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix
index de228c80efaa..889c337e0900 100644
--- a/pkgs/by-name/pi/pigeon/package.nix
+++ b/pkgs/by-name/pi/pigeon/package.nix
@@ -28,6 +28,6 @@ buildGoModule (finalAttrs: {
     description = "PEG parser generator for Go";
     mainProgram = "pigeon";
     maintainers = with lib.maintainers; [ zimbatm ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix
index 75e35a8bf6f0..cf1cf740d9d0 100644
--- a/pkgs/by-name/pi/pijul/package.nix
+++ b/pkgs/by-name/pi/pijul/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Distributed version control system";
     homepage = "https://pijul.org";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       gal_bolle
       dywedir
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index 021a00c7fe4f..37c8b07f1ec0 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       It works like pkill command but search is interactive.
     '';
     homepage = "https://github.com/jacek-kurlit/pik";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bew ];
     mainProgram = "pik";
   };
diff --git a/pkgs/by-name/pi/pinegrow/package.nix b/pkgs/by-name/pi/pinegrow/package.nix
index fdcb41335c28..c62ede8a5590 100644
--- a/pkgs/by-name/pi/pinegrow/package.nix
+++ b/pkgs/by-name/pi/pinegrow/package.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
     description = "UI Web Editor";
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = with lib.licenses; [ unfreeRedistributable ];
+    license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [ gador ];
     mainProgram = "pinegrow";
   };
diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix
index 9f8835de61b9..850d2c0363bd 100644
--- a/pkgs/by-name/pi/pipeworld/package.nix
+++ b/pkgs/by-name/pi/pipeworld/package.nix
@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       application within another desktop as a 'substitute' for your normal
       terminal emulator.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix
index 232710d80be7..38503d07f6f8 100644
--- a/pkgs/by-name/pl/plus42/package.nix
+++ b/pkgs/by-name/pl/plus42/package.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://thomasokken.com/plus42/";
     changelog = "https://thomasokken.com/plus42/history.html";
     description = "Software clone of the HP-42S calculator (enhanced version)";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ elfenermarcell ];
     mainProgram = "plus42dec";
     platforms = with lib.platforms; unix;
diff --git a/pkgs/by-name/po/pop-hp-wallpapers/package.nix b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
index 535476b673cb..badaf14cfa28 100644
--- a/pkgs/by-name/po/pop-hp-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "Wallpapers for High-Performance System76 products";
     homepage = "https://pop.system76.com/";
-    license = with lib.licenses; [ cc-by-sa-40 ];
+    license = lib.licenses.cc-by-sa-40;
     maintainers = with lib.maintainers; [ pandapip1 ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix
index fe4e0747162e..22ad54f4a30d 100644
--- a/pkgs/by-name/po/pouf/package.nix
+++ b/pkgs/by-name/po/pouf/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/mothsart/pouf";
     changelog = "https://github.com/mothsart/pouf/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [ mothsart ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "pouf";
   };
 })
diff --git a/pkgs/by-name/po/powersploit/package.nix b/pkgs/by-name/po/powersploit/package.nix
index 9c452d954b28..dfd88e9b1d9c 100644
--- a/pkgs/by-name/po/powersploit/package.nix
+++ b/pkgs/by-name/po/powersploit/package.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation {
     changelog = "https://github.com/PowerShellMafia/PowerSploit/releases/";
     description = "PowerShell Post-Exploitation Framework";
     homepage = "https://github.com/PowerShellMafia/PowerSploit";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ shard7 ];
     platforms = lib.platforms.all;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
diff --git a/pkgs/by-name/po/powertabeditor/package.nix b/pkgs/by-name/po/powertabeditor/package.nix
index 0825bbf51d7f..ab165971ee25 100644
--- a/pkgs/by-name/po/powertabeditor/package.nix
+++ b/pkgs/by-name/po/powertabeditor/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "View and edit guitar tablature";
     homepage = "https://powertab.github.io/";
     changelog = "https://github.com/powertab/powertabeditor/blob/refs/tags/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; linux ++ darwin ++ windows;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "powertabeditor";
diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index b1b215d4afe8..5e7999db30a2 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "PreCICE stands for Precise Code Interaction Coupling Environment";
     homepage = "https://precice.org/";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ Scriptkiddi ];
     mainProgram = "precice-tools";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pr/prettyping/package.nix b/pkgs/by-name/pr/prettyping/package.nix
index c03d72783e4a..182da0787170 100644
--- a/pkgs/by-name/pr/prettyping/package.nix
+++ b/pkgs/by-name/pr/prettyping/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/denilsonsa/prettyping";
     description = "Wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read";
     mainProgram = "prettyping";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qoelet ];
   };
diff --git a/pkgs/by-name/pr/prio/package.nix b/pkgs/by-name/pr/prio/package.nix
index dc610a27da38..8a01b457bdd2 100644
--- a/pkgs/by-name/pr/prio/package.nix
+++ b/pkgs/by-name/pr/prio/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/letoram/prio";
     description = "Plan9- Rio like Window Manager for Arcan";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
index dc18f47d6965..97d8337c022d 100644
--- a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
+++ b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
@@ -58,6 +58,6 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "prometheus-xmpp-alerts";
     homepage = "https://github.com/jelmer/prometheus-xmpp-alerts";
     maintainers = with lib.maintainers; [ fpletz ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix
index b126923e85d7..4d62b1530a65 100644
--- a/pkgs/by-name/pr/protege/package.nix
+++ b/pkgs/by-name/pr/protege/package.nix
@@ -81,7 +81,7 @@ maven.buildMavenPackage rec {
       connections to description logic reasoners.
     '';
     maintainers = with lib.maintainers; [ nessdoor ];
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     # TODO Protege is able to run on Darwin as well, but I (@nessdoor) had no
     #      way of testing it nor any experience in packaging Darwin apps, so I
     #      will leave the task to someone who has the right tools and knowledge.
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index 373a1bab4b58..852c812b6d66 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "High-performance MySQL proxy";
     mainProgram = "proxysql";
     homepage = "https://proxysql.com/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pu/pufferpanel/package.nix b/pkgs/by-name/pu/pufferpanel/package.nix
index eca9974399ad..82ca7ccf0a21 100644
--- a/pkgs/by-name/pu/pufferpanel/package.nix
+++ b/pkgs/by-name/pu/pufferpanel/package.nix
@@ -107,7 +107,7 @@ buildGoModule rec {
   meta = {
     description = "Free, open source game management panel";
     homepage = "https://www.pufferpanel.com/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ tie ];
     mainProgram = "pufferpanel";
   };
diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix
index a9f32bfc446b..40e8e0e6ca58 100644
--- a/pkgs/by-name/pu/pulldown-cmark/package.nix
+++ b/pkgs/by-name/pu/pulldown-cmark/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Pull parser for CommonMark written in Rust";
     homepage = "https://github.com/raphlinus/pulldown-cmark";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ CobaltCause ];
     mainProgram = "pulldown-cmark";
   };
diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix
index dbb3b1a247ae..8e35378991fe 100644
--- a/pkgs/by-name/pu/pulsarctl/package.nix
+++ b/pkgs/by-name/pu/pulsarctl/package.nix
@@ -70,7 +70,7 @@ buildGoModule rec {
   meta = {
     description = "CLI for Apache Pulsar written in Go";
     homepage = "https://github.com/streamnative/pulsarctl";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = [ ];
     mainProgram = "pulsarctl";
diff --git a/pkgs/by-name/pu/pulumi-bin/package.nix b/pkgs/by-name/pu/pulumi-bin/package.nix
index 86513a3c1187..fa5950c5aa65 100644
--- a/pkgs/by-name/pu/pulumi-bin/package.nix
+++ b/pkgs/by-name/pu/pulumi-bin/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     homepage = "https://pulumi.io/";
     description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = builtins.attrNames data.pulumiPkgs;
     maintainers = with lib.maintainers; [
       jlesquembre
diff --git a/pkgs/by-name/pw/pwdsafety/package.nix b/pkgs/by-name/pw/pwdsafety/package.nix
index f822c3b9dfb5..580927c6dd73 100644
--- a/pkgs/by-name/pw/pwdsafety/package.nix
+++ b/pkgs/by-name/pw/pwdsafety/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     description = "Command line tool checking password safety";
     homepage = "https://github.com/edoardottt/pwdsafety";
     changelog = "https://github.com/edoardottt/pwdsafety/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pwdsafety";
   };
diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index 6d0a126f84c1..34df06103d50 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/hauntsaninja/pyp";
     description = "Easily run Python at the shell";
     changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "pyp";
     maintainers = with lib.maintainers; [
       rmcgibbo
diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index ab6706468ad8..6bb3b984431e 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -86,7 +86,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       that can be accessed from other cells. These objects can represent
       anything including lists or matrices.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "pyspread";
     maintainers = with lib.maintainers; [ Merikei ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/py/pyznap/package.nix b/pkgs/by-name/py/pyznap/package.nix
index 3242caefe190..75f76d05bcc5 100644
--- a/pkgs/by-name/py/pyznap/package.nix
+++ b/pkgs/by-name/py/pyznap/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/yboetz/pyznap";
     description = "ZFS snapshot tool written in python";
     mainProgram = "pyznap";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ rbrewer ];
   };
 })
diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix
index a33c4f16fcb1..f3fc79443fe6 100644
--- a/pkgs/by-name/ql/qlog/package.nix
+++ b/pkgs/by-name/ql/qlog/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Amateur radio logbook software";
     mainProgram = "qlog";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     homepage = "https://github.com/foldynl/QLog";
     maintainers = with lib.maintainers; [
       oliver-koss
diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix
index 09d94c215fa5..557277f70e79 100644
--- a/pkgs/by-name/qm/qmk_hid/package.nix
+++ b/pkgs/by-name/qm/qmk_hid/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Commandline tool for interactng with QMK devices over HID";
     homepage = "https://github.com/FrameworkComputer/qmk_hid";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     mainProgram = "qmk_hid";
   };
diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix
index bb80479dc9c6..d1111f72d39a 100644
--- a/pkgs/by-name/qo/qogir-icon-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix
@@ -73,7 +73,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color
     meta = {
       description = "Flat colorful design icon theme";
       homepage = "https://github.com/vinceliuice/Qogir-icon-theme";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
       platforms = lib.platforms.linux;
       maintainers = with lib.maintainers; [ romildo ];
     };
diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index 47a33f715938..5424752a9a05 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -52,7 +52,7 @@ buildGoModule (finalAttrs: {
     description = "Qovery Command Line Interface";
     homepage = "https://github.com/Qovery/qovery-cli";
     changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "qovery-cli";
   };
diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix
index 7b7fef2f031f..e15223b5c4de 100644
--- a/pkgs/by-name/qu/quark-engine/package.nix
+++ b/pkgs/by-name/qu/quark-engine/package.nix
@@ -58,7 +58,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     description = "Android malware (analysis and scoring) system";
     homepage = "https://quark-engine.readthedocs.io/";
     changelog = "https://github.com/quark-engine/quark-engine/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/qu/quicksand/package.nix b/pkgs/by-name/qu/quicksand/package.nix
index 71fa36a6b2cb..aa66281e43d5 100644
--- a/pkgs/by-name/qu/quicksand/package.nix
+++ b/pkgs/by-name/qu/quicksand/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation {
       sizes as well. Quicksand Family is available in three styles
       which are Light, Regular and Bold including true italics for each weight.
     '';
-    license = with lib.licenses; [ ofl ];
+    license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ hubble ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index 824ca153be96..22cab85c620c 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fuzzel launcher based on yaml configuration";
     homepage = "https://github.com/chmouel/raffi";
     changelog = "https://github.com/chmouel/raffi/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       aos
       chmouel
diff --git a/pkgs/by-name/ra/rankwidth/package.nix b/pkgs/by-name/ra/rankwidth/package.nix
index c54a997198d9..6a01cf204e89 100644
--- a/pkgs/by-name/ra/rankwidth/package.nix
+++ b/pkgs/by-name/ra/rankwidth/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Calculates rank-width and rank-decompositions";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     teams = [ lib.teams.sage ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index 88e66d9926d2..fa067775f0f5 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -63,7 +63,7 @@ pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/wykurz/rcp/releases/tag/v${finalAttrs.version}";
     description = "Tools to efficiently copy, remove and link large filesets";
     homepage = "https://github.com/wykurz/rcp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "rcp";
     maintainers = with lib.maintainers; [ wykurz ];
     # procfs only supports Linux and Android
diff --git a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
index b0aeb3aa66d8..b85c886eb744 100644
--- a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
+++ b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "appintentsmetadataprocessor";
     description = "Open reimplementation of Apple's appintentsmetadataprocessor";
     homepage = "https://codeberg.org/viraptor/re-appintentsmetadataprocessor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/re/re-derq/package.nix b/pkgs/by-name/re/re-derq/package.nix
index a242fd29ab18..a8a5f125fa83 100644
--- a/pkgs/by-name/re/re-derq/package.nix
+++ b/pkgs/by-name/re/re-derq/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "derq";
     description = "Open reimplementation of Apple's derq";
     homepage = "https://codeberg.org/viraptor/re-derq";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/re/re-intentbuilderc/package.nix b/pkgs/by-name/re/re-intentbuilderc/package.nix
index d6391c8f04ef..ff26751b8ff3 100644
--- a/pkgs/by-name/re/re-intentbuilderc/package.nix
+++ b/pkgs/by-name/re/re-intentbuilderc/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "intentbuilderc";
     description = "Open reimplementation of Apple's intentbuilderc";
     homepage = "https://codeberg.com/viraptor/re-intentbuilderc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/re/re-plistbuddy/package.nix b/pkgs/by-name/re/re-plistbuddy/package.nix
index 8e51a23b8378..d5c215dd00ab 100644
--- a/pkgs/by-name/re/re-plistbuddy/package.nix
+++ b/pkgs/by-name/re/re-plistbuddy/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Open reimplementation of Apple's PlistBuddy and plutil";
     homepage = "https://github.com/viraptor/re-plistbuddy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.darwin;
   };
diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix
index a3e17b7a2216..1a213b5b44ea 100644
--- a/pkgs/by-name/re/readsb/package.nix
+++ b/pkgs/by-name/re/readsb/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ADS-B decoder swiss knife";
     homepage = "https://github.com/wiedehopf/readsb";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ wucke13 ];
     platforms = lib.platforms.linux; # uses epoll, hence its linux only
   };
diff --git a/pkgs/by-name/re/reap/package.nix b/pkgs/by-name/re/reap/package.nix
index 3417e3babf53..c1a46e4fa02a 100644
--- a/pkgs/by-name/re/reap/package.nix
+++ b/pkgs/by-name/re/reap/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/leahneukirchen/reap";
     description = "Run process until all its spawned processes are dead";
     mainProgram = "reap";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.leahneukirchen ];
   };
diff --git a/pkgs/by-name/re/red-trul/package.nix b/pkgs/by-name/re/red-trul/package.nix
index 0d47ee9a7074..9fbe34d9d9f0 100644
--- a/pkgs/by-name/re/red-trul/package.nix
+++ b/pkgs/by-name/re/red-trul/package.nix
@@ -49,7 +49,7 @@ buildNpmPackage (finalAttrs: {
     description = "Lightweight utility to transcode FLAC releases";
     homepage = "https://github.com/lfence/red-trul";
     changelog = "https://github.com/lfence/red-trul/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 })
diff --git a/pkgs/by-name/re/redlist/package.nix b/pkgs/by-name/re/redlist/package.nix
index 4a81f6dea55d..19881cb7e1c4 100644
--- a/pkgs/by-name/re/redlist/package.nix
+++ b/pkgs/by-name/re/redlist/package.nix
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Convert Spotify playlists to local m3u's and fill the gaps";
     mainProgram = "redlist";
     homepage = "https://github.com/Laharah/redlist";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 })
diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index 41d622f59b8d..e2402c0740b8 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -80,7 +80,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://gitlab.gnome.org/TheEvilSkeleton/Refine";
     mainProgram = "refine";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ getchoo ];
   };
 })
diff --git a/pkgs/by-name/re/refurb/package.nix b/pkgs/by-name/re/refurb/package.nix
index f5d25cc688c5..494969c9dfd1 100644
--- a/pkgs/by-name/re/refurb/package.nix
+++ b/pkgs/by-name/re/refurb/package.nix
@@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Tool for refurbishing and modernizing Python codebases";
     mainProgram = "refurb";
     homepage = "https://github.com/dosisod/refurb";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 3e31ee1375d6..a0de1bc728d9 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Generate Buck build rules from Rust Cargo dependencies";
     mainProgram = "reindeer";
     homepage = "https://github.com/facebookincubator/reindeer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ amaanq ];
   };
 })
diff --git a/pkgs/by-name/re/rename/package.nix b/pkgs/by-name/re/rename/package.nix
index be43b399c644..a0d518280557 100644
--- a/pkgs/by-name/re/rename/package.nix
+++ b/pkgs/by-name/re/rename/package.nix
@@ -22,7 +22,7 @@ perlPackages.buildPerlPackage rec {
       cyplo
       cfouche
     ];
-    license = with lib.licenses; [ gpl1Plus ];
+    license = lib.licenses.gpl1Plus;
     mainProgram = "rename";
   };
 }
diff --git a/pkgs/by-name/re/resnap/package.nix b/pkgs/by-name/re/resnap/package.nix
index a276cc4bca2a..5b635a0a5878 100644
--- a/pkgs/by-name/re/resnap/package.nix
+++ b/pkgs/by-name/re/resnap/package.nix
@@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Take screnshots of your reMarkable tablet over SSH";
     homepage = "https://github.com/cloudsftp/reSnap";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _404wolf ];
     mainProgram = "reSnap";
   };
diff --git a/pkgs/by-name/re/resorter/package.nix b/pkgs/by-name/re/resorter/package.nix
index 73d53d950b26..702a1cc0c78e 100644
--- a/pkgs/by-name/re/resorter/package.nix
+++ b/pkgs/by-name/re/resorter/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tool to sort a list of items based on pairwise comparisons";
     homepage = "https://github.com/hiAndrewQuinn/resorter";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     mainProgram = "resorter";
     maintainers = [ ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/re/restic-integrity/package.nix b/pkgs/by-name/re/restic-integrity/package.nix
index 04c82529582a..92775e51eda7 100644
--- a/pkgs/by-name/re/restic-integrity/package.nix
+++ b/pkgs/by-name/re/restic-integrity/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI tool to check the integrity of a restic repository without unlocking it";
     homepage = "https://git.nwex.de/networkException/restic-integrity";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ networkexception ];
     mainProgram = "restic-integrity";
   };
diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix
index d6a8422641f3..75b7d7968344 100644
--- a/pkgs/by-name/ri/ripgrep-all/package.nix
+++ b/pkgs/by-name/ri/ripgrep-all/package.nix
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc.
     '';
     homepage = "https://github.com/phiresky/ripgrep-all";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [
       zaninime
       ma27
diff --git a/pkgs/by-name/ro/ron-lsp/package.nix b/pkgs/by-name/ro/ron-lsp/package.nix
index ebd02a7a790f..6574ebe385c2 100644
--- a/pkgs/by-name/ro/ron-lsp/package.nix
+++ b/pkgs/by-name/ro/ron-lsp/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       based on Rust type annotations
     '';
     homepage = "https://github.com/jasonjmcghee/ron-lsp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Dietr1ch
     ];
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index 33c3be604056..b66846f7f4a3 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tool for doing record analysis and transformation";
     mainProgram = "rq";
     homepage = "https://github.com/dflemstr/rq";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix
index b3bcd2f9c188..2f0e593f5631 100644
--- a/pkgs/by-name/ru/ruler/package.nix
+++ b/pkgs/by-name/ru/ruler/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Tool to abuse Exchange services";
     homepage = "https://github.com/sensepost/ruler";
     changelog = "https://github.com/sensepost/ruler/releases/tag/${version}";
-    license = with lib.licenses; [ cc-by-nc-40 ];
+    license = lib.licenses.cc-by-nc-40;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ruler";
   };
diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix
index 178ed2e6419d..08ca42aae459 100644
--- a/pkgs/by-name/ru/russ/package.nix
+++ b/pkgs/by-name/ru/russ/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage {
     changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md";
     description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus";
     homepage = "https://github.com/ckampfe/russ";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ blusk ];
     mainProgram = "russ";
   };
diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 59b748062ca6..595c0b1074b5 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -109,7 +109,7 @@ flutter341.buildFlutterApplication {
     description = "Cross-platform open-source app built for handwriting";
     homepage = "https://github.com/saber-notes/saber";
     mainProgram = "saber";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/by-name/sc/scalpel/package.nix b/pkgs/by-name/sc/scalpel/package.nix
index 4b2400011cb5..1ff683dbb605 100644
--- a/pkgs/by-name/sc/scalpel/package.nix
+++ b/pkgs/by-name/sc/scalpel/package.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "scalpel";
     maintainers = with lib.maintainers; [ shard7 ];
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix
index 7fb3155ede79..f325f137f371 100644
--- a/pkgs/by-name/sc/scilla/package.nix
+++ b/pkgs/by-name/sc/scilla/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
     mainProgram = "scilla";
     homepage = "https://github.com/edoardottt/scilla";
     changelog = "https://github.com/edoardottt/scilla/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix
index 748358d57eb2..16a2765d4214 100644
--- a/pkgs/by-name/sc/scipopt-soplex/package.nix
+++ b/pkgs/by-name/sc/scipopt-soplex/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://soplex.zib.de/";
     description = "Sequential object-oriented simPlex";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "soplex";
     maintainers = with lib.maintainers; [ pmeinhold ];
     changelog = "https://soplex.zib.de/doc-${finalAttrs.version}/html/CHANGELOG.php";
diff --git a/pkgs/by-name/sc/scponly/package.nix b/pkgs/by-name/sc/scponly/package.nix
index df2434dfc50f..e57e8dd5a87f 100644
--- a/pkgs/by-name/sc/scponly/package.nix
+++ b/pkgs/by-name/sc/scponly/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     description = "Shell that only permits scp and sftp-server";
     mainProgram = "scponly";
     homepage = "https://github.com/scponly/scponly";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ wmertens ];
   };
 }
diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
index 2c3fe35fa29e..fca8f5050b70 100644
--- a/pkgs/by-name/sc/scryer-prolog/package.nix
+++ b/pkgs/by-name/sc/scryer-prolog/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Modern Prolog implementation written mostly in Rust";
     mainProgram = "scryer-prolog";
     homepage = "https://github.com/mthom/scryer-prolog";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       malbarbo
       wkral
diff --git a/pkgs/by-name/sd/sdlookup/package.nix b/pkgs/by-name/sd/sdlookup/package.nix
index b567ea34960e..e0a3a89ecfd6 100644
--- a/pkgs/by-name/sd/sdlookup/package.nix
+++ b/pkgs/by-name/sd/sdlookup/package.nix
@@ -21,7 +21,7 @@ buildGoModule {
     description = "IP lookups for open ports and vulnerabilities from internetdb.shodan.io";
     mainProgram = "sdlookup";
     homepage = "https://github.com/j3ssie/sdlookup";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix
index b92735de1e73..ce6fee05e8f1 100644
--- a/pkgs/by-name/se/seabios/package.nix
+++ b/pkgs/by-name/se/seabios/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
       It can run in an emulator or it can run natively on x86 hardware with the
       use of coreboot.
     '';
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ sigmasquadron ];
     platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86;
     badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
diff --git a/pkgs/by-name/se/secp256k1/package.nix b/pkgs/by-name/se/secp256k1/package.nix
index 0ac343bd4bf9..e13840d732b1 100644
--- a/pkgs/by-name/se/secp256k1/package.nix
+++ b/pkgs/by-name/se/secp256k1/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       to research best practices. Use at your own risk.
     '';
     homepage = "https://github.com/bitcoin-core/secp256k1";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = with lib.platforms; all;
   };
diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix
index 2a69fd6531c5..1d700c913a5b 100644
--- a/pkgs/by-name/se/secretscanner/package.nix
+++ b/pkgs/by-name/se/secretscanner/package.nix
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index e5d0ea5c77be..46e798244fab 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Declarative secrets, every environment, any provider";
     homepage = "https://secretspec.dev";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       domenkozar
       sandydoo
diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 4735ebfb1fdf..1e04584bdb6e 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Rich git commit graph in your terminal, like magic";
     homepage = "https://github.com/lusingander/serie";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     mainProgram = "serie";
   };
diff --git a/pkgs/by-name/se/serpent/package.nix b/pkgs/by-name/se/serpent/package.nix
index d33389150004..ea0bc4df2899 100644
--- a/pkgs/by-name/se/serpent/package.nix
+++ b/pkgs/by-name/se/serpent/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       features for contract programming.
     '';
     homepage = "https://github.com/ethereum/wiki/wiki/Serpent";
-    license = with lib.licenses; [ wtfpl ];
+    license = lib.licenses.wtfpl;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sh/sh4d0wup/package.nix b/pkgs/by-name/sh/sh4d0wup/package.nix
index e5472814aea4..946a02278729 100644
--- a/pkgs/by-name/sh/sh4d0wup/package.nix
+++ b/pkgs/by-name/sh/sh4d0wup/package.nix
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/kpcyrd/sh4d0wup";
     changelog = "https://github.com/kpcyrd/sh4d0wup/releases/tag/v${finalAttrs.version}";
     mainProgram = "sh4d0wup";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kpcyrd ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix
index 88baf441cccc..15b850d6836a 100644
--- a/pkgs/by-name/sh/sheldon/package.nix
+++ b/pkgs/by-name/sh/sheldon/package.nix
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Fast and configurable shell plugin manager";
     homepage = "https://github.com/rossmacarthur/sheldon";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ seqizz ];
     platforms = lib.platforms.unix;
     mainProgram = "sheldon";
diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix
index 4b222ed0e8b7..d6f435319c90 100644
--- a/pkgs/by-name/sh/shelldap/package.nix
+++ b/pkgs/by-name/sh/shelldap/package.nix
@@ -47,7 +47,7 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/mahlonsmith/shelldap/";
     description = "Handy shell-like interface for browsing LDAP servers and editing their content";
     changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       clerie
       tobiasBora
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index eb8a761a5c06..c3126dd8b418 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Minimal X screenshot utility";
     homepage = "https://github.com/neXromancers/shotgun";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       lumi
     ];
diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 391414fec8b8..f6ada166e5e2 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SID player using libsidplayfp";
     homepage = "https://github.com/libsidplayfp/sidplayfp";
     changelog = "https://github.com/libsidplayfp/sidplayfp/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "sidplayfp";
     maintainers = with lib.maintainers; [
       OPNA2608
diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix
index 8aba1e37f2ef..dabe255eb73c 100644
--- a/pkgs/by-name/si/simde/package.nix
+++ b/pkgs/by-name/si/simde/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://simd-everywhere.github.io";
     description = "Implementations of SIMD instruction sets for systems which don't natively support them";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ whiteley ];
     platforms = lib.flatten (
       with lib.platforms;
diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix
index 24959753cb62..1f1b4f0e81d3 100644
--- a/pkgs/by-name/si/simple-live-app/package.nix
+++ b/pkgs/by-name/si/simple-live-app/package.nix
@@ -57,7 +57,7 @@ flutter332.buildFlutterApplication rec {
     description = "Simply Watch Live";
     homepage = "https://github.com/xiaoyaocz/dart_simple_live";
     mainProgram = "simple_live_app";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix
index 448689118616..b3299e766e09 100644
--- a/pkgs/by-name/si/sipvicious/package.nix
+++ b/pkgs/by-name/si/sipvicious/package.nix
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Set of tools to audit SIP based VoIP systems";
     homepage = "https://github.com/EnableSecurity/sipvicious";
     changelog = "https://github.com/EnableSecurity/sipvicious/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix
index 41bb1150570c..50f1c705cd4f 100644
--- a/pkgs/by-name/si/sish/package.nix
+++ b/pkgs/by-name/si/sish/package.nix
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
     description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";
     homepage = "https://github.com/antoniomika/sish";
     changelog = "https://github.com/antoniomika/sish/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sish";
   };
diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix
index 9bbdcffd80b0..29edd3944e1e 100644
--- a/pkgs/by-name/sk/skrooge/package.nix
+++ b/pkgs/by-name/sk/skrooge/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Personal finances manager, powered by KDE";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ joko ];
     homepage = "https://skrooge.org/";
   };
diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index f477b22e8125..c755debe616c 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://slint-ui.com/";
     downloadPage = "https://github.com/slint-ui/slint/";
     changelog = "https://github.com/slint-ui/slint/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ xgroleau ];
   };
 })
diff --git a/pkgs/by-name/sl/slowhttptest/package.nix b/pkgs/by-name/sl/slowhttptest/package.nix
index 07e00b6d829c..ce8945ee04e9 100644
--- a/pkgs/by-name/sl/slowhttptest/package.nix
+++ b/pkgs/by-name/sl/slowhttptest/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Application Layer DoS attack simulator";
     homepage = "https://github.com/shekyan/slowhttptest";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "slowhttptest";
   };
diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix
index 1942accedd6f..b3b4dfaa8527 100644
--- a/pkgs/by-name/sl/sly/package.nix
+++ b/pkgs/by-name/sl/sly/package.nix
@@ -47,7 +47,7 @@ flutter335.buildFlutterApplication rec {
     description = "Friendly image editor";
     homepage = "https://github.com/kra-mo/Sly";
     mainProgram = "sly";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/sm/smbscan/package.nix b/pkgs/by-name/sm/smbscan/package.nix
index f5bca72cfee9..8503319301eb 100644
--- a/pkgs/by-name/sm/smbscan/package.nix
+++ b/pkgs/by-name/sm/smbscan/package.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Tool to enumerate file shares";
     homepage = "https://github.com/jeffhacks/smbscan";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "smbscan";
   };
diff --git a/pkgs/by-name/sm/smoked-salmon/package.nix b/pkgs/by-name/sm/smoked-salmon/package.nix
index d1e6331b9ad5..e888f449472c 100644
--- a/pkgs/by-name/sm/smoked-salmon/package.nix
+++ b/pkgs/by-name/sm/smoked-salmon/package.nix
@@ -89,7 +89,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Toolkit for checking, editing and uploading music. Catered to Gazelle-based trackers";
     homepage = "https://github.com/smokin-salmon/smoked-salmon";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "salmon";
     maintainers = with lib.maintainers; [
       ambroisie
diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix
index 3e775420da11..c0b029a37e80 100644
--- a/pkgs/by-name/sn/sn0int/package.nix
+++ b/pkgs/by-name/sn/sn0int/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
     description = "Semi-automatic OSINT framework and package manager";
     homepage = "https://github.com/kpcyrd/sn0int";
     changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       fab
       xrelkd
diff --git a/pkgs/by-name/sn/snowcrash/package.nix b/pkgs/by-name/sn/snowcrash/package.nix
index 253c059d057f..16f353d862a5 100644
--- a/pkgs/by-name/sn/snowcrash/package.nix
+++ b/pkgs/by-name/sn/snowcrash/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   meta = {
     description = "Polyglot payload generator";
     homepage = "https://github.com/redcode-labs/SNOWCRASH";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "SNOWCRASH";
   };
diff --git a/pkgs/by-name/sn/snowmachine/package.nix b/pkgs/by-name/sn/snowmachine/package.nix
index 35f2c33c6cc5..73f70f6740a6 100644
--- a/pkgs/by-name/sn/snowmachine/package.nix
+++ b/pkgs/by-name/sn/snowmachine/package.nix
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Python script that will make your terminal snow";
     homepage = "https://github.com/sontek/snowmachine";
     mainProgram = "snowmachine";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       djanatyn
       sontek
diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix
index 40cf1ef10dcc..899229ad33d1 100644
--- a/pkgs/by-name/so/socat/package.nix
+++ b/pkgs/by-name/so/socat/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     description = "Utility for bidirectional data transfer between two independent data channels";
     homepage = "http://www.dest-unreach.org/socat/";
     platforms = lib.platforms.unix;
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ ryan4yin ];
     mainProgram = "socat";
   };
diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix
index 911ff41f4fcb..d65d20e04a74 100644
--- a/pkgs/by-name/so/soplex/package.nix
+++ b/pkgs/by-name/so/soplex/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://scipopt.org";
     description = "Sequential object-oriented simPlex";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     mainProgram = "soplex";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/sp/spyre/package.nix b/pkgs/by-name/sp/spyre/package.nix
index 2bff9345b6a0..29c859caaed7 100644
--- a/pkgs/by-name/sp/spyre/package.nix
+++ b/pkgs/by-name/sp/spyre/package.nix
@@ -47,7 +47,7 @@ buildGoModule (finalAttrs: {
     description = "YARA-based IOC scanner";
     mainProgram = "spyre";
     homepage = "https://github.com/spyre-project/spyre";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix
index 60e71cb9ca62..d810fdb810cb 100644
--- a/pkgs/by-name/sp/spytrap-adb/package.nix
+++ b/pkgs/by-name/sp/spytrap-adb/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/spytrap-org/spytrap-adb";
     changelog = "https://github.com/spytrap-org/spytrap-adb/releases/tag/v${finalAttrs.version}";
     mainProgram = "spytrap-adb";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kpcyrd ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix
index 890fee503637..c07e786f30a4 100644
--- a/pkgs/by-name/sq/squawk/package.nix
+++ b/pkgs/by-name/sq/squawk/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Linter for PostgreSQL, focused on migrations";
     homepage = "https://squawkhq.com";
     changelog = "https://github.com/sbdchd/squawk/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix
index 9a8f628ccf45..98bf64ea757b 100644
--- a/pkgs/by-name/sr/srisum/package.nix
+++ b/pkgs/by-name/sr/srisum/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line utility to compute and check subresource integrity hashes";
     homepage = "https://github.com/zkat/srisum-rs";
     changelog = "https://github.com/zkat/srisum-rs/raw/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pjjw ];
     platforms = lib.platforms.all;
     mainProgram = "srisum";
diff --git a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
index cea563241906..a1d89ccdda51 100644
--- a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
+++ b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/atj/ssh-askpass-fullscreen";
     broken = stdenv.hostPlatform.isDarwin;
     description = "Small, fullscreen SSH askpass GUI using GTK+2";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "ssh-askpass-fullscreen";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ss/sshchecker/package.nix b/pkgs/by-name/ss/sshchecker/package.nix
index 87b7ae0f27ee..6e0353fdc0d1 100644
--- a/pkgs/by-name/ss/sshchecker/package.nix
+++ b/pkgs/by-name/ss/sshchecker/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       SSH login on the giving IP list.
     '';
     homepage = "https://github.com/lazytools/sshchecker";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix
index 827090d5de74..ff52f3363971 100644
--- a/pkgs/by-name/ss/sssnake/package.nix
+++ b/pkgs/by-name/ss/sssnake/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Cli snake game that plays itself";
     mainProgram = "sssnake";
     homepage = "https://github.com/angeljumbo/sssnake";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ quantenzitrone ];
   };
diff --git a/pkgs/by-name/st/stacktile/package.nix b/pkgs/by-name/st/stacktile/package.nix
index 7796617df9cb..91739e3358f6 100644
--- a/pkgs/by-name/st/stacktile/package.nix
+++ b/pkgs/by-name/st/stacktile/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://sr.ht/~leon_plickat/stacktile/";
     description = "Layout generator for the river Wayland compositor";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "stacktile";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/st/stacs/package.nix b/pkgs/by-name/st/stacs/package.nix
index 5c74e4b929a4..b8f0c3c71bf2 100644
--- a/pkgs/by-name/st/stacs/package.nix
+++ b/pkgs/by-name/st/stacs/package.nix
@@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Static token and credential scanner";
     mainProgram = "stacs";
     homepage = "https://github.com/stacscan/stacs";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/st/stamp/package.nix b/pkgs/by-name/st/stamp/package.nix
index fd889cef2035..553e879c4285 100644
--- a/pkgs/by-name/st/stamp/package.nix
+++ b/pkgs/by-name/st/stamp/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
     description = "Modern GTK4 email client for the GNOME ecosystem";
     homepage = "https://gitlab.gnome.org/jbrummer/stamp";
     maintainers = with lib.maintainers; [ onny ];
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     mainProgram = "stamp";
   };
diff --git a/pkgs/by-name/st/stdmanpages/package.nix b/pkgs/by-name/st/stdmanpages/package.nix
index 0bb79ed1fa09..8421264ba3d3 100644
--- a/pkgs/by-name/st/stdmanpages/package.nix
+++ b/pkgs/by-name/st/stdmanpages/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "GCC C++ STD manual pages";
     homepage = "https://gcc.gnu.org/";
-    license = with lib.licenses; [ fdl13Plus ];
+    license = lib.licenses.fdl13Plus;
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 07a347d16fe0..9b6cc458275b 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${finalAttrs.version}";
     description = "Linux utility for generating 2FA codes for Steam and managing Steam trade confirmations";
     homepage = "https://github.com/dyc3/steamguard-cli";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "steamguard";
     maintainers = with lib.maintainers; [
       surfaceflinger
diff --git a/pkgs/by-name/st/stegseek/package.nix b/pkgs/by-name/st/stegseek/package.nix
index a6f2be99032d..745a16e9482f 100644
--- a/pkgs/by-name/st/stegseek/package.nix
+++ b/pkgs/by-name/st/stegseek/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
       used to extract hidden data from files.
     '';
     homepage = "https://github.com/RickdeJager/stegseek";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "stegseek";
   };
diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix
index e2c8cfef8f21..97a249183ac2 100644
--- a/pkgs/by-name/st/stella/package.nix
+++ b/pkgs/by-name/st/stella/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       As of its 3.5 release, Stella is officially donationware.
     '';
     changelog = "https://github.com/stella-emu/stella/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "stella";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/st/stevia/package.nix b/pkgs/by-name/st/stevia/package.nix
index 7b06e656e1ff..360abbd01815 100644
--- a/pkgs/by-name/st/stevia/package.nix
+++ b/pkgs/by-name/st/stevia/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "User friendly on screen keyboard for Phosh";
     homepage = "https://gitlab.gnome.org/World/Phosh/stevia";
     changelog = "https://gitlab.gnome.org/World/Phosh/stevia/-/releases/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       ungeskriptet
diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix
index 4b2324c1eec7..0ccdcef428eb 100644
--- a/pkgs/by-name/st/stressapptest/package.nix
+++ b/pkgs/by-name/st/stressapptest/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Userspace memory and IO stress test tool";
     homepage = "https://github.com/stressapptest/stressapptest";
     changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.unix;
     mainProgram = "stressapptest";
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 6b0915107681..6bcb9641313d 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -106,7 +106,7 @@ buildGoModule (finalAttrs: {
       Tail your API request logs in real-time
       Create, retrieve, update, or delete API objects.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       RaghavSood
       jk
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index b080c398e672..5f5f26753dbe 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "stylance";
     homepage = "https://github.com/basro/stylance-rs";
     changelog = "https://github.com/basro/stylance-rs/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dav-wolff ];
   };
 })
diff --git a/pkgs/by-name/su/subfont/package.nix b/pkgs/by-name/su/subfont/package.nix
index b38068892390..c2c3bdd6b4ef 100644
--- a/pkgs/by-name/su/subfont/package.nix
+++ b/pkgs/by-name/su/subfont/package.nix
@@ -50,7 +50,7 @@ buildNpmPackage (finalAttrs: {
     mainProgram = "subfont";
     homepage = "https://github.com/Munter/subfont";
     changelog = "https://github.com/Munter/subfont/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dav-wolff ];
   };
 })
diff --git a/pkgs/by-name/su/subjs/package.nix b/pkgs/by-name/su/subjs/package.nix
index f08849bc9cdf..a004e59dd59a 100644
--- a/pkgs/by-name/su/subjs/package.nix
+++ b/pkgs/by-name/su/subjs/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
       secrets and more.
     '';
     homepage = "https://github.com/lc/subjs";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/sv/svxlink/package.nix b/pkgs/by-name/sv/svxlink/package.nix
index a19e96491929..d2935678ac51 100644
--- a/pkgs/by-name/sv/svxlink/package.nix
+++ b/pkgs/by-name/sv/svxlink/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
       GUI, Qtel - The Qt EchoLink client
     '';
     homepage = "https://www.svxlink.org/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ zaninime ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/sw/swaggerhole/package.nix b/pkgs/by-name/sw/swaggerhole/package.nix
index 207d7ebc8571..ed34e0ae2ea0 100644
--- a/pkgs/by-name/sw/swaggerhole/package.nix
+++ b/pkgs/by-name/sw/swaggerhole/package.nix
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication {
     description = "Tool to searching for secret on swaggerhub";
     mainProgram = "swaggerhole";
     homepage = "https://github.com/Liodeus/swaggerHole";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/sw/swapview/package.nix b/pkgs/by-name/sw/swapview/package.nix
index 339d8e3a883f..f0f6bd9f55e9 100644
--- a/pkgs/by-name/sw/swapview/package.nix
+++ b/pkgs/by-name/sw/swapview/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
     mainProgram = "swapview";
     homepage = "https://github.com/lilydjwg/swapview";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ oxalica ];
   };
 }
diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix
index 2628029b1765..e088ab55f8f1 100644
--- a/pkgs/by-name/sw/swayrbar/package.nix
+++ b/pkgs/by-name/sw/swayrbar/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Status command for sway's swaybar implementing the swaybar-protocol";
     homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara";
     changelog = "https://git.sr.ht/~tsdh/swayr/tree/main/item/swayrbar/NEWS.md";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ ilkecan ];
     mainProgram = "swayrbar";
diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index c90ae32ded47..31032d54a62e 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -83,7 +83,7 @@ buildGoModule (finalAttrs: {
       (SBOM) from container images and filesystems. Exceptional for
       vulnerability detection when used with a scanner tool like Grype.
     '';
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       developer-guy
       jk
diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix
index 30fbc199171a..e71bf755322d 100644
--- a/pkgs/by-name/sy/synchrony/package.nix
+++ b/pkgs/by-name/sy/synchrony/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simple deobfuscator for mangled or obfuscated JavaScript files";
     homepage = "https://deobfuscate.relative.im/";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ pluiedev ];
     inherit (nodejs.meta) platforms;
     mainProgram = "synchrony";
diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
index 905ed066b700..5771b760ed7b 100644
--- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
+++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Keyboard configuration application for System76 keyboards and laptops";
     mainProgram = "system76-keyboard-configurator";
     homepage = "https://github.com/pop-os/keyboard-configurator";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ mirrexagon ];
     platforms = with lib.platforms; linux ++ darwin;
   };
diff --git a/pkgs/by-name/t-/t-rec/package.nix b/pkgs/by-name/t-/t-rec/package.nix
index d2267931a7e7..db98ef22b488 100644
--- a/pkgs/by-name/t-/t-rec/package.nix
+++ b/pkgs/by-name/t-/t-rec/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust";
     homepage = "https://github.com/sassman/t-rec-rs";
     changelog = "https://github.com/sassman/t-rec-rs/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       hoverbear
       matthiasbeyer
diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index 948fa1d0479c..4a629a0cd8d7 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Terminal user interface for taskwarrior";
     homepage = "https://github.com/kdheepak/taskwarrior-tui";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     mainProgram = "taskwarrior-tui";
   };
diff --git a/pkgs/by-name/te/tecla/package.nix b/pkgs/by-name/te/tecla/package.nix
index 68787f904c6d..a4cdba67f56c 100644
--- a/pkgs/by-name/te/tecla/package.nix
+++ b/pkgs/by-name/te/tecla/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
       included man pages.
     '';
     changelog = "https://sites.astro.caltech.edu/~mcs/tecla/release.html";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "enhance";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix
index b5c1f90efce5..23c1d2bcd8dd 100644
--- a/pkgs/by-name/te/tectonic-unwrapped/package.nix
+++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix
@@ -125,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive";
     homepage = "https://tectonic-typesetting.github.io/";
     changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "tectonic";
     maintainers = with lib.maintainers; [
       lluchs
diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index 9331153bc2f8..8ca793b8aaef 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Terminal Music Player TUI written in Rust";
     homepage = "https://github.com/tramhao/termusic";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       devhell
       theeasternfurry
diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix
index 03987ee9b31d..baae937e1de1 100644
--- a/pkgs/by-name/te/terrascan/package.nix
+++ b/pkgs/by-name/te/terrascan/package.nix
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/accurics/terrascan";
     changelog = "https://github.com/tenable/terrascan/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/te/tewisay/package.nix b/pkgs/by-name/te/tewisay/package.nix
index db1402554eb3..9abcfaa6b35f 100644
--- a/pkgs/by-name/te/tewisay/package.nix
+++ b/pkgs/by-name/te/tewisay/package.nix
@@ -35,7 +35,7 @@ buildGoModule {
   meta = {
     homepage = "https://github.com/raymond-w-ko/tewisay";
     description = "Cowsay replacement with unicode and partial ansi escape support";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     mainProgram = "tewisay";
   };
 }
diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix
index 2ca3a69a1a76..9430d1570775 100644
--- a/pkgs/by-name/th/the-way/package.nix
+++ b/pkgs/by-name/th/the-way/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "the-way";
     homepage = "https://github.com/out-of-cheese-error/the-way";
     changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       numkem
diff --git a/pkgs/by-name/th/theme-jade1/package.nix b/pkgs/by-name/th/theme-jade1/package.nix
index 544fb224ddd9..69b009620132 100644
--- a/pkgs/by-name/th/theme-jade1/package.nix
+++ b/pkgs/by-name/th/theme-jade1/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Based on Linux Mint theme with dark menus and more intensive green";
     homepage = "https://github.com/madmaxms/theme-jade-1";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
diff --git a/pkgs/by-name/th/theme-obsidian2/package.nix b/pkgs/by-name/th/theme-obsidian2/package.nix
index 26b45b64c8aa..38f9f38405e6 100644
--- a/pkgs/by-name/th/theme-obsidian2/package.nix
+++ b/pkgs/by-name/th/theme-obsidian2/package.nix
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "Gnome theme based upon Adwaita-Maia dark skin";
     homepage = "https://github.com/madmaxms/theme-obsidian-2";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
diff --git a/pkgs/by-name/th/thumper/package.nix b/pkgs/by-name/th/thumper/package.nix
index d28c4bdcdc06..33b492571112 100644
--- a/pkgs/by-name/th/thumper/package.nix
+++ b/pkgs/by-name/th/thumper/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tool to sync files from a local folder into a folder in a BunnyCDN Storage Zone";
     homepage = "https://github.com/kaaveland/thumper";
     changelog = "https://github.com/kaaveland/thumper/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ stv0g ];
     platforms = lib.platforms.all;
     mainProgram = "thumper";
diff --git a/pkgs/by-name/ti/timetagger_cli/package.nix b/pkgs/by-name/ti/timetagger_cli/package.nix
index 07eaefc2bdaf..7bf782f15ae4 100644
--- a/pkgs/by-name/ti/timetagger_cli/package.nix
+++ b/pkgs/by-name/ti/timetagger_cli/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Track your time from the command-line";
     homepage = "https://github.com/almarklein/timetagger_cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     mainProgram = "timetagger";
   };
diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix
index 77da2ee64e97..b23c654fe7f8 100644
--- a/pkgs/by-name/ti/tinty/package.nix
+++ b/pkgs/by-name/ti/tinty/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
     description = "Base16 and base24 color scheme manager";
     homepage = "https://github.com/tinted-theming/tinty";
     changelog = "https://github.com/tinted-theming/tinty/blob/refs/tags/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       pluiedev
diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix
index f7068059afb8..acfac3947220 100644
--- a/pkgs/by-name/ti/tiny-rdm/package.nix
+++ b/pkgs/by-name/ti/tiny-rdm/package.nix
@@ -108,7 +108,7 @@ buildGoModule (finalAttrs: {
     description = "Modern, colorful, super lightweight Redis GUI client";
     homepage = "https://github.com/tiny-craft/tiny-rdm";
     mainProgram = "tiny-rdm";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ti/tinycc/package.nix b/pkgs/by-name/ti/tinycc/package.nix
index bd589a616af7..95e29c1179a5 100644
--- a/pkgs/by-name/ti/tinycc/package.nix
+++ b/pkgs/by-name/ti/tinycc/package.nix
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       With libtcc, you can use TCC as a backend for dynamic code generation.
     '';
-    license = with lib.licenses; [ lgpl21Only ];
+    license = lib.licenses.lgpl21Only;
     mainProgram = "tcc";
     maintainers = with lib.maintainers; [
       onemoresuza
diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix
index 5445237a4511..2e90313055f5 100644
--- a/pkgs/by-name/ti/tinyxml-2/package.nix
+++ b/pkgs/by-name/ti/tinyxml-2/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple, small, efficient, C++ XML parser";
     homepage = "https://github.com/leethomason/tinyxml2";
     changelog = "https://github.com/leethomason/tinyxml2/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ zlib ];
+    license = lib.licenses.zlib;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix
index f2a3bddd28ef..2bf53fb1cc01 100644
--- a/pkgs/by-name/ti/tiscamera/package.nix
+++ b/pkgs/by-name/ti/tiscamera/package.nix
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Linux sources and UVC firmwares for The Imaging Source cameras";
     homepage = "https://github.com/TheImagingSource/tiscamera";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jraygauthier ];
   };
diff --git a/pkgs/by-name/tl/tlaplus-toolbox/package.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
index a2b6303402c3..a4d098c3a3ac 100644
--- a/pkgs/by-name/tl/tlaplus-toolbox/package.nix
+++ b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       versions of your modules, run the TLC model checker, and run TLAPS, the TLA+ proof system.
     '';
     # http://lamport.azurewebsites.net/tla/license.html
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [ "x86_64-linux" ];
     maintainers = [ ];
diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix
index c6de5a0b2d8a..49a481a1238b 100644
--- a/pkgs/by-name/to/tokio-console/package.nix
+++ b/pkgs/by-name/to/tokio-console/package.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Debugger for asynchronous Rust code";
     homepage = "https://github.com/tokio-rs/console";
     mainProgram = "tokio-console";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ max-niederman ];
   };
 })
diff --git a/pkgs/by-name/to/tomato-c/package.nix b/pkgs/by-name/to/tomato-c/package.nix
index 2d39a0999c46..843a1991ef3e 100644
--- a/pkgs/by-name/to/tomato-c/package.nix
+++ b/pkgs/by-name/to/tomato-c/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/gabrielzschmitz/Tomato.C";
     description = "Pomodoro timer written in pure C";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
     mainProgram = "tomato";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix
index 9a061507e249..8be2ec488ef5 100644
--- a/pkgs/by-name/to/tomboy-ng/package.nix
+++ b/pkgs/by-name/to/tomboy-ng/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Note taking app that works and synchronises between Linux, Windows and macOS";
     homepage = "https://github.com/tomboy-notes/tomboy-ng";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "tomboy-ng";
     platforms = lib.platforms.unix ++ lib.platforms.windows;
diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix
index 8a9fe91b00f7..dd66a532fed4 100644
--- a/pkgs/by-name/to/toml2json/package.nix
+++ b/pkgs/by-name/to/toml2json/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Very small CLI for converting TOML to JSON";
     mainProgram = "toml2json";
     homepage = "https://github.com/woodruffw/toml2json";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rvarago ];
   };
 })
diff --git a/pkgs/by-name/to/toss/package.nix b/pkgs/by-name/to/toss/package.nix
index 228ff20dc444..cf7ebd8dfabd 100644
--- a/pkgs/by-name/to/toss/package.nix
+++ b/pkgs/by-name/to/toss/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
     src.meta // {
       description = "Dead simple LAN file transfers from the command line";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       platforms = lib.platforms.unix;
     };
 }
diff --git a/pkgs/by-name/tp/tpm-luks/package.nix b/pkgs/by-name/tp/tpm-luks/package.nix
index 6e43ef8a8d45..c823073f6d13 100644
--- a/pkgs/by-name/tp/tpm-luks/package.nix
+++ b/pkgs/by-name/tp/tpm-luks/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     description = "LUKS key storage in TPM NVRAM";
     homepage = "https://github.com/shpedoikal/tpm-luks/";
     maintainers = [ ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/tr/traitor/package.nix b/pkgs/by-name/tr/traitor/package.nix
index ac47c93b0de7..9abfc1c258a6 100644
--- a/pkgs/by-name/tr/traitor/package.nix
+++ b/pkgs/by-name/tr/traitor/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/liamg/traitor";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index 1ede101acda8..96d0181b162d 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -230,7 +230,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage = "https://github.com/llvm/llvm-project";
     changelog = "https://github.com/llvm/llvm-project/releases/tag/llvmorg-${finalAttrs.version}";
-    license = with lib.licenses; [ ncsa ];
+    license = lib.licenses.ncsa;
     maintainers = with lib.maintainers; [
       SomeoneSerge
     ];
diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index 72f1b6263a66..5bb3877fb41c 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
     description = "Find credentials all over the place";
     homepage = "https://github.com/trufflesecurity/trufflehog";
     changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       fab
       sarcasticadmin
diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix
index f552242c07fb..30a972d2d14a 100644
--- a/pkgs/by-name/tr/trunk-ng/package.nix
+++ b/pkgs/by-name/tr/trunk-ng/package.nix
@@ -38,6 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Build, bundle & ship your Rust WASM application to the web";
     mainProgram = "trunk-ng";
     maintainers = with lib.maintainers; [ ctron ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index 652e99be37a4..a0318ef1f310 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Build, bundle & ship your Rust WASM application to the web";
     mainProgram = "trunk";
     maintainers = with lib.maintainers; [ ctron ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix
index 05e6c7fcc271..cc623258b609 100644
--- a/pkgs/by-name/tr/trustymail/package.nix
+++ b/pkgs/by-name/tr/trustymail/package.nix
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool to scan domains and return data based on trustworthy email best practices";
     homepage = "https://github.com/cisagov/trustymail";
     changelog = "https://github.com/cisagov/trustymail/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "trustymail";
   };
diff --git a/pkgs/by-name/tr/try/package.nix b/pkgs/by-name/tr/try/package.nix
index fa6451dad9a2..9a2eb560d82d 100644
--- a/pkgs/by-name/tr/try/package.nix
+++ b/pkgs/by-name/tr/try/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
       pasqui23
       ezrizhu
     ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/tt/tt-burnin/package.nix b/pkgs/by-name/tt/tt-burnin/package.nix
index 646cfcec7333..001b4cca5bf9 100644
--- a/pkgs/by-name/tt/tt-burnin/package.nix
+++ b/pkgs/by-name/tt/tt-burnin/package.nix
@@ -37,6 +37,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/tenstorrent/tt-burnin";
     changelog = "https://github.com/tenstorrent/tt-burnin/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tt/tt-logger/package.nix b/pkgs/by-name/tt/tt-logger/package.nix
index 8b5600377b6a..ddebe0b5cac3 100644
--- a/pkgs/by-name/tt/tt-logger/package.nix
+++ b/pkgs/by-name/tt/tt-logger/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Flexible and performant C++ logging library for Tenstorrent projects";
     homepage = "https://github.com/tenstorrent/tt-logger";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/tt-metal/package.nix b/pkgs/by-name/tt/tt-metal/package.nix
index 3733045c7d62..1647b5053f9f 100644
--- a/pkgs/by-name/tt/tt-metal/package.nix
+++ b/pkgs/by-name/tt/tt-metal/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "TT-NN operator library, and TT-Metalium low level kernel programming model";
     homepage = "https://github.com/tenstorrent/tt-metal";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix
index 421c2e41bd56..4d5a6cba38c9 100644
--- a/pkgs/by-name/tt/tt-smi/package.nix
+++ b/pkgs/by-name/tt/tt-smi/package.nix
@@ -53,6 +53,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/tenstorrent/tt-smi";
     changelog = "https://github.com/tenstorrent/tt-smi/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/by-name/tt/tt-system-tools/package.nix b/pkgs/by-name/tt/tt-system-tools/package.nix
index 1932478f690d..81eebe663c7d 100644
--- a/pkgs/by-name/tt/tt-system-tools/package.nix
+++ b/pkgs/by-name/tt/tt-system-tools/package.nix
@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/tenstorrent/tt-system-tools";
     changelog = "https://github.com/tenstorrent/tt-system-tools/blob/${finalAttrs.src.tag}/debian/changelog";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/tt-topology/package.nix b/pkgs/by-name/tt/tt-topology/package.nix
index 366fa0c3da0f..ba0ce62ffacf 100644
--- a/pkgs/by-name/tt/tt-topology/package.nix
+++ b/pkgs/by-name/tt/tt-topology/package.nix
@@ -60,6 +60,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/tenstorrent/tt-topology";
     changelog = "https://github.com/tenstorrent/tt-topology/blob/${src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/tt/tt-umd/package.nix b/pkgs/by-name/tt/tt-umd/package.nix
index d18a3f7b11fe..1baef8f79876 100644
--- a/pkgs/by-name/tt/tt-umd/package.nix
+++ b/pkgs/by-name/tt/tt-umd/package.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "User-Mode Driver for Tenstorrent hardware";
     homepage = "https://github.com/tenstorrent/tt-umd";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index 9c70074b39f9..4b0726541d3b 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI tool to manage todo lists in todo.txt format";
     homepage = "https://github.com/VladimirMarkelov/ttdl";
     changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${finalAttrs.version}/changelog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
     mainProgram = "ttdl";
   };
diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix
index 2ae7d6ccf528..b6ee5ad448d0 100644
--- a/pkgs/by-name/tt/ttfb/package.nix
+++ b/pkgs/by-name/tt/ttfb/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/ttfb";
     changelog = "https://github.com/phip1611/ttfb/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
   };
 })
diff --git a/pkgs/by-name/tu/tuifeed/package.nix b/pkgs/by-name/tu/tuifeed/package.nix
index b3a908863599..604d6479ed31 100644
--- a/pkgs/by-name/tu/tuifeed/package.nix
+++ b/pkgs/by-name/tu/tuifeed/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Terminal feed reader with a fancy UI";
     mainProgram = "tuifeed";
     homepage = "https://github.com/veeso/tuifeed";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ devhell ];
   };
 })
diff --git a/pkgs/by-name/tu/tuliprox/package.nix b/pkgs/by-name/tu/tuliprox/package.nix
index 450ac443448c..8b611a37a333 100644
--- a/pkgs/by-name/tu/tuliprox/package.nix
+++ b/pkgs/by-name/tu/tuliprox/package.nix
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/euzu/tuliprox";
     changelog = "https://github.com/euzu/tuliprox/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     mainProgram = "tuliprox";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nyanloutre ];
   };
 })
diff --git a/pkgs/by-name/tw/twolame/package.nix b/pkgs/by-name/tw/twolame/package.nix
index d452f8cb3e53..aa8e98d87e6f 100644
--- a/pkgs/by-name/tw/twolame/package.nix
+++ b/pkgs/by-name/tw/twolame/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       code and portions of LAME.
     '';
     homepage = "https://www.twolame.org/";
-    license = with lib.licenses; [ lgpl2Plus ];
+    license = lib.licenses.lgpl2Plus;
     platforms = with lib.platforms; unix;
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix
index d1b15d4a7fd9..65c295612394 100644
--- a/pkgs/by-name/ud/uddup/package.nix
+++ b/pkgs/by-name/ud/uddup/package.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool for de-duplication URLs";
     mainProgram = "uddup";
     homepage = "https://github.com/rotemreiss/uddup";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix
index e5f2af9d32a5..5caaa445bad8 100644
--- a/pkgs/by-name/ue/uefisettings/package.nix
+++ b/pkgs/by-name/ue/uefisettings/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "CLI tool to read/get/extract and write/change/modify BIOS/UEFI settings";
     homepage = "https://github.com/linuxboot/uefisettings";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "uefisettings";
     maintainers = with lib.maintainers; [ surfaceflinger ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index dad5b5493085..bc06de5c1d0f 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Application-focused API for memory management on NUMA & GPU architectures";
     homepage = "https://github.com/LLNL/Umpire";
     maintainers = with lib.maintainers; [ sheepforce ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix
index eb73ccab10e7..270ab53cb606 100644
--- a/pkgs/by-name/un/units/package.nix
+++ b/pkgs/by-name/un/units/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
       file to suit your needs. You can also use your own data file to supplement
       the standard data file.
     '';
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "units";
     maintainers = with lib.maintainers; [ galen ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/un/unp/package.nix b/pkgs/by-name/un/unp/package.nix
index 4b084bfb161b..2943ba9f65ab 100644
--- a/pkgs/by-name/un/unp/package.nix
+++ b/pkgs/by-name/un/unp/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Command line tool for unpacking archives easily";
     homepage = "https://packages.qa.debian.org/u/unp.html";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.timor ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ur/urlhunter/package.nix b/pkgs/by-name/ur/urlhunter/package.nix
index 975364bc4de1..563d8916b067 100644
--- a/pkgs/by-name/ur/urlhunter/package.nix
+++ b/pkgs/by-name/ur/urlhunter/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       exposed via shortener services such as bit.ly and goo.gl.
     '';
     homepage = "https://github.com/utkusen/urlhunter";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ur/uroboros/package.nix b/pkgs/by-name/ur/uroboros/package.nix
index c5f15f61b015..2f20a07870b9 100644
--- a/pkgs/by-name/ur/uroboros/package.nix
+++ b/pkgs/by-name/ur/uroboros/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   meta = {
     description = "Tool for monitoring and profiling single processes";
     homepage = "https://github.com/evilsocket/uroboros";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix
index 85cb335f6836..9cbe1781c438 100644
--- a/pkgs/by-name/v2/v2ray/package.nix
+++ b/pkgs/by-name/v2/v2ray/package.nix
@@ -69,7 +69,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://www.v2fly.org/en_US/";
     description = "Platform for building proxies to bypass network restrictions";
     mainProgram = "v2ray";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       servalcatty
       ryan4yin
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 2d19afbc481c..e5a704b42dc5 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -111,7 +111,7 @@ buildDotnetModule (finalAttrs: {
     description = "GUI client support Xray core and sing-box-core and others";
     homepage = "https://github.com/2dust/v2rayN";
     mainProgram = "v2rayN";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/va/vangers/clunk.nix b/pkgs/by-name/va/vangers/clunk.nix
index 4f0c7fb94fdb..7f3ab731d1b7 100644
--- a/pkgs/by-name/va/vangers/clunk.nix
+++ b/pkgs/by-name/va/vangers/clunk.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Clunk - real-time binaural sound generation library. Versions for Vangers game. Porting to SDL2 and fix some errors";
     homepage = "https://github.com/stalkerg/clunk";
     platforms = lib.platforms.all;
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
   };
 
diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix
index 78e60ba9bd30..51e4043987af 100644
--- a/pkgs/by-name/va/vangers/package.nix
+++ b/pkgs/by-name/va/vangers/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/KranX/Vangers";
     mainProgram = "vangers";
     platforms = lib.platforms.all;
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
   };
 }
diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix
index f700ef09d791..88e0392e85e4 100644
--- a/pkgs/by-name/va/vanillatd/package.nix
+++ b/pkgs/by-name/va/vanillatd/package.nix
@@ -173,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
       }
       ."${appName}";
     homepage = "https://github.com/TheAssemblyArmada/Vanilla-Conquer";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
     platforms = with lib.platforms; darwin ++ linux;
diff --git a/pkgs/by-name/va/vapoursynth-eedi3/package.nix b/pkgs/by-name/va/vapoursynth-eedi3/package.nix
index bb1fc9c53bae..58a1d5a2e123 100644
--- a/pkgs/by-name/va/vapoursynth-eedi3/package.nix
+++ b/pkgs/by-name/va/vapoursynth-eedi3/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Filter for VapourSynth";
     homepage = "https://github.com/HomeOfVapourSynthEvolution/VapourSynth-EEDI3";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ snaki ];
     platforms = lib.platforms.x86_64;
   };
diff --git a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
index e64ae74b9d70..7161df33ccfd 100644
--- a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
+++ b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Filter for VapourSynth";
     homepage = "https://github.com/HomeOfVapourSynthEvolution/VapourSynth-NNEDI3CL";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ snaki ];
     platforms = lib.platforms.x86_64;
   };
diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix
index f2252a025d83..e0d8106c8b59 100644
--- a/pkgs/by-name/vd/vdo/package.nix
+++ b/pkgs/by-name/vd/vdo/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
       "powerpc64-linux"
       "powerpc64le-linux"
     ];
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index b8536ed9848c..b2cc5703af4e 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -92,7 +92,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
     description = "Comic reader that support reading local and network comics";
     homepage = "https://github.com/venera-app/venera";
     mainProgram = "venera";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ve/verifpal/package.nix b/pkgs/by-name/ve/verifpal/package.nix
index 39acb88195e6..cfe741c4f731 100644
--- a/pkgs/by-name/ve/verifpal/package.nix
+++ b/pkgs/by-name/ve/verifpal/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cryptographic protocol analysis for students and engineers";
     mainProgram = "verifpal";
     maintainers = with lib.maintainers; [ zimbatm ];
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
   };
 })
diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix
index b57d528f8583..78fc1e4505f5 100644
--- a/pkgs/by-name/vi/vimcats/package.nix
+++ b/pkgs/by-name/vi/vimcats/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/mrcjkb/vimcats";
     changelog = "https://github.com/mrcjkb/vimcats/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ mrcjkb ];
     mainProgram = "vimcats";
   };
diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix
index d7a6679ae3aa..73ec17473eae 100644
--- a/pkgs/by-name/vi/vimix-icon-theme/package.nix
+++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix
@@ -71,7 +71,7 @@ lib.checkListOfEnum "vimix-icon-theme: color variants"
     meta = {
       description = "Material Design icon theme based on Paper icon theme";
       homepage = "https://github.com/vinceliuice/vimix-icon-theme";
-      license = with lib.licenses; [ cc-by-sa-40 ];
+      license = lib.licenses.cc-by-sa-40;
       platforms = lib.platforms.linux;
       maintainers = with lib.maintainers; [ romildo ];
     };
diff --git a/pkgs/by-name/vi/viskores/package.nix b/pkgs/by-name/vi/viskores/package.nix
index 5b8d167dd4dd..6e48db339efb 100644
--- a/pkgs/by-name/vi/viskores/package.nix
+++ b/pkgs/by-name/vi/viskores/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Visualization library for many-threaded devices";
     homepage = "https://github.com/Viskores/viskores";
     changelog = "https://github.com/Viskores/viskores/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
   };
diff --git a/pkgs/by-name/vk/vkd3d-proton/package.nix b/pkgs/by-name/vk/vkd3d-proton/package.nix
index 4202ef4e44b2..726bb86fef07 100644
--- a/pkgs/by-name/vk/vkd3d-proton/package.nix
+++ b/pkgs/by-name/vk/vkd3d-proton/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
     description = "Fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     inherit (wine.meta) platforms;
   };
diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix
index fdb6bfadb549..cc2d5ed3ec83 100644
--- a/pkgs/by-name/vk/vkd3d/package.nix
+++ b/pkgs/by-name/vk/vkd3d/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
       If vkd3d is available when building Wine, then Wine will use it to support
       Direct3D 12 applications.
     '';
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     mainProgram = "vkd3d-compiler";
     maintainers = with lib.maintainers; [ liberodark ];
     inherit (wine.meta) platforms;
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index bba04b3ba4ad..856a5f66f375 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Extensible Vulkan benchmarking suite";
     homepage = "https://github.com/vkmark/vkmark";
-    license = with lib.licenses; [ lgpl21Plus ];
+    license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ muscaln ];
     mainProgram = "vkmark";
diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix
index a49e712280f6..424e95571834 100644
--- a/pkgs/by-name/vo/voicevox-core/package.nix
+++ b/pkgs/by-name/vo/voicevox-core/package.nix
@@ -109,7 +109,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}";
     description = "Core library for the VOICEVOX speech synthesis software";
     homepage = "https://github.com/VOICEVOX/voicevox_core";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       tomasajt
       eljamm
diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix
index 4be2e6c84ec8..ad17125a085b 100644
--- a/pkgs/by-name/vo/volta/package.nix
+++ b/pkgs/by-name/vo/volta/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://volta.sh/";
     changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fbrs ];
     mainProgram = "volta";
   };
diff --git a/pkgs/by-name/vt/vt323/package.nix b/pkgs/by-name/vt/vt323/package.nix
index cb6c5710ddf2..7582ce144ebb 100644
--- a/pkgs/by-name/vt/vt323/package.nix
+++ b/pkgs/by-name/vt/vt323/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/phoikoi/VT323/releases/tag/v${finalAttrs.version}";
     description = "Monospaced typeface designed to look like the VT320 text terminal glyphs";
     homepage = "https://github.com/phoikoi/VT323";
-    license = with lib.licenses; [ ofl ];
+    license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ marcel ];
   };
 })
diff --git a/pkgs/by-name/vy/vym/package.nix b/pkgs/by-name/vy/vym/package.nix
index 9d42a69ef879..0ef8ae7ac292 100644
--- a/pkgs/by-name/vy/vym/package.nix
+++ b/pkgs/by-name/vy/vym/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
       drawn by hand or any drawing software vym offers much more features to
       work with such maps.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "vym";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/vz/vzic/package.nix b/pkgs/by-name/vz/vzic/package.nix
index 91ee97fd9d75..6bb48f6dbf21 100644
--- a/pkgs/by-name/vz/vzic/package.nix
+++ b/pkgs/by-name/vz/vzic/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification";
     changelog = "https://github.com/libical/vzic/blob/${finalAttrs.src.rev}/ChangeLog";
     mainProgram = "vzic";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ moraxyc ];
     broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix
index 9332b3d5c426..82027a5c5c7d 100644
--- a/pkgs/by-name/wa/waagent/package.nix
+++ b/pkgs/by-name/wa/waagent/package.nix
@@ -90,7 +90,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       Fabric Controller'';
     homepage = "https://github.com/Azure/WALinuxAgent";
     maintainers = with lib.maintainers; [ codgician ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix
index 79d644b968df..f9a8be74e1aa 100644
--- a/pkgs/by-name/wa/wambo/package.nix
+++ b/pkgs/by-name/wa/wambo/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/phip1611/wambo";
     changelog = "https://github.com/phip1611/wambo/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phip1611 ];
   };
 })
diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix
index 91616cc43fca..a12b3ccb34c7 100644
--- a/pkgs/by-name/wa/wapm/package.nix
+++ b/pkgs/by-name/wa/wapm/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Package manager for WebAssembly modules";
     mainProgram = "wapm";
     homepage = "https://docs.wasmer.io/ecosystem/wapm";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.lucperkins ];
   };
 })
diff --git a/pkgs/by-name/wa/wasmedge/package.nix b/pkgs/by-name/wa/wasmedge/package.nix
index 72a0b94fc30c..984bb3fd6d28 100644
--- a/pkgs/by-name/wa/wasmedge/package.nix
+++ b/pkgs/by-name/wa/wasmedge/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://wasmedge.org/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     description = "Lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications";
     maintainers = [ ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/wa/wasynth/package.nix b/pkgs/by-name/wa/wasynth/package.nix
index e30a4fcbf03f..048b089dd06f 100644
--- a/pkgs/by-name/wa/wasynth/package.nix
+++ b/pkgs/by-name/wa/wasynth/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
        * wasm2luau: translate WebAssembly Luau source code
     '';
     homepage = "https://github.com/Rerumu/Wasynth";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index 880a3be99572..0bf91b22f52a 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Executes commands in response to file modifications";
     homepage = "https://watchexec.github.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       michalrus
       prince213
diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 089e1f37332b..7ab04ae747e2 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -125,7 +125,7 @@ python3Packages.buildPythonApplication {
     changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}";
     description = "User-friendly way to configure Waydroid and install extensions, including Magisk and ARM translation";
     homepage = "https://github.com/ayasa520/waydroid-helper";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "waydroid-helper";
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/wa/wayland-logout/package.nix b/pkgs/by-name/wa/wayland-logout/package.nix
index c5460756c0fd..365299129891 100644
--- a/pkgs/by-name/wa/wayland-logout/package.nix
+++ b/pkgs/by-name/wa/wayland-logout/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "wayland-logout";
     homepage = "https://github.com/soreau/wayland-logout";
     maintainers = with lib.maintainers; [ quantenzitrone ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix
index b9f2952b9a71..4013ae728dd0 100644
--- a/pkgs/by-name/wc/wchisp/package.nix
+++ b/pkgs/by-name/wc/wchisp/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line implementation of WCHISPTool, for flashing ch32 MCUs";
     homepage = "https://ch32-rs.github.io/wchisp/";
     changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = with lib.platforms; linux ++ darwin ++ windows;
     broken = !stdenv.hostPlatform.isLinux;
     maintainers = with lib.maintainers; [ jwillikers ];
diff --git a/pkgs/by-name/we/weathr/package.nix b/pkgs/by-name/we/weathr/package.nix
index 693d018b22ce..b91a2f6cf093 100644
--- a/pkgs/by-name/we/weathr/package.nix
+++ b/pkgs/by-name/we/weathr/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Terminal weather app with ascii animation";
     homepage = "https://github.com/veirt/weathr";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       sudo-mac
       phanirithvij
diff --git a/pkgs/by-name/we/webcamoid/package.nix b/pkgs/by-name/we/webcamoid/package.nix
index 0af42d57267d..ec7e3e6d6900 100644
--- a/pkgs/by-name/we/webcamoid/package.nix
+++ b/pkgs/by-name/we/webcamoid/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "Webcam Capture Software";
     longDescription = "Webcamoid is a full featured and multiplatform webcam suite.";
     homepage = "https://github.com/webcamoid/webcamoid/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ robaca ];
     mainProgram = "webcamoid";
diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix
index 914e48afda06..f0b0022dbf0b 100644
--- a/pkgs/by-name/we/weylus/package.nix
+++ b/pkgs/by-name/we/weylus/package.nix
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage {
     description = "Use your tablet as graphic tablet/touch screen on your computer";
     mainProgram = "weylus";
     homepage = "https://github.com/H-M-H/Weylus";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix
index e85156efc646..467164e48321 100644
--- a/pkgs/by-name/wi/wifi-qr/package.nix
+++ b/pkgs/by-name/wi/wifi-qr/package.nix
@@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "WiFi password sharing via QR codes";
     homepage = "https://github.com/kokoye2007/wifi-qr";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ ambroisie ];
     mainProgram = "wifi-qr";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/wi/wikiman/package.nix b/pkgs/by-name/wi/wikiman/package.nix
index 2c4a8daeea9b..4f7742b6e112 100644
--- a/pkgs/by-name/wi/wikiman/package.nix
+++ b/pkgs/by-name/wi/wikiman/package.nix
@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Offline search engine for manual pages, Arch Wiki, Gentoo Wiki and other documentation";
     homepage = "https://github.com/filiparag/wikiman";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "wikiman";
diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix
index a52b12bf4c6a..b3f5f3d83d34 100644
--- a/pkgs/by-name/wi/windsend-rs/package.nix
+++ b/pkgs/by-name/wi/windsend-rs/package.nix
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Quickly and securely sync clipboard, transfer files and directories between devices";
     homepage = "https://github.com/doraemonkeys/WindSend";
     mainProgram = "wind_send";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix
index 95572f0b0c43..64a130f29ea1 100644
--- a/pkgs/by-name/wi/windsend/package.nix
+++ b/pkgs/by-name/wi/windsend/package.nix
@@ -71,7 +71,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
     description = "Quickly and securely sync clipboard, transfer files and directories between devices";
     homepage = "https://github.com/doraemonkeys/WindSend";
     mainProgram = "WindSend";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix
index 2e8889e36e16..5c32f37c5756 100644
--- a/pkgs/by-name/wi/wio/package.nix
+++ b/pkgs/by-name/wi/wio/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
       Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
       and feel to plan9's rio.
     '';
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "wio";
     maintainers = [ ];
     inherit (wayland.meta) platforms;
diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix
index fdf770a63fe7..a29d3ae42d4c 100644
--- a/pkgs/by-name/wl/wlogout/package.nix
+++ b/pkgs/by-name/wl/wlogout/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ArtsyMacaw/wlogout";
     description = "Wayland based logout menu";
     changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     mainProgram = "wlogout";
     maintainers = with lib.maintainers; [ iogamaster ];
     inherit (wayland.meta) platforms;
diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix
index 5122742e2e93..f28ceebd0ae8 100644
--- a/pkgs/by-name/wo/worker/package.nix
+++ b/pkgs/by-name/wo/worker/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       directories by using history of accessed directories, live filtering, and
       access to commands by using the keyboard.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "worker";
     maintainers = [ ];
     inherit (libx11.meta) platforms;
diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix
index eb800c8405bd..168054ee0a63 100644
--- a/pkgs/by-name/wo/worldpainter/package.nix
+++ b/pkgs/by-name/wo/worldpainter/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.worldpainter.net/";
     description = "Interactive map generator for Minecraft";
     longDescription = "WorldPainter is an interactive map generator for Minecraft. It allows you to \"paint\" landscapes using similar tools as a regular paint program. Sculpt and mould the terrain, paint materials, trees, snow and ice, etc. onto it, and much more";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ eymeric ];
     platforms = lib.platforms.linux;
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix
index a35c3c2e31be..9eef12507260 100644
--- a/pkgs/by-name/wo/wox/package.nix
+++ b/pkgs/by-name/wo/wox/package.nix
@@ -111,7 +111,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/Wox-launcher/Wox/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     mainProgram = "wox";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ eljamm ];
   };
 })
diff --git a/pkgs/by-name/wp/wprecon/package.nix b/pkgs/by-name/wp/wprecon/package.nix
index 0f85b2e7141a..3be96c1ae720 100644
--- a/pkgs/by-name/wp/wprecon/package.nix
+++ b/pkgs/by-name/wp/wprecon/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     homepage = "https://github.com/blackbinn/wprecon";
     # License Zero Noncommercial Public License 2.0.1
     # https://github.com/blackbinn/wprecon/blob/master/LICENSE
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ws/wsjtx/package.nix b/pkgs/by-name/ws/wsjtx/package.nix
index 38c063c47313..c8ccf4133d4f 100644
--- a/pkgs/by-name/ws/wsjtx/package.nix
+++ b/pkgs/by-name/ws/wsjtx/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
       contacts under extreme weak-signal conditions.
     '';
     homepage = "https://wsjt.sourceforge.io";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       lasandell
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index 953197d2a914..df3ccaf4a28d 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation (finalPackages: rec {
       arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It
       allows running an X session as a window under Arcan.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/xc/xcode-install/package.nix b/pkgs/by-name/xc/xcode-install/package.nix
index b4ddae6ce51b..04aeb82b1b11 100644
--- a/pkgs/by-name/xc/xcode-install/package.nix
+++ b/pkgs/by-name/xc/xcode-install/package.nix
@@ -16,6 +16,6 @@ bundlerApp {
     homepage = "https://github.com/xcpretty/xcode-install";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ q3k ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/xd/xdiskusage/package.nix b/pkgs/by-name/xd/xdiskusage/package.nix
index e5f2ded9efb7..e927755f66c2 100644
--- a/pkgs/by-name/xd/xdiskusage/package.nix
+++ b/pkgs/by-name/xd/xdiskusage/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Program to show you what is using up all your disk space";
     homepage = "https://xdiskusage.sourceforge.net/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ fuzzdk ];
     platforms = with lib.platforms; linux;
     mainProgram = "xdiskusage";
diff --git a/pkgs/by-name/xe/xedit/package.nix b/pkgs/by-name/xe/xedit/package.nix
index 037f4540cd9b..8cf32e7bfe22 100644
--- a/pkgs/by-name/xe/xedit/package.nix
+++ b/pkgs/by-name/xe/xedit/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Simple graphical text editor using Athena Widgets (Xaw)";
     homepage = "https://gitlab.freedesktop.org/xorg/app/xedit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
index cdd416124159..c80a2b9c1664 100644
--- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix
+++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "xlibinput_calibrator";
     homepage = "https://github.com/kreijack/xlibinput_calibrator";
     changelog = "https://github.com/kreijack/xlibinput_calibrator/blob/${finalAttrs.src.rev}/Changelog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ atemu ];
   };
 })
diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index 8cfa2b3adf9b..1d4e0faad00c 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -158,7 +158,7 @@ buildPythonPackage rec {
     homepage = "https://xon.sh/";
     description = "Python-powered shell";
     changelog = "https://github.com/xonsh/xonsh/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     mainProgram = "xonsh";
     maintainers = with lib.maintainers; [ samlukeyes123 ];
   };
diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix
index 4ebd26870f5b..90a95f780c3f 100644
--- a/pkgs/by-name/xr/xray/package.nix
+++ b/pkgs/by-name/xr/xray/package.nix
@@ -59,7 +59,7 @@ buildGo126Module (finalAttrs: {
     description = "Platform for building proxies to bypass network restrictions. A replacement for v2ray-core, with XTLS support and fully compatible configuration";
     mainProgram = "xray";
     homepage = "https://github.com/XTLS/Xray-core";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ iopq ];
   };
 })
diff --git a/pkgs/by-name/xs/xscope/package.nix b/pkgs/by-name/xs/xscope/package.nix
index 79ba960b0d41..580dfc3892e4 100644
--- a/pkgs/by-name/xs/xscope/package.nix
+++ b/pkgs/by-name/xs/xscope/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Program to monitor X11/Client conversations";
     homepage = "https://cgit.freedesktop.org/xorg/app/xscope/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ crertel ];
     platforms = lib.platforms.unix;
     mainProgram = "xscope";
diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index 10cc131d07d8..13827a86b3fd 100644
--- a/pkgs/by-name/xt/xterm/package.nix
+++ b/pkgs/by-name/xt/xterm/package.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
       window whenever it is resized.
     '';
     homepage = "https://invisible-island.net/xterm";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = with lib.platforms; linux ++ darwin;
     changelog = "https://invisible-island.net/xterm/xterm.log.html#xterm_${finalAttrs.version}";
     mainProgram = "xterm";
diff --git a/pkgs/by-name/xu/xunit-viewer/package.nix b/pkgs/by-name/xu/xunit-viewer/package.nix
index 4e3ccd52d7ba..0f2c0d477351 100644
--- a/pkgs/by-name/xu/xunit-viewer/package.nix
+++ b/pkgs/by-name/xu/xunit-viewer/package.nix
@@ -36,7 +36,7 @@ buildNpmPackage {
   meta = {
     description = "View your xunit results using JavaScript";
     homepage = "https://lukejpreston.github.io/xunit-viewer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix
index 531a2744b45b..80e193397c76 100644
--- a/pkgs/by-name/ya/yaml2json/package.nix
+++ b/pkgs/by-name/ya/yaml2json/package.nix
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/bronze1man/yaml2json/releases/tag/v${finalAttrs.version}";
     description = "Convert yaml to json";
     mainProgram = "yaml2json";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ya/yay/package.nix b/pkgs/by-name/ya/yay/package.nix
index 958a073161b8..2a5bea5bc5d3 100644
--- a/pkgs/by-name/ya/yay/package.nix
+++ b/pkgs/by-name/ya/yay/package.nix
@@ -66,7 +66,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/Jguer/yay";
     mainProgram = "yay";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/yg/yggdrasil-ng/package.nix b/pkgs/by-name/yg/yggdrasil-ng/package.nix
index 04f621cbdbf5..ddca5e0d8270 100644
--- a/pkgs/by-name/yg/yggdrasil-ng/package.nix
+++ b/pkgs/by-name/yg/yggdrasil-ng/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (oldAttrs: {
     mainProgram = "telemt";
     description = "Yggdrasil Network rewritten in Rust";
     homepage = "https://github.com/Revertron/Yggdrasil-ng";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       r4v3n6101
       malik
diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix
index cdb953a46a03..a0d2f861ccfe 100644
--- a/pkgs/by-name/yt/ytree/package.nix
+++ b/pkgs/by-name/yt/ytree/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.han.de/~werner/ytree.html";
     description = "Curses-based file manager similar to DOS Xtree(TM)";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     mainProgram = "ytree";
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/zd/zdns/package.nix b/pkgs/by-name/zd/zdns/package.nix
index 94c24f404b2f..6c7310276db8 100644
--- a/pkgs/by-name/zd/zdns/package.nix
+++ b/pkgs/by-name/zd/zdns/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     description = "CLI DNS lookup tool";
     mainProgram = "zdns";
     homepage = "https://github.com/zmap/zdns";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/by-name/ze/zellij-unwrapped/package.nix b/pkgs/by-name/ze/zellij-unwrapped/package.nix
index c0331f24ac59..c3db4830ff1e 100644
--- a/pkgs/by-name/ze/zellij-unwrapped/package.nix
+++ b/pkgs/by-name/ze/zellij-unwrapped/package.nix
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Terminal workspace with batteries included";
     homepage = "https://zellij.dev/";
     changelog = "https://github.com/zellij-org/zellij/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       therealansh
       _0x4A6F
diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix
index 0614cb4a6636..37ff5eb0672a 100644
--- a/pkgs/by-name/ze/zesarux/package.nix
+++ b/pkgs/by-name/ze/zesarux/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/chernandezba/zesarux";
     description = "ZX Second-Emulator And Released for UniX";
     mainProgram = "zesarux";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/zn/zn_poly/package.nix b/pkgs/by-name/zn/zn_poly/package.nix
index dc8b0e9101e4..36a9255cfd77 100644
--- a/pkgs/by-name/zn/zn_poly/package.nix
+++ b/pkgs/by-name/zn/zn_poly/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/";
     description = "Polynomial arithmetic over Z/nZ";
-    license = with lib.licenses; [ gpl3 ];
+    license = lib.licenses.gpl3;
     teams = [ lib.teams.sage ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 80f6457629a4..8e8eec5f254f 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Fast cd command that learns your habits";
     homepage = "https://github.com/ajeetdsouza/zoxide";
     changelog = "https://github.com/ajeetdsouza/zoxide/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       ysndr
       cole-h
diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 247e72ebbb65..1d8a1d17093b 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/fcorbelli/zpaqfranz/releases/tag/${finalAttrs.version}";
     description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests";
     mainProgram = "zpaqfranz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix
index f5877f302aeb..a14f27897afc 100644
--- a/pkgs/desktops/enlightenment/evisum/default.nix
+++ b/pkgs/desktops/enlightenment/evisum/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "System and process monitor written with EFL";
     mainProgram = "evisum";
     homepage = "https://git.enlightenment.org/enlightenment/evisum";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     platforms = lib.platforms.linux;
     teams = [ lib.teams.enlightenment ];
   };
diff --git a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
index 856f1fe00f7a..85ad305556a4 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Default Calendar application for Ubuntu Touch devices";
     homepage = "https://gitlab.com/ubports/development/apps/lomiri-calendar-app";
     changelog = "https://gitlab.com/ubports/development/apps/lomiri-calendar-app/-/blob/v${finalAttrs.version}/ChangeLog";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "lomiri-calendar-app";
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
index 51d6f9e0a3a4..db31ea42bf57 100644
--- a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/ubports/development/core/lomiri-wallpapers";
     changelog = "https://gitlab.com/ubports/development/core/lomiri-wallpapers/-/blob/${finalAttrs.version}/ChangeLog";
     # On update, recheck debian/copyright for which licenses apply to the installed images
-    license = with lib.licenses; [ cc-by-sa-30 ];
+    license = lib.licenses.cc-by-sa-30;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 0398ec748206..e2e8b3b2abb5 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -157,7 +157,7 @@ else
       '';
       meta = {
         description = "Android NDK toolchain, tuned for other platforms";
-        license = with lib.licenses; [ unfree ];
+        license = lib.licenses.unfree;
         teams = [ lib.teams.android ];
       };
     };
diff --git a/pkgs/development/compilers/gcc/ng/common/common-let.nix b/pkgs/development/compilers/gcc/ng/common/common-let.nix
index 95f14abd7679..970e9e143be8 100644
--- a/pkgs/development/compilers/gcc/ng/common/common-let.nix
+++ b/pkgs/development/compilers/gcc/ng/common/common-let.nix
@@ -11,7 +11,7 @@
 
 rec {
   gcc_meta = {
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     teams = [ lib.teams.gcc ];
   };
 
diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix
index fd9299482bb3..914d9f672ab9 100644
--- a/pkgs/development/compilers/opensmalltalk-vm/default.nix
+++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix
@@ -110,7 +110,7 @@ let
         description = "Cross-platform virtual machine for Squeak, Pharo, Cuis, and Newspeak";
         mainProgram = scriptName;
         homepage = "https://opensmalltalk.org/";
-        license = with lib.licenses; [ mit ];
+        license = lib.licenses.mit;
         maintainers = with lib.maintainers; [ jakewaksbaum ];
         platforms = [ stdenv.targetPlatform.system ];
       };
diff --git a/pkgs/development/hare-third-party/hare-compress/default.nix b/pkgs/development/hare-third-party/hare-compress/default.nix
index 124247b06e52..ef225a11cc4f 100644
--- a/pkgs/development/hare-third-party/hare-compress/default.nix
+++ b/pkgs/development/hare-third-party/hare-compress/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-compress/";
     description = "Compression algorithms for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ starzation ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/hare-third-party/hare-http/default.nix b/pkgs/development/hare-third-party/hare-http/default.nix
index de07152d248d..1c3d671836c3 100644
--- a/pkgs/development/hare-third-party/hare-http/default.nix
+++ b/pkgs/development/hare-third-party/hare-http/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-http/";
     description = "HTTP(s) support for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ sikmir ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/hare-third-party/hare-json/default.nix b/pkgs/development/hare-third-party/hare-json/default.nix
index 397e826a6a29..76111cb4e0b2 100644
--- a/pkgs/development/hare-third-party/hare-json/default.nix
+++ b/pkgs/development/hare-third-party/hare-json/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-json/";
     description = "This package provides JSON support for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ starzation ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/hare-third-party/hare-png/default.nix b/pkgs/development/hare-third-party/hare-png/default.nix
index 08029b59c70d..252d68f14caa 100644
--- a/pkgs/development/hare-third-party/hare-png/default.nix
+++ b/pkgs/development/hare-third-party/hare-png/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-png/";
     description = "PNG implementation for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ starzation ];
     inherit (hareHook.meta) platforms badPlatforms;
     broken = true; # hare 0.26.0
diff --git a/pkgs/development/hare-third-party/hare-ssh/default.nix b/pkgs/development/hare-third-party/hare-ssh/default.nix
index fcdba0b2e523..d18f0d27e0da 100644
--- a/pkgs/development/hare-third-party/hare-ssh/default.nix
+++ b/pkgs/development/hare-third-party/hare-ssh/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-ssh/";
     description = "SSH client & server protocol implementation for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ patwid ];
 
     inherit (hareHook.meta) platforms badPlatforms;
diff --git a/pkgs/development/hare-third-party/hare-xml/default.nix b/pkgs/development/hare-third-party/hare-xml/default.nix
index 5078801f74d2..07f108982234 100644
--- a/pkgs/development/hare-third-party/hare-xml/default.nix
+++ b/pkgs/development/hare-third-party/hare-xml/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://git.sr.ht/~sircmpwn/hare-xml/";
     description = "This package provides XML support for Hare";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ sikmir ];
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix
index 9b59cff8e7b5..3262bb19976c 100644
--- a/pkgs/development/interpreters/kerf/default.nix
+++ b/pkgs/development/interpreters/kerf/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
       used for local analytics, timeseries, logfile processing,
       and more.
     '';
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     homepage = "https://github.com/kevinlawler/kerf1";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ thoughtpolice ];
diff --git a/pkgs/development/libraries/hyphen/dictionaries.nix b/pkgs/development/libraries/hyphen/dictionaries.nix
index d1beaf73b359..762b70d55974 100644
--- a/pkgs/development/libraries/hyphen/dictionaries.nix
+++ b/pkgs/development/libraries/hyphen/dictionaries.nix
@@ -31,7 +31,7 @@ let
       meta = {
         description = "Hyphen dictionary for ${shortDescription} from LibreOffice";
         homepage = "https://wiki.documentfoundation.org/Development/Dictionaries";
-        license = with lib.licenses; [ mpl20 ];
+        license = lib.licenses.mpl20;
         maintainers = with lib.maintainers; [ theCapypara ];
         platforms = lib.platforms.all;
       };
diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix
index f30cf3449447..b62ff73abc2d 100644
--- a/pkgs/development/libraries/librsb/default.nix
+++ b/pkgs/development/libraries/librsb/default.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
       Contains libraries and header files for developing applications that
       want to make use of librsb.
     '';
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ ravenjoad ];
     platforms = lib.platforms.all;
     # linking errors such as 'undefined reference to `gzungetc'
diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 5e3bbf9d6131..da6c87ad13a5 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -28,7 +28,7 @@ rec {
     '';
     homepage = "https://www.mesa3d.org/";
     changelog = "https://docs.mesa3d.org/relnotes/${version}.html";
-    license = with lib.licenses; [ mit ]; # X11 variant, in most files
+    license = lib.licenses.mit; # X11 variant, in most files
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       k900
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 19b690099e07..c0a00366eac2 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: {
       Poppler is a PDF rendering library based on the xpdf-3.0 code base. In
       addition it provides a number of tools that can be installed separately.
     '';
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
     maintainers = [ ];
     teams = [ lib.teams.freedesktop ];
diff --git a/pkgs/development/misc/resholve/python2-modules/pip/default.nix b/pkgs/development/misc/resholve/python2-modules/pip/default.nix
index 31383a035c0f..33b3a75b1291 100644
--- a/pkgs/development/misc/resholve/python2-modules/pip/default.nix
+++ b/pkgs/development/misc/resholve/python2-modules/pip/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "PyPA recommended tool for installing Python packages";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://pip.pypa.io/";
     knownVulnerabilities = [
       "CVE-2021-28363"
diff --git a/pkgs/development/misc/resholve/python2-modules/wheel/default.nix b/pkgs/development/misc/resholve/python2-modules/wheel/default.nix
index de2fa27e9489..000e542689d3 100644
--- a/pkgs/development/misc/resholve/python2-modules/wheel/default.nix
+++ b/pkgs/development/misc/resholve/python2-modules/wheel/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
       It should be noted that wheel is not intended to be used as a library,
       and as such there is no stable, public API.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siriobalmelli ];
   };
 }
diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index ffb6c2cf6ac9..d97e1f235bd5 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -70,7 +70,7 @@ python27.pkgs.buildPythonApplication {
     description = "Resolve external shell-script dependencies";
     homepage = "https://github.com/abathur/resholve";
     changelog = "https://github.com/abathur/resholve/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ abathur ];
     platforms = lib.platforms.all;
     knownVulnerabilities = [
diff --git a/pkgs/development/ocaml-modules/domain-local-await/default.nix b/pkgs/development/ocaml-modules/domain-local-await/default.nix
index 3aa70d81f44a..49801ed55740 100644
--- a/pkgs/development/ocaml-modules/domain-local-await/default.nix
+++ b/pkgs/development/ocaml-modules/domain-local-await/default.nix
@@ -46,7 +46,7 @@ buildDunePackage (finalAttrs: {
     homepage = "https://github.com/ocaml-multicore/ocaml-domain-local-await";
     changelog = "https://github.com/ocaml-multicore/ocaml-domain-local-await/raw/v${finalAttrs.version}/CHANGES.md";
     description = "Scheduler independent blocking mechanism";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 })
diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix
index d666f11d4b45..97030531897d 100644
--- a/pkgs/development/ocaml-modules/eio/default.nix
+++ b/pkgs/development/ocaml-modules/eio/default.nix
@@ -78,7 +78,7 @@ buildDunePackage {
     homepage = "https://github.com/ocaml-multicore/eio";
     changelog = "https://github.com/ocaml-multicore/eio/raw/v${version}/CHANGES.md";
     description = "Effects-Based Parallel IO for OCaml";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/iomux/default.nix b/pkgs/development/ocaml-modules/iomux/default.nix
index 6f4535e3ec7f..3c0f3e563b89 100644
--- a/pkgs/development/ocaml-modules/iomux/default.nix
+++ b/pkgs/development/ocaml-modules/iomux/default.nix
@@ -28,7 +28,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/haesbaert/ocaml-iomux";
     description = "IO Multiplexers for OCaml";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 })
diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix
index 8372d456cc1b..d91eeadea71d 100644
--- a/pkgs/development/ocaml-modules/lwt_eio/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix
@@ -30,6 +30,6 @@ buildDunePackage (finalAttrs: {
     homepage = "https://github.com/ocaml-multicore/lwt_eio";
     changelog = "https://github.com/ocaml-multicore/lwt_eio/raw/v${finalAttrs.version}/CHANGES.md";
     description = "Use Lwt libraries from within Eio";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
   };
 })
diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix
index cc1c94e15898..b5beae48a6aa 100644
--- a/pkgs/development/ocaml-modules/menhir/lib.nix
+++ b/pkgs/development/ocaml-modules/menhir/lib.nix
@@ -33,7 +33,7 @@ buildDunePackage {
       to OCaml code.  Menhir was designed and implemented by François Pottier
       and Yann Régis-Gianas.
     '';
-    license = with lib.licenses; [ lgpl2Only ];
+    license = lib.licenses.lgpl2Only;
     maintainers = with lib.maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/menhir/sdk.nix b/pkgs/development/ocaml-modules/menhir/sdk.nix
index b7d744d16211..a53ed418fb75 100644
--- a/pkgs/development/ocaml-modules/menhir/sdk.nix
+++ b/pkgs/development/ocaml-modules/menhir/sdk.nix
@@ -11,6 +11,6 @@ buildDunePackage {
 
   meta = menhirLib.meta // {
     description = "Compile-time library for auxiliary tools related to Menhir";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
index 5e7fa5d58574..2e1d9a592222 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
@@ -33,6 +33,6 @@ buildDunePackage {
     description = "PPX syntax extension that generates code for converting OCaml types to and from Yojson";
     homepage = "https://github.com/janestreet/ppx_yojson_conv";
     maintainers = with lib.maintainers; [ djacu ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/thread-table/default.nix b/pkgs/development/ocaml-modules/thread-table/default.nix
index 5caa45f287ca..313fad83569a 100644
--- a/pkgs/development/ocaml-modules/thread-table/default.nix
+++ b/pkgs/development/ocaml-modules/thread-table/default.nix
@@ -32,7 +32,7 @@ buildDunePackage rec {
     homepage = "https://github.com/ocaml-multicore/ocaml-${pname}";
     changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/${version}/CHANGES.md";
     description = "Lock-free thread-safe integer keyed hash table";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ toastal ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/xxhash/default.nix b/pkgs/development/ocaml-modules/xxhash/default.nix
index 4d7834aa8a6e..9a151b530b66 100644
--- a/pkgs/development/ocaml-modules/xxhash/default.nix
+++ b/pkgs/development/ocaml-modules/xxhash/default.nix
@@ -45,7 +45,7 @@ buildDunePackage rec {
   meta = {
     homepage = "https://github.com/314eter/ocaml-xxhash";
     description = "Bindings for xxHash, an extremely fast hash algorithm";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ toastal ];
   };
 }
diff --git a/pkgs/development/octave-modules/octclip/default.nix b/pkgs/development/octave-modules/octclip/default.nix
index 1b7f2b00e3ac..d5bd62f5f5fb 100644
--- a/pkgs/development/octave-modules/octclip/default.nix
+++ b/pkgs/development/octave-modules/octclip/default.nix
@@ -25,7 +25,7 @@ buildOctavePackage rec {
   meta = {
     name = "GNU Octave Clipping Polygons Tool";
     homepage = "https://gnu-octave.github.io/packages/octclip/";
-    license = with lib.licenses; [ gpl3Plus ]; # modified BSD?
+    license = lib.licenses.gpl3Plus; # modified BSD?
     maintainers = with lib.maintainers; [ ravenjoad ];
     description = "Perform boolean operations with polygons using the Greiner-Hormann algorithm";
   };
diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix
index 936148bc1ce8..72c5d1b9e4a2 100644
--- a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix
+++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix
@@ -51,7 +51,7 @@ buildPerlPackage rec {
     longDescription = ''
       Part of BioPerl Extensions (BioPerl-Ext) distribution, a collection of Bioperl C-compiled extensions.
     '';
-    license = with lib.licenses; [ artistic1 ];
+    license = lib.licenses.artistic1;
     maintainers = with lib.maintainers; [ apraga ];
   };
 }
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 43794e71f105..e49485ceb83c 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -66,7 +66,7 @@ buildPerlPackage {
     description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks";
     homepage = "https://www.percona.com/software/database-tools/percona-toolkit";
     changelog = "https://docs.percona.com/percona-toolkit/release_notes.html";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ izorkin ];
   };
 }
diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix
index b6019159ecfe..79315098aea6 100644
--- a/pkgs/development/perl-modules/Po4a/default.nix
+++ b/pkgs/development/perl-modules/Po4a/default.nix
@@ -126,6 +126,6 @@ buildPerlPackage rec {
   meta = {
     description = "Tools for helping translation of documentation";
     homepage = "https://po4a.org";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix
index 02ab159e928f..97dbab07d25f 100644
--- a/pkgs/development/perl-modules/Tirex/default.nix
+++ b/pkgs/development/perl-modules/Tirex/default.nix
@@ -55,6 +55,6 @@ buildPerlPackage rec {
     description = "Tools for running a map tile server";
     homepage = "https://wiki.openstreetmap.org/wiki/Tirex";
     maintainers = with lib.maintainers; [ jglukasik ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index 022da985986d..c28b6963b697 100644
--- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
@@ -33,7 +33,7 @@ buildPerlPackage rec {
   meta = {
     description = "Lightweight application for searching and streaming videos from YouTube";
     homepage = "https://github.com/trizen/youtube-viewer";
-    license = with lib.licenses; [ artistic2 ];
+    license = lib.licenses.artistic2;
     maintainers = with lib.maintainers; [ woffs ];
     mainProgram = "youtube-viewer";
   };
diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index 1233f9f91892..185ddaeaa650 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -26,7 +26,7 @@ buildPecl {
 
   meta = {
     description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php";
     maintainers = with lib.maintainers; [
       das_j
diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix
index 93623e58cf7e..faa1d792b016 100644
--- a/pkgs/development/php-packages/pdlib/default.nix
+++ b/pkgs/development/php-packages/pdlib/default.nix
@@ -24,7 +24,7 @@ buildPecl {
 
   meta = {
     description = "PHP extension for Dlib";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     homepage = "https://github.com/goodspb/pdlib";
     teams = [ lib.teams.php ];
   };
diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix
index 7db58758e37e..d690991c3c34 100644
--- a/pkgs/development/python-modules/adafruit-pureio/default.nix
+++ b/pkgs/development/python-modules/adafruit-pureio/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     description = "Python interface to Linux IO including I2C and SPI";
     homepage = "https://github.com/adafruit/Adafruit_Python_PureIO";
     changelog = "https://github.com/adafruit/Adafruit_Python_PureIO/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix
index f49ba99fd73f..c0ce84a04e88 100644
--- a/pkgs/development/python-modules/adax/default.nix
+++ b/pkgs/development/python-modules/adax/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to communicate with Adax";
     homepage = "https://github.com/Danielhiversen/pyAdax";
     changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix
index 39a7835b5d4d..ccc4652a4877 100644
--- a/pkgs/development/python-modules/addict/default.nix
+++ b/pkgs/development/python-modules/addict/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module that exposes a dictionary subclass that allows items to be set like attributes";
     homepage = "https://github.com/mewwts/addict";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix
index e72448ccc2ab..74dabfa07062 100644
--- a/pkgs/development/python-modules/adext/default.nix
+++ b/pkgs/development/python-modules/adext/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python extension for AlarmDecoder";
     homepage = "https://github.com/ajschmidt8/adext";
     changelog = "https://github.com/ajschmidt8/adext/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix
index 30c52e4963e1..4525c8fe31af 100644
--- a/pkgs/development/python-modules/aesedb/default.nix
+++ b/pkgs/development/python-modules/aesedb/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     mainProgram = "antdsparse";
     homepage = "https://github.com/skelsec/aesedb";
     changelog = "https://github.com/skelsec/aesedb/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix
index b2b16b3bc523..d31608d42bfb 100644
--- a/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/wireservice/agate-dbf/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     description = "Adds read support for dbf files to agate";
     homepage = "https://github.com/wireservice/agate-dbf";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index 83eccddb2c13..8d4f18732aa6 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Adds SQL read/write support to agate";
     homepage = "https://github.com/wireservice/agate-sql";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix
index dd489d313f81..e23b15908148 100644
--- a/pkgs/development/python-modules/aggregate6/default.nix
+++ b/pkgs/development/python-modules/aggregate6/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "IPv4 and IPv6 prefix aggregation tool";
     mainProgram = "aggregate6";
     homepage = "https://github.com/job/aggregate6";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ marcel ];
   };
 }
diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix
index b57430f9e462..f521f8b1c7ef 100644
--- a/pkgs/development/python-modules/aiobiketrax/default.nix
+++ b/pkgs/development/python-modules/aiobiketrax/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Library for interacting with the PowUnity BikeTrax GPS tracker";
     homepage = "https://github.com/basilfx/aiobiketrax";
     changelog = "https://github.com/basilfx/aiobiketrax/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiobroadlink/default.nix b/pkgs/development/python-modules/aiobroadlink/default.nix
index bf5ae089eaa9..e0d501b5faa5 100644
--- a/pkgs/development/python-modules/aiobroadlink/default.nix
+++ b/pkgs/development/python-modules/aiobroadlink/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to control various Broadlink devices";
     mainProgram = "aiobroadlink";
     homepage = "https://github.com/frawau/aiobroadlink";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix
index 9e05876cf0e6..34a29715a620 100644
--- a/pkgs/development/python-modules/aioeafm/default.nix
+++ b/pkgs/development/python-modules/aioeafm/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Python client for access the Real Time flood monitoring API";
     homepage = "https://github.com/Jc2k/aioeafm";
     changelog = "https://github.com/Jc2k/aioeafm/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioeagle/default.nix b/pkgs/development/python-modules/aioeagle/default.nix
index 70e58267b098..e3d8691d2bd4 100644
--- a/pkgs/development/python-modules/aioeagle/default.nix
+++ b/pkgs/development/python-modules/aioeagle/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python library to control EAGLE-200";
     homepage = "https://github.com/home-assistant-libs/aioeagle";
     changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix
index 4ff606078d4b..90fb878c1fce 100644
--- a/pkgs/development/python-modules/aioemonitor/default.nix
+++ b/pkgs/development/python-modules/aioemonitor/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python client for SiteSage Emonitor";
     mainProgram = "my_example";
     homepage = "https://github.com/bdraco/aioemonitor";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
index 5f8b796c10ef..894fbd73175a 100644
--- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix
+++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "WSGI adapter for aiohttp";
     mainProgram = "aiohttp-wsgi-serve";
     homepage = "https://github.com/etianen/aiohttp-wsgi";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix
index a6c5f4cba9b0..b2c555a0a332 100644
--- a/pkgs/development/python-modules/aiokef/default.nix
+++ b/pkgs/development/python-modules/aiokef/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for KEF speakers";
     homepage = "https://github.com/basnijholt/aiokef";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix
index 9569cfb0d133..e71bf6e933f9 100644
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Implementation of a rate limiter for asyncio";
     homepage = "https://github.com/mjpieters/aiolimiter";
     changelog = "https://github.com/mjpieters/aiolimiter/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix
index 362c3c016b96..f30ce5989f3e 100644
--- a/pkgs/development/python-modules/aiolookin/default.nix
+++ b/pkgs/development/python-modules/aiolookin/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python client for interacting with LOOKin devices";
     homepage = "https://github.com/ANMalko/aiolookin";
     changelog = "https://github.com/ANMalko/aiolookin/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix
index 4226de7c027f..685e8a36e3f9 100644
--- a/pkgs/development/python-modules/aiomultiprocess/default.nix
+++ b/pkgs/development/python-modules/aiomultiprocess/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
       the workload and number of cores available.
     '';
     homepage = "https://github.com/omnilib/aiomultiprocess";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix
index 095ed7cf670c..91bd28a3272c 100644
--- a/pkgs/development/python-modules/aionotion/default.nix
+++ b/pkgs/development/python-modules/aionotion/default.nix
@@ -70,7 +70,7 @@ buildPythonPackage rec {
     description = "Python library for Notion Home Monitoring";
     homepage = "https://github.com/bachya/aionotion";
     changelog = "https://github.com/bachya/aionotion/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix
index ce4ef04c4bf4..411fd12a1b87 100644
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing a PostgreSQL database";
     homepage = "https://aiopg.readthedocs.io/";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix
index d846111f5b77..0917f774fe14 100644
--- a/pkgs/development/python-modules/aiopulse/default.nix
+++ b/pkgs/development/python-modules/aiopulse/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/atmurray/aiopulse";
     changelog = "https://github.com/atmurray/aiopulse/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix
index 024752173084..9c161f46dbcb 100644
--- a/pkgs/development/python-modules/aiopvpc/default.nix
+++ b/pkgs/development/python-modules/aiopvpc/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Python module to download Spanish electricity hourly prices (PVPC)";
     homepage = "https://github.com/azogue/aiopvpc";
     changelog = "https://github.com/azogue/aiopvpc/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix
index 3d52f9d5d302..08af5329826d 100644
--- a/pkgs/development/python-modules/aiopyarr/default.nix
+++ b/pkgs/development/python-modules/aiopyarr/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python API client for Lidarr/Radarr/Readarr/Sonarr";
     homepage = "https://github.com/tkdrob/aiopyarr";
     changelog = "https://github.com/tkdrob/aiopyarr/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix
index f5103948c5e5..3387e47afa93 100644
--- a/pkgs/development/python-modules/aiopylgtv/default.nix
+++ b/pkgs/development/python-modules/aiopylgtv/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library to control webOS based LG TV units";
     mainProgram = "aiopylgtvcommand";
     homepage = "https://github.com/bendavid/aiopylgtv";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix
index 93382d3d61fb..d27d0ccac782 100644
--- a/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/pkgs/development/python-modules/aiorecollect/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/bachya/aiorecollect";
     changelog = "https://github.com/bachya/aiorecollect/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix
index 82a8b9002249..8987d12d6ef1 100644
--- a/pkgs/development/python-modules/aioridwell/default.nix
+++ b/pkgs/development/python-modules/aioridwell/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with Ridwell waste recycling";
     homepage = "https://github.com/bachya/aioridwell";
     changelog = "https://github.com/bachya/aioridwell/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index 42d5a84448ac..b588eb73b9c4 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Python list of registered asynchronous callbacks";
     homepage = "https://github.com/aio-libs/aiosignal";
     changelog = "https://github.com/aio-libs/aiosignal/blob/v${version}/CHANGES.rst";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix
index 3cd0d0b024ad..f5968b3a3ef5 100644
--- a/pkgs/development/python-modules/aioskybell/default.nix
+++ b/pkgs/development/python-modules/aioskybell/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = {
     description = "API client for Skybell doorbells";
     homepage = "https://github.com/tkdrob/aioskybell";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix
index 8dcda91cbe91..245c992348c0 100644
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage rec {
     description = "Simple SQL in Python";
     homepage = "https://nackjicholson.github.io/aiosql/";
     changelog = "https://github.com/nackjicholson/aiosql/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ kaction ];
   };
 }
diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix
index 079f656fff57..fb90effd4af4 100644
--- a/pkgs/development/python-modules/aiowatttime/default.nix
+++ b/pkgs/development/python-modules/aiowatttime/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with WattTime";
     homepage = "https://github.com/bachya/aiowatttime";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix
index 8b5339872264..951244f60829 100644
--- a/pkgs/development/python-modules/aioweenect/default.nix
+++ b/pkgs/development/python-modules/aioweenect/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     description = "Library for the weenect API";
     homepage = "https://github.com/eifinger/aioweenect";
     changelog = "https://github.com/eifinger/aioweenect/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix
index 3e0bc134cead..61ecb8ceaf9d 100644
--- a/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/pkgs/development/python-modules/aiowinreg/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python module to parse the registry hive";
     homepage = "https://github.com/skelsec/aiowinreg";
     changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "awinreg";
   };
diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index e98fe6623a36..281c6d9c4c44 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for getting air quality data from Airly sensors";
     homepage = "https://github.com/ak-ambi/python-airly";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/airtouch4pyapi/default.nix b/pkgs/development/python-modules/airtouch4pyapi/default.nix
index b17552f06106..44f65b2b9b92 100644
--- a/pkgs/development/python-modules/airtouch4pyapi/default.nix
+++ b/pkgs/development/python-modules/airtouch4pyapi/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for Airtouch 4 controllers";
     homepage = "https://github.com/LonePurpleWolf/airtouch4pyapi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix
index a4ec18c716f5..c02a12c68ee9 100644
--- a/pkgs/development/python-modules/aladdin-connect/default.nix
+++ b/pkgs/development/python-modules/aladdin-connect/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library for interacting with Genie Aladdin Connect devices";
     homepage = "https://github.com/shoejosh/aladdin-connect";
     changelog = "https://github.com/shoejosh/aladdin-connect/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix
index ff6174074032..55a1a36e940b 100644
--- a/pkgs/development/python-modules/amberelectric/default.nix
+++ b/pkgs/development/python-modules/amberelectric/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Amber Electric API interface";
     homepage = "https://github.com/madpilot/amberelectric.py";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix
index 5b5bbe10373f..47c55501b8b2 100644
--- a/pkgs/development/python-modules/amqtt/default.nix
+++ b/pkgs/development/python-modules/amqtt/default.nix
@@ -82,7 +82,7 @@ buildPythonPackage {
   meta = {
     description = "Python MQTT client and broker implementation";
     homepage = "https://amqtt.readthedocs.io/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/angrcli/default.nix b/pkgs/development/python-modules/angrcli/default.nix
index 89d7fbda4558..359bf3f974f9 100644
--- a/pkgs/development/python-modules/angrcli/default.nix
+++ b/pkgs/development/python-modules/angrcli/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python modules to allow easier interactive use of angr";
     homepage = "https://github.com/fmagin/angr-cli";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index 986314ab3085..07b71c0265d3 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "ROP gadget finder and chain builder";
     homepage = "https://github.com/angr/angrop";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix
index e8bcded1f399..12492697ab1d 100644
--- a/pkgs/development/python-modules/aqualogic/default.nix
+++ b/pkgs/development/python-modules/aqualogic/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library to interface with Hayward/Goldline AquaLogic/ProLogic pool controllers";
     homepage = "https://github.com/swilson/aqualogic";
     changelog = "https://github.com/swilson/aqualogic/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix
index 701fcd562133..5213f48992e5 100644
--- a/pkgs/development/python-modules/arabic-reshaper/default.nix
+++ b/pkgs/development/python-modules/arabic-reshaper/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: {
     description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic";
     homepage = "https://github.com/mpcabd/python-arabic-reshaper";
     changelog = "https://github.com/mpcabd/python-arabic-reshaper/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/arris-tg2492lg/default.nix b/pkgs/development/python-modules/arris-tg2492lg/default.nix
index 94091ce6ec05..8bccd80d2507 100644
--- a/pkgs/development/python-modules/arris-tg2492lg/default.nix
+++ b/pkgs/development/python-modules/arris-tg2492lg/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to connect to an Arris TG2492LG";
     homepage = "https://github.com/vanbalken/arris-tg2492lg";
     changelog = "https://github.com/vanbalken/arris-tg2492lg/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/asyncarve/default.nix b/pkgs/development/python-modules/asyncarve/default.nix
index fa8873170f1a..bb61e05c4cf0 100644
--- a/pkgs/development/python-modules/asyncarve/default.nix
+++ b/pkgs/development/python-modules/asyncarve/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple Arve library";
     homepage = "https://github.com/arvetech/asyncarve";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index e36298ef4e29..b724d159454e 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python support for higher level Datagram";
     homepage = "https://github.com/jsbronder/asyncio-dgram";
     changelog = "https://github.com/jsbronder/asyncio-dgram/blob/${finalAttrs.src.tag}/ChangeLog";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix
index 04cbc60627db..8b695bc7e9f2 100644
--- a/pkgs/development/python-modules/atc-ble/default.nix
+++ b/pkgs/development/python-modules/atc-ble/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Library for ATC devices with custom firmware";
     homepage = "https://github.com/Bluetooth-Devices/atc-ble";
     changelog = "https://github.com/Bluetooth-Devices/atc-ble/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix
index 5287f2845ad5..af509cd4c50a 100644
--- a/pkgs/development/python-modules/atopile/default.nix
+++ b/pkgs/development/python-modules/atopile/default.nix
@@ -238,7 +238,7 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://atopile.io";
     downloadPage = "https://github.com/atopile/atopile";
     changelog = "https://github.com/atopile/atopile/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
     mainProgram = "ato";
   };
diff --git a/pkgs/development/python-modules/autoit-ripper/default.nix b/pkgs/development/python-modules/autoit-ripper/default.nix
index 7b9d8939277b..da254db70d1f 100644
--- a/pkgs/development/python-modules/autoit-ripper/default.nix
+++ b/pkgs/development/python-modules/autoit-ripper/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     mainProgram = "autoit-ripper";
     homepage = "https://github.com/nazywam/AutoIt-Ripper";
     changelog = "https://github.com/nazywam/AutoIt-Ripper/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix
index e932afa10828..566fbc9c7663 100644
--- a/pkgs/development/python-modules/awesomeversion/default.nix
+++ b/pkgs/development/python-modules/awesomeversion/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     description = "Python module to deal with versions";
     homepage = "https://github.com/ludeeus/awesomeversion";
     changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix
index 8cbd84c01adc..489c6db49cd1 100644
--- a/pkgs/development/python-modules/backports-strenum/default.nix
+++ b/pkgs/development/python-modules/backports-strenum/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Base class for creating enumerated constants that are also subclasses of str";
     homepage = "https://github.com/clbarnes/backports.strenum";
-    license = with lib.licenses; [ psfl ];
+    license = lib.licenses.psfl;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix
index 78f53a346173..54cae6e49740 100644
--- a/pkgs/development/python-modules/bagit/default.nix
+++ b/pkgs/development/python-modules/bagit/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     description = "Python library and command line utility for working with BagIt style packages";
     mainProgram = "bagit.py";
     homepage = "https://libraryofcongress.github.io/bagit-python/";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix
index 429938a554e7..69555c07ce71 100644
--- a/pkgs/development/python-modules/base36/default.nix
+++ b/pkgs/development/python-modules/base36/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python implementation for the positional numeral system using 36 as the radix";
     homepage = "https://github.com/tonyseek/python-base36";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
index 6091e329e81a..59a20a28af2d 100644
--- a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
+++ b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "JSONPath implementation for Python";
     mainProgram = "bc_jsonpath_ng";
     homepage = "https://github.com/bridgecrewio/jsonpath-ng";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix
index e9fa511dfefe..91f9bc12a3b1 100644
--- a/pkgs/development/python-modules/beancount-black/default.nix
+++ b/pkgs/development/python-modules/beancount-black/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     description = "Opinioned code formatter for Beancount";
     mainProgram = "bean-black";
     homepage = "https://github.com/LaunchPlatform/beancount-black/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ambroisie ];
   };
 })
diff --git a/pkgs/development/python-modules/beancount-parser/default.nix b/pkgs/development/python-modules/beancount-parser/default.nix
index 6a6d12e6b9a3..bec2826ac1d9 100644
--- a/pkgs/development/python-modules/beancount-parser/default.nix
+++ b/pkgs/development/python-modules/beancount-parser/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     description = "Standalone Lark based Beancount syntax parser";
     homepage = "https://github.com/LaunchPlatform/beancount-parser/";
     changelog = "https://github.com/LaunchPlatform/beancount-parser/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ambroisie ];
   };
 })
diff --git a/pkgs/development/python-modules/beancount-periodic/default.nix b/pkgs/development/python-modules/beancount-periodic/default.nix
index bf64a24996f3..0b6a37808e80 100644
--- a/pkgs/development/python-modules/beancount-periodic/default.nix
+++ b/pkgs/development/python-modules/beancount-periodic/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Beancount plugin to generate periodic transactions";
     homepage = "https://github.com/dallaslu/beancount-periodic";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ polyfloyd ];
   };
 }
diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix
index 188182e5094b..6482c98427cc 100644
--- a/pkgs/development/python-modules/beanhub-cli/default.nix
+++ b/pkgs/development/python-modules/beanhub-cli/default.nix
@@ -105,7 +105,7 @@ buildPythonPackage rec {
     description = "Command line tools for BeanHub or Beancount users";
     homepage = "https://github.com/LaunchPlatform/beanhub-cli/";
     changelog = "https://github.com/LaunchPlatform/beanhub-cli/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
     mainProgram = "bh";
   };
diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix
index 4d7e96a28e0e..9f8cca739a12 100644
--- a/pkgs/development/python-modules/beanhub-extract/default.nix
+++ b/pkgs/development/python-modules/beanhub-extract/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Simple library for extracting all kind of bank account transaction export files, mostly for beanhub-import to ingest and generate transactions";
     homepage = "https://github.com/LaunchPlatform/beanhub-extract/";
     changelog = "https://github.com/LaunchPlatform/beanhub-extract/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
   };
 }
diff --git a/pkgs/development/python-modules/beanhub-forms/default.nix b/pkgs/development/python-modules/beanhub-forms/default.nix
index 53bde2b4a239..5699ae99cbda 100644
--- a/pkgs/development/python-modules/beanhub-forms/default.nix
+++ b/pkgs/development/python-modules/beanhub-forms/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Library for generating and processing BeanHub's custom forms";
     homepage = "https://github.com/LaunchPlatform/beanhub-forms/";
     changelog = "https://github.com/LaunchPlatform/beanhub-forms/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
   };
 }
diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix
index 516765c574de..c78f95c6da7e 100644
--- a/pkgs/development/python-modules/beautifultable/default.nix
+++ b/pkgs/development/python-modules/beautifultable/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python package for printing visually appealing tables";
     homepage = "https://github.com/pri22296/beautifultable";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/bech32/default.nix b/pkgs/development/python-modules/bech32/default.nix
index 4754471728ab..2a754b268943 100644
--- a/pkgs/development/python-modules/bech32/default.nix
+++ b/pkgs/development/python-modules/bech32/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/fiatjaf/bech32";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix
index 0adf5bf1d0de..aced8946e5cc 100644
--- a/pkgs/development/python-modules/beets-audible/default.nix
+++ b/pkgs/development/python-modules/beets-audible/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     description = "Beets-audible: Organize Your Audiobook Collection With Beets";
     homepage = "https://github.com/Neurrone/beets-audible";
     platforms = with lib.platforms; linux ++ darwin ++ windows;
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jwillikers ];
   };
 }
diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix
index e86417d791fe..6301e9088ff6 100644
--- a/pkgs/development/python-modules/berkeleydb/default.nix
+++ b/pkgs/development/python-modules/berkeleydb/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for Oracle Berkeley DB";
     homepage = "https://www.jcea.es/programacion/pybsddb.htm";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/binho-host-adapter/default.nix b/pkgs/development/python-modules/binho-host-adapter/default.nix
index c149f79f46ec..97ce7bfe5cf8 100644
--- a/pkgs/development/python-modules/binho-host-adapter/default.nix
+++ b/pkgs/development/python-modules/binho-host-adapter/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python library for Binho Multi-Protocol USB Host Adapters";
     homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix
index 96e4a8d8aeb5..7174895aed09 100644
--- a/pkgs/development/python-modules/bip-utils/default.nix
+++ b/pkgs/development/python-modules/bip-utils/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation";
     homepage = "https://github.com/ebellocchia/bip_utils";
     changelog = "https://github.com/ebellocchia/bip_utils/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       prusnak
       stargate01
diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix
index 0e6e7ca9806f..e1d942d74611 100644
--- a/pkgs/development/python-modules/bip32/default.nix
+++ b/pkgs/development/python-modules/bip32/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Minimalistic implementation of the BIP32 key derivation scheme";
     homepage = "https://github.com/darosior/python-bip32";
     changelog = "https://github.com/darosior/python-bip32/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ arcnmx ];
   };
 }
diff --git a/pkgs/development/python-modules/blockchain/default.nix b/pkgs/development/python-modules/blockchain/default.nix
index 8e0ded4e10be..872734c1291d 100644
--- a/pkgs/development/python-modules/blockchain/default.nix
+++ b/pkgs/development/python-modules/blockchain/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client Blockchain Bitcoin Developer API";
     homepage = "https://github.com/blockchain/api-v1-client-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/bluepy-devices/default.nix b/pkgs/development/python-modules/bluepy-devices/default.nix
index f13aea81179c..88dd89ab7099 100644
--- a/pkgs/development/python-modules/bluepy-devices/default.nix
+++ b/pkgs/development/python-modules/bluepy-devices/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python BTLE Device Interface for bluepy";
     homepage = "https://github.com/bimbar/bluepy_devices";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index f7efb4b61b2b..4bee501fa190 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library for recovering Bluetooth adapters";
     homepage = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery";
     changelog = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index c1e6ee150ad0..73c3b3eb6ef8 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Generate complex HTML+JS pages with Python";
     homepage = "https://github.com/python-visualization/branca";
     changelog = "https://github.com/python-visualization/branca/blob/${src.tag}/CHANGES.txt";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
index 8868d88e0992..8559aaff9dc3 100644
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python API wrapper for brottsplatskartan.se";
     homepage = "https://github.com/chrillux/brottsplatskartan";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/btsocket/default.nix b/pkgs/development/python-modules/btsocket/default.nix
index fcb612d8c482..79cf7c93baa5 100644
--- a/pkgs/development/python-modules/btsocket/default.nix
+++ b/pkgs/development/python-modules/btsocket/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library to interact with the Bluez Bluetooth Management API";
     homepage = "https://github.com/ukBaz/python-btsocket";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix
index e1735ef501a3..9683ba9f0f52 100644
--- a/pkgs/development/python-modules/cart/default.nix
+++ b/pkgs/development/python-modules/cart/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "cart";
     homepage = "https://github.com/CybercentreCanada/cart";
     changelog = "https://github.com/CybercentreCanada/cart/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 078a9fc50324..eda3af75cb68 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -93,7 +93,7 @@ buildPythonPackage rec {
     description = "Python custom class converters for attrs";
     homepage = "https://github.com/python-attrs/cattrs";
     changelog = "https://github.com/python-attrs/cattrs/blob/${src.tag}/HISTORY.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 797667c6d296..8895a3ca2c9f 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -104,6 +104,6 @@ buildPythonPackage (finalAttrs: {
     platforms = lib.platforms.unix;
     mainProgram = "certbot";
     maintainers = with lib.maintainers; [ miniharinn ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix
index bb3582141f3b..5a2365b7929e 100644
--- a/pkgs/development/python-modules/chirpstack-api/default.nix
+++ b/pkgs/development/python-modules/chirpstack-api/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "ChirpStack gRPC API message and service wrappers for Python";
     homepage = "https://github.com/brocaar/chirpstack-api";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix
index f5b7985d8a0c..03bab2d1eab0 100644
--- a/pkgs/development/python-modules/circuitbreaker/default.nix
+++ b/pkgs/development/python-modules/circuitbreaker/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python Circuit Breaker implementation";
     homepage = "https://github.com/fabfuel/circuitbreaker";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 1ea710021d18..75e0eedf8dab 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Enhancements for standard library's cmd module";
     homepage = "https://github.com/python-cmd2/cmd2";
     changelog = "https://github.com/python-cmd2/cmd2/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ teto ];
   };
 }
diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index 92d42937d813..0e3dd7f0f294 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -119,7 +119,7 @@ buildPythonPackage rec {
     description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis";
     homepage = "https://github.com/CoffeaTeam/coffea";
     changelog = "https://github.com/CoffeaTeam/coffea/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix
index b587e0bc1399..10c5b62fa28c 100644
--- a/pkgs/development/python-modules/commandparse/default.nix
+++ b/pkgs/development/python-modules/commandparse/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to parse command based CLI application";
     homepage = "https://github.com/flgy/commandparse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.fab ];
   };
 }
diff --git a/pkgs/development/python-modules/confight/default.nix b/pkgs/development/python-modules/confight/default.nix
index 9f35fa169dc3..959a0a4c831e 100644
--- a/pkgs/development/python-modules/confight/default.nix
+++ b/pkgs/development/python-modules/confight/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python context manager for managing pid files";
     mainProgram = "confight";
     homepage = "https://github.com/avature/confight";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mkg20001 ];
   };
 }
diff --git a/pkgs/development/python-modules/connect-box/default.nix b/pkgs/development/python-modules/connect-box/default.nix
index f34d7dbc1ba4..f32defffe207 100644
--- a/pkgs/development/python-modules/connect-box/default.nix
+++ b/pkgs/development/python-modules/connect-box/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/home-assistant-ecosystem/python-connect-box";
     changelog = "https://github.com/home-assistant-ecosystem/python-connect-box/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/connection-pool/default.nix b/pkgs/development/python-modules/connection-pool/default.nix
index be52ca1306e9..040909553883 100644
--- a/pkgs/development/python-modules/connection-pool/default.nix
+++ b/pkgs/development/python-modules/connection-pool/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "Thread-safe connection pool";
     homepage = "https://github.com/zhouyl/ConnectionPool";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix
index d8d23367d17f..3b0d5a2b65a5 100644
--- a/pkgs/development/python-modules/connio/default.nix
+++ b/pkgs/development/python-modules/connio/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for concurrency agnostic communication";
     homepage = "https://github.com/tiagocoutinho/connio";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index b5e79d0e1a0b..b0848eccacae 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -104,7 +104,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "correction";
     homepage = "https://cms-nanoaod.github.io/correctionlib/";
     changelog = "https://github.com/cms-nanoAOD/correctionlib/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix
index a4dafe2321a0..26e3051c7ca4 100644
--- a/pkgs/development/python-modules/corsair-scan/default.nix
+++ b/pkgs/development/python-modules/corsair-scan/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "corsair";
     homepage = "https://github.com/Santandersecurityresearch/corsair_scan";
     changelog = "https://github.com/Santandersecurityresearch/corsair_scan/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix
index cd35c8fee54e..ab99527d534b 100644
--- a/pkgs/development/python-modules/cramjam/default.nix
+++ b/pkgs/development/python-modules/cramjam/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage (finalAttrs: {
     description = "Thin Python bindings to de/compression algorithms in Rust";
     homepage = "https://github.com/milesgranger/pyrus-cramjam";
     changelog = "https://github.com/milesgranger/cramjam/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix
index d08d12decbc5..4f9f8e1913b6 100644
--- a/pkgs/development/python-modules/crownstone-core/default.nix
+++ b/pkgs/development/python-modules/crownstone-core/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module with shared classes, util functions and definition of Crownstone";
     homepage = "https://github.com/crownstone/crownstone-lib-python-core";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix
index 14156164ed27..4ecd7e49aae0 100644
--- a/pkgs/development/python-modules/crownstone-sse/default.nix
+++ b/pkgs/development/python-modules/crownstone-sse/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for listening to Crownstone SSE events";
     homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-sse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix
index 8e14d32772a3..51222d3471f4 100644
--- a/pkgs/development/python-modules/crownstone-uart/default.nix
+++ b/pkgs/development/python-modules/crownstone-uart/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for communicating with Crownstone USB dongles";
     homepage = "https://github.com/crownstone/crownstone-lib-python-uart";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/crysp/default.nix b/pkgs/development/python-modules/crysp/default.nix
index c5bb86397a77..3280aaea2db7 100644
--- a/pkgs/development/python-modules/crysp/default.nix
+++ b/pkgs/development/python-modules/crysp/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module that provides crypto-related facilities";
     homepage = "https://github.com/bdcht/crysp";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix
index fca79b25cb40..dec4d63c3035 100644
--- a/pkgs/development/python-modules/cson/default.nix
+++ b/pkgs/development/python-modules/cson/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python parser for the Coffeescript Object Notation (CSON)";
     homepage = "https://github.com/avakar/pycson";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ xworld21 ];
   };
 }
diff --git a/pkgs/development/python-modules/csrmesh/default.nix b/pkgs/development/python-modules/csrmesh/default.nix
index 4989e49d8fbf..eb92e24aa390 100644
--- a/pkgs/development/python-modules/csrmesh/default.nix
+++ b/pkgs/development/python-modules/csrmesh/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the CSRMesh bridge protocol";
     homepage = "https://github.com/nkaminski/csrmesh";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix
index 29aa642355d8..fe2cdb94db0d 100644
--- a/pkgs/development/python-modules/daff/default.nix
+++ b/pkgs/development/python-modules/daff/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for comparing tables, producing a summary of their differences, and using such a summary as a patch file";
     homepage = "https://github.com/paulfitz/daff";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ turion ];
   };
 }
diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix
index 43ef54df2672..c48cc6a79c9b 100644
--- a/pkgs/development/python-modules/dask-histogram/default.nix
+++ b/pkgs/development/python-modules/dask-histogram/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
     description = "Histograms with task scheduling";
     homepage = "https://dask-histogram.readthedocs.io/";
     changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index 94777e49b2dc..e45818b9c6fa 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -94,7 +94,7 @@ buildPythonPackage (finalAttrs: {
     '';
     homepage = "https://arrow.apache.org/datafusion/";
     changelog = "https://github.com/apache/datafusion-python/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ cpcloud ];
   };
 })
diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
index 8130e72ee8b2..062ed2d9656b 100644
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   meta = {
     description = "Read DBF Files with Python";
     homepage = "https://dbfread.readthedocs.org/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix
index 23bd07f6bd74..59aa3a5749bb 100644
--- a/pkgs/development/python-modules/diffsync/default.nix
+++ b/pkgs/development/python-modules/diffsync/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Utility library for comparing and synchronizing different datasets";
     homepage = "https://github.com/networktocode/diffsync";
     changelog = "https://github.com/networktocode/diffsync/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/dingz/default.nix b/pkgs/development/python-modules/dingz/default.nix
index 9528dca90a5e..e7ca037c11b0 100644
--- a/pkgs/development/python-modules/dingz/default.nix
+++ b/pkgs/development/python-modules/dingz/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python API for interacting with Dingz devices";
     mainProgram = "dingz";
     homepage = "https://github.com/home-assistant-ecosystem/python-dingz";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix
index 6ec2a6015311..41281df75b36 100644
--- a/pkgs/development/python-modules/dirty-equals/default.nix
+++ b/pkgs/development/python-modules/dirty-equals/default.nix
@@ -42,7 +42,7 @@ let
       description = "Module for doing dirty (but extremely useful) things with equals";
       homepage = "https://github.com/samuelcolvin/dirty-equals";
       changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/${src.tag}";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ fab ];
     };
   };
diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix
index b6e00c831edf..0778bc601dee 100644
--- a/pkgs/development/python-modules/django-guardian/default.nix
+++ b/pkgs/development/python-modules/django-guardian/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   meta = {
     description = "Per object permissions for Django";
     homepage = "https://github.com/django-guardian/django-guardian";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-js-asset/default.nix b/pkgs/development/python-modules/django-js-asset/default.nix
index 7b8a21ea9315..fec92c80e237 100644
--- a/pkgs/development/python-modules/django-js-asset/default.nix
+++ b/pkgs/development/python-modules/django-js-asset/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Script tag with additional attributes for django.forms.Media";
     homepage = "https://github.com/matthiask/django-js-asset";
     maintainers = with lib.maintainers; [ hexa ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix
index 7cc8c397f127..50cda6412332 100644
--- a/pkgs/development/python-modules/django-mptt/default.nix
+++ b/pkgs/development/python-modules/django-mptt/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Utilities for implementing a modified pre-order traversal tree in Django";
     homepage = "https://github.com/django-mptt/django-mptt";
     maintainers = with lib.maintainers; [ hexa ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index b08d9110ac15..274eca0cfcc4 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Use webpack to generate your static bundles";
     homepage = "https://github.com/owais/django-webpack-loader";
     changelog = "https://github.com/django-webpack/django-webpack-loader/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix
index f5a5b212f380..2bf685acd66c 100644
--- a/pkgs/development/python-modules/dns-lexicon/default.nix
+++ b/pkgs/development/python-modules/dns-lexicon/default.nix
@@ -99,7 +99,7 @@ buildPythonPackage rec {
     mainProgram = "lexicon";
     homepage = "https://github.com/AnalogJ/lexicon";
     changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aviallon ];
   };
 }
diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix
index 00c4b1263db3..087628b802d5 100644
--- a/pkgs/development/python-modules/dotmap/default.nix
+++ b/pkgs/development/python-modules/dotmap/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python for dot-access dictionaries";
     homepage = "https://github.com/drgrib/dotmap";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix
index 81c8ccca8ae7..7de4a82c4212 100644
--- a/pkgs/development/python-modules/dremel3dpy/default.nix
+++ b/pkgs/development/python-modules/dremel3dpy/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Module for interacting with Dremel 3D printers";
     homepage = "https://github.com/godely/dremel3dpy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index db6368ea97ee..0abdc91b1741 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to parse Dutch Smart Meter Requirements (DSMR)";
     homepage = "https://github.com/ndokter/dsmr_parser";
     changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dsmr_console";
   };
diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix
index dc92a43f152d..0fa960e38304 100644
--- a/pkgs/development/python-modules/duden/default.nix
+++ b/pkgs/development/python-modules/duden/default.nix
@@ -53,7 +53,7 @@ let
         various information about given german word. The provided data are
         parsed from german dictionary duden.de.
       '';
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "duden";
       maintainers = with lib.maintainers; [
         linuxissuper
diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix
index 8df5016a2a66..baaab20bc95d 100644
--- a/pkgs/development/python-modules/dwdwfsapi/default.nix
+++ b/pkgs/development/python-modules/dwdwfsapi/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Python client to retrieve data provided by DWD via their geoserver WFS API";
     homepage = "https://github.com/stephan192/dwdwfsapi";
     changelog = "https://github.com/stephan192/dwdwfsapi/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/eagle100/default.nix b/pkgs/development/python-modules/eagle100/default.nix
index cb1449d94227..cfad6ca06eb5 100644
--- a/pkgs/development/python-modules/eagle100/default.nix
+++ b/pkgs/development/python-modules/eagle100/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with Rainforest EAGLE devices";
     homepage = "https://github.com/hastarin/eagle100";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix
index 70904203f80a..abd401ece487 100644
--- a/pkgs/development/python-modules/ecoaliface/default.nix
+++ b/pkgs/development/python-modules/ecoaliface/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with eCoal water boiler controllers";
     homepage = "https://github.com/matkor/ecoaliface";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix
index 618aa11d9634..363e98c8990d 100644
--- a/pkgs/development/python-modules/ecs-logging/default.nix
+++ b/pkgs/development/python-modules/ecs-logging/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Logging formatters for the Elastic Common Schema (ECS) in Python";
     homepage = "https://github.com/elastic/ecs-logging-python";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix
index 539ea4347cee..ef859a69b5c3 100644
--- a/pkgs/development/python-modules/editdistance/default.nix
+++ b/pkgs/development/python-modules/editdistance/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the edit distance (Levenshtein distance)";
     homepage = "https://github.com/roy-ht/editdistance";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix
index 790f1ce79c63..94f7f7189ff7 100644
--- a/pkgs/development/python-modules/eiswarnung/default.nix
+++ b/pkgs/development/python-modules/eiswarnung/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: {
     description = "Module for getting Eiswarning API forecasts";
     homepage = "https://github.com/klaasnicolaas/python-eiswarnung";
     changelog = "https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix
index 1de774c1a7f9..aef92c9fc732 100644
--- a/pkgs/development/python-modules/elmax-api/default.nix
+++ b/pkgs/development/python-modules/elmax-api/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with the Elmax cloud";
     homepage = "https://github.com/albertogeniola/elmax-api";
     changelog = "https://github.com/albertogeniola/elmax-api/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix
index 199a8938d9a1..2b6df23023fb 100644
--- a/pkgs/development/python-modules/elmax/default.nix
+++ b/pkgs/development/python-modules/elmax/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python API client for the Elmax Cloud services";
     mainProgram = "poetry-template";
     homepage = "https://github.com/home-assistant-ecosystem/python-elmax";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix
index 94a3fe441a1b..0640f6b579ae 100644
--- a/pkgs/development/python-modules/energyzero/default.nix
+++ b/pkgs/development/python-modules/energyzero/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     description = "Module for getting the dynamic prices from EnergyZero";
     homepage = "https://github.com/klaasnicolaas/python-energyzero";
     changelog = "https://github.com/klaasnicolaas/python-energyzero/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix
index f1c6b7adf284..5d758239fe03 100644
--- a/pkgs/development/python-modules/enlighten/default.nix
+++ b/pkgs/development/python-modules/enlighten/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Enlighten Progress Bar for Python Console Apps";
     homepage = "https://github.com/Rockhopper-Technologies/enlighten";
     changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       veprbl
       doronbehar
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index 0a6c9ef33736..92863b1f92c4 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     mainProgram = "eradicate";
     homepage = "https://github.com/myint/eradicate";
     changelog = "https://github.com/wemake-services/eradicate/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mmlb ];
   };
 }
diff --git a/pkgs/development/python-modules/eufylife-ble-client/default.nix b/pkgs/development/python-modules/eufylife-ble-client/default.nix
index 75bfa7d2092d..e219c54ba6ce 100644
--- a/pkgs/development/python-modules/eufylife-ble-client/default.nix
+++ b/pkgs/development/python-modules/eufylife-ble-client/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for parsing data from Eufy smart scales";
     homepage = "https://github.com/bdr99/eufylife-ble-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index 1a267eeb6b78..9eeadcae423b 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Backport of PEP 654 (exception groups)";
     homepage = "https://github.com/agronholm/exceptiongroup";
     changelog = "https://github.com/agronholm/exceptiongroup/blob/${version}/CHANGES.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix
index bc97ea19f76c..61d781f1833b 100644
--- a/pkgs/development/python-modules/expects/default.nix
+++ b/pkgs/development/python-modules/expects/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Expressive and extensible TDD/BDD assertion library for Python";
     homepage = "https://expects.readthedocs.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/exrex/default.nix b/pkgs/development/python-modules/exrex/default.nix
index 9d65bf4a0717..c293423d0519 100644
--- a/pkgs/development/python-modules/exrex/default.nix
+++ b/pkgs/development/python-modules/exrex/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Irregular methods on regular expressions";
     homepage = "https://github.com/asciimoo/exrex";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 533136eef735..f48eecb2ae52 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage (finalAttrs: {
     description = "Fake implementation of Redis API";
     homepage = "https://github.com/cunla/fakeredis-py";
     changelog = "https://github.com/cunla/fakeredis-py/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/fastapi-github-oidc/default.nix b/pkgs/development/python-modules/fastapi-github-oidc/default.nix
index 0e133890d1cc..845422877861 100644
--- a/pkgs/development/python-modules/fastapi-github-oidc/default.nix
+++ b/pkgs/development/python-modules/fastapi-github-oidc/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage (finalAttrs: {
     description = "FastAPI compatible middleware to authenticate Github OIDC Tokens";
     homepage = "https://github.com/atopile/fastapi-github-oidc";
     changelog = "https://github.com/atopile/fastapi-github-oidc/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix
index 4226bcc03304..c7e362a0075e 100644
--- a/pkgs/development/python-modules/fe25519/default.nix
+++ b/pkgs/development/python-modules/fe25519/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python field operations for Curve25519's prime";
     homepage = "https://github.com/BjoernMHaase/fe25519";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix
index 8e309de085fa..12836e3119ef 100644
--- a/pkgs/development/python-modules/fixerio/default.nix
+++ b/pkgs/development/python-modules/fixerio/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
       exchange rates published by the European Central Bank.
     '';
     homepage = "https://github.com/amatellanes/fixerio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/flashtext/default.nix b/pkgs/development/python-modules/flashtext/default.nix
index 89d4bf3cf8b3..7ab7f67b7435 100644
--- a/pkgs/development/python-modules/flashtext/default.nix
+++ b/pkgs/development/python-modules/flashtext/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/vi3k6i5/flashtext";
     description = "Python package to replace keywords in sentences or extract keywords from sentences";
     maintainers = with lib.maintainers; [ aanderse ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index 16f9c4d18f50..b462a0785530 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     description = "Flask extension adding a decorator for CORS support";
     homepage = "https://github.com/corydolphin/flask-cors";
     changelog = "https://github.com/corydolphin/flask-cors/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nickcao ];
   };
 })
diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix
index fa5f9d1bc908..52d2d61431ad 100644
--- a/pkgs/development/python-modules/fnvhash/default.nix
+++ b/pkgs/development/python-modules/fnvhash/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/znerol/py-fnvhash/releases/tag/${src.tag}";
     description = "Python FNV hash implementation";
     homepage = "https://github.com/znerol/py-fnvhash";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index 326608205a04..002ee8c2378e 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -88,7 +88,7 @@ buildPythonPackage rec {
     description = "Make beautiful maps with Leaflet.js & Python";
     homepage = "https://github.com/python-visualization/folium";
     changelog = "https://github.com/python-visualization/folium/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.geospatial ];
   };
 }
diff --git a/pkgs/development/python-modules/fordpass/default.nix b/pkgs/development/python-modules/fordpass/default.nix
index cff5176d8816..5846e86a8107 100644
--- a/pkgs/development/python-modules/fordpass/default.nix
+++ b/pkgs/development/python-modules/fordpass/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python module for the FordPass API";
     mainProgram = "demo.py";
     homepage = "https://github.com/clarkd/fordpass-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix
index 8b0375fc3ab7..1be528b7b48b 100644
--- a/pkgs/development/python-modules/fortiosapi/default.nix
+++ b/pkgs/development/python-modules/fortiosapi/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to work with Fortigate/Fortios devices";
     homepage = "https://github.com/fortinet-solutions-cse/fortiosapi";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/foundationdb/default.nix b/pkgs/development/python-modules/foundationdb/default.nix
index a2fbfb84aec7..1121a7126107 100644
--- a/pkgs/development/python-modules/foundationdb/default.nix
+++ b/pkgs/development/python-modules/foundationdb/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
   meta = {
     description = "Python bindings for FoundationDB";
     homepage = "https://www.foundationdb.org";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix
index 0dae763c7022..6cd969161056 100644
--- a/pkgs/development/python-modules/fpyutils/default.nix
+++ b/pkgs/development/python-modules/fpyutils/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     description = "Collection of useful non-standard Python functions";
     homepage = "https://github.com/frnmst/fpyutils";
     changelog = "https://blog.franco.net.eu.org/software/fpyutils-${version}/release.html";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/fullmoon/default.nix b/pkgs/development/python-modules/fullmoon/default.nix
index f474b226ff07..30525d673c96 100644
--- a/pkgs/development/python-modules/fullmoon/default.nix
+++ b/pkgs/development/python-modules/fullmoon/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage {
   meta = {
     description = "Determine the occurrence of the next full moon or to determine if a given date is/was/will be a full moon";
     homepage = "https://github.com/jr-k/python-fullmoon";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ quantenzitrone ];
   };
 }
diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix
index 205692d94ffe..ed6815858bff 100644
--- a/pkgs/development/python-modules/gassist-text/default.nix
+++ b/pkgs/development/python-modules/gassist-text/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Module for interacting with Google Assistant API via text";
     homepage = "https://github.com/tronikos/gassist_text";
     changelog = "https://github.com/tronikos/gassist_text/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix
index 75da97204626..d8276c8fd458 100644
--- a/pkgs/development/python-modules/ge25519/default.nix
+++ b/pkgs/development/python-modules/ge25519/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of Ed25519 group elements and operations";
     homepage = "https://github.com/nthparty/ge25519";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/genome-collector/default.nix b/pkgs/development/python-modules/genome-collector/default.nix
index be6ac3dd232b..4af18d63fded 100644
--- a/pkgs/development/python-modules/genome-collector/default.nix
+++ b/pkgs/development/python-modules/genome-collector/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Genomes and build BLAST/Bowtie indexes in Python";
     homepage = "https://github.com/Edinburgh-Genome-Foundry/genome_collector";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix
index 3a209dc65105..95c68b5e36bc 100644
--- a/pkgs/development/python-modules/geojson-client/default.nix
+++ b/pkgs/development/python-modules/geojson-client/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python module for convenient access to GeoJSON feeds";
     homepage = "https://github.com/exxamalte/python-geojson-client";
     changelog = "https://github.com/exxamalte/python-geojson-client/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 74537988a2d7..a1ec122228b1 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/geopy/geopy";
     description = "Python Geocoding Toolbox";
     changelog = "https://github.com/geopy/geopy/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix
index fef9ad854153..d8076f484d61 100644
--- a/pkgs/development/python-modules/georss-client/default.nix
+++ b/pkgs/development/python-modules/georss-client/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Python library for accessing GeoRSS feeds";
     homepage = "https://github.com/exxamalte/python-georss-client";
     changelog = "https://github.com/exxamalte/python-georss-client/releases/tag/${src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix
index 4c96d487fb9d..a549413ebb3f 100644
--- a/pkgs/development/python-modules/georss-generic-client/default.nix
+++ b/pkgs/development/python-modules/georss-generic-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing generic GeoRSS feeds";
     homepage = "https://github.com/exxamalte/python-georss-generic-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
index a8f75b61cd65..eae23e9e87f5 100644
--- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
+++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python library for accessing the IGN Sismologia GeoRSS feed";
     homepage = "https://github.com/exxamalte/python-georss-ign-sismologia-client";
     changelog = "https://github.com/exxamalte/python-georss-ign-sismologia-client/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
index cd765ec45dcb..03047c256aaa 100644
--- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
+++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed";
     homepage = "https://github.com/exxamalte/python-georss-ingv-centro-nazionale-terremoti-client";
     changelog = "https://github.com/exxamalte/python-georss-ingv-centro-nazionale-terremoti-client/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     broken = true; # Sends a dict to georss_client.xml_parser which expects a string or character stream
   };
diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
index 91682a083060..d616150857c8 100644
--- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
+++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing Natural Resources Canada Earthquakes feed";
     homepage = "https://github.com/exxamalte/python-georss-nrcan-earthquakes-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
index eb453fb23fe2..742e8f19d77c 100644
--- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
+++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for accessing Queensland Bushfire Alert feed";
     homepage = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client";
     changelog = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
index d9fdda6548d2..8537266ef6dd 100644
--- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
+++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing Tasmania Fire Service Incidents feed";
     homepage = "https://github.com/exxamalte/python-georss-tfs-incidents-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
index 8f1e340b217a..4e734a900170 100644
--- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
+++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed";
     homepage = "https://github.com/exxamalte/python-georss-wa-dfes-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix
index 29d377fc8170..ced63fce740f 100644
--- a/pkgs/development/python-modules/google-crc32c/default.nix
+++ b/pkgs/development/python-modules/google-crc32c/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm";
     homepage = "https://github.com/googleapis/python-crc32c";
     changelog = "https://github.com/googleapis/python-crc32c/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google/default.nix b/pkgs/development/python-modules/google/default.nix
index 85b30c2ae3f9..62e076d1d2db 100644
--- a/pkgs/development/python-modules/google/default.nix
+++ b/pkgs/development/python-modules/google/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     description = "Python bindings to the Google search engine";
     mainProgram = "google";
     homepage = "https://pypi.org/project/google/";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/govee-led-wez/default.nix b/pkgs/development/python-modules/govee-led-wez/default.nix
index d0da6cf7b4fa..33213aaca830 100644
--- a/pkgs/development/python-modules/govee-led-wez/default.nix
+++ b/pkgs/development/python-modules/govee-led-wez/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage {
   meta = {
     description = "Control Govee Lights from Python";
     homepage = "https://github.com/wez/govee-py";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/development/python-modules/gps3/default.nix b/pkgs/development/python-modules/gps3/default.nix
index 972c73da8224..55ccb654e8d9 100644
--- a/pkgs/development/python-modules/gps3/default.nix
+++ b/pkgs/development/python-modules/gps3/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage {
   meta = {
     description = "Python client for GPSD";
     homepage = "https://github.com/wadda/gps3";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix
index ee8bd9fdaed3..fec18abcc207 100644
--- a/pkgs/development/python-modules/grequests/default.nix
+++ b/pkgs/development/python-modules/grequests/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Asynchronous HTTP requests";
     homepage = "https://github.com/kennethreitz/grequests";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ matejc ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 634811c727e9..c94d0fc4a591 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Channel Level Live Debug Information Service for gRPC";
     homepage = "https://pypi.org/project/grpcio-channelz";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index 3d65fef2e464..bb4593209fcb 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Standard Health Checking Service for gRPC";
     homepage = "https://pypi.org/project/grpcio-health-checking/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 87e145bb3513..f92d04e3b078 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Standard Protobuf Reflection Service for gRPC";
     homepage = "https://pypi.org/project/grpcio-reflection";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index b3f68350d32f..357a7f7e6dff 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = {
     description = "Testing utilities for gRPC Python";
     homepage = "https://grpc.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix
index 0e84f20ec5d3..970577de1ac5 100644
--- a/pkgs/development/python-modules/hachoir/default.nix
+++ b/pkgs/development/python-modules/hachoir/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python library to view and edit a binary stream";
     homepage = "https://hachoir.readthedocs.io/";
     changelog = "https://github.com/vstinner/hachoir/blob/${version}/doc/changelog.rst";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix
index 66fd9e6e0ac7..3d9336c0c295 100644
--- a/pkgs/development/python-modules/haversine/default.nix
+++ b/pkgs/development/python-modules/haversine/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python module the distance between 2 points on earth";
     homepage = "https://github.com/mapado/haversine";
     changelog = "https://github.com/mapado/haversine/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix
index 1df2d35a335d..188635539cee 100644
--- a/pkgs/development/python-modules/headerparser/default.nix
+++ b/pkgs/development/python-modules/headerparser/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Module to parse key-value pairs in the style of RFC 822 (e-mail) headers";
     homepage = "https://github.com/jwodder/headerparser";
     changelog = "https://github.com/wheelodex/headerparser/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ayazhafiz ];
   };
 }
diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix
index 1a5cdec0f63c..77399396a98e 100644
--- a/pkgs/development/python-modules/hid/default.nix
+++ b/pkgs/development/python-modules/hid/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Hidapi bindings in ctypes";
     homepage = "https://github.com/apmorton/pyhidapi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hikvision/default.nix b/pkgs/development/python-modules/hikvision/default.nix
index 87fd6daceaa3..34eb83dc4205 100644
--- a/pkgs/development/python-modules/hikvision/default.nix
+++ b/pkgs/development/python-modules/hikvision/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python module for interacting with Hikvision IP Cameras";
     homepage = "https://github.com/fbradyirl/hikvision";
     changelog = "https://github.com/fbradyirl/hikvision/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/hkavr/default.nix b/pkgs/development/python-modules/hkavr/default.nix
index 363f2aaee2a5..8935536f47f9 100644
--- a/pkgs/development/python-modules/hkavr/default.nix
+++ b/pkgs/development/python-modules/hkavr/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting with Harman Kardon AVR controllers";
     homepage = "https://github.com/Devqon/hkavr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix
index 3fb455f29db2..47ead2323307 100644
--- a/pkgs/development/python-modules/html-sanitizer/default.nix
+++ b/pkgs/development/python-modules/html-sanitizer/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Allowlist-based and very opinionated HTML sanitizer";
     homepage = "https://github.com/matthiask/html-sanitizer";
     changelog = "https://github.com/matthiask/html-sanitizer/blob/${version}/CHANGELOG.rst";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix
index 344e5a1d4e11..57dffcfce621 100644
--- a/pkgs/development/python-modules/httpserver/default.nix
+++ b/pkgs/development/python-modules/httpserver/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Asyncio implementation of an HTTP server";
     homepage = "https://github.com/thomwiggers/httpserver";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     mainProgram = "httpserver";
   };
diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index dc8ca8e0d984..eb065e5086ae 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     description = "Bitcoin Hardware Wallet Interface";
     homepage = "https://github.com/bitcoin-core/hwi";
     changelog = "https://github.com/bitcoin-core/HWI/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ prusnak ];
   };
 }
diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix
index 3c407734cbec..6fcffffc1d86 100644
--- a/pkgs/development/python-modules/hydrawiser/default.nix
+++ b/pkgs/development/python-modules/hydrawiser/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Hydrawise API";
     homepage = "https://github.com/ptcryan/hydrawiser";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/iammeter/default.nix b/pkgs/development/python-modules/iammeter/default.nix
index 2942fc33214d..44d870c547fc 100644
--- a/pkgs/development/python-modules/iammeter/default.nix
+++ b/pkgs/development/python-modules/iammeter/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module to work with the IamMeter API";
     homepage = "https://pypi.org/project/iammeter/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/iceportal/default.nix b/pkgs/development/python-modules/iceportal/default.nix
index a9d6d4f987c7..42d72c5d9bad 100644
--- a/pkgs/development/python-modules/iceportal/default.nix
+++ b/pkgs/development/python-modules/iceportal/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Library for getting data from the ICE Portal";
     homepage = "https://github.com/home-assistant-ecosystem/python-iceportal";
     changelog = "https://github.com/home-assistant-ecosystem/python-iceportal/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix
index 73214a18040a..344dff94c7d9 100644
--- a/pkgs/development/python-modules/icmplib/default.nix
+++ b/pkgs/development/python-modules/icmplib/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the ICMP protocol";
     homepage = "https://github.com/ValentinBELYN/icmplib";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix
index 9a4f6515023a..166bf5e79121 100644
--- a/pkgs/development/python-modules/imagesize/default.nix
+++ b/pkgs/development/python-modules/imagesize/default.nix
@@ -17,6 +17,6 @@ buildPythonPackage rec {
   meta = {
     description = "Getting image size from png/jpeg/jpeg2000/gif file";
     homepage = "https://github.com/shibukawa/imagesize_py";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix
index cf7d21f680e7..820fbce0b133 100644
--- a/pkgs/development/python-modules/imantics/default.nix
+++ b/pkgs/development/python-modules/imantics/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage {
   meta = {
     description = "Convert and visualize many annotation formats for object dectection and localization";
     homepage = "https://github.com/jsbroks/imantics";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.rakesh4g ];
   };
 }
diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
index 310d7d144519..a567d180b04a 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Immutable mapping type";
     homepage = "https://github.com/MagicStack/immutables";
     changelog = "https://github.com/MagicStack/immutables/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix
index a04dbab45403..a48f6478f7e1 100644
--- a/pkgs/development/python-modules/ismartgate/default.nix
+++ b/pkgs/development/python-modules/ismartgate/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     description = "Python module to work with the ismartgate and gogogate2 API";
     homepage = "https://github.com/bdraco/ismartgate";
     changelog = "https://github.com/bdraco/ismartgate/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix
index cebace0bf539..43d3e5c85349 100644
--- a/pkgs/development/python-modules/iso4217/default.nix
+++ b/pkgs/development/python-modules/iso4217/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "ISO 4217 currency data package for Python";
     homepage = "https://github.com/dahlia/iso4217";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix
index 4b93c5e6c6f5..032699a12689 100644
--- a/pkgs/development/python-modules/iso8601/default.nix
+++ b/pkgs/development/python-modules/iso8601/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Simple module to parse ISO 8601 dates";
     homepage = "https://pyiso8601.readthedocs.io/";
     changelog = "https://github.com/micktwomey/pyiso8601/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/jobspy/default.nix b/pkgs/development/python-modules/jobspy/default.nix
index 9e1b07e49022..09809dfa817a 100644
--- a/pkgs/development/python-modules/jobspy/default.nix
+++ b/pkgs/development/python-modules/jobspy/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/Bunsly/JobSpy";
     homepage = "https://github.com/Bunsly/JobSpy";
     changelog = "https://github.com/Bunsly/JobSpy/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ethancedwards8 ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonpath-python/default.nix b/pkgs/development/python-modules/jsonpath-python/default.nix
index b08e2203447d..9f101e305b87 100644
--- a/pkgs/development/python-modules/jsonpath-python/default.nix
+++ b/pkgs/development/python-modules/jsonpath-python/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sean2077/jsonpath-python";
     description = "More powerful JSONPath implementations in modern python";
     maintainers = with lib.maintainers; [ dadada ];
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
index 70f3ac436c2f..c434a3b29c5f 100644
--- a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     description = "Simple Jupyterhub authenticator that allows anyone to log in";
     homepage = "https://github.com/jupyterhub/tmpauthenticator";
     changelog = "https://github.com/jupyterhub/tmpauthenticator/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ chiroptical ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index fcc2cae5d8c0..759833aab88a 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -89,7 +89,7 @@ buildPythonPackage rec {
     description = "Jupyter lab extension for version control with Git";
     homepage = "https://github.com/jupyterlab/jupyterlab-git";
     changelog = "https://github.com/jupyterlab/jupyterlab-git/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ chiroptical ];
   };
 }
diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix
index a17ebb8c4fd4..309557519827 100644
--- a/pkgs/development/python-modules/justbackoff/default.nix
+++ b/pkgs/development/python-modules/justbackoff/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple backoff algorithm in Python";
     homepage = "https://github.com/alexferl/justbackoff";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix
index c6569295ad73..6f026e9321a7 100644
--- a/pkgs/development/python-modules/karton-asciimagic/default.nix
+++ b/pkgs/development/python-modules/karton-asciimagic/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     mainProgram = "karton-asciimagic";
     homepage = "https://github.com/CERT-Polska/karton-asciimagic";
     changelog = "https://github.com/CERT-Polska/karton-asciimagic/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix
index 0f2e51a244be..a532f5c54b56 100644
--- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix
+++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     mainProgram = "karton-autoit-ripper";
     homepage = "https://github.com/CERT-Polska/karton-autoit-ripper";
     changelog = "https://github.com/CERT-Polska/karton-autoit-ripper/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix
index 28d93bf62b34..f0eedcab8029 100644
--- a/pkgs/development/python-modules/karton-config-extractor/default.nix
+++ b/pkgs/development/python-modules/karton-config-extractor/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     mainProgram = "karton-config-extractor";
     homepage = "https://github.com/CERT-Polska/karton-config-extractor";
     changelog = "https://github.com/CERT-Polska/karton-config-extractor/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix
index 2aa27525f45b..5d46cea45d5a 100644
--- a/pkgs/development/python-modules/karton-dashboard/default.nix
+++ b/pkgs/development/python-modules/karton-dashboard/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     mainProgram = "karton-dashboard";
     homepage = "https://github.com/CERT-Polska/karton-dashboard";
     changelog = "https://github.com/CERT-Polska/karton-dashboard/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
index 585c811bf88b..f3a04ffd3ecf 100644
--- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
+++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     mainProgram = "karton-mwdb-reporter";
     homepage = "https://github.com/CERT-Polska/karton-mwdb-reporter";
     changelog = "https://github.com/CERT-Polska/karton-mwdb-reporter/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix
index 79abcbb98b55..1bf5b2db8609 100644
--- a/pkgs/development/python-modules/karton-yaramatcher/default.nix
+++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     mainProgram = "karton-yaramatcher";
     homepage = "https://github.com/CERT-Polska/karton-yaramatcher";
     changelog = "https://github.com/CERT-Polska/karton-yaramatcher/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/kicadcliwrapper/default.nix b/pkgs/development/python-modules/kicadcliwrapper/default.nix
index 32cbdb773c4d..0c6024db2310 100644
--- a/pkgs/development/python-modules/kicadcliwrapper/default.nix
+++ b/pkgs/development/python-modules/kicadcliwrapper/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Strongly typed, auto-generated bindings for KiCAD's CLI";
     homepage = "https://github.com/atopile/kicadcliwrapper";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix
index 110406f69a48..504d69508ffc 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
   meta = {
     description = "Fast and thorough lazy object proxy";
     homepage = "https://github.com/ionelmc/python-lazy-object-proxy";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix
index 348a2d86d817..62406aec76fd 100644
--- a/pkgs/development/python-modules/led-ble/default.nix
+++ b/pkgs/development/python-modules/led-ble/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Library for LED BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/led-ble";
     changelog = "https://github.com/Bluetooth-Devices/led-ble/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/libpurecool/default.nix b/pkgs/development/python-modules/libpurecool/default.nix
index 48d3b74c49db..651c5bc01ebc 100644
--- a/pkgs/development/python-modules/libpurecool/default.nix
+++ b/pkgs/development/python-modules/libpurecool/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Dyson devices";
     homepage = "http://libpurecool.readthedocs.io";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix
index 5addbb2c8357..19daaadc191f 100644
--- a/pkgs/development/python-modules/limiter/default.nix
+++ b/pkgs/development/python-modules/limiter/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python rate-limiting, thread-safe and asynchronous decorators and context managers";
     homepage = "https://github.com/alexdelorenzo/limiter";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix
index 793059dbe540..38ca284285be 100644
--- a/pkgs/development/python-modules/linuxfd/default.nix
+++ b/pkgs/development/python-modules/linuxfd/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls";
     homepage = "https://github.com/FrankAbelbeck/linuxfd";
     platforms = lib.platforms.linux;
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
   };
 }
diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix
index 6e8c8b7cff6b..196a9a116f25 100644
--- a/pkgs/development/python-modules/luhn/default.nix
+++ b/pkgs/development/python-modules/luhn/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for generate and verify Luhn check digits";
     homepage = "https://github.com/mmcloughlin/luhn";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix
index 69a9671b5368..5c3df91fec3d 100644
--- a/pkgs/development/python-modules/lupupy/default.nix
+++ b/pkgs/development/python-modules/lupupy/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     mainProgram = "lupupy";
     homepage = "https://github.com/majuss/lupupy";
     changelog = "https://github.com/majuss/lupupy/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix
index 058aa0d3a1ff..33b1e0fafa15 100644
--- a/pkgs/development/python-modules/malduck/default.nix
+++ b/pkgs/development/python-modules/malduck/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     description = "Helper for malware analysis";
     homepage = "https://github.com/CERT-Polska/malduck";
     changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "malduck";
   };
diff --git a/pkgs/development/python-modules/mbddns/default.nix b/pkgs/development/python-modules/mbddns/default.nix
index 618707d4119d..57d9f32630ba 100644
--- a/pkgs/development/python-modules/mbddns/default.nix
+++ b/pkgs/development/python-modules/mbddns/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Mythic Beasts Dynamic DNS updater";
     homepage = "https://github.com/thinkl33t/mb-ddns";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mcuuid/default.nix b/pkgs/development/python-modules/mcuuid/default.nix
index aa1c91acd8d2..5949fbf462f8 100644
--- a/pkgs/development/python-modules/mcuuid/default.nix
+++ b/pkgs/development/python-modules/mcuuid/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Getting Minecraft player information from Mojang API";
     homepage = "https://github.com/clerie/mcuuid";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix
index 14d7e327a72d..08ba13045966 100644
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     mainProgram = "md_toc";
     homepage = "https://docs.franco.net.eu.org/md-toc/";
     changelog = "https://blog.franco.net.eu.org/software/CHANGELOG-md-toc.html";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index 6e6ce757e04f..23e7e9246ecc 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library to interact with Meross devices";
     homepage = "https://github.com/albertogeniola/MerossIot";
     changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/messagebird/default.nix b/pkgs/development/python-modules/messagebird/default.nix
index 2705e2deca5e..c6f50ff7373e 100644
--- a/pkgs/development/python-modules/messagebird/default.nix
+++ b/pkgs/development/python-modules/messagebird/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Client for MessageBird's REST API";
     homepage = "https://github.com/messagebird/python-rest-api";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix
index e46c328546fa..dcb024b57b7d 100644
--- a/pkgs/development/python-modules/metar/default.nix
+++ b/pkgs/development/python-modules/metar/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     description = "Python parser for coded METAR weather reports";
     homepage = "https://github.com/python-metar/python-metar";
     changelog = "https://github.com/python-metar/python-metar/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ bsd1 ];
+    license = lib.licenses.bsd1;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/metawear/default.nix b/pkgs/development/python-modules/metawear/default.nix
index a9f4e429ccab..b0f09434de94 100644
--- a/pkgs/development/python-modules/metawear/default.nix
+++ b/pkgs/development/python-modules/metawear/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for the MetaWear C++ SDK by MbientLab";
     homepage = "https://github.com/mbientlab/metawear-sdk-python";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/meteoalertapi/default.nix b/pkgs/development/python-modules/meteoalertapi/default.nix
index 7fb28adb2008..946294a1c27b 100644
--- a/pkgs/development/python-modules/meteoalertapi/default.nix
+++ b/pkgs/development/python-modules/meteoalertapi/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python wrapper for MeteoAlarm.org";
     homepage = "https://github.com/rolfberkenbosch/meteoalert-api";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/miniful/default.nix b/pkgs/development/python-modules/miniful/default.nix
index 7f4dffd861a3..6e22d9342d13 100644
--- a/pkgs/development/python-modules/miniful/default.nix
+++ b/pkgs/development/python-modules/miniful/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Minimal Fuzzy Library";
     homepage = "https://github.com/aresio/miniful";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix
index ab4086935285..86e79643b341 100644
--- a/pkgs/development/python-modules/mmcv/default.nix
+++ b/pkgs/development/python-modules/mmcv/default.nix
@@ -150,7 +150,7 @@ buildPythonPackage (finalAttrs: {
     description = "Foundational Library for Computer Vision Research";
     homepage = "https://github.com/open-mmlab/mmcv";
     changelog = "https://github.com/open-mmlab/mmcv/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rxiao ];
   };
 })
diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix
index 375efd81d47f..b02514a51b51 100644
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@@ -212,7 +212,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library for training deep learning models based on PyTorch";
     homepage = "https://github.com/open-mmlab/mmengine";
     changelog = "https://github.com/open-mmlab/mmengine/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rxiao ];
   };
 })
diff --git a/pkgs/development/python-modules/mongoquery/default.nix b/pkgs/development/python-modules/mongoquery/default.nix
index ae4a0cfc88d5..26d67a38bad9 100644
--- a/pkgs/development/python-modules/mongoquery/default.nix
+++ b/pkgs/development/python-modules/mongoquery/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of mongodb queries";
     homepage = "https://github.com/kapouille/mongoquery";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ misuzu ];
   };
 }
diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix
index d20598fce033..0465fb825c0d 100644
--- a/pkgs/development/python-modules/moonraker-api/default.nix
+++ b/pkgs/development/python-modules/moonraker-api/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for the Moonraker API";
     homepage = "https://github.com/cmroche/moonraker-api";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix
index ecc6d190f270..378f761a17df 100644
--- a/pkgs/development/python-modules/motionblinds/default.nix
+++ b/pkgs/development/python-modules/motionblinds/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for interfacing with Motion Blinds";
     homepage = "https://github.com/starkillerOG/motion-blinds";
     changelog = "https://github.com/starkillerOG/motion-blinds/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix
index cab190139dba..ac16a1a462d0 100644
--- a/pkgs/development/python-modules/motioneye-client/default.nix
+++ b/pkgs/development/python-modules/motioneye-client/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for motionEye";
     homepage = "https://github.com/dermotduffy/motioneye-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
index 5b086d8028d2..7cd262c620b0 100644
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage rec {
     description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";
     homepage = "https://github.com/scikit-hep/mplhep";
     changelog = "https://github.com/scikit-hep/mplhep/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix
index 76a37ffefe2c..b0c48b23892b 100644
--- a/pkgs/development/python-modules/mplleaflet/default.nix
+++ b/pkgs/development/python-modules/mplleaflet/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
   meta = {
     description = "Convert Matplotlib plots into Leaflet web maps";
     homepage = "https://github.com/jwass/mplleaflet";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix
index 0f3ebc69be12..4b399c10c1ae 100644
--- a/pkgs/development/python-modules/msldap/default.nix
+++ b/pkgs/development/python-modules/msldap/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Python LDAP library for auditing MS AD";
     homepage = "https://github.com/skelsec/msldap";
     changelog = "https://github.com/skelsec/msldap/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mulpyplexer/default.nix b/pkgs/development/python-modules/mulpyplexer/default.nix
index 9c0938fe00aa..0816313a567d 100644
--- a/pkgs/development/python-modules/mulpyplexer/default.nix
+++ b/pkgs/development/python-modules/mulpyplexer/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "Multiplex interactions with lists of Python objects";
     homepage = "https://github.com/zardus/mulpyplexer";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mutesync/default.nix b/pkgs/development/python-modules/mutesync/default.nix
index 59b3ff668ef2..4f428225e767 100644
--- a/pkgs/development/python-modules/mutesync/default.nix
+++ b/pkgs/development/python-modules/mutesync/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for interacting with mutesync buttons";
     homepage = "https://github.com/currentoor/pymutesync";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 68f42550d2de..d06dbab6117e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -34,7 +34,7 @@ let
       meta = {
         description = "Type annotations for boto3 ${serviceName}";
         homepage = "https://github.com/youtype/mypy_boto3_builder";
-        license = with lib.licenses; [ mit ];
+        license = lib.licenses.mit;
         maintainers = with lib.maintainers; [
           fab
         ];
diff --git a/pkgs/development/python-modules/name-that-hash/default.nix b/pkgs/development/python-modules/name-that-hash/default.nix
index d6ec8fd9f89c..c967f5f080c3 100644
--- a/pkgs/development/python-modules/name-that-hash/default.nix
+++ b/pkgs/development/python-modules/name-that-hash/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     longDescription = "Don't know what type of hash it is? Name That Hash will name that hash type! Identify MD5, SHA256 and 300+ other hashes.";
     description = "Module and CLI for the identification of hashes";
     homepage = "https://github.com/HashPals/Name-That-Hash";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ eyjhb ];
   };
 }
diff --git a/pkgs/development/python-modules/nats-python/default.nix b/pkgs/development/python-modules/nats-python/default.nix
index 25b353803404..8c9342ad17f0 100644
--- a/pkgs/development/python-modules/nats-python/default.nix
+++ b/pkgs/development/python-modules/nats-python/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python client for NATS messaging system";
     homepage = "https://github.com/Gr1N/nats-python";
     changelog = "https://github.com/Gr1N/nats-python/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index 3dc8c947f5dc..9eb9dbe45f2e 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
   meta = {
     description = "Jupyter lab environment notebook server extension";
     homepage = "https://github.com/jupyter/nbclassic";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/netifaces2/default.nix b/pkgs/development/python-modules/netifaces2/default.nix
index 6899899c85f6..59f35a7ecc76 100644
--- a/pkgs/development/python-modules/netifaces2/default.nix
+++ b/pkgs/development/python-modules/netifaces2/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage {
   meta = {
     description = "Portable network interface information";
     homepage = "https://github.com/SamuelYvon/netifaces-2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = with lib.platforms; unix ++ windows;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index 34722e5fb7e0..500f6fbce30b 100644
--- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     description = "Python module to get air quality data from Nettigo Air Monitor devices";
     homepage = "https://github.com/bieniu/nettigo-air-monitor";
     changelog = "https://github.com/bieniu/nettigo-air-monitor/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/niluclient/default.nix b/pkgs/development/python-modules/niluclient/default.nix
index 7fe68b0b2a89..c15cdd332200 100644
--- a/pkgs/development/python-modules/niluclient/default.nix
+++ b/pkgs/development/python-modules/niluclient/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client for getting air pollution data from NILU sensor stations";
     homepage = "https://github.com/hfurubotten/niluclient";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix
index 2d7bc5fd774f..29756a2d6e86 100644
--- a/pkgs/development/python-modules/nkdfu/default.nix
+++ b/pkgs/development/python-modules/nkdfu/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Python tool for Nitrokeys' firmware update";
     mainProgram = "nkdfu";
     homepage = "https://github.com/Nitrokey/nkdfu";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix
index 37322fe8eef7..bad5b00fa2a4 100644
--- a/pkgs/development/python-modules/nmapthon2/default.nix
+++ b/pkgs/development/python-modules/nmapthon2/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to automate nmap";
     homepage = "https://github.com/cblopez/nmapthon2";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix
index 70290ed9a5ca..5500880dd5c5 100644
--- a/pkgs/development/python-modules/notus-scanner/default.nix
+++ b/pkgs/development/python-modules/notus-scanner/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Helper to create results from local security checks";
     homepage = "https://github.com/greenbone/notus-scanner";
     changelog = "https://github.com/greenbone/notus-scanner/releases/tag/${src.tag}";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/omnikinverter/default.nix b/pkgs/development/python-modules/omnikinverter/default.nix
index 3fe0a3d9d5c3..128509699079 100644
--- a/pkgs/development/python-modules/omnikinverter/default.nix
+++ b/pkgs/development/python-modules/omnikinverter/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Python module for the Omnik Inverter";
     homepage = "https://github.com/klaasnicolaas/python-omnikinverter";
     changelog = "https://github.com/klaasnicolaas/python-omnikinverter/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/omnilogic/default.nix b/pkgs/development/python-modules/omnilogic/default.nix
index 3973110c857e..e6658be9b4c0 100644
--- a/pkgs/development/python-modules/omnilogic/default.nix
+++ b/pkgs/development/python-modules/omnilogic/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python interface for the Hayward Omnilogic pool control system";
     homepage = "https://github.com/djtimca/omnilogic-api";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ondilo/default.nix b/pkgs/development/python-modules/ondilo/default.nix
index d0c059bc613e..c500572b9960 100644
--- a/pkgs/development/python-modules/ondilo/default.nix
+++ b/pkgs/development/python-modules/ondilo/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Python package to access Ondilo ICO APIs";
     homepage = "https://github.com/JeromeHXP/ondilo";
     changelog = "https://github.com/JeromeHXP/ondilo/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix
index 69856d6e2fe8..af60351bba1b 100644
--- a/pkgs/development/python-modules/onnxconverter-common/default.nix
+++ b/pkgs/development/python-modules/onnxconverter-common/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "ONNX Converter and Optimization Tools";
     homepage = "https://github.com/microsoft/onnxconverter-common";
     changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/onnxruntime-tools/default.nix b/pkgs/development/python-modules/onnxruntime-tools/default.nix
index 4cb43574ab4b..1d3e0c09b3d1 100644
--- a/pkgs/development/python-modules/onnxruntime-tools/default.nix
+++ b/pkgs/development/python-modules/onnxruntime-tools/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Transformers Model Optimization Tool of ONNXRuntime";
     homepage = "https://pypi.org/project/onnxruntime-tools/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/oocsi/default.nix b/pkgs/development/python-modules/oocsi/default.nix
index ce8f13194e91..0c1d15274e8f 100644
--- a/pkgs/development/python-modules/oocsi/default.nix
+++ b/pkgs/development/python-modules/oocsi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "OOCSI library for Python";
     homepage = "https://github.com/iddi/oocsi-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/open-garage/default.nix b/pkgs/development/python-modules/open-garage/default.nix
index ea8e0687c69d..e5c77c6da0a0 100644
--- a/pkgs/development/python-modules/open-garage/default.nix
+++ b/pkgs/development/python-modules/open-garage/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with opengarage.io";
     homepage = "https://github.com/Danielhiversen/pyOpenGarage";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/openerz-api/default.nix b/pkgs/development/python-modules/openerz-api/default.nix
index 19d856f5b919..3c8ac8a6445c 100644
--- a/pkgs/development/python-modules/openerz-api/default.nix
+++ b/pkgs/development/python-modules/openerz-api/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python module to interact with the OpenERZ API";
     homepage = "https://github.com/misialq/openerz-api";
     changelog = "https://github.com/misialq/openerz-api/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix
index 48ca148b5563..6b2fdafb20c4 100644
--- a/pkgs/development/python-modules/openevsewifi/default.nix
+++ b/pkgs/development/python-modules/openevsewifi/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for communicating with the wifi module from OpenEVSE";
     homepage = "https://github.com/miniconfig/python-openevse-wifi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix
index 64e01da37a29..cd7cd11f7843 100644
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python module to access Linn Ds and Openhome devices";
     homepage = "https://github.com/bazwilliams/openhomedevice";
     changelog = "https://github.com/bazwilliams/openhomedevice/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix
index 401b7befc2b8..5c29fc76e683 100644
--- a/pkgs/development/python-modules/opensimplex/default.nix
+++ b/pkgs/development/python-modules/opensimplex/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
       directional artifacts characteristic of Perlin noise.
     '';
     homepage = "https://github.com/lmas/opensimplex";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
index 8cec7059d943..09afef0ece30 100644
--- a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
+++ b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python API for OpenWrt ubus RPC";
     homepage = "https://github.com/Noltari/python-ubus-rpc";
     changelog = "https://github.com/Noltari/python-ubus-rpc/releases/tag/${version}";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix
index 3f83167de473..4d67522b5523 100644
--- a/pkgs/development/python-modules/orvibo/default.nix
+++ b/pkgs/development/python-modules/orvibo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client to work with Orvibo devices";
     homepage = "https://github.com/happyleavesaoc/python-orvibo";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix
index 615ff3c2693f..2ff4657fec99 100644
--- a/pkgs/development/python-modules/ospd/default.nix
+++ b/pkgs/development/python-modules/ospd/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Framework for vulnerability scanners which support OSP";
     homepage = "https://github.com/greenbone/ospd";
     changelog = "https://github.com/greenbone/ospd/releases/tag/v${version}";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/paranoid-crypto/default.nix b/pkgs/development/python-modules/paranoid-crypto/default.nix
index 0dc5c7dcd8af..0b8c787ad1a6 100644
--- a/pkgs/development/python-modules/paranoid-crypto/default.nix
+++ b/pkgs/development/python-modules/paranoid-crypto/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage {
   meta = {
     description = "Library contains checks for well known weaknesses on cryptographic artifacts";
     homepage = "https://github.com/google/paranoid_crypto";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix
index 1f6756170992..34392e8af78c 100644
--- a/pkgs/development/python-modules/partd/default.nix
+++ b/pkgs/development/python-modules/partd/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Appendable key-value storage";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     homepage = "https://github.com/dask/partd/";
   };
 }
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index f922218f9142..f9c98b0887b3 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems";
     homepage = "https://pypi.org/project/pathlib2/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix
index f49372a0ac74..07814b892ad5 100644
--- a/pkgs/development/python-modules/pcodedmp/default.nix
+++ b/pkgs/development/python-modules/pcodedmp/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python VBA p-code disassembler";
     mainProgram = "pcodedmp";
     homepage = "https://github.com/bontchev/pcodedmp";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index c097faed6e75..7ed7d0403728 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Library for interacting with Peaqev car charging";
     homepage = "https://github.com/elden1337/peaqev-core";
     changelog = "https://github.com/elden1337/peaqev-core/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix
index 9104a5927829..3a6bbb052bf1 100644
--- a/pkgs/development/python-modules/peco/default.nix
+++ b/pkgs/development/python-modules/peco/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     description = "Library for interacting with the PECO outage map";
     homepage = "https://github.com/IceBotYT/peco-outage-api";
     changelog = "https://github.com/IceBotYT/peco-outage-api/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pencompy/default.nix b/pkgs/development/python-modules/pencompy/default.nix
index a1392e49da42..9d47e86890a1 100644
--- a/pkgs/development/python-modules/pencompy/default.nix
+++ b/pkgs/development/python-modules/pencompy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Library for interacting with Pencom relay boards";
     homepage = "https://github.com/dubnom/pencompy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index b0248aabda7e..f0cc7a23c6e3 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python driver for PostgreSQL";
     homepage = "https://github.com/tlocke/pg8000";
     changelog = "https://github.com/tlocke/pg8000#release-notes";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 405f18f475ab..d678b1ff9e72 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -121,7 +121,7 @@ let
     meta = {
       mainProgram = "pip";
       description = "PyPA recommended tool for installing Python packages";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       homepage = "https://pip.pypa.io/";
       changelog = "https://pip.pypa.io/en/stable/news/#v${lib.replaceStrings [ "." ] [ "-" ] version}";
     };
diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix
index b498025b26d3..0021639a0062 100644
--- a/pkgs/development/python-modules/pixelmatch/default.nix
+++ b/pkgs/development/python-modules/pixelmatch/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "A pixel-level image comparison library";
     homepage = "https://github.com/whtsky/pixelmatch-py";
     changelog = "https://github.com/whtsky/pixelmatch-py/tree/v${version}#changelog";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     teams = [ lib.teams.geospatial ];
   };
 }
diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix
index 8a1654d96ed2..05a7b180c65f 100644
--- a/pkgs/development/python-modules/pkce/default.nix
+++ b/pkgs/development/python-modules/pkce/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to work with PKCE";
     homepage = "https://github.com/RomeoDespres/pkce";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 7babb433980c..1e357f636c33 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module for Plugwise Smiles, Stretch and USB stick";
     homepage = "https://github.com/plugwise/python-plugwise";
     changelog = "https://github.com/plugwise/python-plugwise/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix
index 5233322addcb..1f62a76ca62d 100644
--- a/pkgs/development/python-modules/policyuniverse/default.nix
+++ b/pkgs/development/python-modules/policyuniverse/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Parse and Process AWS IAM Policies, Statements, ARNs and wildcards";
     homepage = "https://github.com/Netflix-Skunkworks/policyuniverse";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 0f500c2091ab..32a3a0128bc9 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage (finalAttrs: {
     description = "Collection of Python utilities, tools, classes and functions";
     homepage = "https://github.com/greenbone/pontos";
     changelog = "https://github.com/greenbone/pontos/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix
index 08535bd38102..ac8e591db379 100644
--- a/pkgs/development/python-modules/poolsense/default.nix
+++ b/pkgs/development/python-modules/poolsense/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to access PoolSense device";
     homepage = "https://github.com/haemishkyd/poolsense";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix
index ec24e5ec39fc..de8569bde9e8 100644
--- a/pkgs/development/python-modules/prefixed/default.nix
+++ b/pkgs/development/python-modules/prefixed/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     description = "Prefixed alternative numeric library";
     homepage = "https://github.com/Rockhopper-Technologies/prefixed";
     changelog = "https://github.com/Rockhopper-Technologies/prefixed/releases/tag/${version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/protoletariat/default.nix b/pkgs/development/python-modules/protoletariat/default.nix
index bf899be7906b..dc3b8ec93b03 100644
--- a/pkgs/development/python-modules/protoletariat/default.nix
+++ b/pkgs/development/python-modules/protoletariat/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python protocol buffers for the rest of us";
     homepage = "https://github.com/cpcloud/protoletariat";
     changelog = "https://github.com/cpcloud/protoletariat/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 })
diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix
index 12ed81d7b4d1..816aa7cdc4e2 100644
--- a/pkgs/development/python-modules/proxy-py/default.nix
+++ b/pkgs/development/python-modules/proxy-py/default.nix
@@ -86,7 +86,7 @@ buildPythonPackage rec {
     description = "Python proxy framework";
     homepage = "https://github.com/abhinavsingh/proxy.py";
     changelog = "https://github.com/abhinavsingh/proxy.py/releases/tag/${src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix
index 5f538647776e..170b7ce3de9a 100644
--- a/pkgs/development/python-modules/psycopg2cffi/default.nix
+++ b/pkgs/development/python-modules/psycopg2cffi/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
   meta = {
     description = "Implementation of the psycopg2 module using cffi";
     homepage = "https://pypi.org/project/psycopg2cffi/";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }
diff --git a/pkgs/development/python-modules/pubnubsub-handler/default.nix b/pkgs/development/python-modules/pubnubsub-handler/default.nix
index 042226cd7c9e..520acc0a1a76 100644
--- a/pkgs/development/python-modules/pubnubsub-handler/default.nix
+++ b/pkgs/development/python-modules/pubnubsub-handler/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "PubNub subscription between PubNub and Home Assistant";
     homepage = "https://github.com/w1ll1am23/pubnubsub-handler";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix
index 2928d2f18c50..2edb2ea7ac92 100644
--- a/pkgs/development/python-modules/py-nightscout/default.nix
+++ b/pkgs/development/python-modules/py-nightscout/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library that provides an interface to Nightscout";
     homepage = "https://github.com/marciogranzotto/py-nightscout";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix
index 0a162ced9955..5eb3ed52cdfc 100644
--- a/pkgs/development/python-modules/py-ubjson/default.nix
+++ b/pkgs/development/python-modules/py-ubjson/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Universal Binary JSON draft-12 serializer for Python";
     homepage = "https://github.com/Iotic-Labs/py-ubjson";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix
index 18d3336e0f6b..0ac29b7b40a5 100644
--- a/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/pkgs/development/python-modules/pyairvisual/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with AirVisual";
     homepage = "https://github.com/bachya/pyairvisual";
     changelog = "https://github.com/bachya/pyairvisual/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyblackbird/default.nix b/pkgs/development/python-modules/pyblackbird/default.nix
index efc12b5045fc..b8689e83a0d7 100644
--- a/pkgs/development/python-modules/pyblackbird/default.nix
+++ b/pkgs/development/python-modules/pyblackbird/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python implementation for Monoprice Blackbird units";
     homepage = "https://github.com/koolsb/pyblackbird";
     changelog = "https://github.com/koolsb/pyblackbird/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix
index b1f67bd8bb98..ab78c9908eac 100644
--- a/pkgs/development/python-modules/pycec/default.nix
+++ b/pkgs/development/python-modules/pycec/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python modules to access HDMI CEC devices";
     mainProgram = "pycec";
     homepage = "https://github.com/konikvranik/pycec/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix
index 98e138573ee6..cf875dd05a86 100644
--- a/pkgs/development/python-modules/pycep-parser/default.nix
+++ b/pkgs/development/python-modules/pycep-parser/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python based Bicep parser";
     homepage = "https://github.com/gruebel/pycep";
     changelog = "https://github.com/gruebel/pycep/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix
index 3ad4b1c12ed1..1c762044dc6f 100644
--- a/pkgs/development/python-modules/pycfdns/default.nix
+++ b/pkgs/development/python-modules/pycfdns/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python module for updating Cloudflare DNS A records";
     homepage = "https://github.com/ludeeus/pycfdns";
     changelog = "https://github.com/ludeeus/pycfdns/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix
index d6c0b0b5d96d..e01fbefaf216 100644
--- a/pkgs/development/python-modules/pychannels/default.nix
+++ b/pkgs/development/python-modules/pychannels/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with the Channels app";
     homepage = "https://github.com/fancybits/pychannels";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix
index eefe2a1e5d44..0d7dd2ff36c2 100644
--- a/pkgs/development/python-modules/pyclimacell/default.nix
+++ b/pkgs/development/python-modules/pyclimacell/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client for ClimaCell API";
     homepage = "https://github.com/raman325/pyclimacell";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycomfoconnect/default.nix b/pkgs/development/python-modules/pycomfoconnect/default.nix
index df071cd577f5..536e84907b1f 100644
--- a/pkgs/development/python-modules/pycomfoconnect/default.nix
+++ b/pkgs/development/python-modules/pycomfoconnect/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python module to interact with ComfoAir Q350/450/600 units";
     homepage = "https://github.com/michaelarnauts/comfoconnect";
     changelog = "https://github.com/michaelarnauts/comfoconnect/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix
index d4167a661254..2c2fc066ee5b 100644
--- a/pkgs/development/python-modules/pycups/default.nix
+++ b/pkgs/development/python-modules/pycups/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python bindings for libcups";
     homepage = "http://cyberelk.net/tim/software/pycups/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
   };
 })
diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index a20fb2a8f041..977fb249a451 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     description = "Python Database Abstraction Layer";
     homepage = "https://github.com/web2py/pydal";
     changelog = "https://github.com/web2py/pydal/commits/v${version}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ wamserma ];
   };
 }
diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix
index e788961a9414..3e510063c487 100644
--- a/pkgs/development/python-modules/pydanfossair/default.nix
+++ b/pkgs/development/python-modules/pydanfossair/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python interface for Danfoss Air HRV systems";
     homepage = "https://github.com/JonasPed/pydanfoss-air";
     changelog = "https://github.com/JonasPed/pydanfoss-air/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pydoods/default.nix b/pkgs/development/python-modules/pydoods/default.nix
index f1f23897f948..ff6cf609ac2b 100644
--- a/pkgs/development/python-modules/pydoods/default.nix
+++ b/pkgs/development/python-modules/pydoods/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for the DOODS service";
     homepage = "https://github.com/snowzach/pydoods";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix
index 9759e99e7247..0a009fe5aee8 100644
--- a/pkgs/development/python-modules/pyefergy/default.nix
+++ b/pkgs/development/python-modules/pyefergy/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/tkdrob/pyefergy/releases/tag/v${version}";
     description = "Python API library for Efergy energy meters";
     homepage = "https://github.com/tkdrob/pyefergy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix
index b3597d6709f9..c176bf52a759 100644
--- a/pkgs/development/python-modules/pyeight/default.nix
+++ b/pkgs/development/python-modules/pyeight/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to interface with the Eight Sleep API";
     homepage = "https://github.com/mezz64/pyEight";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyembroidery/default.nix b/pkgs/development/python-modules/pyembroidery/default.nix
index a5830f5a388e..d0375efccce9 100644
--- a/pkgs/development/python-modules/pyembroidery/default.nix
+++ b/pkgs/development/python-modules/pyembroidery/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage {
   meta = {
     description = "Python library for the reading and writing of embroidery files";
     homepage = "https://github.com/inkstitch/pyembroidery";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pluiedev ];
   };
 }
diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix
index 35448deeabcb..af1cf9797271 100644
--- a/pkgs/development/python-modules/pyeverlights/default.nix
+++ b/pkgs/development/python-modules/pyeverlights/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for interfacing with an EverLights control box";
     homepage = "https://github.com/joncar/pyeverlights";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix
index f05541dcf260..33efbf79853f 100644
--- a/pkgs/development/python-modules/pyevilgenius/default.nix
+++ b/pkgs/development/python-modules/pyevilgenius/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python SDK to interact with Evil Genius Labs devices";
     homepage = "https://github.com/home-assistant-libs/pyevilgenius";
     changelog = "https://github.com/home-assistant-libs/pyevilgenius/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix
index 32a5ea78f418..63ccef1640b7 100644
--- a/pkgs/development/python-modules/pyfibaro/default.nix
+++ b/pkgs/development/python-modules/pyfibaro/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library to access FIBARO Home center";
     homepage = "https://github.com/rappenze/pyfibaro";
     changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix
index 017d3fd83d43..db521addb2f4 100644
--- a/pkgs/development/python-modules/pyfido/default.nix
+++ b/pkgs/development/python-modules/pyfido/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     description = "Python client to get fido account data";
     mainProgram = "pyfido";
     homepage = "https://github.com/titilambert/pyfido";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyflexit/default.nix b/pkgs/development/python-modules/pyflexit/default.nix
index 091829f70fb3..0e9b25fded2f 100644
--- a/pkgs/development/python-modules/pyflexit/default.nix
+++ b/pkgs/development/python-modules/pyflexit/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Flexit A/C units";
     homepage = "https://github.com/Sabesto/pyflexit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix
index f95b618c3460..2b7f43fa6879 100644
--- a/pkgs/development/python-modules/pyflic/default.nix
+++ b/pkgs/development/python-modules/pyflic/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to interact with Flic buttons";
     homepage = "https://github.com/soldag/pyflic";
-    license = with lib.licenses; [ cc0 ];
+    license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix
index 125befd66095..0b9c3804f7d4 100644
--- a/pkgs/development/python-modules/pyflume/default.nix
+++ b/pkgs/development/python-modules/pyflume/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "Python module to work with Flume sensors";
     homepage = "https://github.com/ChrisMandich/PyFlume";
     changelog = "https://github.com/ChrisMandich/PyFlume/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index be21cc0d92af..a47361b3d9b4 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -103,7 +103,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "GUI system for pygame";
     homepage = "https://github.com/MyreMylar/pygame_gui";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       emilytrau
       pbsds
diff --git a/pkgs/development/python-modules/pygeocodio/default.nix b/pkgs/development/python-modules/pygeocodio/default.nix
index 96350f02b599..06bf1c490222 100644
--- a/pkgs/development/python-modules/pygeocodio/default.nix
+++ b/pkgs/development/python-modules/pygeocodio/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/bennylope/pygeocodio/tree/master";
     changelog = "https://github.com/bennylope/pygeocodio/blob/${src.tag}/HISTORY.rst";
     homepage = "https://www.geocod.io/docs/#introduction";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ethancedwards8 ];
   };
 }
diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix
index 405f2fade0bf..553d614b6ea1 100644
--- a/pkgs/development/python-modules/pygmars/default.nix
+++ b/pkgs/development/python-modules/pygmars/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Python lexing and parsing library";
     homepage = "https://github.com/nexB/pygmars";
     changelog = "https://github.com/aboutcode-org/pygmars/blob/${src.tag}/CHANGELOG.rst";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix
index e33fda50158d..92b7a8b62ee7 100644
--- a/pkgs/development/python-modules/pygount/default.nix
+++ b/pkgs/development/python-modules/pygount/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     mainProgram = "pygount";
     homepage = "https://github.com/roskakori/pygount";
     changelog = "https://github.com/roskakori/pygount/blob/${src.tag}/docs/changes.md";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ nickcao ];
   };
 }
diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix
index d1ce96f3749e..bc308eaadc06 100644
--- a/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/pkgs/development/python-modules/pyhaversion/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Python module to the newest version number of Home Assistant";
     homepage = "https://github.com/ludeeus/pyhaversion";
     changelog = "https://github.com/ludeeus/pyhaversion/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ makefu ];
   };
 }
diff --git a/pkgs/development/python-modules/pyhomepilot/default.nix b/pkgs/development/python-modules/pyhomepilot/default.nix
index 158e5d396bd0..afcc466172bf 100644
--- a/pkgs/development/python-modules/pyhomepilot/default.nix
+++ b/pkgs/development/python-modules/pyhomepilot/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with the Rademacher HomePilot API";
     homepage = "https://github.com/nico0302/pyhomepilot";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix
index 578f5d3c586c..5e0a0c222e7f 100644
--- a/pkgs/development/python-modules/pyhumps/default.nix
+++ b/pkgs/development/python-modules/pyhumps/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module to convert strings (and dictionary keys) between snake case, camel case and pascal case";
     homepage = "https://github.com/nficano/humps";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyi2cflash/default.nix b/pkgs/development/python-modules/pyi2cflash/default.nix
index ef37ccb1e917..90b727ecd197 100644
--- a/pkgs/development/python-modules/pyi2cflash/default.nix
+++ b/pkgs/development/python-modules/pyi2cflash/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "I2C eeprom device drivers in Python";
     homepage = "https://github.com/eblot/pyi2cflash";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix
index 88f13e0344f1..17eb2dcaa258 100644
--- a/pkgs/development/python-modules/pyialarm/default.nix
+++ b/pkgs/development/python-modules/pyialarm/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to interface with Antifurto365 iAlarm systems";
     homepage = "https://github.com/RyuzakiKK/pyialarm";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix
index 11800bfcff4a..a7ed3fb406e2 100644
--- a/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/pkgs/development/python-modules/pyinsteon/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/pyinsteon/pyinsteon";
     changelog = "https://github.com/pyinsteon/pyinsteon/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "insteon_tools";
   };
diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix
index 2e605272d94c..b98ab9903e22 100644
--- a/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/pkgs/development/python-modules/pyiqvia/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/bachya/pyiqvia";
     changelog = "https://github.com/bachya/pyiqvia/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pykira/default.nix b/pkgs/development/python-modules/pykira/default.nix
index b4c31955620d..77a26a65bda4 100644
--- a/pkgs/development/python-modules/pykira/default.nix
+++ b/pkgs/development/python-modules/pykira/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to interact with Kira modules";
     homepage = "https://github.com/stu-gott/pykira";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix
index dfcf3204491e..fc3f22a00ab9 100644
--- a/pkgs/development/python-modules/pykostalpiko/default.nix
+++ b/pkgs/development/python-modules/pykostalpiko/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library and CLI-tool to fetch the data from a Kostal Piko inverter";
     homepage = "https://github.com/Florian7843/pykostalpiko";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix
index f587245b2cc7..5495066213ad 100644
--- a/pkgs/development/python-modules/pykulersky/default.nix
+++ b/pkgs/development/python-modules/pykulersky/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python module to control Brightech Kuler Sky Bluetooth LED devices";
     mainProgram = "pykulersky";
     homepage = "https://github.com/emlove/pykulersky";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix
index 8283dff15d8d..562e55ae3cf2 100644
--- a/pkgs/development/python-modules/pylacrosse/default.nix
+++ b/pkgs/development/python-modules/pylacrosse/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library for Jeelink LaCrosse";
     mainProgram = "pylacrosse";
     homepage = "https://github.com/hthiery/python-lacrosse";
-    license = with lib.licenses; [ lgpl2Plus ];
+    license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pylgnetcast/default.nix b/pkgs/development/python-modules/pylgnetcast/default.nix
index 2fb100a7e8e2..5c1d670c28d2 100644
--- a/pkgs/development/python-modules/pylgnetcast/default.nix
+++ b/pkgs/development/python-modules/pylgnetcast/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python API client for the LG Smart TV running NetCast 3 or 4";
     homepage = "https://github.com/Drafteed/python-lgnetcast";
     changelog = "https://github.com/Drafteed/python-lgnetcast/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pylnk3/default.nix b/pkgs/development/python-modules/pylnk3/default.nix
index 795d0968674f..2b5bac69e149 100644
--- a/pkgs/development/python-modules/pylnk3/default.nix
+++ b/pkgs/development/python-modules/pylnk3/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Python library for reading and writing Windows shortcut files (.lnk)";
     mainProgram = "pylnk3";
     homepage = "https://github.com/strayge/pylnk";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fedx-sudo ];
   };
 }
diff --git a/pkgs/development/python-modules/pyluwen/default.nix b/pkgs/development/python-modules/pyluwen/default.nix
index da3620d49289..7ae959475aef 100644
--- a/pkgs/development/python-modules/pyluwen/default.nix
+++ b/pkgs/development/python-modules/pyluwen/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/tenstorrent/luwen";
     changelog = "https://github.com/tenstorrent/luwen/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/pymailgunner/default.nix b/pkgs/development/python-modules/pymailgunner/default.nix
index 6990c9a80c1c..7e5e92794e8f 100644
--- a/pkgs/development/python-modules/pymailgunner/default.nix
+++ b/pkgs/development/python-modules/pymailgunner/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting with Mailgun e-mail service";
     homepage = "https://github.com/pschmitt/pymailgunner";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix
index 46e271fd600b..abcc4aea01e8 100644
--- a/pkgs/development/python-modules/pymata-express/default.nix
+++ b/pkgs/development/python-modules/pymata-express/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
       hardware remotely over a serial link.
     '';
     homepage = "https://mryslab.github.io/pymata-express/";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix
index 88389fa19985..42dec5251758 100644
--- a/pkgs/development/python-modules/pymediaroom/default.nix
+++ b/pkgs/development/python-modules/pymediaroom/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Remote Control for Mediaroom STB";
     homepage = "https://github.com/dgomes/pymediaroom";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix
index 2917e91e9bd5..a23274614b5f 100644
--- a/pkgs/development/python-modules/pymemcache/default.nix
+++ b/pkgs/development/python-modules/pymemcache/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/pinterest/pymemcache/blob/${src.rev}/ChangeLog.rst";
     description = "Python memcached client";
     homepage = "https://pymemcache.readthedocs.io/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymeteireann/default.nix b/pkgs/development/python-modules/pymeteireann/default.nix
index 444582f52405..a89b02674620 100644
--- a/pkgs/development/python-modules/pymeteireann/default.nix
+++ b/pkgs/development/python-modules/pymeteireann/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with the Met Éireann Public Weather Forecast API";
     homepage = "https://github.com/DylanGore/PyMetEireann/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymitv/default.nix b/pkgs/development/python-modules/pymitv/default.nix
index f03d436e094e..218cbda106f4 100644
--- a/pkgs/development/python-modules/pymitv/default.nix
+++ b/pkgs/development/python-modules/pymitv/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client the Mi Tv 3";
     homepage = "https://github.com/simse/pymitv";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix
index be05db41380a..5adfd15f5400 100644
--- a/pkgs/development/python-modules/pymunk/default.nix
+++ b/pkgs/development/python-modules/pymunk/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     description = "2d physics library";
     homepage = "https://www.pymunk.org";
     changelog = "https://github.com/viblo/pymunk/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix
index bf55a2a8859f..62ba307a0cf2 100644
--- a/pkgs/development/python-modules/pynello/default.nix
+++ b/pkgs/development/python-modules/pynello/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python library for nello.io intercoms";
     mainProgram = "nello";
     homepage = "https://github.com/pschmitt/pynello";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynentry/default.nix b/pkgs/development/python-modules/pynentry/default.nix
index cea16b224ee5..233438742040 100644
--- a/pkgs/development/python-modules/pynentry/default.nix
+++ b/pkgs/development/python-modules/pynentry/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage {
   meta = {
     description = "Wrapper for pinentry for python";
     homepage = "https://github.com/Laharah/pynentry";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lilahummel ];
   };
 }
diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix
index 159fdb802914..615ae80eb784 100644
--- a/pkgs/development/python-modules/pynetgear/default.nix
+++ b/pkgs/development/python-modules/pynetgear/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Module for interacting with Netgear wireless routers";
     homepage = "https://github.com/MatMaul/pynetgear";
     changelog = "https://github.com/MatMaul/pynetgear/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix
index 14b206312838..5fd1cbb52e1c 100644
--- a/pkgs/development/python-modules/pynuki/default.nix
+++ b/pkgs/development/python-modules/pynuki/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python bindings for nuki.io bridges";
     homepage = "https://github.com/pschmitt/pynuki";
     changelog = "https://github.com/pschmitt/pynuki/releases/tag/${version}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix
index 2a02a9898fb3..52c979fc5b4f 100644
--- a/pkgs/development/python-modules/pynut2/default.nix
+++ b/pkgs/development/python-modules/pynut2/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "API overhaul of PyNUT, a Python library to allow communication with NUT (Network UPS Tools) servers";
     homepage = "https://github.com/mezz64/python-nut2";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.luker ];
   };
 }
diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix
index a23f92ecd47e..ed194f77d188 100644
--- a/pkgs/development/python-modules/pynws/default.nix
+++ b/pkgs/development/python-modules/pynws/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     description = "Python library to retrieve data from NWS/NOAA";
     homepage = "https://github.com/MatthewFlamm/pynws";
     changelog = "https://github.com/MatthewFlamm/pynws/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix
index b1205d610d77..be8a7f240a77 100644
--- a/pkgs/development/python-modules/pynx584/default.nix
+++ b/pkgs/development/python-modules/pynx584/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage {
   meta = {
     description = "Python package for communicating to NX584/NX8E interfaces";
     homepage = "https://github.com/kk7ds/pynx584";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyombi/default.nix b/pkgs/development/python-modules/pyombi/default.nix
index 35e5e88fe2f5..90f367da2878 100644
--- a/pkgs/development/python-modules/pyombi/default.nix
+++ b/pkgs/development/python-modules/pyombi/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to retrieve information from Ombi";
     homepage = "https://github.com/larssont/pyombi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix
index 2228f04edc80..65f4bbbe2187 100644
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     description = "Python API to retrieve data from openuv.io";
     homepage = "https://github.com/bachya/pyopenuv";
     changelog = "https://github.com/bachya/pyopenuv/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
index 0e0bb2d446ea..d1889e4328d2 100644
--- a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
+++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     description = "Library for retrieving data from for Outbreaks Near Me";
     homepage = "https://github.com/bachya/pyoutbreaksnearme";
     changelog = "https://github.com/bachya/pyoutbreaksnearme/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pypca/default.nix b/pkgs/development/python-modules/pypca/default.nix
index 9e18426ad6b4..74a81987faa8 100644
--- a/pkgs/development/python-modules/pypca/default.nix
+++ b/pkgs/development/python-modules/pypca/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with the PCA 301 smart plugs";
     mainProgram = "pypca";
     homepage = "https://github.com/majuss/pypca";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix
index 0600213f0fb4..e6b5c85d6a73 100644
--- a/pkgs/development/python-modules/pyprosegur/default.nix
+++ b/pkgs/development/python-modules/pyprosegur/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python module to communicate with Prosegur Residential Alarms";
     homepage = "https://github.com/dgomes/pyprosegur";
     changelog = "https://github.com/dgomes/pyprosegur/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pyprosegur";
   };
diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix
index 9442b384e01f..c3792deb90bc 100644
--- a/pkgs/development/python-modules/pyprusalink/default.nix
+++ b/pkgs/development/python-modules/pyprusalink/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Library to communicate with PrusaLink";
     homepage = "https://github.com/home-assistant-libs/pyprusalink";
     changelog = "https://github.com/home-assistant-libs/pyprusalink/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyric/default.nix b/pkgs/development/python-modules/pyric/default.nix
index 0901c52e27ed..57b14a9b802a 100644
--- a/pkgs/development/python-modules/pyric/default.nix
+++ b/pkgs/development/python-modules/pyric/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Radio Interface Controller";
     homepage = "https://github.com/wraith-wireless/PyRIC";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix
index 6ee8a07eca81..a51cca39d0c0 100644
--- a/pkgs/development/python-modules/pyrisco/default.nix
+++ b/pkgs/development/python-modules/pyrisco/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python interface to Risco alarm systems through Risco Cloud";
     homepage = "https://github.com/OnFreund/pyrisco";
     changelog = "https://github.com/OnFreund/pyrisco/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix
index 78cdc714b347..b99bcfded4e9 100644
--- a/pkgs/development/python-modules/pysaj/default.nix
+++ b/pkgs/development/python-modules/pysaj/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library to communicate with SAJ inverters";
     homepage = "https://github.com/fredericvl/pysaj";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix
index 9de53e11514e..d62a7a76fd78 100644
--- a/pkgs/development/python-modules/pyskyqremote/default.nix
+++ b/pkgs/development/python-modules/pyskyqremote/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python module for accessing SkyQ boxes";
     homepage = "https://github.com/RogerSelwyn/skyq_remote";
     changelog = "https://github.com/RogerSelwyn/skyq_remote/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix
index a8ca7bed615a..d8e560c0dad1 100644
--- a/pkgs/development/python-modules/pysmappee/default.nix
+++ b/pkgs/development/python-modules/pysmappee/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Library for the Smappee dev API";
     homepage = "https://github.com/smappee/pysmappee";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix
index f58967964499..5ba17dbd5c4e 100644
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python library for interacting with the SmartThings cloud API";
     homepage = "https://github.com/andrewsayre/pysmartthings";
     changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix
index 25ec7e7fca73..94a0767fd768 100644
--- a/pkgs/development/python-modules/pysmbc/default.nix
+++ b/pkgs/development/python-modules/pysmbc/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Libsmbclient binding for Python";
     homepage = "https://github.com/hamano/pysmbc";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix
index 377a014c6694..d0badb696c75 100644
--- a/pkgs/development/python-modules/pysmt/default.nix
+++ b/pkgs/development/python-modules/pysmt/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     description = "Python library for SMT formulae manipulation and solving";
     mainProgram = "pysmt-install";
     homepage = "https://github.com/pysmt/pysmt";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix
index 5a5f3fd2ca9c..f774b88cd33c 100644
--- a/pkgs/development/python-modules/pysnmplib/default.nix
+++ b/pkgs/development/python-modules/pysnmplib/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Implementation of v1/v2c/v3 SNMP engine";
     homepage = "https://github.com/pysnmp/pysnmp";
     changelog = "https://github.com/pysnmp/pysnmp/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix
index 9c4d1def9175..dc45ff97f095 100644
--- a/pkgs/development/python-modules/pysnooz/default.nix
+++ b/pkgs/development/python-modules/pysnooz/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     description = "Library to control SNOOZ white noise machines";
     homepage = "https://github.com/AustinBrunkhorst/pysnooz";
     changelog = "https://github.com/AustinBrunkhorst/pysnooz/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix
index 2ae7ac6fa8cb..f568f0c3117c 100644
--- a/pkgs/development/python-modules/pysoma/default.nix
+++ b/pkgs/development/python-modules/pysoma/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for the HTTP API provided by SOMA Connect";
     homepage = "https://pypi.org/project/pysoma";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix
index d60ca74c597c..e617b4e3b2c1 100644
--- a/pkgs/development/python-modules/pyspcwebgw/default.nix
+++ b/pkgs/development/python-modules/pyspcwebgw/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Python module for the SPC Web Gateway REST API";
     homepage = "https://github.com/mbrrg/pyspcwebgw";
     changelog = "https://github.com/pyspcwebgw/pyspcwebgw/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix
index be9d4664db2c..21e36307e1c5 100644
--- a/pkgs/development/python-modules/pyswitchbee/default.nix
+++ b/pkgs/development/python-modules/pyswitchbee/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Library to control SwitchBee smart home device";
     homepage = "https://github.com/jafar-atili/pySwitchbee/";
     changelog = "https://github.com/jafar-atili/pySwitchbee/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytankerkoenig/default.nix b/pkgs/development/python-modules/pytankerkoenig/default.nix
index 7d29f005ecd7..ad5038d9280d 100644
--- a/pkgs/development/python-modules/pytankerkoenig/default.nix
+++ b/pkgs/development/python-modules/pytankerkoenig/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to get fuel data from tankerkoenig.de";
     homepage = "https://github.com/ultrara1n/pytankerkoenig";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix
index d7bf3ded84c2..a87c3dc71fbc 100644
--- a/pkgs/development/python-modules/pytap2/default.nix
+++ b/pkgs/development/python-modules/pytap2/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Object-oriented wrapper around the Linux Tun/Tap device";
     homepage = "https://github.com/johnthagen/pytap2";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix
index dfdb75483059..6ebf1dfab5fc 100644
--- a/pkgs/development/python-modules/pytautulli/default.nix
+++ b/pkgs/development/python-modules/pytautulli/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to get information from Tautulli";
     homepage = "https://github.com/ludeeus/pytautulli";
     changelog = "https://github.com/ludeeus/pytautulli/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
index df5397de0597..e1f35a87d1d6 100644
--- a/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "HTTP server for pytest to test HTTP clients";
     homepage = "https://www.github.com/csernazs/pytest-httpserver";
     changelog = "https://github.com/csernazs/pytest-httpserver/blob/${src.tag}/CHANGES.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-pytestrail/default.nix b/pkgs/development/python-modules/pytest-pytestrail/default.nix
index a44cae806fe5..d6500a421a14 100644
--- a/pkgs/development/python-modules/pytest-pytestrail/default.nix
+++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Pytest plugin for interaction with TestRail";
     homepage = "https://github.com/tolstislon/pytest-pytestrail";
     changelog = "https://github.com/tolstislon/pytest-pytestrail/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aanderse ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix
index ec0a2adf5dfb..2d434a6b776c 100644
--- a/pkgs/development/python-modules/pytest-raises/default.nix
+++ b/pkgs/development/python-modules/pytest-raises/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Implementation of pytest.raises as a pytest.mark fixture";
     homepage = "https://github.com/Lemmons/pytest-raises";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
index 061812c70566..542fbd622a5f 100644
--- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix
+++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
   meta = {
     description = "Simple pytest plugin to look for regex in Exceptions";
     homepage = "https://github.com/Walkman/pytest_raisesregexp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix
index 8c460e3be2c6..affdea662cf3 100644
--- a/pkgs/development/python-modules/pytest-vcr/default.nix
+++ b/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Integration VCR.py into pytest";
     homepage = "https://github.com/ktosiek/pytest-vcr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-bitcoinlib/default.nix b/pkgs/development/python-modules/python-bitcoinlib/default.nix
index 7d85630bb15b..a9d3130b2587 100644
--- a/pkgs/development/python-modules/python-bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/python-bitcoinlib/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/petertodd/python-bitcoinlib";
     description = "Easy interface to the Bitcoin data structures and protocol";
     changelog = "https://github.com/petertodd/python-bitcoinlib/raw/${src.rev}/release-notes.md";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ jb55 ];
   };
 }
diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix
index 24cc7b78aa33..34bc19a85741 100644
--- a/pkgs/development/python-modules/python-box/default.nix
+++ b/pkgs/development/python-modules/python-box/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Python dictionaries with advanced dot notation access";
     homepage = "https://github.com/cdgriffith/Box";
     changelog = "https://github.com/cdgriffith/Box/blob/${version}/CHANGES.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix
index 178504667ed8..3c2d3a4ca14c 100644
--- a/pkgs/development/python-modules/python-decouple/default.nix
+++ b/pkgs/development/python-modules/python-decouple/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Module to handle code and condifuration";
     homepage = "https://github.com/HBNetwork/python-decouple";
     changelog = "https://github.com/HBNetwork/python-decouple/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-digitalocean/default.nix b/pkgs/development/python-modules/python-digitalocean/default.nix
index 68e17e1a8344..b732fbb40d38 100644
--- a/pkgs/development/python-modules/python-digitalocean/default.nix
+++ b/pkgs/development/python-modules/python-digitalocean/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     description = "Python API to manage Digital Ocean Droplets and Images";
     homepage = "https://github.com/koalalorenzo/python-digitalocean";
     changelog = "https://github.com/koalalorenzo/python-digitalocean/releases/tag/v${version}";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ teh ];
   };
 }
diff --git a/pkgs/development/python-modules/python-ev3dev2/default.nix b/pkgs/development/python-modules/python-ev3dev2/default.nix
index 67a039644f6b..1f952f6977a0 100644
--- a/pkgs/development/python-modules/python-ev3dev2/default.nix
+++ b/pkgs/development/python-modules/python-ev3dev2/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python language bindings for ev3dev";
     homepage = "https://github.com/ev3dev/ev3dev-lang-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix
index d2fda10794b6..f48618640c3d 100644
--- a/pkgs/development/python-modules/python-fullykiosk/default.nix
+++ b/pkgs/development/python-modules/python-fullykiosk/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Wrapper for Fully Kiosk Browser REST interface";
     homepage = "https://github.com/cgarwood/python-fullykiosk";
     changelog = "https://github.com/cgarwood/python-fullykiosk/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix
index e7a54a29ce3a..dc6c247d6ac5 100644
--- a/pkgs/development/python-modules/python-gammu/default.nix
+++ b/pkgs/development/python-modules/python-gammu/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for Gammu";
     homepage = "https://github.com/gammu/python-gammu/";
-    license = with lib.licenses; [ gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
index 025046cc2e15..ec134073408f 100644
--- a/pkgs/development/python-modules/python-http-client/default.nix
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python HTTP library to call APIs";
     homepage = "https://github.com/sendgrid/python-http-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix
index dfe0c35ba441..88235ef2ce97 100644
--- a/pkgs/development/python-modules/python-i18n/default.nix
+++ b/pkgs/development/python-modules/python-i18n/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Easy to use i18n library";
     homepage = "https://github.com/danhper/python-i18n";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/python-nmap/default.nix b/pkgs/development/python-modules/python-nmap/default.nix
index 21d06b9d1536..85e44aac15ee 100644
--- a/pkgs/development/python-modules/python-nmap/default.nix
+++ b/pkgs/development/python-modules/python-nmap/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
       It also supports nmap script outputs.
     '';
     homepage = "https://xael.org/pages/python-nmap-en.html";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix
index 3c684e3b5899..9af483047a82 100644
--- a/pkgs/development/python-modules/python-pidfile/default.nix
+++ b/pkgs/development/python-modules/python-pidfile/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python context manager for managing pid files";
     homepage = "https://github.com/mosquito/python-pidfile";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix
index bc6702cae441..1f04f6cd5869 100644
--- a/pkgs/development/python-modules/python-rabbitair/default.nix
+++ b/pkgs/development/python-modules/python-rabbitair/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for the control of Rabbit Air air purifiers";
     homepage = "https://github.com/rabbit-air/python-rabbitair";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
index 4204421e7fc6..6f94bb99d595 100644
--- a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
+++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/OpShin/python-secp256k1";
     description = "Fork of python-secp256k1, fixing the commit hash of libsecp256k1 to a Cardano compatible version";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aciceri ];
   };
 })
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index 915f506445c2..f0436a6d2493 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -83,7 +83,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/miguelgrinberg/python-socketio/";
     changelog = "https://github.com/miguelgrinberg/python-socketio/blob/${src.tag}/CHANGES.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mic92 ];
   };
 }
diff --git a/pkgs/development/python-modules/python-status/default.nix b/pkgs/development/python-modules/python-status/default.nix
index a83073c4c912..f344d0d856fd 100644
--- a/pkgs/development/python-modules/python-status/default.nix
+++ b/pkgs/development/python-modules/python-status/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "HTTP Status for Humans";
     homepage = "https://github.com/avinassh/status/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-twitch-client/default.nix b/pkgs/development/python-modules/python-twitch-client/default.nix
index 99c0672638e9..c06b3eeb6385 100644
--- a/pkgs/development/python-modules/python-twitch-client/default.nix
+++ b/pkgs/development/python-modules/python-twitch-client/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python wrapper for the Twitch API";
     homepage = "https://github.com/tsifrer/python-twitch-client";
     changelog = "https://github.com/tsifrer/python-twitch-client/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix
index b0651f7692b9..caa685329825 100644
--- a/pkgs/development/python-modules/python-velbus/default.nix
+++ b/pkgs/development/python-modules/python-velbus/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to control the Velbus home automation system";
     homepage = "https://github.com/thomasdelaet/python-velbus";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix
index d0e07412edda..ba2bb0a11443 100644
--- a/pkgs/development/python-modules/python-whois/default.nix
+++ b/pkgs/development/python-modules/python-whois/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to produce parsed WHOIS data";
     homepage = "https://github.com/richardpenman/whois";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-wink/default.nix b/pkgs/development/python-modules/python-wink/default.nix
index 30556aa9bca8..82fa589a1a35 100644
--- a/pkgs/development/python-modules/python-wink/default.nix
+++ b/pkgs/development/python-modules/python-wink/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the Wink API";
     homepage = "https://github.com/python-wink/python-wink";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/python-yate/default.nix b/pkgs/development/python-modules/python-yate/default.nix
index 2244ebfb0e3d..1bce38e8109f 100644
--- a/pkgs/development/python-modules/python-yate/default.nix
+++ b/pkgs/development/python-modules/python-yate/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     mainProgram = "yate_callgen";
     homepage = "https://github.com/eventphone/python-yate";
     changelog = "https://github.com/eventphone/python-yate/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ clerie ];
   };
 }
diff --git a/pkgs/development/python-modules/pythonegardia/default.nix b/pkgs/development/python-modules/pythonegardia/default.nix
index 8211ba94d80c..e9377ac4dd28 100644
--- a/pkgs/development/python-modules/pythonegardia/default.nix
+++ b/pkgs/development/python-modules/pythonegardia/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python interface with Egardia/Woonveilig alarms";
     homepage = "https://github.com/jeroenterheerdt/python-egardia";
     changelog = "https://github.com/jeroenterheerdt/python-egardia/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
index fc5b8333a715..0e4254a3fb54 100644
--- a/pkgs/development/python-modules/pytile/default.nix
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/bachya/pytile";
     changelog = "https://github.com/bachya/pytile/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix
index d90282a317f1..2f9001ce03f6 100644
--- a/pkgs/development/python-modules/pytrafikverket/default.nix
+++ b/pkgs/development/python-modules/pytrafikverket/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to get data from the Swedish Transport Administration (Trafikverket) API";
     homepage = "https://github.com/gjohansson-ST/pytrafikverket";
     changelog = "https://github.com/gjohansson-ST/pytrafikverket/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytransportnsw/default.nix b/pkgs/development/python-modules/pytransportnsw/default.nix
index 111f557b1e08..bc5ebb6885d1 100644
--- a/pkgs/development/python-modules/pytransportnsw/default.nix
+++ b/pkgs/development/python-modules/pytransportnsw/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to access Transport NSW information";
     homepage = "https://github.com/Dav0815/TransportNSW";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix
index 8ec324147fb1..cb7672a82746 100644
--- a/pkgs/development/python-modules/pytricia/default.nix
+++ b/pkgs/development/python-modules/pytricia/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for fast IP address lookup in Python";
     homepage = "https://github.com/jsommers/pytricia";
-    license = with lib.licenses; [ lgpl3Plus ];
+    license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ mkg ];
   };
 }
diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix
index b210a18e2c4e..3ae0981f7ec7 100644
--- a/pkgs/development/python-modules/pyuseragents/default.nix
+++ b/pkgs/development/python-modules/pyuseragents/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Giving you a random User-Agent Header";
     homepage = "https://github.com/Animenosekai/useragents";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 }
diff --git a/pkgs/development/python-modules/pyvolumio/default.nix b/pkgs/development/python-modules/pyvolumio/default.nix
index faddd1a8f63f..588891523fec 100644
--- a/pkgs/development/python-modules/pyvolumio/default.nix
+++ b/pkgs/development/python-modules/pyvolumio/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to control Volumio";
     homepage = "https://github.com/OnFreund/PyVolumio";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix
index fd1d515ce0bc..5e0544ed0903 100644
--- a/pkgs/development/python-modules/pywaterkotte/default.nix
+++ b/pkgs/development/python-modules/pywaterkotte/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to communicate with Waterkotte heatpumps";
     homepage = "https://github.com/chboland/pywaterkotte";
     changelog = "https://github.com/chboland/pywaterkotte/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix
index 9fd0a1379a21..2ede34a5e569 100644
--- a/pkgs/development/python-modules/pyweatherflowrest/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python module to get data from WeatherFlow Weather Stations";
     homepage = "https://github.com/briis/pyweatherflowrest";
     changelog = "https://github.com/briis/pyweatherflowrest/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pywilight/default.nix b/pkgs/development/python-modules/pywilight/default.nix
index 1e986848d5cf..41db6c19ee38 100644
--- a/pkgs/development/python-modules/pywilight/default.nix
+++ b/pkgs/development/python-modules/pywilight/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for WiLight device";
     homepage = "https://github.com/leofig-rj/pywilight";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix
index ec965674a16d..958cc1c2e6e0 100644
--- a/pkgs/development/python-modules/pyx/default.nix
+++ b/pkgs/development/python-modules/pyx/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
   meta = {
     description = "Python package for the generation of PostScript, PDF, and SVG files";
     homepage = "https://pyx.sourceforge.net/";
-    license = with lib.licenses; [ gpl2 ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/development/python-modules/pyxeoma/default.nix b/pkgs/development/python-modules/pyxeoma/default.nix
index 1575b4b4a712..596c3e865f69 100644
--- a/pkgs/development/python-modules/pyxeoma/default.nix
+++ b/pkgs/development/python-modules/pyxeoma/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for Xeoma web server API";
     homepage = "https://github.com/jeradM/pyxeoma";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix
index c09267bae916..74f6a75a0de4 100644
--- a/pkgs/development/python-modules/pyxiaomigateway/default.nix
+++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to communicate with the Xiaomi Gateway";
     homepage = "https://github.com/Danielhiversen/PyXiaomiGateway/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/pkgs/development/python-modules/pyyaml-env-tag/default.nix
index 508058f4ee86..220e4c6b1cf4 100644
--- a/pkgs/development/python-modules/pyyaml-env-tag/default.nix
+++ b/pkgs/development/python-modules/pyyaml-env-tag/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Custom YAML tag for referencing environment variables";
     homepage = "https://github.com/waylan/pyyaml-env-tag";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix
index eff24f89ef83..eb168cf1b683 100644
--- a/pkgs/development/python-modules/pyzerproc/default.nix
+++ b/pkgs/development/python-modules/pyzerproc/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python library to control Zerproc Bluetooth LED smart string lights";
     mainProgram = "pyzerproc";
     homepage = "https://github.com/emlove/pyzerproc";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix
index 419b0ad57697..2a75e109ecea 100644
--- a/pkgs/development/python-modules/quantum-gateway/default.nix
+++ b/pkgs/development/python-modules/quantum-gateway/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with Verizon Fios Quantum gateway devices";
     homepage = "https://github.com/cisasteelersfan/quantum_gateway";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/rachiopy/default.nix b/pkgs/development/python-modules/rachiopy/default.nix
index a6852c297559..5ba79a99edcf 100644
--- a/pkgs/development/python-modules/rachiopy/default.nix
+++ b/pkgs/development/python-modules/rachiopy/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Python client for Rachio Irrigation controller";
     homepage = "https://github.com/rfverbruggen/rachiopy";
     changelog = "https://github.com/rfverbruggen/rachiopy/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix
index c47025b1adf2..287632ec913f 100644
--- a/pkgs/development/python-modules/radiotherm/default.nix
+++ b/pkgs/development/python-modules/radiotherm/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for Wifi Radiothermostat";
     homepage = "https://github.com/mhrivnak/radiotherm";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix
index 5a937713c908..0c2ce13959a7 100644
--- a/pkgs/development/python-modules/rapidocr/default.nix
+++ b/pkgs/development/python-modules/rapidocr/default.nix
@@ -119,7 +119,7 @@ buildPythonPackage {
     changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}";
     description = "Cross platform OCR Library based on OnnxRuntime";
     homepage = "https://github.com/RapidAI/RapidOCR";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "rapidocr";
   };
diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix
index dad43bb905eb..4b2049578d13 100644
--- a/pkgs/development/python-modules/ratelimit/default.nix
+++ b/pkgs/development/python-modules/ratelimit/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API Rate Limit Decorator";
     homepage = "https://github.com/tomasbasham/ratelimit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix
index 0132864c422c..3f47dcae195e 100644
--- a/pkgs/development/python-modules/readme-renderer/default.nix
+++ b/pkgs/development/python-modules/readme-renderer/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     description = "Python library for rendering readme descriptions";
     homepage = "https://github.com/pypa/readme_renderer";
     changelog = "https://github.com/pypa/readme_renderer/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 72d06d712baa..f893229b11a3 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     description = "Python library for interacting with RainMachine smart sprinkler controllers";
     homepage = "https://github.com/bachya/regenmaschine";
     changelog = "https://github.com/bachya/regenmaschine/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix
index 0db323c1c46a..e477f4e9eb7b 100644
--- a/pkgs/development/python-modules/remi/default.nix
+++ b/pkgs/development/python-modules/remi/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pythonic, lightweight and websocket-based webui library";
     homepage = "https://github.com/rawpython/remi";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pbsds ];
   };
 }
diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix
index a58bd2237356..1760d1c0e7bd 100644
--- a/pkgs/development/python-modules/requests-futures/default.nix
+++ b/pkgs/development/python-modules/requests-futures/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Asynchronous Python HTTP Requests for Humans using Futures";
     homepage = "https://github.com/ross/requests-futures";
     changelog = "https://github.com/ross/requests-futures/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ applePrincess ];
   };
 }
diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix
index 4927ab67a108..595570e60bcb 100644
--- a/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/pkgs/development/python-modules/requests-oauthlib/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = {
     description = "OAuthlib authentication support for Requests";
     homepage = "https://github.com/requests/requests-oauthlib";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ prikhi ];
   };
 }
diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix
index c09e53a24cf9..b3bd57992879 100644
--- a/pkgs/development/python-modules/requests-pkcs12/default.nix
+++ b/pkgs/development/python-modules/requests-pkcs12/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "PKCS#12 support for the Python requests library";
     homepage = "https://github.com/m-click/requests_pkcs12";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/retry-decorator/default.nix b/pkgs/development/python-modules/retry-decorator/default.nix
index 591ec8a257ce..224cba7db723 100644
--- a/pkgs/development/python-modules/retry-decorator/default.nix
+++ b/pkgs/development/python-modules/retry-decorator/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Decorator for retrying when exceptions occur";
     homepage = "https://github.com/pnpnpn/retry-decorator";
     changelog = "https://github.com/pnpnpn/retry-decorator/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/rjpl/default.nix b/pkgs/development/python-modules/rjpl/default.nix
index 8bea61aa9c4f..9c7c58856a4c 100644
--- a/pkgs/development/python-modules/rjpl/default.nix
+++ b/pkgs/development/python-modules/rjpl/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting with the Rejseplanen API";
     homepage = "https://github.com/tomatpasser/python-rejseplanen";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix
index 1cfa6c205428..72381d0d0b26 100644
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python library to interface with the Roon API";
     homepage = "https://github.com/pavoni/pyroon";
     changelog = "https://github.com/pavoni/pyroon/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index 872dc558ecbd..ee7abae0daa8 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage rec {
     description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
     homepage = "https://rpyc.readthedocs.org";
     changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix
index a2f24b793071..31d24ee8f25e 100644
--- a/pkgs/development/python-modules/ruyaml/default.nix
+++ b/pkgs/development/python-modules/ruyaml/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     description = "YAML 1.2 loader/dumper package for Python";
     homepage = "https://ruyaml.readthedocs.io/";
     changelog = "https://github.com/pycontribs/ruyaml/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/schiene/default.nix b/pkgs/development/python-modules/schiene/default.nix
index b79866910489..2c3483ac0e95 100644
--- a/pkgs/development/python-modules/schiene/default.nix
+++ b/pkgs/development/python-modules/schiene/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for interacting with Bahn.de";
     homepage = "https://github.com/kennell/schiene";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index 61cd4585d23c..019b2f66a2e6 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -97,7 +97,7 @@ buildPythonPackage (finalAttrs: {
     description = "Next generation Python CMake adaptor and Python API for plugins";
     homepage = "https://github.com/scikit-build/scikit-build-core";
     changelog = "https://github.com/scikit-build/scikit-build-core/blob/${finalAttrs.src.tag}/docs/about/changelog.md";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix
index 81f7c82c87f1..631d67373b2e 100644
--- a/pkgs/development/python-modules/screenlogicpy/default.nix
+++ b/pkgs/development/python-modules/screenlogicpy/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     mainProgram = "screenlogicpy";
     homepage = "https://github.com/dieselrabbit/screenlogicpy";
     changelog = "https://github.com/dieselrabbit/screenlogicpy/releases/tag/${src.tag}";
-    license = with lib.licenses; [ gpl3Only ];
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix
index f0257c66503d..1e85cb3d2049 100644
--- a/pkgs/development/python-modules/sdds/default.nix
+++ b/pkgs/development/python-modules/sdds/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module to handle SDDS files";
     homepage = "https://pylhc.github.io/sdds/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index b019830aead6..340774ab71e9 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -96,7 +96,7 @@ buildPythonPackage (finalAttrs: {
     description = "Statistical data visualization";
     homepage = "https://seaborn.pydata.org/";
     changelog = "https://github.com/mwaskom/seaborn/blob/${finalAttrs.src.tag}/doc/whatsnew/${finalAttrs.src.tag}.rst";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ miniharinn ];
   };
 })
diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix
index 1c1ad8de5118..02bd1b426609 100644
--- a/pkgs/development/python-modules/seatconnect/default.nix
+++ b/pkgs/development/python-modules/seatconnect/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Python module to communicate with Seat Connect";
     homepage = "https://github.com/farfar/seatconnect";
     changelog = "https://github.com/Farfar/seatconnect/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/seccomp/default.nix b/pkgs/development/python-modules/seccomp/default.nix
index 07c6989957ca..bc416f762a3a 100644
--- a/pkgs/development/python-modules/seccomp/default.nix
+++ b/pkgs/development/python-modules/seccomp/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python bindings for libseccomp";
-    license = with lib.licenses; [ lgpl21 ];
+    license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
index 4d46563e92a8..b806592383b3 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/ludbb/secp256k1-py";
     description = "Python FFI bindings for secp256k1";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/semaphore-bot/default.nix b/pkgs/development/python-modules/semaphore-bot/default.nix
index 53b4b92c5e48..3c786d7988bb 100644
--- a/pkgs/development/python-modules/semaphore-bot/default.nix
+++ b/pkgs/development/python-modules/semaphore-bot/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple rule-based bot library for Signal Private Messenger";
     homepage = "https://github.com/lwesterhof/semaphore";
-    license = with lib.licenses; [ agpl3Plus ];
+    license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ onny ];
   };
 }
diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix
index 4d473785437d..a23843ecb5ed 100644
--- a/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Models for storing and converting Sensor Data state";
     homepage = "https://github.com/bluetooth-devices/sensor-state-data";
     changelog = "https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/${src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix
index 4d4d45d7fcb4..058eb3bf3834 100644
--- a/pkgs/development/python-modules/sensorpush-ble/default.nix
+++ b/pkgs/development/python-modules/sensorpush-ble/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Library for SensorPush BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble";
     changelog = "https://github.com/Bluetooth-Devices/sensorpush-ble/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix
index 09947966f6a4..f719d9b0baad 100644
--- a/pkgs/development/python-modules/serialio/default.nix
+++ b/pkgs/development/python-modules/serialio/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for concurrency agnostic serial communication";
     homepage = "https://github.com/tiagocoutinho/serialio";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/setuptools/80.nix b/pkgs/development/python-modules/setuptools/80.nix
index a051cb776fa3..db2a7edf0756 100644
--- a/pkgs/development/python-modules/setuptools/80.nix
+++ b/pkgs/development/python-modules/setuptools/80.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://setuptools.pypa.io/en/stable/history.html#v${
       lib.replaceString "." "-" finalAttrs.version
     }";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = python.meta.platforms;
     teams = [ lib.teams.python ];
   };
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 7daa5062fbb8..1cef51c821e4 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://setuptools.pypa.io/en/stable/history.html#v${
       lib.replaceString "." "-" finalAttrs.version
     }";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     platforms = python.meta.platforms;
     teams = [ lib.teams.python ];
   };
diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix
index b446eebe65e3..065b43f22ee2 100644
--- a/pkgs/development/python-modules/seventeentrack/default.nix
+++ b/pkgs/development/python-modules/seventeentrack/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to track package info from 17track.com";
     homepage = "https://github.com/McSwindler/seventeentrack";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix
index 0c5225937155..2891c51f370d 100644
--- a/pkgs/development/python-modules/simpful/default.nix
+++ b/pkgs/development/python-modules/simpful/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
     description = "Library for fuzzy logic";
     homepage = "https://github.com/aresio/simpful";
     changelog = "https://github.com/aresio/simpful/releases/tag/${version}";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix
index 2c6f786e0a75..036bcb75a942 100644
--- a/pkgs/development/python-modules/simple-rest-client/default.nix
+++ b/pkgs/development/python-modules/simple-rest-client/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple REST client for Python";
     homepage = "https://github.com/allisson/python-simple-rest-client";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix
index e620f3aa8c6a..0798be6ebd55 100644
--- a/pkgs/development/python-modules/simplehound/default.nix
+++ b/pkgs/development/python-modules/simplehound/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for Sighthound";
     homepage = "https://github.com/robmarkcole/simplehound";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/skl2onnx/default.nix b/pkgs/development/python-modules/skl2onnx/default.nix
index 762a9017aa4e..6b37430426f9 100644
--- a/pkgs/development/python-modules/skl2onnx/default.nix
+++ b/pkgs/development/python-modules/skl2onnx/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Convert scikit-learn models to ONNX";
     changelog = "https://github.com/onnx/sklearn-onnx/releases/tag/${finalAttrs.version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix
index cff4d35bfb18..fb12a1f8654e 100644
--- a/pkgs/development/python-modules/skodaconnect/default.nix
+++ b/pkgs/development/python-modules/skodaconnect/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python module to communicate with Skoda Connect";
     homepage = "https://github.com/lendy007/skodaconnect";
     changelog = "https://github.com/lendy007/skodaconnect/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sleepyq/default.nix b/pkgs/development/python-modules/sleepyq/default.nix
index 4a4aabecfaa5..32d9c9ac39a8 100644
--- a/pkgs/development/python-modules/sleepyq/default.nix
+++ b/pkgs/development/python-modules/sleepyq/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for SleepIQ API";
     homepage = "https://github.com/technicalpickles/sleepyq";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix
index 6778e5ae1e14..a004af063a6e 100644
--- a/pkgs/development/python-modules/smhi-pkg/default.nix
+++ b/pkgs/development/python-modules/smhi-pkg/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Python library for accessing SMHI open forecast data";
     homepage = "https://github.com/joysoftware/pypi_smhi";
     changelog = "https://github.com/joysoftware/pypi_smhi/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix
index 073553c1e196..b37aee5a70cd 100644
--- a/pkgs/development/python-modules/socialscan/default.nix
+++ b/pkgs/development/python-modules/socialscan/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
     mainProgram = "socialscan";
     homepage = "https://github.com/iojw/socialscan";
     changelog = "https://github.com/iojw/socialscan/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/sockio/default.nix b/pkgs/development/python-modules/sockio/default.nix
index e565233c1ad6..64646e5d746f 100644
--- a/pkgs/development/python-modules/sockio/default.nix
+++ b/pkgs/development/python-modules/sockio/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
   meta = {
     description = "Implementation of the Modbus protocol";
     homepage = "https://tiagocoutinho.github.io/sockio/";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix
index bf7af7a8c3fa..1c23b87d7bda 100644
--- a/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/pkgs/development/python-modules/sortedcollections/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Sorted Collections";
     homepage = "http://www.grantjenks.com/docs/sortedcollections/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 3ac147f224e8..712d60f8bb5a 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Play and Record Sound with Python";
     homepage = "https://python-sounddevice.readthedocs.io/";
     changelog = "https://github.com/spatialaudio/python-sounddevice/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix
index 46116244a9e1..1a8df9327857 100644
--- a/pkgs/development/python-modules/speg/default.nix
+++ b/pkgs/development/python-modules/speg/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "PEG-based parser interpreter with memoization (in time)";
     homepage = "https://github.com/avakar/speg";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ xworld21 ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix
index d6081880c211..3ae5e824a15e 100644
--- a/pkgs/development/python-modules/sphinx-autobuild/default.nix
+++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Rebuild Sphinx documentation on changes, with live-reload in the browser";
     mainProgram = "sphinx-autobuild";
     homepage = "https://github.com/sphinx-doc/sphinx-autobuild";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ holgerpeters ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
index b802f80aef8f..ca68dd25917d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
     homepage = "https://github.com/sphinx-contrib/plantuml/";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/spur/default.nix b/pkgs/development/python-modules/spur/default.nix
index e16316e3f495..321a3409ef33 100644
--- a/pkgs/development/python-modules/spur/default.nix
+++ b/pkgs/development/python-modules/spur/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     description = "Python module to run commands and manipulate files locally or over SSH";
     homepage = "https://github.com/mwilliamson/spur.py";
     changelog = "https://github.com/mwilliamson/spur.py/blob/0.3.23/CHANGES";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix
index b903351b8419..c1765495d353 100644
--- a/pkgs/development/python-modules/spyse-python/default.nix
+++ b/pkgs/development/python-modules/spyse-python/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     description = "Python module for spyse.com API";
     homepage = "https://github.com/spyse-com/spyse-python";
     changelog = "https://github.com/spyse-com/spyse-python/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix
index 37ce28ec0573..1cffb179eee2 100644
--- a/pkgs/development/python-modules/srvlookup/default.nix
+++ b/pkgs/development/python-modules/srvlookup/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Wrapper for dnspython to return SRV records for a given host, protocol, and domain name";
     homepage = "https://github.com/gmr/srvlookup";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ mmlb ];
   };
 }
diff --git a/pkgs/development/python-modules/staticmap/default.nix b/pkgs/development/python-modules/staticmap/default.nix
index 83351a8b77e9..55beaed32d8a 100644
--- a/pkgs/development/python-modules/staticmap/default.nix
+++ b/pkgs/development/python-modules/staticmap/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Small, python-based library for creating map images with lines and markers";
     homepage = "https://pypi.org/project/staticmap/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ traxys ];
   };
 }
diff --git a/pkgs/development/python-modules/stdiomask/default.nix b/pkgs/development/python-modules/stdiomask/default.nix
index 32f605562a92..84152907af9f 100644
--- a/pkgs/development/python-modules/stdiomask/default.nix
+++ b/pkgs/development/python-modules/stdiomask/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for masking passwords";
     homepage = "https://github.com/asweigart/stdiomask";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix
index 23e27c951bb2..d7803cc4b1fc 100644
--- a/pkgs/development/python-modules/stopit/default.nix
+++ b/pkgs/development/python-modules/stopit/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Raise asynchronous exceptions in other thread, control the timeout of blocks or callables with a context manager or a decorator";
     homepage = "https://github.com/glenfant/stopit";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/streamlabswater/default.nix b/pkgs/development/python-modules/streamlabswater/default.nix
index 5234cb7c5db6..0ab9594b4579 100644
--- a/pkgs/development/python-modules/streamlabswater/default.nix
+++ b/pkgs/development/python-modules/streamlabswater/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for the StreamLabs API";
     homepage = "https://github.com/streamlabswater/stream-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix
index 0982ebe4d7d3..0f3d92031840 100644
--- a/pkgs/development/python-modules/strenum/default.nix
+++ b/pkgs/development/python-modules/strenum/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Module for enum that inherits from str";
     homepage = "https://github.com/irgeek/StrEnum";
     changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix
index 2c1aa3d5b918..232ce592a2ea 100644
--- a/pkgs/development/python-modules/striprtf/default.nix
+++ b/pkgs/development/python-modules/striprtf/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Simple library to convert rtf to text";
     mainProgram = "striprtf";
     maintainers = with lib.maintainers; [ aanderse ];
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/subzerod/default.nix b/pkgs/development/python-modules/subzerod/default.nix
index d8d957fcc026..2c13ead5a466 100644
--- a/pkgs/development/python-modules/subzerod/default.nix
+++ b/pkgs/development/python-modules/subzerod/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     description = "Python module to help with the enumeration of subdomains";
     mainProgram = "subzerod";
     homepage = "https://github.com/sanderfoobar/subzerod";
-    license = with lib.licenses; [ wtfpl ];
+    license = lib.licenses.wtfpl;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
index 761e079d76c4..800655fd57e7 100644
--- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
+++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python logging formatter for emitting RFC5424 Syslog messages";
     homepage = "https://github.com/easypost/syslog-rfc5424-formatter";
     changelog = "https://github.com/EasyPost/syslog-rfc5424-formatter/blob/v${finalAttrs.version}/CHANGES.md";
-    license = with lib.licenses; [ isc ];
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix
index 89c94f8d86b7..17613c0bb39f 100644
--- a/pkgs/development/python-modules/tahoma-api/default.nix
+++ b/pkgs/development/python-modules/tahoma-api/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to interface with Tahoma REST API";
     homepage = "https://github.com/philklei/tahoma-api/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix
index f51577891397..aa578fbb2f45 100644
--- a/pkgs/development/python-modules/tailer/default.nix
+++ b/pkgs/development/python-modules/tailer/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Python implementation implementation of GNU tail and head";
     mainProgram = "pytail";
     homepage = "https://github.com/six8/pytailer";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix
index 006404b68c34..a1a2192a7a19 100644
--- a/pkgs/development/python-modules/termplotlib/default.nix
+++ b/pkgs/development/python-modules/termplotlib/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Matplotlib for your terminal";
     homepage = "https://github.com/nschloe/termplotlib";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index c0de041f8f84..df926cc31b41 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Python library to work with Tesla API";
     homepage = "https://github.com/zabuldon/teslajsonpy";
     changelog = "https://github.com/zabuldon/teslajsonpy/releases/tag/${src.tag}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix
index 87c21c8bd3c1..1f377ce8de64 100644
--- a/pkgs/development/python-modules/testbook/default.nix
+++ b/pkgs/development/python-modules/testbook/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Unit testing framework extension for testing code in Jupyter Notebooks";
     homepage = "https://testbook.readthedocs.io/";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ djacu ];
   };
 }
diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix
index 1af94a75f124..b1b17242357d 100644
--- a/pkgs/development/python-modules/testrail-api/default.nix
+++ b/pkgs/development/python-modules/testrail-api/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Python wrapper of the TestRail API";
     homepage = "https://github.com/tolstislon/testrail-api";
     changelog = "https://github.com/tolstislon/testrail-api/releases/tag/${src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aanderse ];
   };
 }
diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix
index 88f565d1f1dc..61ce44252b99 100644
--- a/pkgs/development/python-modules/timeago/default.nix
+++ b/pkgs/development/python-modules/timeago/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to format past datetime output";
     homepage = "https://github.com/hustcc/timeago";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 2481bdb8f71e..5c787c88d568 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library that interacts with TMB API";
     homepage = "https://github.com/alemuro/tmb";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix
index ebf8aff02dc0..fea49a3821e8 100644
--- a/pkgs/development/python-modules/tololib/default.nix
+++ b/pkgs/development/python-modules/tololib/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices";
     homepage = "https://gitlab.com/MatthiasLohr/tololib";
     changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "tolo-cli";
   };
diff --git a/pkgs/development/python-modules/toonapi/default.nix b/pkgs/development/python-modules/toonapi/default.nix
index e6fb3e6624c9..b6a334d6471a 100644
--- a/pkgs/development/python-modules/toonapi/default.nix
+++ b/pkgs/development/python-modules/toonapi/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Python client for the Quby ToonAPI";
     homepage = "https://github.com/frenck/python-toonapi";
     changelog = "https://github.com/frenck/python-toonapi/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/torrequest/default.nix b/pkgs/development/python-modules/torrequest/default.nix
index adfaa1b59016..d89f50229ee0 100644
--- a/pkgs/development/python-modules/torrequest/default.nix
+++ b/pkgs/development/python-modules/torrequest/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/erdiaker/torrequest";
     description = "Simple Python interface for HTTP(s) requests over Tor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ applePrincess ];
   };
 }
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 50b685ec17e6..87caeb59adf3 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     mainProgram = "tqdm";
     homepage = "https://github.com/tqdm/tqdm";
     changelog = "https://tqdm.github.io/releases/";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ miniharinn ];
   };
 }
diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix
index 64d6973ec9c9..80cc4b1afbf5 100644
--- a/pkgs/development/python-modules/translatepy/default.nix
+++ b/pkgs/development/python-modules/translatepy/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     description = "Module grouping multiple translation APIs";
     mainProgram = "translatepy";
     homepage = "https://github.com/Animenosekai/translate";
-    license = with lib.licenses; [ agpl3Only ];
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ emilytrau ];
   };
 })
diff --git a/pkgs/development/python-modules/translitcodec/default.nix b/pkgs/development/python-modules/translitcodec/default.nix
index f07027619844..a4a9d2529ec1 100644
--- a/pkgs/development/python-modules/translitcodec/default.nix
+++ b/pkgs/development/python-modules/translitcodec/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage {
   meta = {
     description = "Unicode to 8-bit charset transliteration codec";
     homepage = "https://github.com/claudep/translitcodec";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rycee ];
   };
 }
diff --git a/pkgs/development/python-modules/tt-flash/default.nix b/pkgs/development/python-modules/tt-flash/default.nix
index 30a84d5d9ce7..e0b496081b13 100644
--- a/pkgs/development/python-modules/tt-flash/default.nix
+++ b/pkgs/development/python-modules/tt-flash/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage (finalAttrs: {
     downloadPage = "https://github.com/tenstorrent/tt-flash";
     changelog = "https://github.com/tenstorrent/tt-flash/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 })
diff --git a/pkgs/development/python-modules/tt-tools-common/default.nix b/pkgs/development/python-modules/tt-tools-common/default.nix
index f2f3914e87b5..0fdfa8c11e7e 100644
--- a/pkgs/development/python-modules/tt-tools-common/default.nix
+++ b/pkgs/development/python-modules/tt-tools-common/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Helper library for common utilities shared across Tentorrent tools";
     homepage = "https://github.com/tenstorrent/tt-tools-common";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix
index 9da0fac62b2c..5984183b2dd4 100644
--- a/pkgs/development/python-modules/ttach/default.nix
+++ b/pkgs/development/python-modules/ttach/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
   meta = {
     description = "Image Test Time Augmentation with PyTorch";
     homepage = "https://github.com/qubvel/ttach";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/ttstokenizer/default.nix b/pkgs/development/python-modules/ttstokenizer/default.nix
index 621d1dc4a817..2ce756623f66 100644
--- a/pkgs/development/python-modules/ttstokenizer/default.nix
+++ b/pkgs/development/python-modules/ttstokenizer/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tokenizer for Text to Speech (TTS) models";
     homepage = "https://pypi.org/project/ttstokenizer";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
index 293151cadf49..eb49efb6a5dd 100644
--- a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
+++ b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tuya IoT Python SDK for Tuya Open API";
     homepage = "https://github.com/tuya/tuya-iot-python-sdk";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix
index 8dcc7e20b3d2..05937a2af6d5 100644
--- a/pkgs/development/python-modules/tuyaha/default.nix
+++ b/pkgs/development/python-modules/tuyaha/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module with the Tuya API";
     homepage = "https://github.com/PaulAnnekov/tuyaha";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/twinkly-client/default.nix b/pkgs/development/python-modules/twinkly-client/default.nix
index fb6ed9b4d418..a2c38ebf2106 100644
--- a/pkgs/development/python-modules/twinkly-client/default.nix
+++ b/pkgs/development/python-modules/twinkly-client/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to communicate with Twinkly LED strings";
     homepage = "https://github.com/dr1rrb/py-twinkly-client";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix
index 06370cf7deba..10f854ece49f 100644
--- a/pkgs/development/python-modules/twitterapi/default.nix
+++ b/pkgs/development/python-modules/twitterapi/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python wrapper for Twitter's REST and Streaming APIs";
     homepage = "https://github.com/geduldig/TwitterAPI";
     changelog = "https://github.com/geduldig/TwitterAPI/blob/v${version}/CHANGE.log";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/types-docopt/default.nix b/pkgs/development/python-modules/types-docopt/default.nix
index ac1ae5695dac..143f2fda4a74 100644
--- a/pkgs/development/python-modules/types-docopt/default.nix
+++ b/pkgs/development/python-modules/types-docopt/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = {
     description = "Typing stubs for docopt";
     homepage = "https://pypi.org/project/types-docopt/";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ueagle/default.nix b/pkgs/development/python-modules/ueagle/default.nix
index 3397be054181..d9f8b0c7d845 100644
--- a/pkgs/development/python-modules/ueagle/default.nix
+++ b/pkgs/development/python-modules/ueagle/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library Rainforest EAGLE devices";
     homepage = "https://github.com/jcalbert/uEagle";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix
index 11778ceeefac..9e39b3357452 100644
--- a/pkgs/development/python-modules/ulid-transform/default.nix
+++ b/pkgs/development/python-modules/ulid-transform/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "Library to create and transform ULIDs";
     homepage = "https://github.com/bdraco/ulid-transform";
     changelog = "https://github.com/bdraco/ulid-transform/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix
index dc887510576b..0dce7dc7ce96 100644
--- a/pkgs/development/python-modules/umalqurra/default.nix
+++ b/pkgs/development/python-modules/umalqurra/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
   meta = {
     description = "Date Api that support Hijri Umalqurra calendar";
     homepage = "https://github.com/tytkal/python-hijiri-ummalqura";
-    license = with lib.licenses; [ publicDomain ];
+    license = lib.licenses.publicDomain;
   };
 }
diff --git a/pkgs/development/python-modules/umodbus/default.nix b/pkgs/development/python-modules/umodbus/default.nix
index ba718909179b..c0343724e9b3 100644
--- a/pkgs/development/python-modules/umodbus/default.nix
+++ b/pkgs/development/python-modules/umodbus/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Implementation of the Modbus protocol";
     homepage = "https://github.com/AdvancedClimateSystems/uModbus/";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix
index 4e16b9e9da44..a2b6460746d6 100644
--- a/pkgs/development/python-modules/upnpy/default.nix
+++ b/pkgs/development/python-modules/upnpy/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = {
     description = "UPnP client library for Python";
     homepage = "https://github.com/5kyc0d3r/upnpy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix
index bfe9f77cba58..97a6cdb8c775 100644
--- a/pkgs/development/python-modules/uptime-kuma-api/default.nix
+++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Python wrapper for the Uptime Kuma Socket.IO API";
     homepage = "https://github.com/lucasheld/uptime-kuma-api";
     changelog = "https://github.com/lucasheld/uptime-kuma-api/blob/${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ julienmalka ];
   };
 }
diff --git a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
index 12603b8f2597..643571fc0d76 100644
--- a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
+++ b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper around UptimeKuma /metrics endpoint";
     homepage = "https://github.com/meichthys/utptime_kuma_monitor";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix
index e1136fc6bc2d..3c6ac865101a 100644
--- a/pkgs/development/python-modules/usb-devices/default.nix
+++ b/pkgs/development/python-modules/usb-devices/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     description = "Library for for mapping, describing, and resetting USB devices";
     homepage = "https://github.com/Bluetooth-Devices/usb-devices";
     changelog = "https://github.com/Bluetooth-Devices/usb-devices/blob/v${version}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix
index d7d229d44ed7..185da919aa33 100644
--- a/pkgs/development/python-modules/utils/default.nix
+++ b/pkgs/development/python-modules/utils/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python set of utility functions and objects";
     homepage = "https://github.com/haaksmash/pyutils";
-    license = with lib.licenses; [ lgpl3Only ];
+    license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix
index a7721b45febb..0f40dea6fa58 100644
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -87,7 +87,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way";
     homepage = "https://github.com/scikit-hep/vector";
     changelog = "https://github.com/scikit-hep/vector/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
 })
diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix
index 871c381848ad..4d560e6327e9 100644
--- a/pkgs/development/python-modules/venstarcolortouch/default.nix
+++ b/pkgs/development/python-modules/venstarcolortouch/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python interface for Venstar ColorTouch thermostats Resources";
     homepage = "https://github.com/hpeyerl/venstar_colortouch";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix
index a4a504976742..12cdeb137c12 100644
--- a/pkgs/development/python-modules/vt-py/default.nix
+++ b/pkgs/development/python-modules/vt-py/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
     description = "Python client library for VirusTotal";
     homepage = "https://virustotal.github.io/vt-py/";
     changelog = "https://github.com/VirusTotal/vt-py/releases/tag//${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix
index 369fe5e26226..a12987160cbf 100644
--- a/pkgs/development/python-modules/waqiasync/default.nix
+++ b/pkgs/development/python-modules/waqiasync/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python library for http://aqicn.org";
     homepage = "https://github.com/andrey-git/waqi-async";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/warble/default.nix b/pkgs/development/python-modules/warble/default.nix
index c9d278e872e4..78206c183e08 100644
--- a/pkgs/development/python-modules/warble/default.nix
+++ b/pkgs/development/python-modules/warble/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for MbientLab's Warble library";
     homepage = "https://github.com/mbientlab/pywarble";
-    license = with lib.licenses; [ unfree ];
+    license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/development/python-modules/warrant-lite/default.nix b/pkgs/development/python-modules/warrant-lite/default.nix
index df012dfd8648..44a5c4ea31c9 100644
--- a/pkgs/development/python-modules/warrant-lite/default.nix
+++ b/pkgs/development/python-modules/warrant-lite/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for process SRP requests for AWS Cognito";
     homepage = "https://github.com/capless/warrant-lite";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix
index 118ad29b935c..b5858e59eda0 100644
--- a/pkgs/development/python-modules/webexteamssdk/default.nix
+++ b/pkgs/development/python-modules/webexteamssdk/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     description = "Python module for Webex Teams APIs";
     homepage = "https://github.com/CiscoDevNet/webexteamssdk";
     changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix
index 1613d10047e7..ae2995c95293 100644
--- a/pkgs/development/python-modules/webrtcvad/default.nix
+++ b/pkgs/development/python-modules/webrtcvad/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Interface to the Google WebRTC Voice Activity Detector (VAD)";
     homepage = "https://github.com/wiseman/py-webrtcvad";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ prusnak ];
   };
 })
diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix
index 1fad7df705ec..0a1198dd81f1 100644
--- a/pkgs/development/python-modules/webthing/default.nix
+++ b/pkgs/development/python-modules/webthing/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python implementation of a Web Thing server";
     homepage = "https://github.com/WebThingsIO/webthing-python";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix
index 0d8d5585791a..91cfc896c839 100644
--- a/pkgs/development/python-modules/wfuzz/default.nix
+++ b/pkgs/development/python-modules/wfuzz/default.nix
@@ -87,7 +87,7 @@ buildPythonPackage (finalAttrs: {
       web application vulnerabilities.
     '';
     homepage = "https://wfuzz.readthedocs.io";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       bad3r
       pamplemousse
diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix
index 344592152e9a..51dc2d9ce639 100644
--- a/pkgs/development/python-modules/wget/default.nix
+++ b/pkgs/development/python-modules/wget/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pure python download utility";
     homepage = "https://bitbucket.org/techtonik/python-wget/";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ prusnak ];
   };
 }
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 4aca9e5d587d..26d34354d33c 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
       It should be noted that wheel is not intended to be used as a library,
       and as such there is no stable, public API.
     '';
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siriobalmelli ];
   };
 }
diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index de0f86f9bf17..abbf69819133 100644
--- a/pkgs/development/python-modules/whois/default.nix
+++ b/pkgs/development/python-modules/whois/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python module/library for retrieving WHOIS information";
     homepage = "https://github.com/DannyCork/python-whois/";
     changelog = "https://github.com/DannyCork/python-whois/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix
index 929f2ec335f7..5fd196c50944 100644
--- a/pkgs/development/python-modules/wiffi/default.nix
+++ b/pkgs/development/python-modules/wiffi/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: {
     description = "Python module to interface with STALL WIFFI devices";
     homepage = "https://github.com/mampfes/python-wiffi";
     changelog = "https://github.com/mampfes/python-wiffi/blob/${finalAttrs.version}/HISTORY.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix
index c62525010612..34c71a1b2b62 100644
--- a/pkgs/development/python-modules/winacl/default.nix
+++ b/pkgs/development/python-modules/winacl/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     description = "Python module for ACL/ACE/Security descriptor manipulation";
     homepage = "https://github.com/skelsec/winacl";
     changelog = "https://github.com/skelsec/winacl/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix
index fdcb27c6c319..baae8550e97e 100644
--- a/pkgs/development/python-modules/winsspi/default.nix
+++ b/pkgs/development/python-modules/winsspi/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module for ACL/ACE/Security descriptor manipulation";
     homepage = "https://github.com/skelsec/winsspi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix
index 406f5ec33dbf..8580615cbca2 100644
--- a/pkgs/development/python-modules/xmind/default.nix
+++ b/pkgs/development/python-modules/xmind/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module to create mindmaps";
     homepage = "https://github.com/zhuifengshen/xmind";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 })
diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix
index e4cf1e3e6d05..bd7f8e4b7af9 100644
--- a/pkgs/development/python-modules/xmljson/default.nix
+++ b/pkgs/development/python-modules/xmljson/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: {
     description = "Converts XML into dictionary structures and vice-versa";
     mainProgram = "xml2json";
     homepage = "https://github.com/sanand0/xmljson";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rakesh4g ];
   };
 })
diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix
index e60370884ac9..b7e29b0d78b7 100644
--- a/pkgs/development/python-modules/xpath-expressions/default.nix
+++ b/pkgs/development/python-modules/xpath-expressions/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to handle XPath expressions";
     homepage = "https://github.com/orf/xpath-expressions";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
index ec620caedb6d..6ed595a9451b 100644
--- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix
+++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python module to interface with Yale Smart Alarm Systems";
     homepage = "https://github.com/domwillcode/yale-smart-alarm-client";
     changelog = "https://github.com/domwillcode/yale-smart-alarm-client/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index f84f8ced4678..f52c9645c9ad 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell";
     homepage = "https://github.com/bdraco/yalexs";
     changelog = "https://github.com/bdraco/yalexs/blob/${src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix
index bead558a6cb5..339dfe9caeae 100644
--- a/pkgs/development/python-modules/youless-api/default.nix
+++ b/pkgs/development/python-modules/youless-api/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Python library for YouLess sensors";
     homepage = "https://github.com/gjong/youless-python-bridge";
     changelog = "https://github.com/gjong/youless-python-bridge/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix
index 006d22fdae46..d3e428104c9e 100644
--- a/pkgs/development/python-modules/zwave-me-ws/default.nix
+++ b/pkgs/development/python-modules/zwave-me-ws/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Library to connect to a ZWave-Me instance";
     homepage = "https://github.com/Z-Wave-Me/zwave-me-ws";
     changelog = "https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix
index 760b01e1c851..9662cfb18299 100644
--- a/pkgs/development/rocm-modules/amdsmi/default.nix
+++ b/pkgs/development/rocm-modules/amdsmi/default.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "System management interface for AMD GPUs supported by ROCm";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/amdsmi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix
index 2605fc8a38f0..cf221df55431 100644
--- a/pkgs/development/rocm-modules/aqlprofile/default.nix
+++ b/pkgs/development/rocm-modules/aqlprofile/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AQLPROFILE library for AMD HSA runtime API extension support";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/aqlprofile";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix
index 9ea6f7e28156..297d4f66cea4 100644
--- a/pkgs/development/rocm-modules/clr/default.nix
+++ b/pkgs/development/rocm-modules/clr/default.nix
@@ -327,7 +327,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AMD Common Language Runtime for hipamd, opencl, and rocclr";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/clr";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix
index da94466388c8..70b5a4cefe7c 100644
--- a/pkgs/development/rocm-modules/composable_kernel/base.nix
+++ b/pkgs/development/rocm-modules/composable_kernel/base.nix
@@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Performance portable programming model for machine learning tensor operators";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
     broken = true; # this base package shouldn't be built directly
diff --git a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix
index a5b57743b8eb..d41ac17f8207 100644
--- a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix
+++ b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix
@@ -35,7 +35,7 @@ buildPythonPackage {
   meta = {
     description = "Pytorch inductor backend which uses composable_kernel universal GEMM implementations";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix
index 3213c827c2be..cdd55d421d9d 100644
--- a/pkgs/development/rocm-modules/half/default.nix
+++ b/pkgs/development/rocm-modules/half/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C++ library for half precision floating point arithmetics";
     homepage = "https://github.com/ROCm/half";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix
index 156e693efdfa..06b2f9947bf0 100644
--- a/pkgs/development/rocm-modules/hip-common/default.nix
+++ b/pkgs/development/rocm-modules/hip-common/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C++ Heterogeneous-Compute Interface for Portability";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/hip";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix
index 6335fef1d2e3..bb87c0f5fe30 100644
--- a/pkgs/development/rocm-modules/hipblas-common/default.nix
+++ b/pkgs/development/rocm-modules/hipblas-common/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Common files shared by hipBLAS and hipBLASLt";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas-common";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix
index 536f4d0db819..2269608ea83f 100644
--- a/pkgs/development/rocm-modules/hipblas/default.nix
+++ b/pkgs/development/rocm-modules/hipblas/default.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm BLAS marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix
index 4adc66cc4b44..dce0613d09da 100644
--- a/pkgs/development/rocm-modules/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/hipblaslt/default.nix
@@ -249,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library that provides general matrix-matrix operations with a flexible API";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblaslt";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipcc/default.nix b/pkgs/development/rocm-modules/hipcc/default.nix
index ac8ab20eb637..f3cb9462e18d 100644
--- a/pkgs/development/rocm-modules/hipcc/default.nix
+++ b/pkgs/development/rocm-modules/hipcc/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Compiler driver utility that calls clang or nvcc";
     homepage = "https://github.com/ROCm/HIPCC";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix
index 34517595e273..9621afcac174 100644
--- a/pkgs/development/rocm-modules/hipcub/default.nix
+++ b/pkgs/development/rocm-modules/hipcub/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Thin wrapper library on top of rocPRIM or CUB";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipcub";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix
index 3362e768151d..b8634c392f6c 100644
--- a/pkgs/development/rocm-modules/hipfft/default.nix
+++ b/pkgs/development/rocm-modules/hipfft/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "FFT marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipfft";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix
index dacce14205a9..e167ce3a09e5 100644
--- a/pkgs/development/rocm-modules/hipfort/default.nix
+++ b/pkgs/development/rocm-modules/hipfort/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Fortran interfaces for ROCm libraries";
     homepage = "https://github.com/ROCm/hipfort";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix
index 34452bb8f850..f833cada2dc8 100644
--- a/pkgs/development/rocm-modules/hipify/default.nix
+++ b/pkgs/development/rocm-modules/hipify/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Convert CUDA to Portable C++ Code";
     homepage = "https://github.com/ROCm/HIPIFY";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix
index 0eb275ee4a8d..a57aa6c888fb 100644
--- a/pkgs/development/rocm-modules/hiprand/default.nix
+++ b/pkgs/development/rocm-modules/hiprand/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "HIP wrapper for rocRAND and cuRAND";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hiprand";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix
index 33dc5ba82caf..10c6a7164a1c 100644
--- a/pkgs/development/rocm-modules/hipsolver/default.nix
+++ b/pkgs/development/rocm-modules/hipsolver/default.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm SOLVER marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsolver";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix
index 22fee11fd997..749abeae27bc 100644
--- a/pkgs/development/rocm-modules/hipsparse/default.nix
+++ b/pkgs/development/rocm-modules/hipsparse/default.nix
@@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm SPARSE marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/hipsparselt/default.nix b/pkgs/development/rocm-modules/hipsparselt/default.nix
index c82c3d40ed67..424ec1e5c3e4 100644
--- a/pkgs/development/rocm-modules/hipsparselt/default.nix
+++ b/pkgs/development/rocm-modules/hipsparselt/default.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm hipSPARSELt - a SPARSE marshalling library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparselt";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix
index 0528481e4023..5b79f8213d64 100644
--- a/pkgs/development/rocm-modules/migraphx/default.nix
+++ b/pkgs/development/rocm-modules/migraphx/default.nix
@@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "AMD's graph optimization engine";
     homepage = "https://github.com/ROCm/AMDMIGraphX";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix
index 3c4c85c678a5..03875659e739 100644
--- a/pkgs/development/rocm-modules/miopen/default.nix
+++ b/pkgs/development/rocm-modules/miopen/default.nix
@@ -332,7 +332,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Machine intelligence library for ROCm";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/miopen";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix
index 4c76482c5490..dd136895afe4 100644
--- a/pkgs/development/rocm-modules/mivisionx/default.nix
+++ b/pkgs/development/rocm-modules/mivisionx/default.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications";
     homepage = "https://github.com/ROCm/MIVisionX";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
     broken = useOpenCL;
diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix
index 1411a41167bb..c343a1370686 100644
--- a/pkgs/development/rocm-modules/rdc/default.nix
+++ b/pkgs/development/rocm-modules/rdc/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rdc";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix
index 5bd37731db07..8dd80796326d 100644
--- a/pkgs/development/rocm-modules/rocalution/default.nix
+++ b/pkgs/development/rocm-modules/rocalution/default.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Iterative sparse solvers for ROCm";
     homepage = "https://github.com/ROCm/rocALUTION";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix
index 3cd83c02d00a..af723802f044 100644
--- a/pkgs/development/rocm-modules/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/rocblas/default.nix
@@ -201,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "BLAS implementation for ROCm platform";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocblas";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix
index cf407b26eb44..6cabdb339a36 100644
--- a/pkgs/development/rocm-modules/rocdbgapi/default.nix
+++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Debugger support for control of execution and inspection state of AMD's GPU architectures";
     homepage = "https://github.com/ROCm/ROCdbgapi";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix
index a306984f479d..17c67b623ca4 100644
--- a/pkgs/development/rocm-modules/rocfft/default.nix
+++ b/pkgs/development/rocm-modules/rocfft/default.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "FFT implementation for ROCm";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocfft";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix
index 43708495442a..3f1df9c06b91 100644
--- a/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix
+++ b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Bandwidth test for AMD GPUs supported by ROCm";
     homepage = "https://github.com/ROCm/rocm_bandwidth_test";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fangpen ];
     teams = [ lib.teams.rocm ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix
index a438dd1bc797..5a5890e73ed2 100644
--- a/pkgs/development/rocm-modules/rocm-core/default.nix
+++ b/pkgs/development/rocm-modules/rocm-core/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Utility for getting the ROCm release version";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-core";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix
index de511274b4ab..88073de2dca6 100644
--- a/pkgs/development/rocm-modules/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Platform runtime for ROCm";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocr-runtime";
-    license = with lib.licenses; [ ncsa ];
+    license = lib.licenses.ncsa;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix
index d34829e8624f..c0044c938a9e 100644
--- a/pkgs/development/rocm-modules/rocm-smi/default.nix
+++ b/pkgs/development/rocm-modules/rocm-smi/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "System management interface for AMD GPUs supported by ROCm";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-smi-lib";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lovesegfault ];
     teams = [ lib.teams.rocm ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix
index 1bf4f2932440..ef039a40d8e1 100644
--- a/pkgs/development/rocm-modules/rocmlir/default.nix
+++ b/pkgs/development/rocm-modules/rocmlir/default.nix
@@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "MLIR-based convolution and GEMM kernel generator";
     homepage = "https://github.com/ROCm/rocMLIR";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix
index a3d3745ce1f3..d9dd9a370da3 100644
--- a/pkgs/development/rocm-modules/rocprim/default.nix
+++ b/pkgs/development/rocm-modules/rocprim/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm parallel primitives";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocprim";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix
index 902a49d300d2..bac33aa72990 100644
--- a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix
+++ b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library for decoding ROCm thread trace data";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprof-trace-decoder";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
index eec7a614b15f..0577493ae599 100644
--- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Profiling with perf-counters and derived metrics";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler-register";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix
index d49a8e2f50a8..21b5d4b0e320 100644
--- a/pkgs/development/rocm-modules/rocprofiler/default.nix
+++ b/pkgs/development/rocm-modules/rocprofiler/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Profiling with perf-counters and derived metrics";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
index 4e3338ea0bae..dc10ed234714 100644
--- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
+++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Library that provides some debugging functionality for ROCr";
     homepage = "https://github.com/ROCm/rocr_debug_agent";
-    license = with lib.licenses; [ ncsa ];
+    license = lib.licenses.ncsa;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix
index c1ce84ebdbaa..ba292a1f5f5b 100644
--- a/pkgs/development/rocm-modules/rocrand/default.nix
+++ b/pkgs/development/rocm-modules/rocrand/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Generate pseudo-random and quasi-random numbers";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocrand";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocshmem/default.nix b/pkgs/development/rocm-modules/rocshmem/default.nix
index c23e4b239945..b7bac8646f67 100644
--- a/pkgs/development/rocm-modules/rocshmem/default.nix
+++ b/pkgs/development/rocm-modules/rocshmem/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "The ROCm OpenSHMEM (rocSHMEM) runtime";
     homepage = "https://github.com/ROCm/rocSHMEM";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix
index 1549ca241569..3185b204c1e2 100644
--- a/pkgs/development/rocm-modules/rocsolver/default.nix
+++ b/pkgs/development/rocm-modules/rocsolver/default.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm LAPACK implementation";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsolver";
-    license = with lib.licenses; [ bsd2 ];
+    license = lib.licenses.bsd2;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
     timeout = 14400; # 4 hours
diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix
index e58e3aaab71a..b6712be8ffd4 100644
--- a/pkgs/development/rocm-modules/rocsparse/default.nix
+++ b/pkgs/development/rocm-modules/rocsparse/default.nix
@@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm SPARSE implementation";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsparse";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix
index 3be1b9f46f11..bcc6b125c2c5 100644
--- a/pkgs/development/rocm-modules/rocthrust/default.nix
+++ b/pkgs/development/rocm-modules/rocthrust/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "ROCm parallel algorithm library";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocthrust";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix
index 45d66b683a00..80fcac95cc4e 100644
--- a/pkgs/development/rocm-modules/roctracer/default.nix
+++ b/pkgs/development/rocm-modules/roctracer/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tracer callback/activity library";
     homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/roctracer";
-    license = with lib.licenses; [ mit ]; # mitx11
+    license = lib.licenses.mit; # mitx11
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix
index a7e4bc5a8c46..95002721dfc8 100644
--- a/pkgs/development/rocm-modules/rocwmma/default.nix
+++ b/pkgs/development/rocm-modules/rocwmma/default.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Mixed precision matrix multiplication and accumulation";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocwmma";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix
index 78901c918ed1..ac26ace58a61 100644
--- a/pkgs/development/rocm-modules/rpp/default.nix
+++ b/pkgs/development/rocm-modules/rpp/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Comprehensive high-performance computer vision library for AMD processors";
     homepage = "https://github.com/ROCm/rpp";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix
index 1f2ab4e9c49e..edf6b496d84e 100644
--- a/pkgs/development/rocm-modules/tensile/default.nix
+++ b/pkgs/development/rocm-modules/tensile/default.nix
@@ -86,7 +86,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "GEMMs and tensor contractions";
     homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/shared/tensile";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     teams = [ lib.teams.rocm ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index 19e3046ab7f9..59dc914c3170 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -46,6 +46,6 @@ buildGoModule rec {
     changelog = "https://github.com/terraform-linters/tflint-ruleset-aws/blob/v${version}/CHANGELOG.md";
     description = "TFLint ruleset plugin for Terraform AWS Provider";
     maintainers = with lib.maintainers; [ flokli ];
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
   };
 }
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
index 1f09717391f1..54462770cd6d 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
@@ -40,6 +40,6 @@ buildGoModule rec {
     description = "TFLint ruleset plugin for Terraform Google Provider";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ john-rodewald ];
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
   };
 }
diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
index 46830e563a68..25e85d0acd4d 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     description = "Rust adapter for Buildkite Test Analytics";
     mainProgram = "buildkite-test-collector";
     homepage = "https://buildkite.com/test-analytics";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jfroche ];
   };
 }
diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index af24dcb64838..74fb790d56cb 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
       rust ffi declarations.
     '';
     homepage = "https://github.com/rust-lang/rust-bindgen";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ johntitor ];
     mainProgram = "bindgen";
     platforms = lib.platforms.unix;
diff --git a/pkgs/kde/misc/kio-fuse/default.nix b/pkgs/kde/misc/kio-fuse/default.nix
index ec1fb884f853..060fa81c3178 100644
--- a/pkgs/kde/misc/kio-fuse/default.nix
+++ b/pkgs/kde/misc/kio-fuse/default.nix
@@ -17,5 +17,5 @@ mkKdeDerivation rec {
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [ fuse3 ];
 
-  meta.license = with lib.licenses; [ gpl3Plus ];
+  meta.license = lib.licenses.gpl3Plus;
 }
diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix
index 88f278d92986..e8b5cfd47c4f 100644
--- a/pkgs/kde/misc/phonon-vlc/default.nix
+++ b/pkgs/kde/misc/phonon-vlc/default.nix
@@ -22,5 +22,5 @@ mkKdeDerivation rec {
     "-DPHONON_BUILD_QT6=1"
   ];
 
-  meta.license = with lib.licenses; [ lgpl21Plus ];
+  meta.license = lib.licenses.lgpl21Plus;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
index 565fdbddfa3f..4522985c46fb 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
@@ -81,6 +81,6 @@ mkDerivation {
 
   meta = {
     platforms = lib.platforms.freebsd;
-    license = with lib.licenses; [ cddl ];
+    license = lib.licenses.cddl;
   };
 }
diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix
index 80a309fa1619..b4d26d43aa7f 100644
--- a/pkgs/os-specific/linux/nct6687d/default.nix
+++ b/pkgs/os-specific/linux/nct6687d/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Kernel module for the Nuvoton NCT6687-R chipset found on many B550/B650 motherboards from ASUS and MSI";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     homepage = "https://github.com/Fred78290/nct6687d/";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ atemu ];
diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix
index 6c4317f8bac1..bf01f27a15ba 100644
--- a/pkgs/os-specific/linux/rtw89/default.nix
+++ b/pkgs/os-specific/linux/rtw89/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Driver for Realtek 8852AE, 8852BE, and 8853CE, 802.11ax devices";
     homepage = "https://github.com/lwfinger/rtw89";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ tvorog ];
     platforms = lib.platforms.linux;
     broken = kernel.kernelOlder "5.7";
diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix
index f8cc8f60ad1c..1e3923f6f787 100644
--- a/pkgs/os-specific/linux/tt-kmd/default.nix
+++ b/pkgs/os-specific/linux/tt-kmd/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tenstorrent Kernel Module";
     homepage = "https://github.com/tenstorrent/tt-kmd";
     maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
index 2b944d5846e6..b414391cc1ba 100644
--- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
@@ -29,7 +29,7 @@ buildHomeAssistantComponent rec {
   meta = {
     description = "Home Assistant custom component providing body metrics for Xiaomi Mi Scale 1 and 2";
     homepage = "https://github.com/dckiller51/bodymiscale";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ justinas ];
   };
 }
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index e4ba92fa0bf6..7bb9cf8f80a7 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -57,7 +57,7 @@ let
     meta = {
       description = "Forward proxy module for CONNECT request handling";
       homepage = "https://github.com/chobits/ngx_http_proxy_connect_module";
-      license = with lib.licenses; [ bsd2 ];
+      license = lib.licenses.bsd2;
       maintainers = [ ];
     };
   };
@@ -81,7 +81,7 @@ let
       meta = {
         description = "Validates Akamai v2 query string tokens";
         homepage = "https://github.com/kaltura/nginx-akamai-token-validate-module";
-        license = with lib.licenses; [ agpl3Only ];
+        license = lib.licenses.agpl3Only;
         maintainers = [ ];
       };
     };
@@ -112,7 +112,7 @@ let
       meta = {
         description = "Integrate ARPA2 Resource ACLs into nginx";
         homepage = "https://gitlab.com/arpa2/nginx-auth-a2aclr";
-        license = with lib.licenses; [ isc ];
+        license = lib.licenses.isc;
         maintainers = [ ];
       };
     };
@@ -130,7 +130,7 @@ let
       meta = {
         description = "Proxy to authenticated AWS services";
         homepage = "https://github.com/anomalizer/ngx_aws_auth";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -158,7 +158,7 @@ let
       meta = {
         description = "Brotli compression";
         homepage = "https://github.com/google/ngx_brotli";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -176,7 +176,7 @@ let
       meta = {
         description = "Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches";
         homepage = "https://github.com/nginx-modules/ngx_cache_purge";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -194,7 +194,7 @@ let
       meta = {
         description = "Collection of small and useful nginx add-ons";
         homepage = "https://github.com/FRiCKLE/ngx_coolkit";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -214,7 +214,7 @@ let
       meta = {
         description = "WebDAV PROPFIND,OPTIONS,LOCK,UNLOCK support";
         homepage = "https://github.com/arut/nginx-dav-ext-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -232,7 +232,7 @@ let
       meta = {
         description = "Adds additional generic tools that module developers can use in their own modules";
         homepage = "https://github.com/vision5/ngx_devel_kit";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -252,7 +252,7 @@ let
       meta = {
         description = "Brings echo, sleep, time, exec and more shell-style goodies to Nginx";
         homepage = "https://github.com/openresty/echo-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -270,7 +270,7 @@ let
       meta = {
         description = "Fancy indexes module";
         homepage = "https://github.com/aperezdc/ngx-fancyindex";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ aneeshusa ];
       };
     };
@@ -288,7 +288,7 @@ let
       meta = {
         description = "Fluentd data collector";
         homepage = "https://github.com/fluent/nginx-fluentd-module";
-        license = with lib.licenses; [ asl20 ];
+        license = lib.licenses.asl20;
         maintainers = [ ];
       };
     };
@@ -308,7 +308,7 @@ let
       meta = {
         description = "Creates variables with values from the maxmind geoip2 databases";
         homepage = "https://github.com/leev/ngx_http_geoip2_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ pinpox ];
       };
     };
@@ -342,7 +342,7 @@ let
       meta = {
         description = "IP address anonymizer";
         homepage = "https://github.com/masonicboom/ipscrub";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -360,7 +360,7 @@ let
       meta = {
         description = "Limit the total speed from the specific user";
         homepage = "https://github.com/yaoweibin/nginx_limit_speed_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -378,7 +378,7 @@ let
       meta = {
         description = "HTTP live module";
         homepage = "https://github.com/arut/nginx-live-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -414,7 +414,7 @@ let
       meta = {
         description = "Embed the Power of Lua";
         homepage = "https://github.com/openresty/lua-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -435,7 +435,7 @@ let
       meta = {
         description = "Expose Lua API to ngx_lua for Nginx upstreams";
         homepage = "https://github.com/openresty/lua-upstream-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -463,7 +463,7 @@ let
       meta = {
         description = "Open source, cross platform web application firewall (WAF)";
         homepage = "https://github.com/SpiderLabs/ModSecurity";
-        license = with lib.licenses; [ asl20 ];
+        license = lib.licenses.asl20;
         maintainers = [ ];
       };
     };
@@ -481,7 +481,7 @@ let
       meta = {
         description = "Set, add, and clear arbitrary output headers";
         homepage = "https://github.com/openresty/headers-more-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ SuperSandro2000 ];
       };
     };
@@ -499,7 +499,7 @@ let
       meta = {
         description = "MPEG-TS Live Module";
         homepage = "https://github.com/arut/nginx-ts-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -519,7 +519,7 @@ let
       meta = {
         description = "Open-source, high performance, low rules maintenance WAF";
         homepage = "https://github.com/nbs-system/naxsi";
-        license = with lib.licenses; [ gpl3 ];
+        license = lib.licenses.gpl3;
         maintainers = [ ];
       };
     };
@@ -554,7 +554,7 @@ let
       meta = {
         description = "Subset of the JavaScript language that allows extending nginx functionality";
         homepage = "https://nginx.org/en/docs/njs/";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ jvanbruegge ];
       };
     };
@@ -594,7 +594,7 @@ let
       meta = {
         description = "Automatic PageSpeed optimization";
         homepage = "https://github.com/apache/incubator-pagespeed-ngx";
-        license = with lib.licenses; [ asl20 ];
+        license = lib.licenses.asl20;
         maintainers = [ ];
       };
     };
@@ -614,7 +614,7 @@ let
       meta = {
         description = "Use PAM for simple http authentication";
         homepage = "https://github.com/sto/ngx_http_auth_pam_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -632,7 +632,7 @@ let
       meta = {
         description = "Pinba module for nginx";
         homepage = "https://github.com/tony2001/ngx_http_pinba_module";
-        license = with lib.licenses; [ unfree ]; # no license in repo
+        license = lib.licenses.unfree; # no license in repo
         maintainers = [ ];
       };
     };
@@ -650,7 +650,7 @@ let
       meta = {
         description = "Pure stream http push technology";
         homepage = "https://github.com/wandenberg/nginx-push-stream-module";
-        license = with lib.licenses; [ gpl3 ];
+        license = lib.licenses.gpl3;
         maintainers = [ ];
       };
     };
@@ -668,7 +668,7 @@ let
       meta = {
         description = "Media Streaming Server";
         homepage = "https://github.com/arut/nginx-rtmp-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -689,7 +689,7 @@ let
       meta = {
         description = "Generates CDN tokens, either as a cookie or as a query string parameter";
         homepage = "https://github.com/kaltura/nginx-secure-token-module";
-        license = with lib.licenses; [ agpl3Only ];
+        license = lib.licenses.agpl3Only;
         maintainers = [ ];
       };
     };
@@ -707,7 +707,7 @@ let
       meta = {
         description = "Various set_xxx directives added to the rewrite module (md5/sha1, sql/json quoting and many more)";
         homepage = "https://github.com/openresty/set-misc-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -725,7 +725,7 @@ let
       meta = {
         description = "Shibboleth auth request";
         homepage = "https://github.com/nginx-shib/nginx-http-shibboleth";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -743,7 +743,7 @@ let
       meta = {
         description = "Implements a collection of augmented statistics based on HTTP-codes and upstreams response time";
         homepage = "https://github.com/goldenclone/nginx-sla";
-        license = with lib.licenses; [ unfree ]; # no license in repo
+        license = lib.licenses.unfree; # no license in repo
         maintainers = [ ];
       };
     };
@@ -761,7 +761,7 @@ let
       meta = {
         description = "Adds ability to cache static files";
         homepage = "https://github.com/friCKLE/ngx_slowfs_cache";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -779,7 +779,7 @@ let
       meta = {
         description = "Expose querystring parameters sorted in a variable";
         homepage = "https://github.com/wandenberg/nginx-sorted-querystring-module";
-        license = with lib.licenses; [ mit ];
+        license = lib.licenses.mit;
         maintainers = [ ];
       };
     };
@@ -799,7 +799,7 @@ let
       meta = {
         description = "SPNEGO HTTP Authentication Module";
         homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [
           de11n
           despsyched
@@ -820,7 +820,7 @@ let
       meta = {
         description = "Send statistics to statsd";
         homepage = "https://github.com/harvesthq/nginx-statsd";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -838,7 +838,7 @@ let
       meta = {
         description = "Stream server traffic status core module";
         homepage = "https://github.com/vozlt/nginx-module-stream-sts";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -856,7 +856,7 @@ let
       meta = {
         description = "Stream server traffic status module";
         homepage = "https://github.com/vozlt/nginx-module-sts";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -874,7 +874,7 @@ let
       meta = {
         description = "Filter module which can do both regular expression and fixed string substitutions";
         homepage = "https://github.com/yaoweibin/ngx_http_substitutions_filter_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -892,7 +892,7 @@ let
       meta = {
         description = "Nginx sysguard module";
         homepage = "https://github.com/vozlt/nginx-module-sysguard";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -910,7 +910,7 @@ let
       meta = {
         description = "Handle file uploads using multipart/form-data encoding and resumable uploads";
         homepage = "https://github.com/fdintino/nginx-upload-module";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         maintainers = [ ];
       };
     };
@@ -928,7 +928,7 @@ let
       meta = {
         description = "Support upstream health check";
         homepage = "https://github.com/yaoweibin/nginx_upstream_check_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -951,7 +951,7 @@ let
       meta = {
         description = "Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)";
         homepage = "https://github.com/tarantool/nginx_upstream_module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -969,7 +969,7 @@ let
       meta = {
         description = "URL encoding converting module";
         homepage = "https://github.com/vozlt/nginx-module-url";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = [ ];
       };
     };
@@ -993,7 +993,7 @@ let
       meta = {
         description = "Extract thumbs from a video file";
         homepage = "https://github.com/wandenberg/nginx-video-thumbextractor-module";
-        license = with lib.licenses; [ gpl3 ];
+        license = lib.licenses.gpl3;
         maintainers = [ ];
       };
     };
@@ -1030,7 +1030,7 @@ let
       meta = {
         description = "VOD packager";
         homepage = "https://github.com/kaltura/nginx-vod-module";
-        license = with lib.licenses; [ agpl3Only ];
+        license = lib.licenses.agpl3Only;
         maintainers = [ ];
       };
     };
@@ -1048,7 +1048,7 @@ let
       meta = {
         description = "Virtual host traffic status module";
         homepage = "https://github.com/vozlt/nginx-module-vts";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ SuperSandro2000 ];
       };
     };
@@ -1066,7 +1066,7 @@ let
       meta = {
         description = "Streaming ZIP archiver for nginx";
         homepage = "https://github.com/evanmiller/mod_zip";
-        license = with lib.licenses; [ bsd3 ];
+        license = lib.licenses.bsd3;
         broken = stdenv.hostPlatform.isDarwin;
         maintainers = with lib.maintainers; [
           DutchGerman
@@ -1090,7 +1090,7 @@ let
       meta = {
         description = "Nginx modules for the Zstandard compression";
         homepage = "https://github.com/tokers/zstd-nginx-module";
-        license = with lib.licenses; [ bsd2 ];
+        license = lib.licenses.bsd2;
         maintainers = with lib.maintainers; [ SuperSandro2000 ];
       };
     };
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
index ce90058b04bf..87545ed5846a 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/NETWAYS/check_interfaces/releases/tag/v${version}";
     description = "Icinga check plugin for network hardware interfaces";
     homepage = "https://github.com/NETWAYS/check_interfaces/";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "check_interfaces";
diff --git a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
index 1a9899745b88..2bbdd7d5159f 100644
--- a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/SteScho/manubulon-snmp/releases/tag/v${version}";
     description = "Set of Icinga/Nagios plugins to check hosts and hardware with the SNMP protocol";
     homepage = "https://github.com/SteScho/manubulon-snmp";
-    license = with lib.licenses; [ gpl2Only ];
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jwillikers ];
   };
diff --git a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
index 36ca174a8e66..0308e67ce4d4 100644
--- a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/alexander-naumov/openbsd_snmp3_check/releases/tag/v${version}";
     description = "SNMP v3 check for OpenBSD systems state monitoring";
     homepage = "https://github.com/alexander-naumov/openbsd_snmp3_check";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "openbsd_snmp3.py";
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 03c614cb66e9..03d06ce67bcf 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://facebook.github.io/zstd/";
     changelog = "https://github.com/facebook/zstd/blob/v${finalAttrs.version}/CHANGELOG";
-    license = with lib.licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only.
+    license = lib.licenses.bsd3; # Or, at your opinion, GPL-2.0-only.
     mainProgram = "zstd";
     platforms = lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix
index 30de45679491..3d11b8c4a38f 100644
--- a/pkgs/tools/misc/bat-extras/modules/core.nix
+++ b/pkgs/tools/misc/bat-extras/modules/core.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Bash scripts that integrate bat with various command line tools";
     homepage = "https://github.com/eth-p/bat-extras";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       bbigras
       PerchunPak
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 88fda3568660..96cae37b8977 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -58,7 +58,7 @@ pythonPackages.buildPythonPackage rec {
     homepage = "https://www.telepresence.io/";
     description = "Local development against a remote Kubernetes or OpenShift cluster";
     mainProgram = "telepresence";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index 613abfc30bde..941f65a84f76 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
     description = "cat for markdown";
     homepage = "https://github.com/swsnr/mdcat";
     changelog = "https://github.com/swsnr/mdcat/releases/tag/mdcat-${version}";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5b7534c412b6..650df7f74367 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -136,7 +136,7 @@ with self;
     meta = {
       description = "Grep-like tool tailored to working with large trees of source code";
       homepage = "https://beyondgrep.com";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.asakura ];
     };
   };
@@ -444,7 +444,7 @@ with self;
     meta = {
       description = "Alien package for the GNU Multiple Precision library";
       homepage = "https://metacpan.org/pod/Alien::GMP";
-      license = with lib.licenses; [ lgpl3Plus ];
+      license = lib.licenses.lgpl3Plus;
     };
   };
 
@@ -1044,7 +1044,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Test.pm wrapper with helpers for testing Apache";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -1273,7 +1273,7 @@ with self;
     meta = {
       description = "Write object oriented scripts with ease";
       homepage = "https://github.com/jhthorsen/applify";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -1388,7 +1388,7 @@ with self;
 
     meta = {
       description = "Manage perl installations in your $HOME";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "perlbrew";
     };
   };
@@ -1482,7 +1482,7 @@ with self;
     meta = {
       description = "Sensible database change management";
       homepage = "https://sqitch.org";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "sqitch";
     };
   };
@@ -1500,7 +1500,7 @@ with self;
     meta = {
       description = "Simple Statistics";
       homepage = "https://github.com/nferraz/st";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       maintainers = [ ];
       mainProgram = "st";
     };
@@ -1519,7 +1519,7 @@ with self;
     meta = {
       description = "Validate method/function parameters";
       homepage = "https://metacpan.org/release/Params-Validate";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -1680,7 +1680,7 @@ with self;
     meta = {
       description = "Simple limitable FIFO array, with sum and average methods";
       homepage = "https://github.com/dwburke/perl-Array-FIFO";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -1726,7 +1726,7 @@ with self;
     };
     meta = {
       description = "Ping a huge number of servers in several seconds";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -1814,7 +1814,7 @@ with self;
     ];
     meta = {
       description = "API wrapper around the 'tar' utility";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -1846,7 +1846,7 @@ with self;
     meta = {
       description = "Object-oriented interface to FITS HDUs";
       homepage = "https://github.com/timj/perl-Astro-FITS-Header";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -1897,7 +1897,7 @@ with self;
     meta = {
       description = "Fast C metadata and tag reader for all common audio file formats, slimserver fork";
       homepage = "https://github.com/Logitech/slimserver-vendor";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -1915,7 +1915,7 @@ with self;
     ];
     meta = {
       description = "DEC VMS password hashing";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
   };
 
@@ -1994,7 +1994,7 @@ with self;
     '';
     meta = {
       description = "Perl extension for MIT Kerberos 5 admin interface";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -2090,7 +2090,7 @@ with self;
     ];
     meta = {
       description = "Provide simple Radius client facilities";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2155,7 +2155,7 @@ with self;
     meta = {
       description = "Salted Challenge Response Authentication Mechanism (RFC 5802)";
       homepage = "https://github.com/dagolden/Authen-SCRAM";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -2231,7 +2231,7 @@ with self;
     ];
     meta = {
       description = "Call methods on native types";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2262,7 +2262,7 @@ with self;
         which includes C, C++, Java, Perl, Python, and more.
       '';
       homepage = "http://www.aarontrevena.co.uk/opensource/autodia/";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       mainProgram = "autodia.pl";
     };
   };
@@ -2323,7 +2323,7 @@ with self;
     meta = {
       description = "Perl interface to the ZBar Barcode Reader";
       homepage = "https://metacpan.org/pod/Barcode::ZBar";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -2773,7 +2773,7 @@ with self;
     };
     meta = {
       description = "BSD process resource limit and priority functions";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with lib.maintainers; [
         de11n
         despsyched
@@ -2832,7 +2832,7 @@ with self;
     meta = {
       description = "Work with International Standard Book Numbers";
       homepage = "https://github.com/briandfoy/business-isbn";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2846,7 +2846,7 @@ with self;
     meta = {
       description = "Data pack for Business::ISBN";
       homepage = "https://github.com/briandfoy/business-isbn-data";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2861,7 +2861,7 @@ with self;
     meta = {
       description = "Work with International Standard Music Numbers";
       homepage = "https://github.com/briandfoy/business-ismn";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -2875,7 +2875,7 @@ with self;
     meta = {
       description = "Perl extension for International Standard Serial Numbers";
       homepage = "https://github.com/briandfoy/business-issn";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -3093,7 +3093,7 @@ with self;
     meta = {
       description = "Perl interface to the cairo 2d vector graphics library";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -3115,7 +3115,7 @@ with self;
     meta = {
       description = "Integrate Cairo into the Glib type system";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -3182,7 +3182,7 @@ with self;
     };
     meta = {
       description = "Canary to check perl compatibility for schmorp's modules";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
   };
 
@@ -3216,7 +3216,7 @@ with self;
     meta = {
       description = "Capture STDOUT and STDERR from Perl, XS or external programs";
       homepage = "https://github.com/dagolden/Capture-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -3264,7 +3264,7 @@ with self;
     buildInputs = [ TestException ];
     meta = {
       description = "Convenience assertions for common situations";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -3552,7 +3552,7 @@ with self;
     meta = {
       description = "Serves PODs right from your Catalyst application";
       homepage = "https://search.cpan.org/dist/Catalyst-Controller-POD";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -4426,7 +4426,7 @@ with self;
     };
     meta = {
       description = "Get the CDDB info for an audio cd";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       maintainers = [ maintainers.endgame ];
       mainProgram = "cddb.pl";
     };
@@ -4441,7 +4441,7 @@ with self;
     };
     meta = {
       description = "Parse a CDDB/freedb data file";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -4466,7 +4466,7 @@ with self;
     meta = {
       description = "Handle Common Gateway Interface requests and responses";
       homepage = "https://metacpan.org/module/CGI";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -4604,7 +4604,7 @@ with self;
     meta = {
       description = "Lightweight CGI form processing package";
       homepage = "https://github.com/JerilynFranz/perl-CGI-Minimal";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -4635,7 +4635,7 @@ with self;
     propagatedBuildInputs = [ CGI ];
     meta = {
       description = "Persistent session data in CGI applications";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -4669,7 +4669,7 @@ with self;
     buildInputs = [ TestDeep ];
     meta = {
       description = "Build structures from CGI data";
-      license = with lib.licenses; [ bsd2 ];
+      license = lib.licenses.bsd2;
     };
   };
 
@@ -4764,7 +4764,7 @@ with self;
     meta = {
       description = "Communicate with a smart card using PC/SC";
       homepage = "https://pcsc-perl.apdu.fr/";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = with maintainers; [
         anthonyroussel
       ];
@@ -4780,7 +4780,7 @@ with self;
     };
     meta = {
       description = "Package for creating Cisco IPPhone XML objects";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -5088,7 +5088,7 @@ with self;
     };
     meta = {
       description = "Another class and object builder";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -5358,7 +5358,7 @@ with self;
     meta = {
       description = "Minimalist class construction";
       homepage = "https://github.com/dagolden/Class-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -5402,7 +5402,7 @@ with self;
     meta = {
       description = "XS implementation of parts of Class::Load";
       homepage = "https://github.com/moose/Class-Load-XS";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -5566,7 +5566,7 @@ with self;
     meta = {
       description = "Subroutines for making simple command line scripts";
       homepage = "https://github.com/reyjrar/CLI-Helpers";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -5977,7 +5977,7 @@ with self;
     };
     meta = {
       description = "Generic Config Module";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -6494,7 +6494,7 @@ with self;
     };
     meta = {
       description = "Constant subs with deferred value calculation";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -6823,7 +6823,7 @@ with self;
     meta = {
       description = "Common library for searching CPAN modules, authors and distributions";
       homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -6938,7 +6938,7 @@ with self;
     meta = {
       changelog = "https://github.com/Leont/crypt-argon2/blob/v0.031/Changes";
       description = "Perl interface to the Argon2 key derivation functions";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
     };
   };
 
@@ -6967,7 +6967,7 @@ with self;
     };
     meta = {
       description = "Perl Blowfish encryption module";
-      license = with lib.licenses; [ bsdOriginalShortened ];
+      license = lib.licenses.bsdOriginalShortened;
     };
   };
 
@@ -7040,7 +7040,7 @@ with self;
     ];
     meta = {
       description = "Perl DES encryption module";
-      license = with lib.licenses; [ bsdOriginalShortened ];
+      license = lib.licenses.bsdOriginalShortened;
     };
   };
 
@@ -7223,7 +7223,7 @@ with self;
     meta = {
       description = "Secure memorable password generator";
       homepage = "http://www.bartb.ie/hsxkpasswd";
-      license = with lib.licenses; [ bsd2 ];
+      license = lib.licenses.bsd2;
       maintainers = [ maintainers.dannixon ];
       mainProgram = "hsxkpasswd";
     };
@@ -7241,7 +7241,7 @@ with self;
     };
     meta = {
       description = "Perl interface to IDEA block cipher";
-      license = with lib.licenses; [ bsdOriginalShortened ];
+      license = lib.licenses.bsdOriginalShortened;
     };
   };
 
@@ -7356,7 +7356,7 @@ with self;
     meta = {
       description = "Parse PKCS #10 certificate requests";
       homepage = "https://github.com/openxpki/Crypt-PKCS10";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
     };
   };
 
@@ -7524,7 +7524,7 @@ with self;
     };
     meta = {
       description = "Crypt::CBC compliant Rijndael encryption module";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
     };
   };
 
@@ -7592,7 +7592,7 @@ with self;
     };
     meta = {
       description = "Perl-only implementation of lanman and nt md4 hash functions, for use in Samba style smbpasswd entries";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -7898,7 +7898,7 @@ with self;
 
     meta = {
       description = "Minimal Ed25519 bindings";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.thoughtpolice ];
     };
   };
@@ -7922,7 +7922,7 @@ with self;
     ];
     meta = {
       description = "OpenSSL support for LWP";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -7959,7 +7959,7 @@ with self;
     };
     meta = {
       description = "Perl extension for minifying CSS";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -8014,7 +8014,7 @@ with self;
     env.NIX_CFLAGS_LINK = "-L${pkgs.ncurses.out}/lib -lncurses";
     meta = {
       description = "Perl bindings to ncurses";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -8203,7 +8203,7 @@ with self;
     propagatedBuildInputs = [ IOInteractiveTiny ];
     meta = {
       description = "Dump with recursive encoding";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "edumper";
     };
   };
@@ -8397,7 +8397,7 @@ with self;
     meta = {
       description = "Pack and unpack big-endian IEEE754 floats and doubles";
       homepage = "https://metacpan.org/release/Data-IEEE754";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -8841,7 +8841,7 @@ with self;
     ];
     meta = {
       description = "Globally/Universally Unique Identifiers (GUIDs/UUIDs)";
-      license = with lib.licenses; [ bsd0 ];
+      license = lib.licenses.bsd0;
     };
   };
 
@@ -8857,7 +8857,7 @@ with self;
     meta = {
       description = "Fast random UUID generator using the Mersenne Twister algorithm";
       homepage = "https://metacpan.org/release/Data-UUID-MT";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -9013,7 +9013,7 @@ with self;
     propagatedBuildInputs = [ DateSimple ];
     meta = {
       description = "Work with a range of dates";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -9053,7 +9053,7 @@ with self;
     meta = {
       description = "Date and time object for Perl";
       homepage = "https://metacpan.org/release/DateTime";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -9122,7 +9122,7 @@ with self;
     meta = {
       description = "Create DateTime parser classes and objects";
       homepage = "https://metacpan.org/release/DateTime-Format-Builder";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -9329,7 +9329,7 @@ with self;
     meta = {
       description = "Parse and format strp and strf time patterns";
       homepage = "https://metacpan.org/release/DateTime-Format-Strptime";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -9429,7 +9429,7 @@ with self;
     meta = {
       description = "Parse and format RFC3339 datetime strings";
       homepage = "https://search.cpan.org/dist/DateTime-Format-RFC3339";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
     };
   };
 
@@ -9764,7 +9764,7 @@ with self;
     };
     meta = {
       description = "Print out each line before it is executed (like sh -x)";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -10539,7 +10539,7 @@ with self;
     };
     meta = {
       description = "Simple detection of binary versus text in strings";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -10600,7 +10600,7 @@ with self;
     ];
     meta = {
       description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -10809,7 +10809,7 @@ with self;
     meta = {
       description = "Object representing a stack trace";
       homepage = "https://metacpan.org/release/Devel-StackTrace";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -10872,7 +10872,7 @@ with self;
     };
     meta = {
       description = "Module that calculates CRC sums of all sorts";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -10902,7 +10902,7 @@ with self;
     };
     meta = {
       description = "Perl extension for 32 bit Jenkins Hashing Algorithm";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -11017,7 +11017,7 @@ with self;
     meta = {
       description = "Calculate and verify Subresource Integrity hashes (SRI)";
       homepage = "https://github.com/haukex/Digest-SRI";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -11035,7 +11035,7 @@ with self;
     meta = {
       description = "Treat a directory and a manifest file as a hash/dictionary of keys to texts or blobs";
       homepage = "https://metacpan.org/release/Dir-Manifest";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -11391,7 +11391,7 @@ with self;
     meta = {
       description = "Validate your CPAN META.json files";
       homepage = "https://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -11668,7 +11668,7 @@ with self;
     propagatedBuildInputs = [ DistZilla ];
     meta = {
       description = "Release Test::Version tests";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -12159,7 +12159,7 @@ with self;
     meta = {
       description = "High speed Base32 encoding using GMP with BigInt and MD5 support";
       homepage = "https://metacpan.org/release/Encode-Base32-GMP";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -12208,7 +12208,7 @@ with self;
     };
     meta = {
       description = "Extra sets of Chinese encodings";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -12428,7 +12428,7 @@ with self;
     propagatedBuildInputs = [ commonsense ];
     meta = {
       description = "Perl interface to libev, a high performance full-featured event loop";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
   };
 
@@ -12956,7 +12956,7 @@ with self;
     meta = {
       description = "Simplistic interface to pkg-config";
       homepage = "https://gitlab.gnome.org/GNOME/perl-extutils-pkgconfig";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
       maintainers = [ lib.maintainers.fliegendewurst ];
     };
   };
@@ -13080,7 +13080,7 @@ with self;
     '';
     meta = {
       description = "Fast CGI module";
-      license = with lib.licenses; [ oml ];
+      license = lib.licenses.oml;
     };
   };
 
@@ -13115,7 +13115,7 @@ with self;
     };
     meta = {
       description = "Perl-based FastCGI process manager";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -13327,7 +13327,7 @@ with self;
     ];
     meta = {
       description = "Watch for changes to files, cross-platform style";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -13566,7 +13566,7 @@ with self;
     meta = {
       description = "Object oriented File::Find replacement";
       homepage = "https://metacpan.org/release/File-Find-Object";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -13690,7 +13690,7 @@ with self;
     };
     meta = {
       description = "File locking with fcntl(2)";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       maintainers = with maintainers; [ das_j ];
     };
   };
@@ -13731,7 +13731,7 @@ with self;
     meta = {
       description = "FileHandle which supports multi-byte unget";
       homepage = "https://github.com/coppit/filehandle-unget";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with maintainers; [ romildo ];
     };
   };
@@ -13915,7 +13915,7 @@ with self;
     };
     meta = {
       description = "Guess file type from contents";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -13969,7 +13969,7 @@ with self;
     };
     meta = {
       description = "File-finding iterator";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -14043,7 +14043,7 @@ with self;
     meta = {
       description = "Change directory temporarily for a limited scope";
       homepage = "https://github.com/dagolden/File-pushd";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -14510,7 +14510,7 @@ with self;
       homepage = "https://finance-quote.sourceforge.net/";
       changelog = "https://github.com/finance-quote/finance-quote/releases/tag/v${version}";
       description = "Get stock and mutual fund quotes from various exchanges";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = with lib.maintainers; [ nevivurn ];
     };
   };
@@ -14557,7 +14557,7 @@ with self;
     buildInputs = [ IOString ];
     meta = {
       description = "TTF font support for Perl";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -14781,7 +14781,7 @@ with self;
     meta = {
       description = "Verify solutions for solitaire games";
       homepage = "https://metacpan.org/release/Games-Solitaire-Verify";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "verify-solitaire-solution";
       # Unsuccessful stat on filename containing newline at lib/perl5/5.40.0/File/Path.pm line 361.
       broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -14950,7 +14950,7 @@ with self;
     };
     meta = {
       description = "Interpolates script options from files into @ARGV or another array";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       maintainers = [ maintainers.pSub ];
     };
   };
@@ -15024,7 +15024,7 @@ with self;
     propagatedBuildInputs = [ Error ];
     meta = {
       description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = with lib.maintainers; [
         de11n
         despsyched
@@ -15041,7 +15041,7 @@ with self;
     };
     meta = {
       description = "Create fixup commits for topic branches";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.DamienCassou ];
       mainProgram = "git-autofixup";
     };
@@ -15132,7 +15132,7 @@ with self;
     meta = {
       description = "Perl wrappers for the GLib utility and Object libraries";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
       # Can't load module IO, dynamic loading not available in this perl.
       broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
     };
@@ -15179,7 +15179,7 @@ with self;
     meta = {
       description = "Dynamically create Perl language bindings";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -15450,7 +15450,7 @@ with self;
 
     meta = {
       description = "Perl interface to the GraphViz graphing tool";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -15487,7 +15487,7 @@ with self;
 
     meta = {
       description = "Perl interface to the GraphViz graphing tool";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -15513,7 +15513,7 @@ with self;
     meta = {
       description = "Search mailboxes for mail matching a regular expression";
       homepage = "https://github.com/coppit/grepmail";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with maintainers; [ romildo ];
     };
   };
@@ -15588,7 +15588,7 @@ with self;
     meta = {
       description = "Perl interface to the 2.x series of the Gimp Toolkit library";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -15605,7 +15605,7 @@ with self;
     ];
     meta = {
       description = "(DEPRECATED) Perl interface to the EggTrayIcon library";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin
     };
   };
@@ -15629,7 +15629,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Perl extension for libappindicator";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -15651,7 +15651,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Perl bindings for the GtkImageView widget";
-      license = with lib.licenses; [ lgpl3Plus ];
+      license = lib.licenses.lgpl3Plus;
     };
   };
 
@@ -15700,7 +15700,7 @@ with self;
     '';
     meta = {
       description = "Perl interface to the 3.x series of the gtk+ toolkit";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -15750,7 +15750,7 @@ with self;
     meta = {
       description = "Simple interface to Gtk3's complex MVC list widget";
       homepage = "https://github.com/soig/Gtk3-SimpleList";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -15872,7 +15872,7 @@ with self;
     propagatedBuildInputs = [ LogTrace ];
     meta = {
       description = "Flatten/unflatten complex data hashes";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -16215,7 +16215,7 @@ with self;
     meta = {
       description = "HTML to text formatting using external programs";
       homepage = "https://user42.tuxfamily.org/html-formatexternal/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -16638,7 +16638,7 @@ with self;
     meta = {
       description = "(X)HTML validation in a Perl object";
       homepage = "https://github.com/petdance/html-tidy";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "webtidy";
     };
   };
@@ -16799,7 +16799,7 @@ with self;
     meta = {
       description = "Minimalist HTTP user agent cookie jar";
       homepage = "https://github.com/dagolden/HTTP-CookieJar";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -17435,7 +17435,7 @@ with self;
     ];
     meta = {
       description = "Fast, high-quality fixed-point image resizing";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -17797,7 +17797,7 @@ with self;
     meta = {
       description = "Utilities for interactive I/O";
       homepage = "https://github.com/briandfoy/io-interactive";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -17810,7 +17810,7 @@ with self;
     };
     meta = {
       description = "Is_interactive() without large deps";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -18127,7 +18127,7 @@ with self;
     propagatedBuildInputs = [ GeographyCountries ];
     meta = {
       description = "Fast lookup of country codes from IP addresses";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "ip2cc";
     };
   };
@@ -18141,7 +18141,7 @@ with self;
     };
     meta = {
       description = "2-letter, 3-letter, and numerical codes for countries";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -18360,7 +18360,7 @@ with self;
         public methods have been defined.  These classes and methods are
         available to the Perl program as if they had been written in Perl.
       '';
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin
     };
   };
@@ -18581,7 +18581,7 @@ with self;
     meta = {
       description = "Validate data against a JSON schema";
       homepage = "https://github.com/mojolicious/json-validator";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -18751,7 +18751,7 @@ with self;
     meta = {
       description = "Transforms TeX and LaTeX into XML/HTML/MathML";
       homepage = "https://dlmf.nist.gov/LaTeXML/";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
       maintainers = with maintainers; [ xworld21 ];
       mainProgram = "latexmlc";
     };
@@ -18877,7 +18877,7 @@ with self;
     __darwinAllowLocalNetworking = true;
     meta = {
       description = "Wrapper for libapreq2's module/handle API";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -18890,7 +18890,7 @@ with self;
     };
     meta = {
       description = "Portable l10n and i10n functions";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
     };
   };
 
@@ -18920,7 +18920,7 @@ with self;
     meta = {
       description = "Add paths relative to the current file to @INC";
       homepage = "https://github.com/Grinnz/lib-relative";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -19090,7 +19090,7 @@ with self;
     ];
     meta = {
       description = "Part-of-speech tagger for English natural language processing";
-      license = with lib.licenses; [ gpl3Only ];
+      license = lib.licenses.gpl3Only;
     };
   };
 
@@ -19212,7 +19212,7 @@ with self;
     };
     meta = {
       description = "Porters stemming algorithm for Denmark";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -19246,7 +19246,7 @@ with self;
     meta = {
       description = "Embed / expand oEmbed resources and other URL / links";
       homepage = "https://github.com/jhthorsen/linkembedder";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -19283,7 +19283,7 @@ with self;
     meta = {
       description = "Fast parsing of the Linux desktop files";
       homepage = "https://github.com/trizen/Linux-DesktopFiles";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -19376,7 +19376,7 @@ with self;
     meta = {
       description = "Combines List::Util, List::SomeUtils and List::UtilsBy in one bite-sized package";
       homepage = "https://metacpan.org/release/List-AllUtils";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -19445,7 +19445,7 @@ with self;
     meta = {
       description = "Provide the stuff missing in List::Util in XS";
       homepage = "https://metacpan.org/release/List-MoreUtils-XS";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -19531,7 +19531,7 @@ with self;
     propagatedBuildInputs = [ LocaleMaketextLexicon ];
     meta = {
       description = "PO file parser for Maketext";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -19573,7 +19573,7 @@ with self;
     };
     meta = {
       description = "Maketext from already interpolated strings";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
     };
   };
 
@@ -19587,7 +19587,7 @@ with self;
     meta = {
       description = "Use other catalog formats in Maketext";
       homepage = "https://search.cpan.org/dist/Locale-Maketext-Lexicon";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "xgettext.pl";
     };
   };
@@ -19899,7 +19899,7 @@ with self;
     meta = {
       description = "Dispatches messages to one or more outputs";
       homepage = "https://metacpan.org/release/Log-Dispatch";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -20023,7 +20023,7 @@ with self;
     };
     meta = {
       description = "Provides a unified approach to tracing";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
     };
   };
 
@@ -20619,7 +20619,7 @@ with self;
     meta = {
       description = "Fast and simple mbox folder reader";
       homepage = "https://github.com/coppit/mail-mbox-messageparser";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       maintainers = with maintainers; [ romildo ];
     };
   };
@@ -20719,7 +20719,7 @@ with self;
     };
     meta = {
       description = "Perl extension for validating email addresses according to RFC822";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -20793,7 +20793,7 @@ with self;
     doCheck = false; # The main test performs network access
     meta = {
       description = "Object-oriented implementation of Sender Policy Framework";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       mainProgram = "spfquery";
     };
   };
@@ -20894,7 +20894,7 @@ with self;
       description = "Parse and evaluate mathematical expressions";
       homepage = "https://github.com/Grinnz/Math-Calc-Parser";
       broken = true;
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -21019,7 +21019,7 @@ with self;
     };
     meta = {
       description = "This module provides a few functions related to Fibonacci numbers";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21038,7 +21038,7 @@ with self;
     env.NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp";
     meta = {
       description = "High speed arbitrary size integer math";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -21172,7 +21172,7 @@ with self;
     ];
     meta = {
       description = "Points on a path through the 2-D plane";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -21289,7 +21289,7 @@ with self;
     propagatedBuildInputs = [ ObjectInsideOut ];
     meta = {
       description = "Auto-seeded Mersenne Twister PRNGs";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -21312,7 +21312,7 @@ with self;
     meta = {
       description = "Cryptographically-secure, cross-platform replacement for rand()";
       homepage = "https://github.com/frioux/Math-Random-Secure";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21364,7 +21364,7 @@ with self;
     meta = {
       description = "Code shared by the MaxMind DB reader and writer modules";
       homepage = "https://metacpan.org/release/MaxMind-DB-Common";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21391,7 +21391,7 @@ with self;
     meta = {
       description = "Read MaxMind DB files and look up IP addresses";
       homepage = "https://metacpan.org/release/MaxMind-DB-Reader";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21417,7 +21417,7 @@ with self;
     meta = {
       description = "Fast XS implementation of MaxMind DB reader";
       homepage = "https://metacpan.org/release/MaxMind-DB-Reader-XS";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -21711,7 +21711,7 @@ with self;
       homepage = "https://www.mhonarc.org/";
       description = "Mail-to-HTML converter";
       mainProgram = "mhonarc";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -21759,7 +21759,7 @@ with self;
     buildInputs = [ ProcWaitStat ];
     meta = {
       description = "Construct and optionally mail MIME messages";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
     # Nothing in mime-construct --help or mime-construct’s man page mentions
     # anything about mime-construct executing its arguments.
@@ -21874,7 +21874,7 @@ with self;
     meta = {
       description = "High performance job queue for Perl";
       homepage = "https://github.com/mojolicious/minion";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -21896,7 +21896,7 @@ with self;
     meta = {
       homepage = "https://github.com/Difegue/Minion-Backend-Redis";
       description = "Redis backend for Minion job queue";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ tomasajt ];
     };
   };
@@ -21916,7 +21916,7 @@ with self;
     meta = {
       description = "SQLite backend for Minion job queue";
       homepage = "https://github.com/Grinnz/Minion-Backend-SQLite";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -22393,7 +22393,7 @@ with self;
     meta = {
       description = "Loads one of several alternate underlying implementations for a module";
       homepage = "https://metacpan.org/release/Module-Implementation";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -22741,7 +22741,7 @@ with self;
     buildInputs = [ IPCRun ];
     meta = {
       description = "Module signature file manipulation";
-      license = with lib.licenses; [ cc0 ];
+      license = lib.licenses.cc0;
       mainProgram = "cpansign";
     };
   };
@@ -22806,7 +22806,7 @@ with self;
     meta = {
       description = "Minimalistic HTML/XML DOM parser with CSS selectors";
       homepage = "https://github.com/Grinnz/Mojo-DOM58";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -22824,7 +22824,7 @@ with self;
     passthru.tests = nixosTests.mod_perl;
     meta = {
       description = "Embed a Perl interpreter in the Apache/2.x HTTP server";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       mainProgram = "mp2bug";
     };
   };
@@ -22839,7 +22839,7 @@ with self;
     meta = {
       description = "Real-time web framework";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [
         marcusramberg
         sgo
@@ -22864,7 +22864,7 @@ with self;
     meta = {
       description = "Compress and convert css, less, sass, javascript and coffeescript files";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-assetpack";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ sgo ];
     };
   };
@@ -22942,7 +22942,7 @@ with self;
     meta = {
       description = "OpenAPI / Swagger plugin for Mojolicious";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-openapi";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -22983,7 +22983,7 @@ with self;
     meta = {
       description = "Mojolicious server status";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.thoughtpolice ];
     };
   };
@@ -22999,7 +22999,7 @@ with self;
     meta = {
       description = "Plugin for enabling a Mojolicious app to log to syslog";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23020,7 +23020,7 @@ with self;
     meta = {
       homepage = "https://github.com/Grinnz/Mojolicious-Plugin-TemplateToolkit";
       description = "Template Toolkit renderer plugin for Mojolicious";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = with maintainers; [ tomasajt ];
     };
   };
@@ -23036,7 +23036,7 @@ with self;
     meta = {
       description = "Render exceptions as text in command line user agents";
       homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23055,7 +23055,7 @@ with self;
     meta = {
       description = "Mojolicious <3 Webpack";
       homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23074,7 +23074,7 @@ with self;
     meta = {
       description = "Redis driver based on Mojo::IOLoop";
       homepage = "https://github.com/jhthorsen/mojo-redis";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23122,7 +23122,7 @@ with self;
     meta = {
       description = "Tiny Mojolicious wrapper for SQLite";
       homepage = "https://github.com/Grinnz/Mojo-SQLite";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23143,7 +23143,7 @@ with self;
     meta = {
       description = "Mojolicious and Async MySQL/MariaDB";
       homepage = "https://github.com/jhthorsen/mojo-mysql";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23160,7 +23160,7 @@ with self;
     meta = {
       description = "(DISCOURAGED) Promises/A+ and flow-control helpers";
       homepage = "https://github.com/jberger/Mojo-IOLoop-Delay";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -23227,7 +23227,7 @@ with self;
     meta = {
       description = "Mojolicious ♥ PostgreSQL";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -23857,7 +23857,7 @@ with self;
     meta = {
       description = "PostgreSQL runner for tests";
       homepage = "https://github.com/TJC/Test-postgresql";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -24246,7 +24246,7 @@ with self;
     meta = {
       description = "Mark overload code symbols as methods";
       homepage = "https://metacpan.org/release/MooseX-MarkAsMethods";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -24441,7 +24441,7 @@ with self;
     propagatedBuildInputs = [ Moose ];
     meta = {
       description = "Name your accessors foo() and set_foo()";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -24550,7 +24550,7 @@ with self;
     meta = {
       description = "Make your object constructors blow up on unknown attributes";
       homepage = "https://metacpan.org/release/MooseX-StrictConstructor";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -24771,7 +24771,7 @@ with self;
     meta = {
       description = "Path::Tiny types and coercions for Moose";
       homepage = "https://github.com/karenetheridge/moosex-types-path-tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -24804,7 +24804,7 @@ with self;
     meta = {
       description = "Moose type constraints for strings or string-like objects";
       homepage = "https://github.com/dagolden/MooseX-Types-Stringlike";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -24874,7 +24874,7 @@ with self;
     propagatedBuildInputs = [ AudioCuefileParser ];
     meta = {
       description = "Split an MP3 file without gaps (based on pcutmp3)";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -24912,7 +24912,7 @@ with self;
     outputs = [ "out" ];
     meta = {
       description = "Module for reading tags of MP3 audio files";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -24996,7 +24996,7 @@ with self;
     meta = {
       description = "Mozilla's CA cert bundle in PEM format";
       homepage = "https://github.com/gisle/mozilla-ca";
-      license = with lib.licenses; [ mpl20 ];
+      license = lib.licenses.mpl20;
     };
   };
 
@@ -25061,7 +25061,7 @@ with self;
     propagatedBuildInputs = [ pkgs.libdiscid ];
     meta = {
       description = "- Perl interface for the MusicBrainz libdiscid library";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -25228,7 +25228,7 @@ with self;
     meta = {
       description = "Lookup the username on the remote end of a TCP/IP connection";
       homepage = "https://github.com/toddr/Net-Ident";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -25322,7 +25322,7 @@ with self;
     doCheck = false; # wants network
     meta = {
       description = "Amazon Mechanical Turk SDK for Perl";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -25661,7 +25661,7 @@ with self;
     makeMakerFlags = [ "--noonline-tests" ];
     meta = {
       description = "Perl Interface to the Domain Name System";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -25734,7 +25734,7 @@ with self;
     preCheck = "rm t/13-gethostsubs.t"; # it performs DNS queries
     meta = {
       description = "Base framework for frame crafting";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -25748,7 +25748,7 @@ with self;
     propagatedBuildInputs = [ NetFrame ];
     meta = {
       description = "Internet Protocol v6 layer object";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -25778,7 +25778,7 @@ with self;
     ];
     meta = {
       description = "OOP Interface to FreeDB Server(s)";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin
     };
   };
@@ -25957,7 +25957,7 @@ with self;
     meta = {
       homepage = "https://github.com/tomhrr/p5-Net-IP-XS";
       description = "IPv4/IPv6 address library";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -26071,7 +26071,7 @@ with self;
     meta = {
       description = "Communicate with an MPD server";
       homepage = "https://metacpan.org/pod/Net::MPD";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -26151,7 +26151,7 @@ with self;
     ];
     meta = {
       description = "Patricia Trie perl module for fast IP address lookups";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -26296,7 +26296,7 @@ with self;
     ];
     meta = {
       description = "Co-operative multithreaded server using Coro";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -26522,7 +26522,7 @@ with self;
     '';
     meta = {
       description = "Perl bindings for OpenSSL and LibreSSL";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -26899,7 +26899,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Access Ogg Vorbis info and comment fields";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -26946,7 +26946,7 @@ with self;
     meta = {
       description = "Client for talking to an Open API powered server";
       homepage = "https://github.com/jhthorsen/openapi-client";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -27007,7 +27007,7 @@ with self;
     ];
     meta = {
       description = "Perl Open OpenDocument Connector";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
       maintainers = [ maintainers.wentasah ];
     };
   };
@@ -27097,7 +27097,7 @@ with self;
     meta = {
       description = "Perl extension for Apache ZooKeeper";
       homepage = "https://github.com/mark-5/p5-net-zookeeper";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [
         de11n
         despsyched
@@ -27179,7 +27179,7 @@ with self;
     meta = {
       description = "Manage deprecation warnings for your distribution";
       homepage = "https://metacpan.org/release/Package-DeprecationManager";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -27192,7 +27192,7 @@ with self;
     };
     meta = {
       description = "Utilities to read and manipulate patches and CVS";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -27291,7 +27291,7 @@ with self;
     meta = {
       description = "Layout and render international text";
       homepage = "https://gtk2-perl.sourceforge.net";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -27426,7 +27426,7 @@ with self;
     meta = {
       description = "Validate method/function parameters";
       homepage = "https://metacpan.org/release/Params-Validate";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -27450,7 +27450,7 @@ with self;
     meta = {
       description = "Build an optimized subroutine parameter validator once, use it forever";
       homepage = "https://metacpan.org/release/Params-ValidationCompiler";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -27815,7 +27815,7 @@ with self;
     meta = {
       description = "Iterative, recursive file finder";
       homepage = "https://github.com/dagolden/Path-Iterator-Rule";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -27836,7 +27836,7 @@ with self;
     meta = {
       description = "File path utility";
       homepage = "https://github.com/dagolden/Path-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -27871,7 +27871,7 @@ with self;
     meta = {
       description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2";
       homepage = "https://github.com/dagolden/PBKDF2-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -27890,7 +27890,7 @@ with self;
     propagatedBuildInputs = [ FontTTF ];
     meta = {
       description = "Create, modify, and examine PDF files";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -27909,7 +27909,7 @@ with self;
     meta = {
       description = "Facilitates the creation and modification of PDF files";
       homepage = "https://metacpan.org/pod/PDF::Builder";
-      license = with lib.licenses; [ lgpl21Plus ];
+      license = lib.licenses.lgpl21Plus;
     };
   };
 
@@ -28087,7 +28087,7 @@ with self;
     meta = {
       description = "Community-inspired Perl::Critic policies";
       homepage = "https://github.com/Grinnz/Perl-Critic-Community";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -28106,7 +28106,7 @@ with self;
     meta = {
       description = "Policies for Perl::Critic concerned with using Moose";
       homepage = "https://metacpan.org/release/Perl-Critic-Moose";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -28159,7 +28159,7 @@ with self;
     meta = {
       description = "Some add-on policies for Perl::Critic";
       homepage = "https://user42.tuxfamily.org/perl-critic-pulp/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -28373,7 +28373,7 @@ with self;
     '';
     meta = {
       description = "Objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script";
-      license = with lib.licenses; [ imagemagick ];
+      license = lib.licenses.imagemagick;
     };
   };
 
@@ -28386,7 +28386,7 @@ with self;
     };
     meta = {
       description = "Indent and reformat perl scripts";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       mainProgram = "perltidy";
     };
   };
@@ -28804,7 +28804,7 @@ with self;
     meta = {
       description = "Determine minimum Perl version of POD directives";
       homepage = "https://user42.tuxfamily.org/pod-minimumversion/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
       mainProgram = "pod-minimumversion";
     };
   };
@@ -29003,7 +29003,7 @@ with self;
     };
     meta = {
       description = "Pattern-based Perl Recognizer";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.artturin ];
     };
   };
@@ -29034,7 +29034,7 @@ with self;
     };
     meta = {
       description = "Perl extension to access the unix process table";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -29238,7 +29238,7 @@ with self;
     meta = {
       description = "Optimized pure-perl Redis protocol parser/encoder";
       homepage = "https://github.com/Grinnz/Protocol-Redis-Faster";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -29294,7 +29294,7 @@ with self;
     };
     meta = {
       description = "Perl Web Server Gateway Interface Specification";
-      license = with lib.licenses; [ cc-by-sa-25 ];
+      license = lib.licenses.cc-by-sa-25;
     };
   };
 
@@ -29616,7 +29616,7 @@ with self;
     };
     meta = {
       description = "Modules for parsing/translating POD format documents";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
       mainProgram = "podselect";
     };
   };
@@ -29738,7 +29738,7 @@ with self;
     meta = {
       description = "Check POD L<> link references";
       homepage = "https://user42.tuxfamily.org/podlinkcheck/index.html";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -29869,7 +29869,7 @@ with self;
     meta = {
       description = "Formatter for spellchecking Pod";
       homepage = "https://github.com/perl-pod/Pod-Spell";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "podspell";
     };
   };
@@ -30068,7 +30068,7 @@ with self;
     meta = {
       description = "Facility for creating read-only scalars, arrays, hashes";
       homepage = "https://github.com/sanko/readonly";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30086,7 +30086,7 @@ with self;
     meta = {
       description = "Faster facility for creating read-only scalars, arrays, hashes";
       homepage = "https://github.com/sanko/readonly";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30129,7 +30129,7 @@ with self;
     meta = {
       description = "Perl binding for Redis database";
       homepage = "https://github.com/PerlRedis/perl-redis";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30142,7 +30142,7 @@ with self;
     };
     meta = {
       description = "Utility functions for checking references";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -30171,7 +30171,7 @@ with self;
     };
     meta = {
       description = "Provide commonly requested regular expressions";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -30895,7 +30895,7 @@ with self;
     };
     meta = {
       description = "Unordered collections (sets) of Perl Objects";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -30942,7 +30942,7 @@ with self;
     };
     meta = {
       description = "Library for parsing the output from SGMLS and NSGMLS parsers";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       mainProgram = "sgmlspl.pl";
     };
   };
@@ -31042,7 +31042,7 @@ with self;
     '';
     meta = {
       description = "IPv6 related part of the C socket.h defines and structure manipulators";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -31103,7 +31103,7 @@ with self;
     meta = {
       description = "Software::License pack for Creative Commons' licenses";
       homepage = "https://github.com/SineSwiper/Software-License-CCpack";
-      license = with lib.licenses; [ lgpl3Plus ];
+      license = lib.licenses.lgpl3Plus;
     };
   };
 
@@ -31162,7 +31162,7 @@ with self;
     meta = {
       description = "Type constraints and coercions for Perl";
       homepage = "https://metacpan.org/release/Specio";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -31184,7 +31184,7 @@ with self;
     meta = {
       description = "Path::Tiny types and coercions for Specio";
       homepage = "https://metacpan.org/release/Specio-Library-Path-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -31381,7 +31381,7 @@ with self;
     meta = {
       description = "PostgreSQL features for SQL::Abstract";
       homepage = "https://mojolicious.org";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -31602,7 +31602,7 @@ with self;
     propagatedBuildInputs = [ NumberFormat ];
     meta = {
       description = "Collection of very basic statistics modules";
-      license = with lib.licenses; [ lgpl2Only ];
+      license = lib.licenses.lgpl2Only;
     };
   };
 
@@ -31799,7 +31799,7 @@ with self;
     };
     meta = {
       description = "Perl interface for cyclic redundancy check generation";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -31905,7 +31905,7 @@ with self;
     };
     meta = {
       description = "Sprintf-like string formatting capabilities with arbitrary format definitions";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -31919,7 +31919,7 @@ with self;
     propagatedBuildInputs = [ SubExporter ];
     meta = {
       description = "Build sprintf-like functions of your own";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -31933,7 +31933,7 @@ with self;
     meta = {
       # https://metacpan.org/pod/String::Interpolate
       description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine";
-      license = with lib.licenses; [ gpl1Plus ];
+      license = lib.licenses.gpl1Plus;
     };
     propagatedBuildInputs = [
       PadWalker
@@ -32037,7 +32037,7 @@ with self;
     doCheck = true;
     meta = {
       description = "Calculate the similarity of two strings";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -32644,7 +32644,7 @@ with self;
     meta = {
       description = "Use mmap to map in a file as a Perl variable";
       maintainers = with maintainers; [ peterhoeg ];
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -32657,7 +32657,7 @@ with self;
     };
     meta = {
       description = "Memory information";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = [ maintainers.pSub ];
     };
   };
@@ -32888,7 +32888,7 @@ with self;
     meta = {
       description = "Install the CPAN dependencies of the Freecell Solver test suite";
       homepage = "https://metacpan.org/release/Task-FreecellSolver-Testing";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -32955,7 +32955,7 @@ with self;
     meta = {
       description = "Specifications for installing all the Test::Run";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -33124,7 +33124,7 @@ with self;
     ];
     meta = {
       description = "Adds a .json vmethod and a json filter";
-      license = with lib.licenses; [ bsd0 ];
+      license = lib.licenses.bsd0;
     };
   };
 
@@ -33430,7 +33430,7 @@ with self;
     };
     meta = {
       description = "Fully-featured shell-like command line environment";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -33529,7 +33529,7 @@ with self;
     };
     meta = {
       description = "Class to emulate a DEC VT102 terminal";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -33659,7 +33659,7 @@ with self;
     meta = {
       description = "Fail if tests warn";
       homepage = "https://metacpan.org/release/Test2-Plugin-NoWarnings";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -33793,7 +33793,7 @@ with self;
     '';
     meta = {
       description = "Simple set of building blocks for both unit and runtime testing";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -33852,7 +33852,7 @@ with self;
     meta = {
       description = "Provides a bits_is() subroutine for testing binary data";
       homepage = "https://metacpan.org/release/Test-Bits";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34020,7 +34020,7 @@ with self;
     };
     meta = {
       description = "Validate your CPAN META.json files";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34034,7 +34034,7 @@ with self;
     propagatedBuildInputs = [ JSON ];
     meta = {
       description = "Validate your CPAN META.json files";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34055,7 +34055,7 @@ with self;
     meta = {
       description = "Split data-driven tests into several test scripts";
       homepage = "https://metacpan.org/release/Test-Data-Split";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -34280,7 +34280,7 @@ with self;
     meta = {
       description = "Add test failures if warnings are caught";
       homepage = "https://github.com/dagolden/Test-FailWarnings";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -34341,7 +34341,7 @@ with self;
     meta = {
       description = "Test file attributes";
       homepage = "https://github.com/briandfoy/test-file";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34398,7 +34398,7 @@ with self;
     meta = {
       description = "Portable filename comparison";
       homepage = "https://metacpan.org/release/Test-Filename";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -34688,7 +34688,7 @@ with self;
     ];
     meta = {
       description = "Verifies code hasn't left circular references";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -34745,7 +34745,7 @@ with self;
     ];
     meta = {
       description = "Simulating other classes";
-      license = with lib.licenses; [ lgpl2Plus ];
+      license = lib.licenses.lgpl2Plus;
     };
   };
 
@@ -35018,7 +35018,7 @@ with self;
     };
     meta = {
       description = "Make sure you didn't emit any warnings while testing";
-      license = with lib.licenses; [ lgpl21Only ];
+      license = lib.licenses.lgpl21Only;
     };
   };
 
@@ -35048,7 +35048,7 @@ with self;
     propagatedBuildInputs = [ CaptureTiny ];
     meta = {
       description = "Utilities to test STDOUT and STDERR messages";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -35154,7 +35154,7 @@ with self;
     propagatedBuildInputs = [ PodCoverage ];
     meta = {
       description = "Check for pod coverage in your distribution";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -35309,7 +35309,7 @@ with self;
     buildInputs = [ CaptureTiny ];
     meta = {
       description = "Composable, reusable tests with roles and Moo";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -35356,7 +35356,7 @@ with self;
     meta = {
       description = "Base class to run standard TAP scripts";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35380,7 +35380,7 @@ with self;
     meta = {
       description = "Analyze tests from the command line using Test::Run";
       homepage = "http://web-cpan.berlios.de/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
       mainProgram = "runprove";
     };
   };
@@ -35402,7 +35402,7 @@ with self;
     meta = {
       description = "Define different interpreters for different test scripts with Test::Run";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35423,7 +35423,7 @@ with self;
     meta = {
       description = "Stop processing the entire test suite";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35445,7 +35445,7 @@ with self;
     meta = {
       description = "Make the file verdict ('ok', 'NOT OK')";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35466,7 +35466,7 @@ with self;
     meta = {
       description = "Test::Run plugin that";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35487,7 +35487,7 @@ with self;
     meta = {
       description = "Trim the first components";
       homepage = "https://web-cpan.shlomifish.org/modules/Test-Run";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35503,7 +35503,7 @@ with self;
     meta = {
       description = "Tests that an external program is valgrind-clean";
       homepage = "https://metacpan.org/release/Test-RunValgrind";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35581,7 +35581,7 @@ with self;
     propagatedBuildInputs = [ TextDiff ];
     meta = {
       description = "Test against data stored in automatically-named file";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -35687,7 +35687,7 @@ with self;
     meta = {
       description = "Temporary directories that stick around when tests fail";
       homepage = "https://github.com/dagolden/Test-TempDir-Tiny";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -35776,7 +35776,7 @@ with self;
     meta = {
       description = "Test for trailing space in source files";
       homepage = "https://metacpan.org/release/Test-TrailingSpace";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -35886,7 +35886,7 @@ with self;
     meta = {
       description = "Testing-specific WWW::Mechanize subclass";
       homepage = "https://github.com/libwww-perl/WWW-Mechanize";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36011,7 +36011,7 @@ with self;
     meta = {
       description = "Module to align text";
       homepage = "https://metacpan.org/release/Text-Aligner";
-      license = with lib.licenses; [ isc ];
+      license = lib.licenses.isc;
     };
   };
 
@@ -36342,7 +36342,7 @@ with self;
     meta = {
       description = "Test environment setup for development with IDE";
       homepage = "https://github.com/wchristian/Test-InDistDir";
-      license = with lib.licenses; [ wtfpl ];
+      license = lib.licenses.wtfpl;
       maintainers = [ maintainers.sgo ];
     };
   };
@@ -36433,7 +36433,7 @@ with self;
     meta = {
       description = "Interact with a t/test_manifest file";
       homepage = "https://github.com/briandfoy/test-manifest";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36451,7 +36451,7 @@ with self;
     ];
     meta = {
       description = "Convert Markdown syntax to (X)HTML";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       mainProgram = "Markdown.pl";
     };
   };
@@ -36525,7 +36525,7 @@ with self;
     ];
     meta = {
       description = "Convert MultiMarkdown syntax to (X)HTML";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       mainProgram = "MultiMarkdown.pl";
     };
   };
@@ -36540,7 +36540,7 @@ with self;
     meta = {
       description = "Compare the difference between numbers against a given tolerance";
       homepage = "https://github.com/dagolden/Test-Number-Delta";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -36586,7 +36586,7 @@ with self;
     propagatedBuildInputs = [ TextDiff ];
     meta = {
       description = "Patches text with given patch";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -36645,7 +36645,7 @@ with self;
     buildInputs = [ TestException ];
     meta = {
       description = "Read record-oriented files";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -36708,7 +36708,7 @@ with self;
     propagatedBuildInputs = [ UnicodeLineBreak ];
     meta = {
       description = "Simple eyecandy ASCII tables";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36739,7 +36739,7 @@ with self;
     meta = {
       description = "Sprintf-like function with named conversions";
       homepage = "https://metacpan.org/release/Text-Sprintf-Named";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -36754,7 +36754,7 @@ with self;
     meta = {
       description = "Organize Data in Tables";
       homepage = "https://metacpan.org/release/Text-Table";
-      license = with lib.licenses; [ isc ];
+      license = lib.licenses.isc;
     };
   };
 
@@ -36767,7 +36767,7 @@ with self;
     };
     meta = {
       description = "Display text in formatted table output";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -36841,7 +36841,7 @@ with self;
     propagatedBuildInputs = [ FileFindRulePerl ];
     meta = {
       description = "Check to see that version's in modules are sane";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -36883,7 +36883,7 @@ with self;
     env.NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF";
     meta = {
       description = "Remove accents from a string";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
       broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin
     };
   };
@@ -36930,7 +36930,7 @@ with self;
     };
     meta = {
       description = "Extract collocations and Ngrams from text";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
       maintainers = [ maintainers.bzizou ];
     };
   };
@@ -37079,7 +37079,7 @@ with self;
     propagatedBuildInputs = [ TieCacheLRU ];
     meta = {
       description = "Extends Tie::Cache::LRU with expiring";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -37093,7 +37093,7 @@ with self;
     meta = {
       description = "Cycle through a list of values via a scalar";
       homepage = "https://github.com/briandfoy/tie-cycle";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -37161,7 +37161,7 @@ with self;
     meta = {
       description = "Tied handle that hides the beginning of a file";
       homepage = "https://github.com/dagolden/tie-handle-offset";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -37191,7 +37191,7 @@ with self;
     };
     meta = {
       description = "Tied hash with specific methods overriden by callbacks";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -37220,7 +37220,7 @@ with self;
     };
     meta = {
       description = "Use regular expressions as hash keys";
-      license = with lib.licenses; [ artistic1 ];
+      license = lib.licenses.artistic1;
     };
   };
 
@@ -37395,7 +37395,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Parse and format time values";
-      license = with lib.licenses; [ publicDomain ];
+      license = lib.licenses.publicDomain;
     };
   };
 
@@ -37477,7 +37477,7 @@ with self;
     doCheck = false; # Expects working X11.
     meta = {
       description = "Tk - a Graphical User Interface Toolkit";
-      license = with lib.licenses; [ tcltk ];
+      license = lib.licenses.tcltk;
     };
   };
 
@@ -37569,7 +37569,7 @@ with self;
     meta = {
       description = "Minimal try/catch with proper preservation of $@";
       homepage = "https://github.com/p5sagit/Try-Tiny";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -37917,7 +37917,7 @@ with self;
     meta = {
       description = "Build a URI from a set of named parameters";
       homepage = "https://metacpan.org/release/URI-FromHash";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
     };
   };
 
@@ -38130,7 +38130,7 @@ with self;
     meta = {
       description = "UUIDs based on /dev/urandom or the Windows Crypto API";
       homepage = "https://github.com/dagolden/UUID-URandom";
-      license = with lib.licenses; [ asl20 ];
+      license = lib.licenses.asl20;
     };
   };
 
@@ -38250,7 +38250,7 @@ with self;
     meta = {
       description = "W3C Link Checker";
       homepage = "https://validator.w3.org/checklink";
-      license = with lib.licenses; [ w3c ];
+      license = lib.licenses.w3c;
       mainProgram = "checklink";
     };
   };
@@ -38305,7 +38305,7 @@ with self;
     doCheck = false; # performs network access
     meta = {
       description = "Perl extension interface for libcurl";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -38641,7 +38641,7 @@ with self;
     doCheck = false; # requires an X server
     meta = {
       description = "Provides GUI testing/interaction routines";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -38803,7 +38803,7 @@ with self;
     ];
     meta = {
       description = "Interface to XML::DOM toolset";
-      license = with lib.licenses; [ gpl2Only ];
+      license = lib.licenses.gpl2Only;
     };
   };
 
@@ -38911,7 +38911,7 @@ with self;
     propagatedBuildInputs = [ libxml_perl ];
     meta = {
       description = "Yet another Perl SAX XML Writer";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
       mainProgram = "xmlpretty";
     };
   };
@@ -38994,7 +38994,7 @@ with self;
     };
     meta = {
       description = "Perl implementation of the XML::Mini XML create/parse interface";
-      license = with lib.licenses; [ gpl3Plus ];
+      license = lib.licenses.gpl3Plus;
     };
   };
 
@@ -39071,7 +39071,7 @@ with self;
     propagatedBuildInputs = [ XMLParser ];
     meta = {
       description = "Parse and evaluate XPath statements";
-      license = with lib.licenses; [ artistic2 ];
+      license = lib.licenses.artistic2;
       mainProgram = "xpath";
     };
   };
@@ -39101,7 +39101,7 @@ with self;
     };
     meta = {
       description = "Regular expressions for XML tokens";
-      license = with lib.licenses; [ gpl2Plus ];
+      license = lib.licenses.gpl2Plus;
     };
   };
 
@@ -39369,7 +39369,7 @@ with self;
     };
     meta = {
       description = "Module for creating a XML document object oriented with on the fly validating towards the given DTD";
-      license = with lib.licenses; [ gpl1Only ];
+      license = lib.licenses.gpl1Only;
     };
   };
 
@@ -39507,7 +39507,7 @@ with self;
     meta = {
       description = "Fast, lightweight YAML loader and dumper";
       homepage = "https://github.com/toddr/YAML-Syck";
-      license = with lib.licenses; [ mit ];
+      license = lib.licenses.mit;
     };
   };
 
@@ -39728,7 +39728,7 @@ with self;
 
     meta = {
       description = "Run Zonemaster tests from the command line";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
       maintainers = with lib.maintainers; [ qbit ];
     };
   };
@@ -39773,7 +39773,7 @@ with self;
 
     meta = {
       description = "Tool to check the quality of a DNS zone";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 
@@ -39805,7 +39805,7 @@ with self;
     ];
     meta = {
       description = "Perl wrapper for the ldns DNS library";
-      license = with lib.licenses; [ bsd3 ];
+      license = lib.licenses.bsd3;
     };
   };
 

From 83c87b6daaf4fa2f9e738bfd03359bc7c88a14d0 Mon Sep 17 00:00:00 2001
From: Mica <paperdigits@users.noreply.github.com>
Date: Wed, 15 Jul 2026 11:09:20 -0700
Subject: [PATCH 0975/1386] darktable: remove paperdigits as maintainer

---
 pkgs/by-name/da/darktable/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index d70fc071213a..00b9c8d1264e 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -237,7 +237,6 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       flosse
       mrVanDalo
-      paperdigits
       freyacodes
     ];
   };

From 8844bd09de9baf1e0e2420b753118c331cb82c49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 18:11:35 +0000
Subject: [PATCH 0976/1386] yggdrasil-ng: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/yg/yggdrasil-ng/package.nix b/pkgs/by-name/yg/yggdrasil-ng/package.nix
index 04f621cbdbf5..5aeac7a7ebf9 100644
--- a/pkgs/by-name/yg/yggdrasil-ng/package.nix
+++ b/pkgs/by-name/yg/yggdrasil-ng/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (oldAttrs: {
   pname = "yggdrasil-ng";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Yggdrasil-ng";
     tag = "v${oldAttrs.version}";
-    hash = "sha256-Ic3r8xNeBMg+vN9C2JPRrpVRNHqT5XuDT+EoD493qdM=";
+    hash = "sha256-idhtzN1qJQ50u+1KjFVAxttR2pHKPp6iFvL6XTp3XFQ=";
   };
 
-  cargoHash = "sha256-eA5tXPqZJnRIYQGxmjOA8esDV8u74afWMfZ9bn9PsWE=";
+  cargoHash = "sha256-qJrRz2JIkQD185XY3tSbJFKZWCY0+1heT6MhIeH/52A=";
 
   __structuredAttrs = true;
 

From 909349e2afa55928b2db27a3921c323912daeb45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 18:30:22 +0000
Subject: [PATCH 0977/1386] python3Packages.pydemumble: 0.0.1 -> 0.1.2

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

diff --git a/pkgs/development/python-modules/pydemumble/default.nix b/pkgs/development/python-modules/pydemumble/default.nix
index 5ddb540b7963..411c4499151b 100644
--- a/pkgs/development/python-modules/pydemumble/default.nix
+++ b/pkgs/development/python-modules/pydemumble/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pydemumble";
-  version = "0.0.1";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = "pydemumble";
     tag = "v${version}";
-    hash = "sha256-JAUMTOYGHu64L0zLK2dzf0poHrGGiE29WoAR5kRsR+s=";
+    hash = "sha256-c6jKnWsB8Do076eiMQXNo0JNCiLNh9iMohEnBAf+YW8=";
     fetchSubmodules = true;
   };
 

From 8ac0a2ec2b3370667ea4da7e3c2af5ca79848a70 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Sat, 13 Dec 2025 02:01:02 +0100
Subject: [PATCH 0978/1386] rustfs: init at 1.0.0-beta.9

---
 pkgs/by-name/ru/rustfs/package.nix | 100 +++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 pkgs/by-name/ru/rustfs/package.nix

diff --git a/pkgs/by-name/ru/rustfs/package.nix b/pkgs/by-name/ru/rustfs/package.nix
new file mode 100644
index 000000000000..1a973ddb5281
--- /dev/null
+++ b/pkgs/by-name/ru/rustfs/package.nix
@@ -0,0 +1,100 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+  pnpm,
+  pnpmConfigHook,
+  nodejs,
+  rustPlatform,
+  protobuf,
+  cacert,
+}:
+
+let
+  console = stdenv.mkDerivation (finalAttrs: {
+    pname = "rustfs-console";
+    version = "0.1.13";
+    __structuredAttrs = true;
+    __darwinAllowLocalNetworking = true;
+
+    src = fetchFromGitHub {
+      owner = "rustfs";
+      repo = "console";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-pxpT3kV30qA+Ob/RWi11rsapGyNc6h1EN79fcPi1e1E=";
+    };
+
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      fetcherVersion = 4;
+      hash = "sha256-+U4HRaThEeC6jA6dA4UmhJLvANq0IMySOW5ua9m5Q6A=";
+    };
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm
+      pnpmConfigHook
+    ];
+
+    buildPhase = ''
+      pnpm run build
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      cp -r out/. $out/
+      runHook postInstall
+    '';
+  });
+in
+rustPlatform.buildRustPackage rec {
+  pname = "rustfs";
+  version = "1.0.0-beta.9";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "rustfs";
+    repo = "rustfs";
+    tag = version;
+    hash = "sha256-aNbicnNHaJn05k5EffgPEURf/Uj2A8PjOHiH2UGPz4M=";
+  };
+
+  postPatch = ''
+    rm -rf ./rustfs/static
+    cp -rL ${console} ./rustfs/static
+  '';
+
+  cargoHash = "sha256-abbsElP4dSSZnL4UfQEoHUtiEW8B/p6Y81UA7EbqbD4=";
+
+  nativeBuildInputs = [
+    protobuf
+    cacert
+  ];
+
+  env = {
+    RUSTFLAGS = "--cfg tokio_unstable";
+    # reqwest loads CA certs even if not used during tests
+    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  };
+
+  # Only build the main rustfs binary
+  cargoBuildFlags = "-p rustfs";
+  cargoTestFlags = "-p rustfs";
+
+  checkFlags = [
+    # failing since 1.0.0-beta.9, seem like upstream issues
+    "--skip=app::capacity_dirty_scope_test"
+    "--skip=app::delete_objects_stat_gating_test"
+    "--skip=app::put_prelookup_gating_test"
+    "--skip=two_embedded_servers_isolate_auth_and_data_planes"
+  ];
+
+  meta = {
+    description = "S3-compatible high-performance object storage system supporting migration and coexistence with other S3-compatible platforms such as MinIO and Ceph";
+    homepage = "https://github.com/rustfs/rustfs";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ marcel ];
+    mainProgram = "rustfs";
+  };
+}

From 81b44d852745e661d85729bec374841087e7791e Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Sat, 13 Dec 2025 02:02:00 +0100
Subject: [PATCH 0979/1386] nixos/rustfs: init

---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-servers/rustfs.nix | 151 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/rustfs.nix                        |  69 ++++++++
 pkgs/by-name/ru/rustfs/package.nix            |   5 +
 5 files changed, 227 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/rustfs.nix
 create mode 100644 nixos/tests/rustfs.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1b7c62d6b643..5596db7c60f2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1854,6 +1854,7 @@
   ./services/web-servers/nginx/tailscale-auth.nix
   ./services/web-servers/phpfpm/default.nix
   ./services/web-servers/pomerium.nix
+  ./services/web-servers/rustfs.nix
   ./services/web-servers/rustus.nix
   ./services/web-servers/send.nix
   ./services/web-servers/stargazer.nix
diff --git a/nixos/modules/services/web-servers/rustfs.nix b/nixos/modules/services/web-servers/rustfs.nix
new file mode 100644
index 000000000000..675a6314426b
--- /dev/null
+++ b/nixos/modules/services/web-servers/rustfs.nix
@@ -0,0 +1,151 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.rustfs;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    marcel
+  ];
+
+  options.services.rustfs = {
+    enable = lib.mkEnableOption "RustFS Object Storage Server";
+
+    package = lib.mkPackageOption pkgs "rustfs" { };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "rustfs";
+      description = "The user RustFS should run as.";
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "rustfs";
+      description = "The group RustFS should run as.";
+    };
+
+    settings = lib.mkOption {
+      default = { };
+      description = ''
+        Options for RustFS configuration. Refer to
+        <https://docs.rustfs.com/installation/linux/single-node-single-disk.html#_5-configure-environment-variables>
+        for details on supported values.
+      '';
+      example = lib.literalExpression ''
+        {
+          RUSTFS_CONSOLE_ENABLE = "true";
+          RUSTFS_VOLUMES = "/mnt/rustfs";
+        }
+      '';
+      type = lib.types.submodule {
+        freeformType = lib.types.attrsOf (
+          lib.types.oneOf [
+            lib.types.str
+            lib.types.int
+          ]
+        );
+        options = {
+          RUSTFS_VOLUMES = lib.mkOption {
+            type = lib.types.path;
+            default = "/var/lib/rustfs";
+            description = "The directory where RustFS stores it's data.";
+          };
+        };
+      };
+    };
+
+    environmentFile = lib.mkOption {
+      type = lib.types.str;
+      description = "Path to environment file containing secrets like RUSTFS_ACCESS_KEY or RUSTFS_SECRET_KEY.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = !(cfg.settings ? RUSTFS_ACCESS_KEY);
+        message = "RUSTFS_ACCESS_KEY must not be set in services.rustfs.settings. Use environmentFile instead.";
+      }
+      {
+        assertion = !(cfg.settings ? RUSTFS_SECRET_KEY);
+        message = "RUSTFS_SECRET_KEY must not be set in services.rustfs.settings. Use environmentFile instead.";
+      }
+    ];
+
+    systemd = {
+      tmpfiles.settings."10-rustfs".${cfg.settings.RUSTFS_VOLUMES}.d = {
+        inherit (cfg) user group;
+      };
+
+      # https://docs.rustfs.com/installation/linux/single-node-single-disk.html#_6-configure-system-service
+      services.rustfs = {
+        description = "RustFS Object Storage Server";
+        documentation = [ "https://rustfs.com/docs/" ];
+
+        after = [ "network-online.target" ];
+        wants = [ "network-online.target" ];
+
+        wantedBy = [ "multi-user.target" ];
+
+        environment = cfg.settings;
+
+        preStart = ''
+          if [ -z "$RUSTFS_ACCESS_KEY" ] || [ -z "$RUSTFS_SECRET_KEY" ]; then
+            echo "RustFS uses well-known default values for RUSTFS_ACCESS_KEY and RUSTFS_SECRET_KEY,"
+            echo "please configure them using services.rustfs.environmentFile."
+            exit 1
+          fi
+        '';
+
+        serviceConfig = {
+          Type = "notify";
+          NotifyAccess = "main";
+          User = cfg.user;
+          Group = cfg.group;
+
+          EnvironmentFile = cfg.environmentFile;
+          ExecStart = lib.getExe cfg.package;
+
+          LimitNOFILE = 1048576;
+          LimitNPROC = 32768;
+          TasksMax = "infinity";
+
+          Restart = "always";
+          RestartSec = "10s";
+
+          OOMScoreAdjust = "-1000";
+          SendSIGKILL = false;
+
+          TimeoutStartSec = "30s";
+          TimeoutStopSec = "30s";
+
+          NoNewPrivileges = true;
+
+          ProtectHome = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          ProtectClock = true;
+          ProtectKernelTunables = true;
+          ProtectKernelModules = true;
+          ProtectControlGroups = true;
+          RestrictSUIDSGID = true;
+          RestrictRealtime = true;
+        };
+      };
+    };
+
+    users = {
+      users.${cfg.user} = {
+        isSystemUser = true;
+        inherit (cfg) group;
+      };
+      groups.${cfg.group} = { };
+    };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5e7a1a12a29c..e3e189a80f65 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1512,6 +1512,7 @@ in
   rtkit = runTest ./rtkit.nix;
   rtorrent = runTest ./rtorrent.nix;
   rush = runTest ./rush.nix;
+  rustfs = runTest ./rustfs.nix;
   rustical = runTest ./web-apps/rustical.nix;
   rustls-libssl = runTest ./rustls-libssl.nix;
   rxe = runTest ./rxe.nix;
diff --git a/nixos/tests/rustfs.nix b/nixos/tests/rustfs.nix
new file mode 100644
index 000000000000..7cace30e3bfc
--- /dev/null
+++ b/nixos/tests/rustfs.nix
@@ -0,0 +1,69 @@
+{ pkgs, ... }:
+
+let
+  accessKey = "BKIKJAA5BMMU2RHO6IBB";
+  secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
+
+  rustfsPythonScript =
+    pkgs.writers.writePython3 "rustfs-test" { libraries = with pkgs.python3Packages; [ minio ]; }
+      /* python */ ''
+        import io
+        import os
+        from minio import Minio
+
+        minioClient = Minio(
+          'localhost:9000',
+          access_key='${accessKey}',
+          secret_key='${secretKey}',
+          secure=False
+        )
+        sio = io.BytesIO()
+        sio.write(b'Test from Python')
+        sio.seek(0, os.SEEK_END)
+        sio_len = sio.tell()
+        sio.seek(0)
+        minioClient.put_object(
+          'test-bucket',
+          'test.txt',
+          sio,
+          sio_len,
+          content_type='text/plain'
+        )
+      '';
+
+in
+{
+  name = "rustfs";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [
+      marcel
+    ];
+  };
+
+  containers.machine =
+    { pkgs, ... }:
+    {
+      services.rustfs = {
+        enable = true;
+        environmentFile = builtins.toString (
+          pkgs.writeText "rustfs-secrets.env" ''
+            RUSTFS_ACCESS_KEY=${accessKey}
+            RUSTFS_SECRET_KEY=${secretKey}
+          ''
+        );
+      };
+
+      environment.systemPackages = with pkgs; [ minio-client ];
+    };
+
+  testScript = /* python */ ''
+    machine.wait_for_unit("rustfs.service")
+
+    machine.succeed("mc alias set rustfs http://localhost:9000 ${accessKey} ${secretKey} --api s3v4")
+    machine.succeed("mc mb rustfs/test-bucket")
+    machine.succeed("${rustfsPythonScript}")
+    assert "test-bucket" in machine.succeed("mc ls rustfs")
+    assert "Test from Python" in machine.succeed("mc cat rustfs/test-bucket/test.txt")
+    machine.succeed("mc rb --force rustfs/test-bucket")
+  '';
+}
diff --git a/pkgs/by-name/ru/rustfs/package.nix b/pkgs/by-name/ru/rustfs/package.nix
index 1a973ddb5281..bd1f974cf4f6 100644
--- a/pkgs/by-name/ru/rustfs/package.nix
+++ b/pkgs/by-name/ru/rustfs/package.nix
@@ -9,6 +9,7 @@
   rustPlatform,
   protobuf,
   cacert,
+  nixosTests,
 }:
 
 let
@@ -90,6 +91,10 @@ rustPlatform.buildRustPackage rec {
     "--skip=two_embedded_servers_isolate_auth_and_data_planes"
   ];
 
+  passthru.tests = {
+    inherit (nixosTests) rustfs;
+  };
+
   meta = {
     description = "S3-compatible high-performance object storage system supporting migration and coexistence with other S3-compatible platforms such as MinIO and Ceph";
     homepage = "https://github.com/rustfs/rustfs";

From c187e9f688ba32d48a60de75a8f9fbed8b223997 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Wed, 15 Jul 2026 20:48:01 +0200
Subject: [PATCH 0980/1386] ungoogled-chromium: 150.0.7871.114-1 ->
 150.0.7871.124-1

https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_0353146366.html

This update includes 15 security fixes.

CVEs:
CVE-2026-15764 CVE-2026-15765 CVE-2026-15766 CVE-2026-15767
CVE-2026-15768 CVE-2026-15769 CVE-2026-15770 CVE-2026-15771
CVE-2026-15772 CVE-2026-15773 CVE-2026-15774 CVE-2026-15775
CVE-2026-15776 CVE-2026-15777 CVE-2026-15778
---
 .../networking/browsers/chromium/info.json    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index c4ef999b274b..33f308b23834 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -838,7 +838,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "150.0.7871.114",
+    "version": "150.0.7871.124",
     "deps": {
       "depot_tools": {
         "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
@@ -850,16 +850,16 @@
         "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
       },
       "ungoogled-patches": {
-        "rev": "150.0.7871.114-1",
-        "hash": "sha256-qvAtrj013U44vU+U3JLuItAPbgtHwm9Kq7hU2NLYDaE="
+        "rev": "150.0.7871.124-1",
+        "hash": "sha256-3dwDG3YuX/l5bOLcC3lICM2qmGnwVAPPJraDRaHZSe8="
       },
       "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "f405107495a07cb1bfcf687d4af8d91117098db6",
-        "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=",
+        "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa",
+        "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -929,8 +929,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "8d3c5a8caebd836b99fa32062951a401910eba33",
-        "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8="
+        "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
+        "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -1389,8 +1389,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272",
-        "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI="
+        "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8",
+        "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1494,8 +1494,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0",
-        "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA="
+        "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
+        "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1664,8 +1664,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16",
-        "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g="
+        "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744",
+        "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",

From 7f51f22af421adfbf2e3455285792e84ca512008 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Wed, 15 Jul 2026 20:51:31 +0200
Subject: [PATCH 0981/1386] python3Packages.nbxmpp: 7.2.0 -> 7.3.0

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

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index ae9ed1ea77a8..bdb62ba19ef9 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -14,17 +14,17 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "nbxmpp";
-  version = "7.2.0";
+  version = "7.3.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     domain = "dev.gajim.org";
     owner = "gajim";
     repo = "python-nbxmpp";
-    tag = version;
-    hash = "sha256-OtJzCcaqcy2a46iNRcpknORgdTbzMtILocs5c6Akzrc=";
+    tag = finalAttrs.version;
+    hash = "sha256-UsWCZ5g7LJImqc32kBfyLaGrT3DKsl8/muWUbPufmXs=";
   };
 
   nativeBuildInputs = [
@@ -50,8 +50,9 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
+    changelog = "https://dev.gajim.org/gajim/python-nbxmpp/-/blob/${finalAttrs.src.tag}/ChangeLog";
     description = "Non-blocking Jabber/XMPP module";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ haansn08 ];
   };
-}
+})

From 42465880f5ef9693a476fdf64e57f91441d6c5dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 12:27:26 +0000
Subject: [PATCH 0982/1386] tmuxPlugins.tokyo-night-tmux: 1.6.6 -> 1.8.1

Co-authored-by: redyf <mateusalvespereira7@gmail.com>
---
 pkgs/misc/tmux-plugins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 3ee51f489581..677de7c8b28c 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -976,12 +976,12 @@ in
   tokyo-night-tmux = mkTmuxPlugin {
     pluginName = "tokyo-night-tmux";
     rtpFilePath = "tokyo-night.tmux";
-    version = "1.6.6";
+    version = "1.8.1";
     src = pkgs.fetchFromGitHub {
       owner = "janoamaral";
       repo = "tokyo-night-tmux";
-      rev = "caf6cbb4c3a32d716dfedc02bc63ec8cf238f632";
-      hash = "sha256-TOS9+eOEMInAgosB3D9KhahudW2i1ZEH+IXEc0RCpU0=";
+      rev = "a39e00bf01fea05f916e4b7707bad5e64adee02c";
+      hash = "sha256-tmS0MBANSsTg53E2GB0TnjwGcZXboTRFNeDE6Ehn+bM=";
     };
     meta = {
       homepage = "https://github.com/janoamaral/tokyo-night-tmux";

From 6bea8bbfd01f70bb5fc3b2f10948b743242b7c19 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 15 Jul 2026 19:58:11 +0100
Subject: [PATCH 0983/1386] apparmor-utils: fix aa-remove-unknown

it seems this was linking against apparmor-parser whilst the file
doesn't actually exist there but rather apparmor-init
---
 pkgs/by-name/ap/apparmor-utils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix
index ac360b87646a..3ec57fde8ebe 100644
--- a/pkgs/by-name/ap/apparmor-utils/package.nix
+++ b/pkgs/by-name/ap/apparmor-utils/package.nix
@@ -11,7 +11,7 @@
   buildPackages,
 
   # apparmor deps
-  apparmor-parser,
+  apparmor-init,
 }:
 let
   inherit (python3Packages) libapparmor;
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication {
     cd utils
 
     substituteInPlace aa-remove-unknown \
-      --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions"
+      --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-init}/lib/apparmor/rc.apparmor.functions"
     substituteInPlace Makefile \
       --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
     sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile

From 3bb9258551869b50e077a50cc67e7bc7944ee16a Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Wed, 15 Jul 2026 21:07:34 +0200
Subject: [PATCH 0984/1386] gajim: 2.4.7.1 -> 2.5.0

---
 .../networking/instant-messengers/gajim/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index afbeaa4e4885..e9b623befca0 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -38,14 +38,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "gajim";
-  version = "2.4.7.1";
+  version = "2.5.0";
 
   src = fetchFromGitLab {
     domain = "dev.gajim.org";
     owner = "gajim";
     repo = "gajim";
-    tag = "${finalAttrs.version}+win";
-    hash = "sha256-/X2Xp1ZnPLTZc1Hf4Kp6R/+mezU6qoUhaT9OskYlnOY=";
+    tag = finalAttrs.version;
+    hash = "sha256-3/HQNizXLjeQpCdEK14LMflyNUKF1BI8eli3BGxiH40=";
   };
 
   pyproject = true;
@@ -55,11 +55,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     adwaita-icon-theme
     gtksourceview5
     glib-networking
+    gstreamer
+    gst-plugins-base
   ]
   ++ lib.optionals enableJingle [
     farstream
-    gstreamer
-    gst-plugins-base
     gst-libav
     gst-plugins-good
     libnice

From 2dc576e45f3da556245deb8413b7caee02d09853 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 15:25:41 +0000
Subject: [PATCH 0985/1386] cudatext: 1.234.4.1 -> 1.234.6.0

---
 pkgs/by-name/cu/cudatext/deps.json   | 8 ++++----
 pkgs/by-name/cu/cudatext/package.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json
index ba7392d2130e..f75d576ecf74 100644
--- a/pkgs/by-name/cu/cudatext/deps.json
+++ b/pkgs/by-name/cu/cudatext/deps.json
@@ -16,8 +16,8 @@
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2026.06.12",
-    "hash": "sha256-JTUxakTv9MVbMQArJJC995kSCD37Xs1rvLmDoyQhHf4="
+    "rev": "2026.06.24",
+    "hash": "sha256-mjvWki4rUSvSYCmqM2eLDwbsKHkSSnq4noZYJDby1rY="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
@@ -31,8 +31,8 @@
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
-    "rev": "2026.06.10",
-    "hash": "sha256-WZnGdl0lt8nOKKZsqPIcSRTVXYEixGKDHtMPveOvE5E="
+    "rev": "2026.07.08",
+    "hash": "sha256-mwFBB75vSCLiL1XQ0yR/Tf9ykTevdyAIYtYnusF77T0="
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",
diff --git a/pkgs/by-name/cu/cudatext/package.nix b/pkgs/by-name/cu/cudatext/package.nix
index 6f2445c3172a..d08496a0c29c 100644
--- a/pkgs/by-name/cu/cudatext/package.nix
+++ b/pkgs/by-name/cu/cudatext/package.nix
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cudatext";
-  version = "1.234.4.1";
+  version = "1.234.6.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     tag = finalAttrs.version;
-    hash = "sha256-/2OXF0ggbBvgAlQTeQcjxITd8UbdOc9Hruml112XoEU=";
+    hash = "sha256-4ahclaXYtHPepQRtvcYyYyD42pEJMngO5DJMItudQd0=";
   };
 
   patches = [ ./proc_globdata.patch ];

From 90299533d69c2cde7a5250f5630976bba6dfcc9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 19:26:43 +0000
Subject: [PATCH 0986/1386] virtnbdbackup: 2.46 -> 2.47

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

diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix
index cdff08d4a4d6..c5814e7db368 100644
--- a/pkgs/by-name/vi/virtnbdbackup/package.nix
+++ b/pkgs/by-name/vi/virtnbdbackup/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "virtnbdbackup";
-  version = "2.46";
+  version = "2.47";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "abbbi";
     repo = "virtnbdbackup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4UETKb0GSsX1etbj69bcI+hFzd7q4qFVyd6JE+KoCwk=";
+    hash = "sha256-YcSYuXL7jZn2g4Uluw35ID/1EqJCs8M2M+2dYywupjk=";
   };
 
   build-system = with python3Packages; [

From 7cedd313eee3c3f4f6ba75236fe34c57298c74c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Jul 2026 21:27:45 +0200
Subject: [PATCH 0987/1386] ripgrep: 15.1.0 -> 15.2.0

Diff: https://github.com/BurntSushi/ripgrep/compare/15.1.0...15.2.0

Changelog: https://github.com/BurntSushi/ripgrep/releases/tag/15.2.0
---
 pkgs/by-name/ri/ripgrep/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index fbfb4fc87bfc..6249e96438c3 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -17,7 +17,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ripgrep";
-  version = "15.1.0";
+  version = "15.2.0";
 
   __structuredAttrs = true;
 
@@ -25,10 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "BurntSushi";
     repo = "ripgrep";
     tag = finalAttrs.version;
-    hash = "sha256-0gjwYMUlXYnmIWQS1SVzF1yQw1lpveRLw5qp049lc3I=";
+    hash = "sha256-BsSIbZwB6s8i3dDTRYJ1EdVbJmiO0oxcLu6qiYlPkOI=";
   };
 
-  cargoHash = "sha256-ry3pLuYNwX776Dpj9IE2+uc7eEa5+sQvdNNeG1eJecs=";
+  cargoHash = "sha256-AqizStE9ICd6mNDZWdeXg6dHuTiY+B0TNauQQYWUa84=";
 
   nativeBuildInputs = [
     installShellFiles

From a07849623d5cab9be2d17567468a68d8fdf3d18f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 19:28:30 +0000
Subject: [PATCH 0988/1386] ntfs3g: 2026.2.25 -> 2026.7.7

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

diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix
index 8b4aa462b4e9..3c7d25a6d49a 100644
--- a/pkgs/by-name/nt/ntfs3g/package.nix
+++ b/pkgs/by-name/nt/ntfs3g/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ntfs3g";
-  version = "2026.2.25";
+  version = "2026.7.7";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "tuxera";
     repo = "ntfs-3g";
     tag = finalAttrs.version;
-    hash = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c=";
+    hash = "sha256-7Z3rMOHBwrWqkxeksic3+Z+WvwJy2ra9rRxGjESsd04=";
   };
 
   buildInputs = [

From 1b950b50bd4d9e75ac55f0002505be213f9d4f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@telecom-paris.fr>
Date: Mon, 13 Jul 2026 17:12:39 +0200
Subject: [PATCH 0989/1386] rocqPackages.mkRocqDerivation: change prefix for
 rocq

Make the defauult prefix be set to `[ "rocq" ]` (instead of
`[ "rocq-core" ]`) if `useCoq` is `false`.

This matches the opam convention and ensures that the default
`opam-name` will be correct.
---
 doc/languages-frameworks/rocq.section.md                 | 2 +-
 pkgs/build-support/rocq/default.nix                      | 9 +++++++--
 .../rocq-modules/mathcomp-analysis/default.nix           | 2 +-
 .../rocq-modules/mathcomp-bigenough/default.nix          | 2 +-
 .../development/rocq-modules/mathcomp-finmap/default.nix | 2 +-
 .../rocq-modules/mathcomp-real-closed/default.nix        | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/doc/languages-frameworks/rocq.section.md b/doc/languages-frameworks/rocq.section.md
index 056394056797..b93a2b62e33e 100644
--- a/doc/languages-frameworks/rocq.section.md
+++ b/doc/languages-frameworks/rocq.section.md
@@ -59,7 +59,7 @@ The recommended way of defining a derivation for a Rocq library, is to use the `
 * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags,
 * `releaseArtifact` (optional, defaults to `(v: null)`), provides a default mapping from release names to artifact names (only works for github artifact for now),
 * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers,
-* `namePrefix` (optional, defaults to `[ "rocq-core" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
+* `namePrefix` (optional, defaults to `[ "rocq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
 * `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set).
 * `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`,
 * `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements,
diff --git a/pkgs/build-support/rocq/default.nix b/pkgs/build-support/rocq/default.nix
index 5f6a1c535e0f..6a25a171cb25 100644
--- a/pkgs/build-support/rocq/default.nix
+++ b/pkgs/build-support/rocq/default.nix
@@ -162,8 +162,13 @@ let
     + optionalString (v == null) "-broken";
   useDune = args.useDune or (useDuneifVersion fetched.version);
   useCoq = args.useCoq or (useCoqifVersion fetched.version);
-  namePrefix = args.namePrefix or [ (if useCoq then "coq" else "rocq-core") ];
-  append-version = p: n: p + display-pkg n "" rocqPackages.${n}.version + "-";
+  namePrefix = args.namePrefix or [ (if useCoq then "coq" else "rocq") ];
+  append-version =
+    p: n:
+    let
+      version = if n == "rocq" then rocqPackages.rocq-core.version else rocqPackages.${n}.version;
+    in
+    p + display-pkg n "" version + "-";
   prefix-name = foldl append-version "" namePrefix;
   opam-name = args.opam-name or (concatStringsSep "-" (namePrefix ++ [ pname ]));
   rocq-core = if useCoq then coq // { rocq-version = coq.coq-version; } else args0.rocq-core;
diff --git a/pkgs/development/rocq-modules/mathcomp-analysis/default.nix b/pkgs/development/rocq-modules/mathcomp-analysis/default.nix
index c40340feeb35..3941139e8770 100644
--- a/pkgs/development/rocq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/rocq-modules/mathcomp-analysis/default.nix
@@ -85,7 +85,7 @@ let
           ;
 
         namePrefix = [
-          "rocq-core"
+          "rocq"
           "mathcomp"
         ];
 
diff --git a/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix b/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix
index 2643fdda7456..71f3ca0c6be2 100644
--- a/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix
+++ b/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix
@@ -9,7 +9,7 @@
 mkRocqDerivation {
 
   namePrefix = [
-    "rocq-core"
+    "rocq"
     "mathcomp"
   ];
   pname = "bigenough";
diff --git a/pkgs/development/rocq-modules/mathcomp-finmap/default.nix b/pkgs/development/rocq-modules/mathcomp-finmap/default.nix
index 5fd9b61f82e4..8e5ed395218d 100644
--- a/pkgs/development/rocq-modules/mathcomp-finmap/default.nix
+++ b/pkgs/development/rocq-modules/mathcomp-finmap/default.nix
@@ -9,7 +9,7 @@
 mkRocqDerivation {
 
   namePrefix = [
-    "rocq-core"
+    "rocq"
     "mathcomp"
   ];
   pname = "finmap";
diff --git a/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix b/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix
index e260b8308d0b..8a8fa9c78a2c 100644
--- a/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix
+++ b/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix
@@ -10,7 +10,7 @@
 mkRocqDerivation {
 
   namePrefix = [
-    "rocq-core"
+    "rocq"
     "mathcomp"
   ];
   pname = "real-closed";

From 4081e2d179462879a81aea78b5ac58736a784316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Jul 2026 21:45:27 +0200
Subject: [PATCH 0990/1386] 
 home-assistant-custom-lovelace-modules.horizon-card: 1.4.5 -> 1.5.0

Diff: https://github.com/rejuvenate/lovelace-horizon-card/compare/v1.4.5...v1.5.0

Changelog: https://github.com/rejuvenate/lovelace-horizon-card/releases/tag/v1.5.0
---
 .../custom-lovelace-modules/horizon-card/package.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
index 615335c38064..26e707d2ca36 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "horizon-card";
-  version = "1.4.5";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "rejuvenate";
     repo = "lovelace-horizon-card";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3HYAo5BRnWmI8OWrWmA1V1ctPC1zlcFLAFuSfsDhtjo=";
+    hash = "sha256-pUZoraOD4jLxun/I3OkIgcy45es3a0Sdh5GTEG2oNK4=";
   };
 
   patches = [

From b8e34a7948dfa3ffc32ee78fc870d668425ab263 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 20:08:42 +0000
Subject: [PATCH 0991/1386] lumen: 2.30.0 -> 2.31.0

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

diff --git a/pkgs/by-name/lu/lumen/package.nix b/pkgs/by-name/lu/lumen/package.nix
index af26fb66b206..71962b623652 100644
--- a/pkgs/by-name/lu/lumen/package.nix
+++ b/pkgs/by-name/lu/lumen/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lumen";
-  version = "2.30.0";
+  version = "2.31.0";
 
   __structuredAttrs = true;
 
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "jnsahaj";
     repo = "lumen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EoxMYlWHmuprjjhvj3GyCxGDIcT/d+JMda9j75pqs+k=";
+    hash = "sha256-RoOCBwmBIOu17h0cB/t69lw1NWGl6chwAEgK4QixsPs=";
   };
 
-  cargoHash = "sha256-qTFRfy+Wutee5SbaMaqcYjXgr6xZKYYBIuyVA7jAGiY=";
+  cargoHash = "sha256-RKSFbsqeR+m/VLs1qu6Ln4bZ9prYj5vUoemuLpSe5+M=";
 
   strictDeps = true;
 

From 9421183a6909af00afd5093c6ddee7261d9af9ca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:17:22 +0200
Subject: [PATCH 0992/1386] python3Packages.tencentcloud-sdk-python: 3.1.132 ->
 3.1.133

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.132...3.1.133

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.133/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 47f0ed598f08..ad792af8927e 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.132";
+  version = "3.1.133";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-jfjArHN7+HARacfaePaP6+LsXNFK1uOHGoylc4FO46I=";
+    hash = "sha256-E9xxurSGAvJd4f2CGxI8IR9mSGTwGpOLqNMSEhrhOXY=";
   };
 
   build-system = [ setuptools ];

From c45e631d7b914775649c02407e1977d4e02c9b30 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 15 Jul 2026 22:19:09 +0200
Subject: [PATCH 0993/1386] datalab: add wayland support

---
 pkgs/development/python-modules/datalab-platform/default.nix | 5 +++++
 pkgs/development/python-modules/sigima/default.nix           | 1 +
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/datalab-platform/default.nix b/pkgs/development/python-modules/datalab-platform/default.nix
index 0c71b8aecb1f..f4012144743d 100644
--- a/pkgs/development/python-modules/datalab-platform/default.nix
+++ b/pkgs/development/python-modules/datalab-platform/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -72,6 +73,9 @@ buildPythonPackage (finalAttrs: {
 
   buildInputs = [
     qt5.qtbase
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qt5.qtwayland
   ];
 
   build-system = [
@@ -136,6 +140,7 @@ buildPythonPackage (finalAttrs: {
 
   pythonRelaxDeps = [
     "guidata"
+    "numpy"
     "plotpy"
     "scipy"
   ];
diff --git a/pkgs/development/python-modules/sigima/default.nix b/pkgs/development/python-modules/sigima/default.nix
index bf67ac8b0666..4ba1f3fe14f5 100644
--- a/pkgs/development/python-modules/sigima/default.nix
+++ b/pkgs/development/python-modules/sigima/default.nix
@@ -119,6 +119,7 @@ buildPythonPackage (finalAttrs: {
   ];
 
   pythonRelaxDeps = [
+    "numpy"
     "scipy"
   ];
 

From 82257ad240bded1aa597a522b51bd8533dda43c6 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 22:25:35 +0200
Subject: [PATCH 0994/1386] perlPackages.JavaScriptMinifierXS: 0.15 -> 0.16

https://metacpan.org/release/GTERMARS/JavaScript-Minifier-XS-0.16/changes

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 059b36670216..6b166ee6490f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -18399,10 +18399,10 @@ with self;
 
   JavaScriptMinifierXS = buildPerlPackage {
     pname = "JavaScript-Minifier-XS";
-    version = "0.15";
+    version = "0.16";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.15.tar.gz";
-      hash = "sha256-XZsDT1jwtv9bZGR708WpzgWypw7e4zn7wxc67nR8wFA=";
+      url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.16.tar.gz";
+      hash = "sha256-dQNOh2k568PdSM4uuvBgRLBu1XqzoYY/BT+VDphNmVQ=";
     };
     buildInputs = [ TestDiagINC ];
     meta = {

From 5f123df6f0320323ec2e0a311cf045d994d40e77 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:28:55 +0200
Subject: [PATCH 0995/1386] python313Packages.iamdata: 0.1.202607081 ->
 0.1.202607151

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202607081...v0.1.202607151

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202607151
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 3559b8146bfc..22b30fdbdd5c 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202607081";
+  version = "0.1.202607151";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5bVmdhbO2Gv4CvkZDGR/k4j9S8+vlTJXPI4hyVnyb54=";
+    hash = "sha256-MGKX+QzsXyohsRHHy4qt+H4BemgvJesKwKzi2KrETr4=";
   };
 
   __darwinAllowLocalNetworking = true;

From 1caabe30b4216c5ec935e90a73b00bf613b3fe9f Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 10 Jul 2026 23:21:22 -0700
Subject: [PATCH 0996/1386] kalamine: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ka/kalamine/package.nix | 29 ++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix
index faca12ca4c63..5963e2cd1375 100644
--- a/pkgs/by-name/ka/kalamine/package.nix
+++ b/pkgs/by-name/ka/kalamine/package.nix
@@ -1,26 +1,30 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "kalamine";
   version = "0.40";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "OneDeadKey";
     repo = "kalamine";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-9R8N5p+VNuiqTl3a0SSmJEVg3Ol76nROf43GsdOdJL8=";
   };
 
-  nativeBuildInputs = [
-    python3.pkgs.hatchling
+  build-system = [
+    python3Packages.hatchling
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3Packages; [
     click
     livereload
     lxml
@@ -31,6 +35,19 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   pythonImportsCheck = [ "kalamine" ];
 
+  # https://github.com/OneDeadKey/kalamine/blob/a9724bf6e93a34c740f9349b8811b2e51cc62c41/Makefile#L39
+  preCheck = ''
+    python -m kalamine.cli build layouts/*.toml
+  '';
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckProgramArg = "version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+
   meta = {
     description = "Keyboard Layout Maker";
     homepage = "https://github.com/OneDeadKey/kalamine/";

From c3f91bc1940a5730bcfc96c80980ed6832e1768f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 13:31:07 -0700
Subject: [PATCH 0997/1386] python3Packages.qh3: 1.9.3 -> 1.9.4

Diff: https://github.com/jawah/qh3/compare/v1.9.3...v1.9.4

Changelog: https://github.com/jawah/qh3/blob/v1.9.4/CHANGELOG.rst
---
 pkgs/development/python-modules/qh3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix
index 4773e622ff7f..60dc5bf1b519 100644
--- a/pkgs/development/python-modules/qh3/default.nix
+++ b/pkgs/development/python-modules/qh3/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "qh3";
-  version = "1.9.3";
+  version = "1.9.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "qh3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-m77m+uw6tntW+YEo0+hKZx8EePNcoivBZC84X7RDu5o=";
+    hash = "sha256-Mu9wvwHHn5wZfE+TdMu/nr2B7+WbFhFHDoItDs6rRPM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-mQ7kRXi5dqSJ1D58rZivKVO6j3SC+9GkDZkErU21cQc=";
+    hash = "sha256-bwdaM+DdXm5YpzVlyYdDqnR+QQ0dY199DYN2g33RvCs=";
   };
 
   nativeBuildInputs = [

From 16d3d4fb6d7b194b01ac1091448a3f2174f7d236 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 15 Jul 2026 22:28:14 +0200
Subject: [PATCH 0998/1386] nginxMainline: 1.31.2 -> 1.31.3

https://github.com/nginx/nginx/releases/tag/release-1.31.3

fixes:
- CVE-2026-42533
- CVE-2026-60005
- CVE-2026-56434
---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index ffdd1b43b0f5..6ebaf7704ae6 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.31.2";
-  hash = "sha256-ryqVfEHaY23cT4g+RSPG0UC0eE285CAAw2SuUJKqRzw=";
+  version = "1.31.3";
+  hash = "sha256-p2V8UIEcLZLZiVOV6Lhz72A5gULE2yHrZHgRw49t1SU=";
 }

From 94585324b29e23372861ab40d0aa79e661ffcae4 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 15 Jul 2026 22:28:14 +0200
Subject: [PATCH 0999/1386] nginxStable: 1.30.3 -> 1.30.4

https://github.com/nginx/nginx/releases/tag/release-1.30.4

fixes:
- CVE-2026-42533
- CVE-2026-60005
- CVE-2026-56434
---
 pkgs/servers/http/nginx/stable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index c67b76e64573..68a9d225a8d7 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.30.3";
-  hash = "sha256-5YI9xvRWEJk975Pr9s/OaCZK9JWMd+h0t9IPNwkAG48=";
+  version = "1.30.4";
+  hash = "sha256-QmHckOnkfBxAQSdumqo9SOvi5mT3KOFPqVrmxn1XoIs=";
 }

From 745c1786e214d08eb5090ea5f7422b37a7e12550 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 10 Jul 2026 16:42:36 -0700
Subject: [PATCH 1000/1386] celestia: 1.6.4 -> 1.6.4-unstable-2026-07-02

CMakeLists.txt marks this 1.7.0 since https://github.com/CelestiaProject/Celestia/commit/af9c3fa01ce7b2c14e5aa0047e6136179c5d63cd
---
 pkgs/by-name/ce/celestia/content.nix | 50 ++++++++++++++++
 pkgs/by-name/ce/celestia/package.nix | 87 ++++++++++++++++++----------
 2 files changed, 106 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/by-name/ce/celestia/content.nix

diff --git a/pkgs/by-name/ce/celestia/content.nix b/pkgs/by-name/ce/celestia/content.nix
new file mode 100644
index 000000000000..4af7acfeac44
--- /dev/null
+++ b/pkgs/by-name/ce/celestia/content.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gettext,
+  imagemagick,
+}:
+
+stdenv.mkDerivation {
+  pname = "celestia-content";
+  version = "0-unstable-2026-07-19";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "CelestiaProject";
+    repo = "CelestiaContent";
+    rev = "724b9545b72c56c1a9afeda35d48f611e4f0d20f";
+    hash = "sha256-4wicyDIvBK3gD6pAgFO0YH5gRT8E7/g9Qr3YDbRKHVw=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    gettext
+    imagemagick
+  ];
+
+  meta = {
+    description = "Data files for Celestia space simulator";
+    maintainers = with lib.maintainers; [ pancaek ];
+    license =
+      with lib.licenses;
+      AND [
+        cc-by-30
+        cc-by-40
+        cc-by-nc-sa-30
+        # (unused according to upstream CI, at least for now)
+        # cc-by-sa-30
+        cc-by-sa-40
+        cc0
+        gpl2Plus
+        jpl-image
+        cc-by-nc-30-igo
+        # some files are unlicensed so far, so to be safe let's mark unfree also
+        unfree
+      ];
+  };
+}
diff --git a/pkgs/by-name/ce/celestia/package.nix b/pkgs/by-name/ce/celestia/package.nix
index 8e6d4fbcace6..0c7c379628a8 100644
--- a/pkgs/by-name/ce/celestia/package.nix
+++ b/pkgs/by-name/ce/celestia/package.nix
@@ -2,77 +2,102 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   pkg-config,
   libglut,
-  gtk2,
-  gnome2,
   libjpeg_turbo,
-  libtheora,
-  libxmu,
   lua,
   libGLU,
   libGL,
   perl,
-  autoreconfHook,
+  eigen,
+  freetype,
+  cmake,
+  libepoxy,
+  libpng,
+  boost,
+  fmt,
+  libavif,
+  ffmpeg,
+  gperf,
+  gettext,
+  qt6Packages,
+  callPackage,
+  celestia-content ? callPackage ./content.nix { },
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "celestia";
-  version = "1.6.4";
+  version = "1.6.4-unstable-2026-07-02";
 
   src = fetchFromGitHub {
     owner = "CelestiaProject";
     repo = "Celestia";
-    rev = version;
-    sha256 = "sha256-MkElGo1ZR0ImW/526QlDE1ePd+VOQxwkX7l+0WyZ6Vs=";
+    rev = "ded2c69ec7b819640a6c807fc7d4280bbf08e26b";
+    hash = "sha256-GDp31jwY9ifppUJ3Yy84E+x33O4+UmR/ODrHwH2HyeM=";
+    fetchSubmodules = true;
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/CelestiaProject/Celestia/commit/94894bed3bf98d41c5097e7829d491d8ff8d4a62.patch?full_index=1";
-      hash = "sha256-hEZ6BhSEx6Qm+fLisc63xSCDT6GX92AHD0BuldOhzFk=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace configure.ac \
-      --replace-fail "dnl AM_GNU_GETTEXT_VERSION([0.15])" "AM_GNU_GETTEXT_VERSION([0.15])"
-  '';
+  strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     pkg-config
-    autoreconfHook
+    cmake
+    gperf
+    gettext
+    qt6Packages.wrapQtAppsHook
   ];
+
   buildInputs = [
+    qt6Packages.qtbase
     libglut
-    gtk2
-    gnome2.gtkglext
     lua
     perl
     libjpeg_turbo
-    libtheora
-    libxmu
+    eigen
+    libepoxy
+    libpng
+    fmt
+    boost
+    libavif
+    ffmpeg
+    freetype
     libGLU
     libGL
   ];
 
-  configureFlags = [
-    "--with-gtk"
-    "--with-lua=${lua}"
+  cmakeFlags = [
+    (lib.cmakeFeature "ENABLE_QT6" "ON")
+    (lib.cmakeFeature "ENABLE_FFMPEG" "ON")
+    (lib.cmakeFeature "ENABLE_LIBAVIF" "ON")
+    (lib.cmakeFeature "GIT_COMMIT" "${finalAttrs.src.rev}")
   ];
 
   enableParallelBuilding = true;
 
+  qtWrapperArgs = [
+    "--unset"
+    "QT_QPA_PLATFORMTHEME"
+    "--unset"
+    "QT_STYLE_OVERRIDE"
+  ];
+
+  postInstall = ''
+    cp -r ${celestia-content}/share/celestia/* $out/share/celestia
+    cp -r ${celestia-content}/share/locale/* $out/share/locale
+  '';
+
   meta = {
     homepage = "https://celestiaproject.space/";
     description = "Real-time 3D simulation of space";
     mainProgram = "celestia";
-    changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
+    # no tagged release for ages, remove this for now
+    # changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       returntoreality
+      pancaek
     ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 4e8b4f73b6e795249b47e82b65a85278c1f556d2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 11:00:10 +0200
Subject: [PATCH 1001/1386] python3Packages.mypy-boto3-es: 1.43.7 -> 1.43.47

---
 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 d06dbab6117e..60b765986cce 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -511,8 +511,8 @@ in
       "sha256-vJVCkj3pNY8p6UKnr1zdMy8um84ONHYEYG2izkVaNA8=";
 
   mypy-boto3-es =
-    buildMypyBoto3Package "es" "1.43.7"
-      "sha256-ECDgtsDWKJGlXAI0KrwcVwDO3mqkHMm7wdW6pSVQ0hk=";
+    buildMypyBoto3Package "es" "1.43.47"
+      "sha256-5oCX/SqzPteV6nkys8NQXuFB5AX9VURIidU4MBmJil8=";
 
   mypy-boto3-events =
     buildMypyBoto3Package "events" "1.43.0"

From cbea3805cf6627a0f2b38d8d4d3d6871fd7e051e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 11:00:21 +0200
Subject: [PATCH 1002/1386] python3Packages.mypy-boto3-gamelift: 1.43.33 ->
 1.43.47

---
 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 60b765986cce..abf7e4c1c32c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -559,8 +559,8 @@ in
       "sha256-4roB3AEdN4zXGceUNkrmarmTThmPbS9SltvHG6kF+84=";
 
   mypy-boto3-gamelift =
-    buildMypyBoto3Package "gamelift" "1.43.33"
-      "sha256-OVgUWPp91lYeOXZpFDYRiRxxLWt6xbI6Ib2aozMu2eU=";
+    buildMypyBoto3Package "gamelift" "1.43.47"
+      "sha256-RG+oi43/mshz3rbssYLfx6lI7VN5E7VHMiA7vFavJP4=";
 
   mypy-boto3-glacier =
     buildMypyBoto3Package "glacier" "1.43.0"

From 9e5d2ba798afd87eeffac42d2a74b150ab6f7013 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 11:00:28 +0200
Subject: [PATCH 1003/1386] python3Packages.mypy-boto3-guardduty: 1.43.45 ->
 1.43.47

---
 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 abf7e4c1c32c..979216c21656 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -590,8 +590,8 @@ in
       "sha256-+DDeD9YWo98meLZU2Mzu5AE0S7HFg6kfxeUWUh9XcQA=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.43.45"
-      "sha256-i/5xOzymGSnyYznSODZCBgCZM1JRXz7R9VKU71J9yNs=";
+    buildMypyBoto3Package "guardduty" "1.43.47"
+      "sha256-0+dEQ+FP/r1o+8XTKS/wG67RLb9euBEaU3dz4m4r4GI=";
 
   mypy-boto3-health =
     buildMypyBoto3Package "health" "1.43.0"

From 578f2e195bd727a4332e00688a123a5b734ea612 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 11:00:57 +0200
Subject: [PATCH 1004/1386] python3Packages.mypy-boto3-lambda: 1.43.46 ->
 1.43.47

---
 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 979216c21656..152f13f4f411 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -766,8 +766,8 @@ in
       "sha256-gYTCgaRwH3zKi6gg4MC8DUwXQT+jZO6lqc/vi+JUahU=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.43.46"
-      "sha256-mM1VwviZXBkkjd5PBEpJKZSDCoyV6VH26erz78gJKSk=";
+    buildMypyBoto3Package "lambda" "1.43.47"
+      "sha256-IaFTzlMYq0bEBdIy58yCl76Z1g839YRxlFs4E2N6emg=";
 
   mypy-boto3-lex-models =
     buildMypyBoto3Package "lex-models" "1.43.3"

From abe4b34ee216acb719e15bf84aacf3fb71c23fc8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 11:01:49 +0200
Subject: [PATCH 1005/1386] python3Packages.mypy-boto3-redshift-serverless:
 1.43.0 -> 1.43.47

---
 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 152f13f4f411..7f22f6657b62 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1098,8 +1098,8 @@ in
       "sha256-N8VjcHLbK2bd2Nd338HZvA3gfoSN581qMsbIjkdv1QI=";
 
   mypy-boto3-redshift-serverless =
-    buildMypyBoto3Package "redshift-serverless" "1.43.0"
-      "sha256-wDNJZO9wawzUzfDG7Qo7If/J1wUhrqNxklBEv4Wd4dg=";
+    buildMypyBoto3Package "redshift-serverless" "1.43.47"
+      "sha256-VaYGoE0AFuPeosL6DzjUMOL057iZw65IUQfG85aEjAo=";
 
   mypy-boto3-rekognition =
     buildMypyBoto3Package "rekognition" "1.43.0"

From ab2e9499bda0286c50c5cb946e2395b6a4ec5c9e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Jul 2026 11:02:58 +0200
Subject: [PATCH 1006/1386] python3Packages.boto3-stubs: 1.43.46 -> 1.43.47

---
 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 fdec0666c2b9..d6ce9e1225eb 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.43.46";
+  version = "1.43.47";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-dlHkPTCFXU3WqNqVSapQvlAOqnMBqfG+itIHkc4jbxw=";
+    hash = "sha256-MrFqvlVT8x3UPlEBPJJW/qcMnTP3ySqG4AL8J1uHaAc=";
   };
 
   build-system = [ setuptools ];

From 279f708c88e620bdb417fb84aef7e3e74bbc9bd8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:36:29 +0200
Subject: [PATCH 1007/1386] python3Packages.mypy-boto3-connect: 1.43.45 ->
 1.43.48

---
 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 7f22f6657b62..5127b7b6cf7e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -335,8 +335,8 @@ in
       "sha256-3JYcWKFk0dKJg/qn+EBvxeAO5xh5PXCU3dTEWDr1oXI=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.43.45"
-      "sha256-HLKYdoO/ueyNxBEzAj6Rgzvzvcid7PPgjrzdNxmWF5s=";
+    buildMypyBoto3Package "connect" "1.43.48"
+      "sha256-M6zWE3yVBrBVpZqbftDuTIOUwmwmvbV/JLIZ0GDnBms=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.43.0"

From 058e5e1a02e92a740ce5cd542bc6955fe8e61500 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:36:41 +0200
Subject: [PATCH 1008/1386] python3Packages.mypy-boto3-drs: 1.43.0 -> 1.43.48

---
 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 5127b7b6cf7e..8b902b9841b0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -423,8 +423,8 @@ in
       "sha256-67KqkSc8oUjKhuvQW6glmb211JZd+xkF03Mt8FISE8k=";
 
   mypy-boto3-drs =
-    buildMypyBoto3Package "drs" "1.43.0"
-      "sha256-1cKleN7L5xTlQCPq3OKiSQcnkeooPKS1AqIg1sBXOMk=";
+    buildMypyBoto3Package "drs" "1.43.48"
+      "sha256-tuVUCFE6CpcuKu9+hEOev1iIHqP3WFf9Ho4BTSvoMd8=";
 
   mypy-boto3-ds =
     buildMypyBoto3Package "ds" "1.43.0"

From 40244182589a4b468a29ee084eb036a02be22baa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:36:51 +0200
Subject: [PATCH 1009/1386] python3Packages.mypy-boto3-elbv2: 1.43.0 -> 1.43.49

---
 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 8b902b9841b0..8aeb8e04806b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -491,8 +491,8 @@ in
       "sha256-ft2sKNwhMdRhms/ZXOetpR/gnB3YNYGsbQWQySagk2E=";
 
   mypy-boto3-elbv2 =
-    buildMypyBoto3Package "elbv2" "1.43.0"
-      "sha256-duh/9/eUhdVkmkEgdf5EB5nbp/TlXQQLMMAorlYPRu8=";
+    buildMypyBoto3Package "elbv2" "1.43.49"
+      "sha256-j2IENj3FybRDIuhTUrKD3wbmhFbvy5XyZFHC//a+duk=";
 
   mypy-boto3-emr =
     buildMypyBoto3Package "emr" "1.43.23"

From 261dea33ff492c0cd192431a498e150545da3b0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:36:53 +0200
Subject: [PATCH 1010/1386] python3Packages.mypy-boto3-emr-containers: 1.43.0
 -> 1.43.48

---
 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 8aeb8e04806b..dbe7e3d319d4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -499,8 +499,8 @@ in
       "sha256-eaShKsX1+JR8ZOm70f1bMkUeJB/NEhq1xVOpCu4AGGA=";
 
   mypy-boto3-emr-containers =
-    buildMypyBoto3Package "emr-containers" "1.43.0"
-      "sha256-fvFFfq6wf98uG59Zb4dQFIx+i+NH14zn94lX7jwKPkI=";
+    buildMypyBoto3Package "emr-containers" "1.43.48"
+      "sha256-yEvsOJzD5qVgWSvpJN2Whaw031yfmLituv1Wo/Ctmc0=";
 
   mypy-boto3-emr-serverless =
     buildMypyBoto3Package "emr-serverless" "1.43.24"

From e1aa597dad37138af37159acc459b6b4122cfbfb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:37:07 +0200
Subject: [PATCH 1011/1386] python3Packages.mypy-boto3-healthlake: 1.43.33 ->
 1.43.49

---
 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 dbe7e3d319d4..1e30363d24d8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -598,8 +598,8 @@ in
       "sha256-UHDodWN6MLV54LA31Pc7vlMr7a0tVrmCfVjXl96cjsE=";
 
   mypy-boto3-healthlake =
-    buildMypyBoto3Package "healthlake" "1.43.33"
-      "sha256-KBy7YsMMoTw7A+HPAA4hFKJ/cesmuBuiucPuCGkTlgI=";
+    buildMypyBoto3Package "healthlake" "1.43.49"
+      "sha256-oPQuxAKSUTpHGyq1J80W57cISh+d+4IGN8ClJdhkfnw=";
 
   mypy-boto3-iam =
     buildMypyBoto3Package "iam" "1.43.29"

From 5429c20ca2d4542e498f97613f0a1485f058ff60 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:37:29 +0200
Subject: [PATCH 1012/1386] python3Packages.mypy-boto3-lambda: 1.43.47 ->
 1.43.48

---
 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 1e30363d24d8..852ebbf9de56 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -766,8 +766,8 @@ in
       "sha256-gYTCgaRwH3zKi6gg4MC8DUwXQT+jZO6lqc/vi+JUahU=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.43.47"
-      "sha256-IaFTzlMYq0bEBdIy58yCl76Z1g839YRxlFs4E2N6emg=";
+    buildMypyBoto3Package "lambda" "1.43.48"
+      "sha256-94PUbPDQAeunE7As6Yo5Vv+Q9KAt/phsDde6wyA0ywc=";
 
   mypy-boto3-lex-models =
     buildMypyBoto3Package "lex-models" "1.43.3"

From d7a2bf7e53c688701f7b1532e5bd06407f4efdd9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:37:55 +0200
Subject: [PATCH 1013/1386] python3Packages.mypy-boto3-mq: 1.43.32 -> 1.43.48

---
 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 852ebbf9de56..e678b75a6082 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -926,8 +926,8 @@ in
       "sha256-Xn8quvaU8HAJKLiUuh7vGqy6j/VYWrrdwAEuMnFSdzw=";
 
   mypy-boto3-mq =
-    buildMypyBoto3Package "mq" "1.43.32"
-      "sha256-8O4z5OB5E/NbmM+hLvtJ6MmArl/Nub9HwkYmaWiGb6s=";
+    buildMypyBoto3Package "mq" "1.43.48"
+      "sha256-ALT7Le8lS4EXFe1a92z0t0iT8aYKOxJS5EGic/7hwC8=";
 
   mypy-boto3-mturk =
     buildMypyBoto3Package "mturk" "1.43.0"

From 4c96c4125e5e64063a2e7c6ee0d205224dd212c5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:38:06 +0200
Subject: [PATCH 1014/1386] 
 python3Packages.mypy-boto3-payment-cryptography-data: 1.43.12 -> 1.43.49

---
 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 e678b75a6082..1dae07a1da96 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1002,8 +1002,8 @@ in
       "sha256-R+9NhCyUKOhMZCyWll1kilbBGlcNfpqEXgQVskDo/nU=";
 
   mypy-boto3-payment-cryptography-data =
-    buildMypyBoto3Package "payment-cryptography-data" "1.43.12"
-      "sha256-SvSi3Mzf+Er3keeO4BeeIrfPKkzwZtKENKuAbaEz28c=";
+    buildMypyBoto3Package "payment-cryptography-data" "1.43.49"
+      "sha256-7qCpo7OktzpZtZosFM9e1ygUPhcYFmShD67ngrG5Wf0=";
 
   mypy-boto3-pca-connector-ad =
     buildMypyBoto3Package "pca-connector-ad" "1.43.0"

From 1a903cd0938b3c3bdf2c689eb7ecaaf4551401f0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:38:22 +0200
Subject: [PATCH 1015/1386] python3Packages.mypy-boto3-rds: 1.43.30 -> 1.43.49

---
 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 1dae07a1da96..30e68830f003 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1082,8 +1082,8 @@ in
       "sha256-ZmYC3YQujmfSUK0pOGCGFwT7LrSa3oJfo9juUb+2Xpk=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.43.30"
-      "sha256-VEWtNjsbdzYKdYufG0PrdMi9+kb4JxLvzsPo9DombYc=";
+    buildMypyBoto3Package "rds" "1.43.49"
+      "sha256-9NLdqD2ZtmgngemY5IKhIxcC+mSgQ1DkB5hqno4cOdo=";
 
   mypy-boto3-rds-data =
     buildMypyBoto3Package "rds-data" "1.43.37"

From f1f300f32a6506af0750afe25e3ea09c8cbd4468 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:38:49 +0200
Subject: [PATCH 1016/1386] python3Packages.mypy-boto3-securityhub: 1.43.42 ->
 1.43.48

---
 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 30e68830f003..eb3cacb12dc4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1218,8 +1218,8 @@ in
       "sha256-Jl7i/d+dPkKuOWhWJft4YaU5EQ2OMkNyhHwOHL1mayA=";
 
   mypy-boto3-securityhub =
-    buildMypyBoto3Package "securityhub" "1.43.42"
-      "sha256-cSOykgzNlSiXXnwyTF7MRWNhk4v83kabdJJ9FtIq108=";
+    buildMypyBoto3Package "securityhub" "1.43.48"
+      "sha256-R05c+bDVzi1NNW03CTkORKYhbiPyajsjn88BRx3RNJw=";
 
   mypy-boto3-securitylake =
     buildMypyBoto3Package "securitylake" "1.43.0"

From 0713d1359b2c6a71b46dcf7e31aba933a2232bf5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:38:54 +0200
Subject: [PATCH 1017/1386] python3Packages.mypy-boto3-servicediscovery: 1.43.0
 -> 1.43.48

---
 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 eb3cacb12dc4..d6c3b46e73d6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1242,8 +1242,8 @@ in
       "sha256-tX0woQcWoUOPKxSthE9p2rs1gsiA57DJY4JgreeAt0c=";
 
   mypy-boto3-servicediscovery =
-    buildMypyBoto3Package "servicediscovery" "1.43.0"
-      "sha256-g1TsUJgdMpo1Sf8rPcmVi0ZNnTRmuqAKFz6LbMuZrp8=";
+    buildMypyBoto3Package "servicediscovery" "1.43.48"
+      "sha256-F0UEyBR8QZyFfB5REL9P5z0zsZNhcddgxksj/tE+GXQ=";
 
   mypy-boto3-ses =
     buildMypyBoto3Package "ses" "1.43.0"

From bdf538a85714d38c1219596c082e5a3065d52933 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:39:03 +0200
Subject: [PATCH 1018/1386] python3Packages.mypy-boto3-ssm: 1.43.42 -> 1.43.48

---
 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 d6c3b46e73d6..64ee43fb21fc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1290,8 +1290,8 @@ in
       "sha256-Psjh5lHoMK/89/4VGy4wkLjqmNc8sGkFOwnKTH9MhjY=";
 
   mypy-boto3-ssm =
-    buildMypyBoto3Package "ssm" "1.43.42"
-      "sha256-HVyE4b0DZMpnCC0uzAC2HAnFioMgif7aeUZHg3zm05A=";
+    buildMypyBoto3Package "ssm" "1.43.48"
+      "sha256-5qAQOqzTY/iUoUl5NCmbL7Ldpsvev1KLCgN6HqfUjnc=";
 
   mypy-boto3-ssm-contacts =
     buildMypyBoto3Package "ssm-contacts" "1.43.0"

From 37aa083458d301d50d0112860319647ac0c81269 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Jul 2026 22:39:30 +0200
Subject: [PATCH 1019/1386] python3Packages.boto3-stubs: 1.43.47 -> 1.43.49

---
 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 d6ce9e1225eb..ec56c340b2fe 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.43.47";
+  version = "1.43.49";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-MrFqvlVT8x3UPlEBPJJW/qcMnTP3ySqG4AL8J1uHaAc=";
+    hash = "sha256-A6jQK8hBfMl0stRkIScrU3APw0H7EENbgEuEi0jKM1c=";
   };
 
   build-system = [ setuptools ];

From 0671a1d4777376953323867475c8c0e46a4aea1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 13:42:05 -0700
Subject: [PATCH 1020/1386] python3Packages.jaraco-net: drop superfluous
 dependency

---
 pkgs/development/python-modules/jaraco-net/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix
index fb194cae82b6..5936a0172405 100644
--- a/pkgs/development/python-modules/jaraco-net/default.nix
+++ b/pkgs/development/python-modules/jaraco-net/default.nix
@@ -25,7 +25,6 @@
   ifconfig-parser,
   pytestCheckHook,
   cherrypy,
-  importlib-resources,
   pyparsing,
   pytest-responses,
   net-tools,
@@ -74,7 +73,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     cherrypy
-    importlib-resources
     pyparsing
     pytest-responses
   ]

From b1f7477150d2a8a5c6b4e0bccc91571bc83b2f46 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 15 Jul 2026 13:56:08 -0700
Subject: [PATCH 1021/1386] gnugrep: move to by-name/

---
 .../gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch  | 0
 .../text/gnugrep/default.nix => by-name/gn/gnugrep/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{tools/text => by-name/gn}/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch (100%)
 rename pkgs/{tools/text/gnugrep/default.nix => by-name/gn/gnugrep/package.nix} (100%)

diff --git a/pkgs/tools/text/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/by-name/gn/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
similarity index 100%
rename from pkgs/tools/text/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
rename to pkgs/by-name/gn/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/by-name/gn/gnugrep/package.nix
similarity index 100%
rename from pkgs/tools/text/gnugrep/default.nix
rename to pkgs/by-name/gn/gnugrep/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e00dc626823..2dcbfc9a6cfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2089,8 +2089,6 @@ with pkgs;
 
   gnucap-full = gnucap.withPlugins (p: [ p.verilog ]);
 
-  gnugrep = callPackage ../tools/text/gnugrep { };
-
   gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
   gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
 

From 81b7af53da356d790d1ef11bf3e868bdce7c8a0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 21:02:02 +0000
Subject: [PATCH 1022/1386] crowdin-cli: 4.14.3 -> 4.14.4

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

diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix
index acf0adfbf76e..6ecda3150328 100644
--- a/pkgs/by-name/cr/crowdin-cli/package.nix
+++ b/pkgs/by-name/cr/crowdin-cli/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crowdin-cli";
-  version = "4.14.3";
+  version = "4.14.4";
 
   src = fetchurl {
     url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
-    hash = "sha256-Jtj1WcKkJF0toa2/xK/cR0r4+lzzMFkoQnG6jCFSAM4=";
+    hash = "sha256-dHRFgAY+nWZq46VpC4tc/A2QR+f73ypn1aMxTI9g1F0=";
   };
 
   nativeBuildInputs = [

From ac61dddf2ecf2a9f727445c58c8cb2401f3feba9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 14 Jul 2026 22:22:13 +0200
Subject: [PATCH 1023/1386] faust-benchmark-tools: init

---
 .../fa/faust-benchmark-tools/package.nix      | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 pkgs/by-name/fa/faust-benchmark-tools/package.nix

diff --git a/pkgs/by-name/fa/faust-benchmark-tools/package.nix b/pkgs/by-name/fa/faust-benchmark-tools/package.nix
new file mode 100644
index 000000000000..138232f6bc92
--- /dev/null
+++ b/pkgs/by-name/fa/faust-benchmark-tools/package.nix
@@ -0,0 +1,142 @@
+{
+  lib,
+  stdenv,
+  faust,
+  makeWrapper,
+  llvm,
+  ncurses,
+  zlib,
+  libxml2,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "faust-benchmark-tools";
+  inherit (faust) version src;
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # The benchmark tools live in their own directory with their own Makefile,
+  # decoupled from the main CMake build.
+  sourceRoot = "${finalAttrs.src.name}/tools/benchmark";
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    # The benchmark binaries link ${faust}/lib/libfaust.a statically and
+    # include headers from ${faust}/include. The runtime scripts find `faust`,
+    # `faustpath`, and `faustoptflags` via the PATH wrap in postFixup.
+    faust
+    llvm
+    ncurses
+    zlib
+    libxml2
+  ];
+
+  postPatch = ''
+    # --build rather than --host: under strictDeps there is no host bash in
+    # scope, so --host silently leaves the shebangs alone. This package is
+    # native-only anyway (see meta).
+    patchShebangs --build faustbench faust2object faust-tester
+  '';
+
+  makeFlags = [
+    "FAUST=${faust}/bin/faust"
+    # Upstream's Makefile hardcodes ../../build on Darwin (they can't run an
+    # arm64 faust on their x86 CI runner) and only derives these from FAUST on
+    # other platforms. We build natively, so point them at the real faust
+    # output unconditionally.
+    "LIB=${faust}/lib"
+    "INC=${faust}/include"
+    "FARCH=${faust}/share/faust"
+    # The Makefile only shells out to `llvm-config` when LLVM is unset
+    # (`ifndef LLVM`), so setting it here avoids needing llvm-config on PATH.
+    "LLVM=$(shell ${lib.getDev llvm}/bin/llvm-config --link-static --ldflags --libs all --system-libs)"
+    # Restrict to the non-audio, non-GUI tools. Avoids pulling in
+    # gtk2/jack2/libsamplerate/liblo. The Makefile uses `TARGETS ?= …`.
+    "TARGETS=dynamic-faust faustbench-llvm faustbench-llvm-interp faustbench-interp interp-tracer"
+  ];
+
+  enableParallelBuilding = true;
+
+  # Upstream's `install` target doesn't create its target directories, and
+  # unconditionally installs the wasm/iOS tools and faustbench.cpp regardless
+  # of TARGETS, which would defeat the restriction above.
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin \
+      dynamic-faust \
+      faustbench-llvm \
+      faustbench-llvm-interp \
+      faustbench-interp \
+      interp-tracer \
+      faustbench \
+      faust2object \
+      faust-tester
+
+    # faustbench reads this file at runtime to assemble its C++ test harness.
+    install -Dm644 faustbench.cpp $out/share/faust/faustbench.cpp
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    # `faustbench` reads $FAUSTLIB/faustbench.cpp, but $FAUSTLIB is set by
+    # faustpath to ${faust}/share/faust which does not contain our copy.
+    # Redirect to the copy we just installed.
+    substituteInPlace $out/bin/faustbench \
+      --replace-fail '$FAUSTLIB/faustbench.cpp' "$out/share/faust/faustbench.cpp"
+
+    # Plain PATH wrap is enough for faust-tester (just calls faust2plot from
+    # faust). faustbench and faust2object compile C++ at runtime, so they need
+    # the build environment exported too.
+    wrapProgram $out/bin/faust-tester \
+      --prefix PATH : "$out/bin:${lib.makeBinPath [ faust ]}"
+
+    # Mirror what faust.wrapWithBuildEnv does for the two compile-driving
+    # scripts, so users get a working $CXX and friends without a dev shell.
+    # (wrapWithBuildEnv itself is a whole-derivation builder — dontBuild, its
+    # own installPhase copying from tools/faust2appls — so it can't wrap
+    # binaries we compile here.)
+    nix_cc_wrapper_target_host="$(printenv | grep ^NIX_CC_WRAPPER_TARGET_HOST | sed 's/=.*//')"
+    nix_bintools_wrapper_target_host="$(printenv | grep ^NIX_BINTOOLS_WRAPPER_TARGET_HOST | sed 's/=.*//')"
+    for s in faustbench faust2object; do
+      wrapProgram $out/bin/$s \
+        --prefix PATH : "$out/bin:${lib.makeBinPath [ faust ]}:$PATH" \
+        --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
+        --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \
+        --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \
+        --set "$nix_cc_wrapper_target_host" "''${!nix_cc_wrapper_target_host}" \
+        --set "$nix_bintools_wrapper_target_host" "''${!nix_bintools_wrapper_target_host}"
+    done
+  '';
+
+  # Version is inherited from `faust`; bumping faust auto-bumps this. No
+  # passthru.updateScript needed.
+
+  meta = {
+    description = "Benchmarking, tracing, and dynamic-compilation tools for the Faust compiler";
+    longDescription = ''
+      A subset of the tools from the upstream Faust `tools/benchmark/`
+      directory: dynamic-faust, faustbench-llvm, faustbench-llvm-interp,
+      faustbench-interp, interp-tracer (binaries built against libfaust.a),
+      plus the scripts faustbench, faust2object, and faust-tester.
+
+      This package intentionally excludes the JACK/GTK runners (dynamic-jack-gtk,
+      faust-osc-controller, signal-tester, box-tester) and the WASM bench
+      tools to keep the closure small. They can be packaged separately if
+      needed.
+    '';
+    homepage = "https://github.com/grame-cncm/faust/tree/master-dev/tools/benchmark";
+    changelog = "https://github.com/grame-cncm/faust/blob/${finalAttrs.version}/Changes.txt";
+    license = lib.licenses.gpl3Plus;
+    # Cross is not wired up: llvm-config is executed at build time from
+    # buildInputs, and faust2object invokes it again at runtime on the host.
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    mainProgram = "faustbench";
+  };
+})

From 496f07e9d6e0f4ce8a57895a2928408d55e53fde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 21:22:13 +0000
Subject: [PATCH 1024/1386] cntb: 1.6 -> 1.7

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

diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix
index 29b4af7a2f05..c570b3295b31 100644
--- a/pkgs/by-name/cn/cntb/package.nix
+++ b/pkgs/by-name/cn/cntb/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cntb";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "contabo";
     repo = "cntb";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-si6mJ5jHGrgnKp0NP92iFOtGf8x8LG7fqnGccBKXThI=";
+    hash = "sha256-FR55cvsEEKR+zdvHrJWtmIv/fUn2nAY7JKd2DUlhb4M=";
     # docs contains two files with the same name but different cases,
     # this leads to a different hash on case insensitive filesystems (e.g. darwin)
     # https://github.com/contabo/cntb/issues/34
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-W1087nbI6Gd9uy8HPTlms6mXfmj/IzcGIW2AXYRBQG4=";
+  vendorHash = "sha256-uM7RaVF95WsNok3W7smfX952+Ojl2saGO41QRIFG824=";
 
   ldflags = [
     "-X contabo.com/cli/cntb/cmd.version=${finalAttrs.src.rev}"

From 176022d8d8191bd777ecf83131cd964f552f91b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 21:34:50 +0000
Subject: [PATCH 1025/1386] bazel-watcher: 0.29.0 -> 0.30.0

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

diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix
index 3017531eecb0..3bb61a93afcd 100644
--- a/pkgs/by-name/ba/bazel-watcher/package.nix
+++ b/pkgs/by-name/ba/bazel-watcher/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "bazel-watcher";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-watcher";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ssG2BFd2utB9xu9zYdcvZYLq+XF9ZOctxNGtpbrhLG8=";
+    hash = "sha256-5W39lT66Jid8qzeUADcuDPKR7UkTxtEOwaKUO6oHWtk=";
   };
 
   vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY=";

From 55161ee0b6e6d9c37ef3ccf7640f586c0afee9d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 21:35:40 +0000
Subject: [PATCH 1026/1386] cargo-readme: 3.3.2 -> 3.3.3

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

diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix
index 6de86e184a61..0bd0b9c113d6 100644
--- a/pkgs/by-name/ca/cargo-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-readme/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-readme";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "webern";
     repo = "cargo-readme";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-p8QQNACU9lFig0vBQrb1u2T44Icwk10OBjGzaVLj7kk=";
+    sha256 = "sha256-Urp5OvM6LzLb8SY49u2Dc57NFJtyxpMkvCbb6hTUDMs=";
   };
 
-  cargoHash = "sha256-kfXDMBqS4/QC+khQhQ2Jrer8TuFKlnZFS3IZ2lcVOR8=";
+  cargoHash = "sha256-CmYJ8acmcaWregM0zroaTFaPFV6cnS2KWf5Y4LXMcyk=";
 
   # disable doc tests
   cargoTestFlags = [

From 18b168517592a2235a50215b2de9a07840b2bf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 14:46:02 -0700
Subject: [PATCH 1027/1386] python3Packages.apispec: update dependencies

---
 pkgs/development/python-modules/apispec/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index d3c07ea9bbff..4c81029244ee 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -4,10 +4,8 @@
   fetchPypi,
   flit-core,
   marshmallow,
-  mock,
   openapi-spec-validator,
   packaging,
-  prance,
   pytestCheckHook,
   pyyaml,
 }:
@@ -29,15 +27,10 @@ buildPythonPackage rec {
   optional-dependencies = {
     marshmallow = [ marshmallow ];
     yaml = [ pyyaml ];
-    validation = [
-      openapi-spec-validator
-      prance
-    ]
-    ++ prance.optional-dependencies.osv;
   };
 
   nativeCheckInputs = [
-    mock
+    openapi-spec-validator
     pytestCheckHook
   ]
   ++ lib.concatAttrValues optional-dependencies;

From 25be3bae9d19558f76993317bed7937b38cf272f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 21:49:32 +0000
Subject: [PATCH 1028/1386] clusterctl: 1.13.3 -> 1.13.4

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

diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix
index 385ff7aff0e8..047d640963a7 100644
--- a/pkgs/by-name/cl/clusterctl/package.nix
+++ b/pkgs/by-name/cl/clusterctl/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "clusterctl";
-  version = "1.13.3";
+  version = "1.13.4";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ValaeZiYlSXydMwmcGMcBXETWweu3d4XRb+fHnangp4=";
+    hash = "sha256-x/u4lWacCz3GpUCyC8ty4nPPQblEs9G7vucqSJSupEQ=";
   };
 
-  vendorHash = "sha256-GeZUJozumnxXGIJ4moXxuLDATeJDRbTeGDdscZIvjh0=";
+  vendorHash = "sha256-73hCBGzE9LB59L+GurlZeTV6K/FLJgtjQc3ku4JR+iM=";
 
   subPackages = [ "cmd/clusterctl" ];
 

From d163922d618c0627a8b47540681024d7c3c5b0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= <ilkecan@protonmail.com>
Date: Thu, 16 Jul 2026 00:50:06 +0300
Subject: [PATCH 1029/1386] glew: restore EGL+GLX compatibility patch

Restore the downstream patch allowing a single GLEW build to support both
EGL and GLX.

The patch originated in the AUR glew-egl-glx package and was later adopted
by Arch Linux. It was subsequently removed from the Arch packaging
repository, and later dropped from nixpkgs as we no longer had an upstream
copy to fetch.

Vendor an updated version of the patch into nixpkgs.

Without it, applications built with GLEW_EGL cannot initialize GLX,
requiring package-specific workarounds and leaving some applications
broken.
---
 pkgs/by-name/gl/glew/package.nix           |   9 ++
 pkgs/by-name/gl/glew/patches/egl+glx.patch | 172 +++++++++++++++++++++
 2 files changed, 181 insertions(+)
 create mode 100644 pkgs/by-name/gl/glew/patches/egl+glx.patch

diff --git a/pkgs/by-name/gl/glew/package.nix b/pkgs/by-name/gl/glew/package.nix
index db1e2c5f1b55..cff1bbb2067a 100644
--- a/pkgs/by-name/gl/glew/package.nix
+++ b/pkgs/by-name/gl/glew/package.nix
@@ -21,6 +21,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-tkeQ+UuSas1+j4TF1gAKhstDlnvR5oiwMIkHl5nJ6Ik=";
   };
 
+  patches = [
+    # Allow a single GLEW build to support both EGL and GLX.
+    #
+    # Originally developed for the AUR glew-egl-glx package and later adopted by
+    # Arch Linux. Carry an updated copy in-tree after it was removed from Arch's
+    # packaging repository.
+    ./patches/egl+glx.patch
+  ];
+
   outputs = [
     "bin"
     "out"
diff --git a/pkgs/by-name/gl/glew/patches/egl+glx.patch b/pkgs/by-name/gl/glew/patches/egl+glx.patch
new file mode 100644
index 000000000000..9853f8e53236
--- /dev/null
+++ b/pkgs/by-name/gl/glew/patches/egl+glx.patch
@@ -0,0 +1,172 @@
+--- a/src/glew.c
++++ b/src/glew.c
+@@ -36,6 +36,10 @@
+ #  include GLEW_INCLUDE
+ #endif
+ 
++#if defined(GLEW_EGL)
++#  include <GL/eglew.h>
++#endif
++
+ #if defined(GLEW_OSMESA)
+ #  define GLAPI extern
+ #  ifndef APIENTRY
+@@ -47,8 +51,6 @@
+ #    undef APIENTRY
+ #    undef GLEW_APIENTRY_DEFINED
+ #  endif
+-#elif defined(GLEW_EGL)
+-#  include <GL/eglew.h>
+ #elif defined(_WIN32)
+ /*
+  * If NOGDI is defined, wingdi.h won't be included by windows.h, and thus
+@@ -65,8 +67,7 @@
+ 
+ #include <stddef.h>  /* For size_t */
+ 
+-#if defined(GLEW_EGL)
+-#elif defined(GLEW_REGAL)
++#if defined(GLEW_REGAL)
+ 
+ /* In GLEW_REGAL mode we call directly into the linked
+    libRegal.so glGetProcAddressREGAL for looking up
+@@ -167,23 +168,37 @@ void* NSGLGetProcAddress (const GLubyte *name)
+  * Define glewGetProcAddress.
+  */
+ #if defined(GLEW_REGAL)
+-#  define glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name)
++#  define _glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name)
+ #elif defined(GLEW_OSMESA)
+-#  define glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name)
+-#elif defined(GLEW_EGL)
+-#  define glewGetProcAddress(name) eglGetProcAddress((const char *)name)
++#  define _glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name)
+ #elif defined(_WIN32)
+-#  define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
++#  define _glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
+ #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
+-#  define glewGetProcAddress(name) NSGLGetProcAddress(name)
++#  define _glewGetProcAddress(name) NSGLGetProcAddress(name)
+ #elif defined(__sgi) || defined(__sun) || defined(__HAIKU__)
+-#  define glewGetProcAddress(name) dlGetProcAddress(name)
++#  define _glewGetProcAddress(name) dlGetProcAddress(name)
+ #elif defined(__ANDROID__)
+-#  define glewGetProcAddress(name) NULL /* TODO */
++#  define _glewGetProcAddress(name) NULL /* TODO */
+ #elif defined(__native_client__)
+-#  define glewGetProcAddress(name) NULL /* TODO */
++#  define _glewGetProcAddress(name) NULL /* TODO */
+ #else /* __linux */
+-#  define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
++#  define _glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
++#endif
++
++#if defined(GLEW_EGL)
++static GLboolean _EGL_available = GL_FALSE;
++static void (*glewGetProcAddress (const GLubyte *name)) (void)
++{
++  void (*addr)(void);
++  if (_EGL_available)
++  {
++    addr = eglGetProcAddress((const char *)name);
++    if (addr) return addr;
++  }
++  return _glewGetProcAddress(name);
++}
++#else
++#  define glewGetProcAddress(name) _glewGetProcAddress(name)
+ #endif
+ 
+ /*
+@@ -19783,9 +19798,7 @@ GLenum GLEWAPIENTRY glewContextInit (void)
+ }
+ 
+ 
+-#if defined(GLEW_OSMESA)
+-
+-#elif defined(GLEW_EGL)
++#if defined(GLEW_EGL)
+ 
+ PFNEGLCHOOSECONFIGPROC __eglewChooseConfig = NULL;
+ PFNEGLCOPYBUFFERSPROC __eglewCopyBuffers = NULL;
+@@ -21074,8 +21087,8 @@ GLenum eglewInit (EGLDisplay display)
+   PFNEGLQUERYSTRINGPROC queryString = NULL;
+ 
+   /* Load necessary entry points */
+-  initialize = (PFNEGLINITIALIZEPROC)   glewGetProcAddress("eglInitialize");
+-  queryString = (PFNEGLQUERYSTRINGPROC) glewGetProcAddress("eglQueryString");
++  initialize = (PFNEGLINITIALIZEPROC)   eglGetProcAddress("eglInitialize");
++  queryString = (PFNEGLQUERYSTRINGPROC) eglGetProcAddress("eglQueryString");
+   if (!initialize || !queryString)
+     return 1;
+ 
+@@ -21669,7 +21682,9 @@ GLenum eglewInit (EGLDisplay display)
+   return GLEW_OK;
+ }
+ 
+-#elif defined(_WIN32)
++#endif
++
++#if defined(_WIN32)
+ 
+ PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL;
+ 
+@@ -23750,13 +23765,26 @@ GLenum GLEWAPIENTRY glewInit (void)
+   GLenum r;
+ #if defined(GLEW_EGL)
+   PFNEGLGETCURRENTDISPLAYPROC getCurrentDisplay = NULL;
++  EGLDisplay display;
+ #endif
+   r = glewContextInit();
+   if ( r != 0 ) return r;
+ #if defined(GLEW_EGL)
+-  getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) glewGetProcAddress("eglGetCurrentDisplay");
+-  return eglewInit(getCurrentDisplay());
+-#elif defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__)
++  getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) eglGetProcAddress("eglGetCurrentDisplay");
++  if (getCurrentDisplay)
++    display = getCurrentDisplay();
++  else
++    display = EGL_NO_DISPLAY;
++  if (display != EGL_NO_DISPLAY)
++  {
++    r = eglewInit(display);
++    if ( r == 0 ) {
++      _EGL_available = GL_TRUE;
++      return r;
++    }
++  }
++#endif
++#if defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__)
+   return r;
+ #elif defined(_WIN32)
+   return wglewInit();
+@@ -30675,7 +30703,7 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
+   return ret;
+ }
+ 
+-#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA)
++#if defined(_WIN32) && !defined(GLEW_OSMESA)
+ 
+ GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
+ {
+@@ -31118,7 +31146,7 @@ GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
+   return ret;
+ }
+ 
+-#elif !defined(GLEW_OSMESA) && !defined(GLEW_EGL) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
++#elif !defined(GLEW_OSMESA) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+ 
+ GLboolean glxewIsSupported (const char* name)
+ {
+@@ -31702,7 +31730,9 @@ GLboolean glxewIsSupported (const char* name)
+   return ret;
+ }
+ 
+-#elif defined(GLEW_EGL)
++#endif
++
++#if defined(GLEW_EGL)
+ 
+ GLboolean eglewIsSupported (const char* name)
+ {

From 43336689363e62d9fda2a630ea208853d64f0121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 14:52:29 -0700
Subject: [PATCH 1030/1386] python3Packages.victron-mqtt: 2026.7.2 -> 2026.7.3

Diff: https://github.com/tomer-w/victron_mqtt/compare/v2026.7.2...v2026.7.3

Changelog: https://github.com/tomer-w/victron_mqtt/releases/tag/v2026.7.3
---
 pkgs/development/python-modules/victron-mqtt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index ac13a0b9f9f5..12f1952ab591 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "victron-mqtt";
-  version = "2026.7.2";
+  version = "2026.7.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomer-w";
     repo = "victron_mqtt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZU5qz+21rxHnpHlV0Vn+iiBDqW110hy/4+Emblj6gWo=";
+    hash = "sha256-J5k3JkAP1E39KL3JMIfg00jDuiFfIss+N3+/Jxscx3s=";
   };
 
   build-system = [

From edf64598243419f3834cab09359bf0574454f0f7 Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Tue, 14 Jul 2026 22:15:23 +0200
Subject: [PATCH 1031/1386] glslviewer: fix audio device handling

---
 pkgs/by-name/gl/glslviewer/package.nix                    | 2 ++
 .../patches/0001-fix-miniaudio-device-id-handling.patch   | 8 ++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch

diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix
index a367e8b89296..5e6e02cae010 100644
--- a/pkgs/by-name/gl/glslviewer/package.nix
+++ b/pkgs/by-name/gl/glslviewer/package.nix
@@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
+  # https://github.com/patriciogonzalezvivo/vera/pull/31/changes
+  patches = [ ./patches/0001-fix-miniaudio-device-id-handling.patch ];
   postInstall = ''
     substituteInPlace $out/share/thumbnailers/glslViewer.thumbnailer \
       --replace-fail "TryExec=glslThumbnailer" "TryExec=$out/bin/glslThumbnailer" \
diff --git a/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch
new file mode 100644
index 000000000000..d98c869ae71f
--- /dev/null
+++ b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch
@@ -0,0 +1,8 @@
+--- a/deps/vera/src/gl/textureStreamAudio.cpp
++++ b/deps/vera/src/gl/textureStreamAudio.cpp
+@@ -59,7 +59,6 @@ TextureStreamAudio::TextureStreamAudio(): TextureStream() {
+     m_dft_buffer = (float*)av_malloc_array(sizeof(float), m_buf_len);
+     m_buffer_wr.resize(m_buf_len, 0);
+     m_buffer_re.resize(m_buf_len, 0);
+-    m_dft_buffer = nullptr;
+ }

From 11dbafea9e033d7a4ad2a06c8d2175184b08a60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= <ilkecan@protonmail.com>
Date: Thu, 16 Jul 2026 01:00:43 +0300
Subject: [PATCH 1032/1386] various: remove GLEW compatibility workarounds

The restored EGL+GLX compatibility patch allows the default GLEW build to
support both EGL and GLX again.

Remove package specific overrides that forced `enableEGL = false`.
---
 pkgs/by-name/me/meshlab/package.nix  | 7 +------
 pkgs/by-name/op/openscad/package.nix | 4 +---
 pkgs/by-name/rp/rpcs3/package.nix    | 4 +---
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix
index ed277bf0733b..104fbc3a03d2 100644
--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -76,12 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     bzip2
     muparser
     eigen
-    # MeshLab renders through Qt's xcb platform, which creates a GLX context,
-    # and calls glewInit() against it. The default EGL-enabled glew is built
-    # EGL-only (no GLX dispatch table), so glewInit can't read GL_VERSION and
-    # the app fails to launch with "GLEW initialization failed: Missing GL
-    # version". See https://github.com/NixOS/nixpkgs/issues/531470
-    (glew.override { enableEGL = false; })
+    glew
     gmp
     levmar
     qhull
diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index 7cf1da9371b2..ede0cdbd0c8c 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -127,9 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     eigen
     boost
-    # OpenSCAD's GLX offscreen renderer needs GLEW's GLXEW symbols (`__GLXEW_SGIX_pbuffer`, `__GLXEW_SGIX_fbconfig`)
-    # which are not found in the default EGL-enabled glew and causes the build failure in https://github.com/NixOS/nixpkgs/issues/530529
-    (glew.override { enableEGL = false; })
+    glew
     opencsg
     cgal_5
     mpfr
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index bc9d8f9bbde1..b4518e0a27b6 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -117,9 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
     qtmultimedia
     openal
-    # RPCS3's X11 swap-interval path uses GLEW's GLXEW symbols, which
-    # are not provided in the default EGL-enabled GLEW build.
-    (glew.override { enableEGL = false; })
+    glew
     vulkan-headers
     vulkan-loader
     libpng

From 78ae46a39de9db847d91b1f712ed37b2b7ba70a8 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 16 Jul 2026 00:40:08 +0300
Subject: [PATCH 1033/1386] hyprlandPlugins.hypr-darkwindow: fix build

Assisted-by: codex with gpt-5.6-sol-high
---
 .../window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix
index 4097b4b0d045..9a1f00e07b0d 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix
@@ -13,7 +13,7 @@ mkHyprlandPlugin (finalAttrs: {
     owner = "micha4w";
     repo = "Hypr-DarkWindow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-By/4CmpJvVvcBoyTtelH7MSLCKRaoXLCpiSfrbZIePc=";
+    hash = "sha256-91l5TD46OMfvmhd1WqWxm42cEnjR1yAj2Qk/73mr3ks=";
   };
 
   installPhase = ''

From 13fce961007acb49aaadc70fb8255b6dcc3532ac Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 16 Jul 2026 00:41:43 +0300
Subject: [PATCH 1034/1386] hyprlandPlugins.hyprgrass: fix build

Assisted-by: codex with gpt-5.6-sol-high
---
 .../window-managers/hyprwm/hyprland-plugins/hyprgrass.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
index 7d0fbc2f1e16..640e16bfd659 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
@@ -12,13 +12,13 @@
 
 mkHyprlandPlugin {
   pluginName = "hyprgrass";
-  version = "0.8.2-unstable-2025-10-08";
+  version = "0.8.2-unstable-2026-06-10";
 
   src = fetchFromGitHub {
     owner = "horriblename";
     repo = "hyprgrass";
-    rev = "fdfa60d464a18ae20b7a7bc63c0d2336f37c164b";
-    hash = "sha256-2Y2D2wuNqSldprawq8BSca90gSYSR5ZKL5ZW2YAV2F8=";
+    rev = "d094a3e62f6ecaeb41515982d3e13edefaf8a4e7";
+    hash = "sha256-tCt7FNc1RBHou/ym7B0XzoOqqNq8Df+dizEDkAgJ4U0=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ mkHyprlandPlugin {
 
   doCheck = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     description = "Hyprland plugin for touch gestures";

From b8d7e28d7aab2d5a71a9879c556f9fdf52d21abf Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 16 Jul 2026 00:42:39 +0300
Subject: [PATCH 1035/1386] hyprlandPlugins.hyprsplit: fix build

Assisted-by: codex with gpt-5.6-sol-high
---
 .../window-managers/hyprwm/hyprland-plugins/hyprsplit.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 4f8d170a5d7a..c8e6d07f48a5 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -8,13 +8,13 @@
 }:
 mkHyprlandPlugin (finalAttrs: {
   pluginName = "hyprsplit";
-  version = "0.54.2";
+  version = "0.54.3-unstable-2026-06-11";
 
   src = fetchFromGitHub {
     owner = "shezdy";
     repo = "hyprsplit";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-NFMLZmM6lM7v6WFcewOp7pKPlr6ampX/MB/kGxt/gPE=";
+    rev = "6b00b677d8905fb38779c91e12d6294e0e586a44";
+    hash = "sha256-PaoUtmk+qIP/ESdxkxnY7mUMpMHjix88qu22R5GLQqE=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,7 @@ mkHyprlandPlugin (finalAttrs: {
     ninja
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     homepage = "https://github.com/shezdy/hyprsplit";

From 7a9c1e3ccc135a3a8570a65dc6f1fcff2ed5becb Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 16 Jul 2026 00:47:02 +0300
Subject: [PATCH 1036/1386] hyprlandPlugins.imgborders: fix build

Assisted-by: codex with gpt-5.6-sol-high
---
 .../hyprwm/hyprland-plugins/imgborders.nix    | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix
index f7e387354ced..ff1811eb2b09 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix
@@ -5,31 +5,22 @@
   cmake,
   nix-update-script,
 }:
-mkHyprlandPlugin (finalAttrs: {
+mkHyprlandPlugin {
   pluginName = "imgborders";
-  version = "1.0.1";
+  version = "1.0.2-unstable-2026-05-17";
 
   src = fetchFromCodeberg {
     owner = "zacoons";
     repo = "imgborders";
-    tag = finalAttrs.version;
-    hash = "sha256-fCzz4gh8pd7J6KQJB/avYcS0Z7NYpxjznPMtOwypPSQ=";
+    rev = "a20b4d36d01f82823ba3749db95c91743d26f656";
+    hash = "sha256-e3PiaR7G6l/lMJ41xtSPcfMKhZcx8UHj13lr0u+8JAk=";
   };
 
   nativeBuildInputs = [
     cmake
   ];
 
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib
-    mv imgborders.so $out/lib/libimgborders.so
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     homepage = "https://codeberg.org/zacoons/imgborders";
@@ -39,4 +30,4 @@ mkHyprlandPlugin (finalAttrs: {
       mrdev023
     ];
   };
-})
+}

From dbcdb38f82d4d5d2385eb3e3f154f934d0b212ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 22:10:19 +0000
Subject: [PATCH 1037/1386] terraform-providers.aliyun_alicloud: 1.284.0 ->
 1.285.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index bbd0d279a248..873ac6b735bc 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-PF/mGGoO8voHyUiUN3qTOsBEJ0r6TBWa+p1P4vgliDs=",
+    "hash": "sha256-G52l+5WlcxSNflx0ioD0jEKI1GBWe5D4qW8VH8k6uTA=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.284.0",
+    "rev": "v1.285.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4="
+    "vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs="
   },
   "aminueza_minio": {
     "hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=",

From 9db44383ead3fb0d6bd3d62e7ed77c000926dd8d Mon Sep 17 00:00:00 2001
From: redyf <mateusalvespereira7@gmail.com>
Date: Wed, 15 Jul 2026 19:23:05 -0300
Subject: [PATCH 1038/1386] maintainers: remove redyf from packages

---
 pkgs/by-name/af/affine-bin/package.nix                   | 1 -
 pkgs/by-name/br/bruno/package.nix                        | 1 -
 pkgs/development/tools/language-servers/nixd/default.nix | 1 -
 3 files changed, 3 deletions(-)

diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix
index f2e33e1c83e4..f26a395c878e 100644
--- a/pkgs/by-name/af/affine-bin/package.nix
+++ b/pkgs/by-name/af/affine-bin/package.nix
@@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation (
         license = lib.licenses.mit;
         maintainers = with lib.maintainers; [
           richar
-          redyf
           xiaoxiangmoe
         ];
         platforms = [
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index f847d768e712..63153baf9f0f 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -197,7 +197,6 @@ buildNpmPackage rec {
       gepbird
       kashw2
       mattpolzin
-      redyf
       water-sucks
       starsep
     ];
diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index e1c25f8f2dc1..d2f27587f767 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -54,7 +54,6 @@ let
         inclyc
         Ruixi-rebirth
         aleksana
-        redyf
       ];
       platforms = lib.platforms.unix;
     };

From 412746bf6785c9e7a076a8f60de6a318c72624e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 16 Jul 2026 00:32:30 +0200
Subject: [PATCH 1039/1386] wyoming-piper: 2.2.2 -> 2.3.1

https://github.com/rhasspy/wyoming-piper/blob/refs/tags/v2.3.1/CHANGELOG.md
---
 pkgs/by-name/wy/wyoming-piper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wy/wyoming-piper/package.nix b/pkgs/by-name/wy/wyoming-piper/package.nix
index 04263e12a46d..1520c528b8f7 100644
--- a/pkgs/by-name/wy/wyoming-piper/package.nix
+++ b/pkgs/by-name/wy/wyoming-piper/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "wyoming-piper";
-  version = "2.2.2";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming-piper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pk6HAzl0A8R5szI7d6ZFOQI5akkzWb0Nb/WuxKdIwg8=";
+    hash = "sha256-LKt1BNa9jrZIDUZxZvniZcPrAuUkwOs85uIiA5mFWyY=";
   };
 
   build-system = with python3Packages; [

From 386c6d9021ae0b69331ede349c4451e6120e9e03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 22:46:20 +0000
Subject: [PATCH 1040/1386] libzim: 9.8.0 -> 9.8.1

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

diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix
index 16e55e157f6a..acaaa36ff43a 100644
--- a/pkgs/by-name/li/libzim/package.nix
+++ b/pkgs/by-name/li/libzim/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libzim";
-  version = "9.8.0";
+  version = "9.8.1";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = "libzim";
     tag = finalAttrs.version;
-    hash = "sha256-7AfhDpNuEGsb2ys4Lq+VEPI5sVZJ4Md0G6uLcuRKbtE=";
+    hash = "sha256-XgUB3Nrz7qTinf9Xp1k+R8b+AfzpMAFlFUV6mej7TDU=";
   };
 
   nativeBuildInputs = [

From 780d8ccd2266b0ed6c9e4b4208bfda2b0e791785 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 22:48:48 +0000
Subject: [PATCH 1041/1386] everest: 6314 -> 6397

---
 pkgs/by-name/ev/everest-bin/package.nix | 6 +++---
 pkgs/by-name/ev/everest/package.nix     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index 2d0ba6e4a1a3..c8d002ee079e 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -8,15 +8,15 @@
 
 let
   pname = "everest";
-  version = "6314";
+  version = "6397";
   phome = "$out/lib/Celeste";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
   src = fetchzip {
-    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6314.0/main.zip";
+    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6397.0/main.zip";
     extension = "zip";
-    hash = "sha256-YM6zjANINWQlTNu3EJFKIVl9VhVY4Ednjp+I+6Ap7dI=";
+    hash = "sha256-zU9FCDe5NDfuxnV+KdI0g9XiqAZM/tI1XZOXifYLblE=";
   };
   buildInputs = [
     icu
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index b05e536acf03..95263042bdb4 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -11,8 +11,8 @@
 
 let
   pname = "everest";
-  version = "6314";
-  rev = "a3112074ae83766af9f8cf48295689bbd8166730";
+  version = "6397";
+  rev = "985fd82290fe47798bcd46cbbaa7574fe02780c8";
   phome = "$out/lib/Celeste";
 in
 buildDotnetModule {
@@ -25,7 +25,7 @@ buildDotnetModule {
     fetchSubmodules = true;
     # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
     # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
-    hash = "sha256-yZLhjP09ocn8lbb6SuklcEHvqz/GV2/wlxpjYm/gr08=";
+    hash = "sha256-p/blM1lXeR2MBjfgMlJuseYZgQj3ziaiY9x3V+vH15s=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];

From 9a6f19fbdb203a9a11097f6cfd2c133da75093f5 Mon Sep 17 00:00:00 2001
From: Cathal Mullan <contact@cathal.dev>
Date: Wed, 15 Jul 2026 23:56:15 +0100
Subject: [PATCH 1042/1386] valeStyles.redhat: init at 664

---
 pkgs/by-name/va/vale/styles.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/by-name/va/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix
index 5c2264809fdf..51967c40e659 100644
--- a/pkgs/by-name/va/vale/styles.nix
+++ b/pkgs/by-name/va/vale/styles.nix
@@ -140,6 +140,23 @@ in
     };
   };
 
+  redhat = buildStyle rec {
+    name = "RedHat";
+    version = "664";
+    src = fetchFromGitHub {
+      owner = "redhat-documentation";
+      repo = "vale-at-red-hat";
+      rev = "v${version}";
+      hash = "sha256-MVC/OJctGo5SYKkrMatNDXCfVgM/KcckHUB70STj3zw=";
+    };
+    stylePath = ".vale/styles/RedHat";
+    meta = {
+      description = "Vale-compatible implementation of the Red Hat documentation style guide";
+      homepage = "https://github.com/redhat-documentation/vale-at-red-hat";
+      license = lib.licenses.mit;
+    };
+  };
+
   write-good = buildStyle rec {
     name = "write-good";
     version = "0.4.1";

From c6524ae9cf1f698a647bf41a7ad6dd54d235cfdd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 23:16:38 +0000
Subject: [PATCH 1043/1386] picosnitch: 2.1.2 -> 2.2.1

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

diff --git a/pkgs/by-name/pi/picosnitch/package.nix b/pkgs/by-name/pi/picosnitch/package.nix
index d2fa2667bc60..6462446f3138 100644
--- a/pkgs/by-name/pi/picosnitch/package.nix
+++ b/pkgs/by-name/pi/picosnitch/package.nix
@@ -11,12 +11,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "picosnitch";
-  version = "2.1.2";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-JTvuZOPgSjdD5jJYLmsqzy8ATzuhtoAu+uGvOVsChks=";
+    sha256 = "sha256-HJQOO8WTNsan3hMoFu7C2DMYrg98GF5hmK2SR6iy5ew=";
   };
 
   build-system = with python3.pkgs; [ hatchling ];

From bd8a8d1101734761eb269b0ceeba9c952064a9ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 23:22:18 +0000
Subject: [PATCH 1044/1386] xpipe: 23.6 -> 23.7

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

diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 9a59a0ec908d..7d8b9374ccfe 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-soypc4tPi9UexNqObZtKWvGgFA/4lPyv5ID3VEbjDDo=";
+      x86_64-linux = "sha256-gsZgP8wFl1eWFCYT9F6EBHynY24qFFaFVKIQiRzuWto=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "23.6";
+  version = "23.7";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From 2f52c1f991222d59d667f19889513e3aa78fc0ec Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 Jul 2026 01:34:37 +0200
Subject: [PATCH 1045/1386] bean-add: fix version scheme

---
 pkgs/applications/office/beancount/bean-add.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index e3e80e2cbef5..ca6203a771fd 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation {
   pname = "bean-add";
-  version = "unstable-2018-01-08";
+  version = "0-unstable-2018-01-08";
 
   src = fetchFromGitHub {
     owner = "simon-v";

From e8852a21809fa17e467a70cbde013650848f8b6e Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 Jul 2026 01:37:08 +0200
Subject: [PATCH 1046/1386] bead-add: use installBin

---
 pkgs/applications/office/beancount/bean-add.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index ca6203a771fd..91ed7e4894ef 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
+  installShellFiles,
 }:
 
 stdenv.mkDerivation {
@@ -18,10 +19,10 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = with python3Packages; [ python ];
 
-  installPhase = ''
-    mkdir -p $out/bin/
-    cp bean-add $out/bin/bean-add
-    chmod +x $out/bin/bean-add
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installBin bean-add
   '';
 
   meta = {

From c6d96887af719a89c30d234c59725ce4a92c7461 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 00:02:15 +0000
Subject: [PATCH 1047/1386] grafanaPlugins.grafana-lokiexplore-app: 2.1.5 ->
 2.2.1

---
 .../grafana/plugins/grafana-lokiexplore-app/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
index b5c80ef7f339..2458236086d7 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-lokiexplore-app";
-  version = "2.1.5";
-  zipHash = "sha256-n5bZnLBgOUcUuZigVdYX9Fsp5NczFsAiHvxwfoz43f4=";
+  version = "2.2.1";
+  zipHash = "sha256-/Oa+s30Psv75sk0weo7Z2dHcqTCbofeyNw8WBB6yP0o=";
   meta = {
     description = "Browse Loki logs without the need for writing complex queries";
     license = lib.licenses.agpl3Only;

From 02c6bf43d81692d1e1f10edd771b8ded7eb4ede0 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 Jul 2026 02:04:12 +0200
Subject: [PATCH 1048/1386] bookworm: fix version scheme

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

diff --git a/pkgs/by-name/bo/bookworm/package.nix b/pkgs/by-name/bo/bookworm/package.nix
index 3bb6790f0574..3378df6a5ef3 100644
--- a/pkgs/by-name/bo/bookworm/package.nix
+++ b/pkgs/by-name/bo/bookworm/package.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation {
   pname = "bookworm";
-  version = "unstable-2026-05-28";
+  version = "1.1.2-unstable-2026-05-28";
 
   src = fetchFromGitHub {
     owner = "babluboy";

From d4005dce694424d927a885a6f0bd5a93fe44282e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 00:08:14 +0000
Subject: [PATCH 1049/1386] terraform-providers.spacelift-io_spacelift: 1.52.3
 -> 1.52.4

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index bbd0d279a248..55ce70d0760c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1238,13 +1238,13 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-1f066NavFneIeH8X5CYGd0GmssPfzJACXt6GHvR/FLU=",
+    "hash": "sha256-mPrRDA/waxBNIpO8u/QCSi8uNZT6sCs2M5UFyMYZ4dw=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.52.3",
+    "rev": "v1.52.4",
     "spdx": "MIT",
-    "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
+    "vendorHash": "sha256-VmrvdRsNk2s6GQw7t8Aj0ASAEgQ/9v1TxnNIO9TderI="
   },
   "splunk-terraform_signalfx": {
     "hash": "sha256-bWZ5TvTVoYA6J67mi24rSzf5Qf6jk0RUgiC9CAa1s1o=",

From 04083079b90775674264d5a1ab753039712360fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 00:28:05 +0000
Subject: [PATCH 1050/1386] cloudquery: 6.36.1 -> 6.41.0

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

diff --git a/pkgs/by-name/cl/cloudquery/package.nix b/pkgs/by-name/cl/cloudquery/package.nix
index 08f046705476..fb602644e68a 100644
--- a/pkgs/by-name/cl/cloudquery/package.nix
+++ b/pkgs/by-name/cl/cloudquery/package.nix
@@ -9,19 +9,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudquery";
-  version = "6.36.1";
+  version = "6.41.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "cloudquery";
     repo = "cloudquery";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D0gciTH5OwYXBPabOmn6bMHyWZwS6y5uAQIdNS+WugE=";
+    hash = "sha256-ybHyZnJTtOacywgjJ+PiH8KJNn1DgBNJ4yMMtu4y/vw=";
   };
 
   modRoot = "cli";
 
-  vendorHash = "sha256-gY/FQ71Nwk9i7QXgMmOVlJe9lEW9ViPZ3Eh1NusIizE=";
+  vendorHash = "sha256-zXYYheZtWFuOZ/9AH+h/Qjf4+UZ6RRb9grk/mrJZxTU=";
 
   subPackages = [
     "."

From 05f19d4106af54d9051776eefc6380d2e0fdd0a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 00:29:22 +0000
Subject: [PATCH 1051/1386] python3Packages.eccodes: 2.47.0 -> 2.48.0

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

diff --git a/pkgs/by-name/ec/eccodes/package.nix b/pkgs/by-name/ec/eccodes/package.nix
index 32c9129f541a..3b7425f56866 100644
--- a/pkgs/by-name/ec/eccodes/package.nix
+++ b/pkgs/by-name/ec/eccodes/package.nix
@@ -17,11 +17,11 @@
 }:
 gccStdenv.mkDerivation rec {
   pname = "eccodes";
-  version = "2.47.0";
+  version = "2.48.0";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    hash = "sha256-gtqBmqm1GDHcFLO/KRi/7lCxzVOgUIjQw/RJN1iq4JQ=";
+    hash = "sha256-Yuj6XKE30TgYml/dbVsiBcicwmM44/Qoaro9ibScn5o=";
   };
 
   postPatch = ''

From d2d96d82d02276cb1f14f765f0bb97d6b4caf9e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 00:39:03 +0000
Subject: [PATCH 1052/1386] whitesur-gtk-theme: 2025-07-24 -> 2026-07-07

---
 pkgs/by-name/wh/whitesur-gtk-theme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
index 4e8921fe4c6f..83e137312d7d 100644
--- a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
+++ b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
@@ -94,13 +94,13 @@ lib.checkListOfEnum "${pname}: window control buttons variants" [ "normal" "alt"
   stdenv.mkDerivation
   rec {
     pname = "whitesur-gtk-theme";
-    version = "2025-07-24";
+    version = "2026-07-07";
 
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = "whitesur-gtk-theme";
       rev = version;
-      hash = "sha256-tuon9XxMdrz9XNTp50sbss2gtx6H9hEZh8t2jSoqx28=";
+      hash = "sha256-Um+OAg8fz5d/IXNHF6R6ECDealZKzgyBRODuyinujNc=";
     };
 
     nativeBuildInputs = [

From a75101a46ba453bf73063110815519bbc8a9ddb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 6 Jul 2026 00:09:08 +0200
Subject: [PATCH 1053/1386] headplane: 0.6.3 -> 0.7.0, inherit headplane-agent
 from headplane, nixos/headplane: clean up deprecated options

Changelog: https://github.com/tale/headplane/releases/tag/v0.7.0
Diff: https://github.com/tale/headplane/compare/v0.6.3...v0.7.0

The current layout of the module and the usage of attrs defaulting to null to disable features does not allow to use mkRenamedOptionModule or mkRemovedOptionModule inside of settings.
---
 .../modules/services/networking/headplane.nix | 117 ++++--------------
 pkgs/by-name/he/headplane-agent/package.nix   |  13 +-
 pkgs/by-name/he/headplane/package.nix         |  30 ++---
 3 files changed, 39 insertions(+), 121 deletions(-)

diff --git a/nixos/modules/services/networking/headplane.nix b/nixos/modules/services/networking/headplane.nix
index 19e131fcab8d..7285accb5962 100644
--- a/nixos/modules/services/networking/headplane.nix
+++ b/nixos/modules/services/networking/headplane.nix
@@ -44,7 +44,7 @@ in
     settings = mkOption {
       description = ''
         Headplane configuration options. Generates a YAML config file.
-        See: https://github.com/tale/headplane/blob/main/config.example.yaml
+        See <https://github.com/tale/headplane/blob/main/config.example.yaml>.
       '';
       type = types.submodule {
         options = {
@@ -129,6 +129,16 @@ in
           headscale = mkOption {
             type = types.submodule {
               options = {
+                api_key_path = mkOption {
+                  type = types.nullOr types.path;
+                  default = null;
+                  description = ''
+                    Path to a file containing a Headscale API key.
+                    This is required for OIDC authentication aswell for the Headplane agent.
+                  '';
+                  example = lib.literalExpression "config.sops.secrets.headplane_pre_authkey.path";
+                };
+
                 url = mkOption {
                   type = types.str;
                   default = "http://127.0.0.1:${toString config.services.headscale.port}";
@@ -211,15 +221,6 @@ in
                           '';
                         };
 
-                        pre_authkey_path = mkOption {
-                          type = types.nullOr types.path;
-                          default = null;
-                          description = ''
-                            Path to a file containing a Headscale pre-auth key for the agent.
-                          '';
-                          example = lib.literalExpression "config.sops.secrets.headplane_pre_authkey.path";
-                        };
-
                         executable_path = mkOption {
                           type = types.path;
                           readOnly = true;
@@ -237,20 +238,14 @@ in
                         };
 
                         cache_ttl = mkOption {
-                          type = types.nullOr types.int;
-                          default = null;
+                          type = types.ints.positive;
+                          default = 180000;
                           description = ''
-                            Deprecated cache TTL for the agent. This option is accepted
-                            by Headplane 0.6.2 but has no effect.
+                            How long to cache agent information (in milliseconds).
+                            If you want data to update faster, reduce the TTL, but this will increase the frequency of requests to Headscale.
                           '';
                         };
 
-                        cache_path = mkOption {
-                          type = types.path;
-                          default = "/var/lib/headplane/agent_cache.json";
-                          description = "The path to store the agent's cache.";
-                        };
-
                         work_dir = mkOption {
                           type = types.path;
                           default = "/var/lib/headplane/agent";
@@ -325,16 +320,6 @@ in
                     example = lib.literalExpression "config.sops.secrets.oidc_client_secret.path";
                   };
 
-                  headscale_api_key_path = mkOption {
-                    type = types.nullOr types.path;
-                    default = null;
-                    description = ''
-                      Path to a file containing the Headscale API key.
-                      Required for OIDC authentication.
-                    '';
-                    example = lib.literalExpression "config.sops.secrets.headscale_api_key.path";
-                  };
-
                   disable_api_key_login = mkOption {
                     type = types.bool;
                     default = false;
@@ -366,25 +351,6 @@ in
                     '';
                   };
 
-                  redirect_uri = mkOption {
-                    type = types.nullOr types.str;
-                    default = null;
-                    description = ''
-                      Deprecated OIDC redirect URI. Use services.headplane.settings.server.base_url
-                      instead; Headplane derives the callback URL from it.
-                    '';
-                    example = "https://headplane.example.com/admin/oidc/callback";
-                  };
-
-                  strict_validation = mkOption {
-                    type = types.nullOr types.bool;
-                    default = null;
-                    description = ''
-                      Deprecated OIDC validation setting. This option is accepted
-                      by Headplane 0.6.2 but has no effect.
-                    '';
-                  };
-
                   profile_picture_source = mkOption {
                     type = types.enum [
                       "oidc"
@@ -429,16 +395,6 @@ in
                     description = "Custom userinfo endpoint URL.";
                     example = "https://provider.example.com/userinfo";
                   };
-
-                  user_storage_file = mkOption {
-                    type = types.nullOr types.path;
-                    default = null;
-                    description = ''
-                      Deprecated path to the pre-0.6.2 JSON user database.
-                      Headplane uses this once to migrate users into its internal database.
-                    '';
-                    example = "/var/lib/headplane/users.json";
-                  };
                 };
               }
             );
@@ -452,33 +408,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    warnings =
-      lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.redirect_uri != null) [
-        ''
-          services.headplane.settings.oidc.redirect_uri is deprecated by Headplane 0.6.2.
-          Use services.headplane.settings.server.base_url instead; Headplane derives
-          the OIDC callback URL from it.
-        ''
-      ]
-      ++ lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.strict_validation != null) [
-        ''
-          services.headplane.settings.oidc.strict_validation is deprecated and has no effect
-          in Headplane 0.6.2.
-        ''
-      ]
-      ++ lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.user_storage_file != null) [
-        ''
-          services.headplane.settings.oidc.user_storage_file is deprecated. Headplane 0.6.2
-          uses it only to migrate the pre-0.6.2 JSON user database into the internal database.
-        ''
-      ]
-      ++ lib.optionals (agentSettings != null && agentSettings.cache_ttl != null) [
-        ''
-          services.headplane.settings.integration.agent.cache_ttl is deprecated and has no
-          effect in Headplane 0.6.2.
-        ''
-      ];
-
     assertions = [
       {
         assertion = config.services.headscale.enable;
@@ -502,26 +431,25 @@ in
         '';
       }
       {
-        assertion = cfg.settings.oidc == null || cfg.settings.oidc.headscale_api_key_path != null;
+        assertion = cfg.settings.oidc == null || cfg.settings.headscale.api_key_path != null;
         message = ''
-          services.headplane.settings.oidc.headscale_api_key_path must be set
-          when services.headplane.settings.oidc is non-null. Headplane's OIDC
-          flow requires a Headscale API key to mint sessions.
+          services.headplane.settings.headscale.api_key_path must be set
+          when services.headplane.settings.oidc is non-null.
+          Headplane's OIDC flow requires a Headscale API key to mint sessions.
         '';
       }
       {
         assertion =
-          agentSettings == null || !agentSettings.enabled || agentSettings.pre_authkey_path != null;
+          agentSettings == null || !agentSettings.enabled || cfg.settings.headscale.api_key_path != null;
         message = ''
-          services.headplane.settings.integration.agent.pre_authkey_path must be set
-          when the agent is enabled.
+          services.headplane.settings.headscale.api_key_path must be set when the agent is enabled.
         '';
       }
     ];
 
     environment = {
       systemPackages = [ cfg.package ];
-      etc."headplane/config.yaml".source = "${settingsFile}";
+      etc."headplane/config.yaml".source = settingsFile;
     };
 
     systemd.services.headplane = {
@@ -534,6 +462,7 @@ in
         config.systemd.services.headscale.name
       ];
       requires = [ config.systemd.services.headscale.name ];
+      restartTriggers = [ settingsFile ];
 
       environment = {
         HEADPLANE_DEBUG_LOG = toString cfg.debug;
diff --git a/pkgs/by-name/he/headplane-agent/package.nix b/pkgs/by-name/he/headplane-agent/package.nix
index d7e795a62a99..583c4941847d 100644
--- a/pkgs/by-name/he/headplane-agent/package.nix
+++ b/pkgs/by-name/he/headplane-agent/package.nix
@@ -1,22 +1,15 @@
 {
   buildGoModule,
-  fetchFromGitHub,
+  headplane,
   lib,
 }:
 buildGoModule (finalAttrs: {
   pname = "headplane-agent";
   __structuredAttrs = true;
-  # Note, if you are upgrading this, you should upgrade headplane at the same time
-  version = "0.6.3";
+  inherit (headplane) version src;
 
-  src = fetchFromGitHub {
-    owner = "tale";
-    repo = "headplane";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-zvJUTKRIlHyPMq80teVXBSb7K9Zz44Kuuj2PPi6qIOw=";
-  };
+  vendorHash = headplane.goVendorHash;
 
-  vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA=";
   subPackages = [ "cmd/hp_agent" ];
 
   ldflags = [
diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix
index 61201296d950..4e844e82b10b 100644
--- a/pkgs/by-name/he/headplane/package.nix
+++ b/pkgs/by-name/he/headplane/package.nix
@@ -3,32 +3,31 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   git,
-  headplane-agent,
   lib,
   makeWrapper,
   nixosTests,
-  nodejs_22,
+  nodejs_24,
   pnpm_10,
   pnpmConfigHook,
   stdenv,
 }:
 let
   pname = "headplane";
-  # Note, if you are upgrading this, you should upgrade headplane-agent at the same time
-  version = "0.6.3";
-  pnpmDepsHash = "sha256-CsmffCo9Se/4oiOqbcuhjPMuGmR2GL+YfcyWgzBTAh8=";
+  version = "0.7.0";
+  goVendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA=";
+  pnpmDepsHash = "sha256-OBerkCnB/QL5HGYp2kehzFYEIKSuqpBt0dTFHIypc00=";
   src = fetchFromGitHub {
     owner = "tale";
     repo = "headplane";
     tag = "v${version}";
-    hash = "sha256-zvJUTKRIlHyPMq80teVXBSb7K9Zz44Kuuj2PPi6qIOw=";
+    hash = "sha256-UMAGsrG2xfpgWlsDhf4aWJKoOrUbruucDNOhCJcYmQQ=";
   };
 
   headplaneSshWasm = buildGoModule {
     pname = "headplane-ssh-wasm";
     inherit version src;
     subPackages = [ "cmd/hp_ssh" ];
-    vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA=";
+    vendorHash = goVendorHash;
     env.CGO_ENABLED = 0;
     doCheck = false;
     buildPhase = ''
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     git
     makeWrapper
-    nodejs_22
+    nodejs_24
     pnpm_10
     pnpmConfigHook
   ];
@@ -82,14 +81,14 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     hash = pnpmDepsHash;
-    fetcherVersion = 3;
+    fetcherVersion = 4;
   };
 
   buildPhase = ''
     runHook preBuild
-    cp ${headplaneSshWasm}/hp_ssh.wasm app/hp_ssh.wasm
-    cp ${headplaneSshWasm}/wasm_exec.js app/wasm_exec.js
-    pnpm --offline build
+    cp ${headplaneSshWasm}/hp_ssh.wasm public/hp_ssh.wasm
+    cp ${headplaneSshWasm}/wasm_exec.js public/wasm_exec.js
+    pnpm build
     runHook postBuild
   '';
 
@@ -97,18 +96,15 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
     mkdir -p $out/{bin,share/headplane}
     cp -r build $out/share/headplane/
-    cp -r node_modules $out/share/headplane/
     cp -r drizzle $out/share/headplane/
-    substituteInPlace $out/share/headplane/build/server/index.js \
-      --replace "$PWD" "../.."
-    makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \
+    makeWrapper ${lib.getExe nodejs_24} $out/bin/headplane \
       --chdir $out/share/headplane \
       --add-flags $out/share/headplane/build/server/index.js
     runHook postInstall
   '';
 
   passthru = {
-    agent = headplane-agent;
+    inherit goVendorHash;
     tests = { inherit (nixosTests) headplane; };
   };
 

From b501cb180d8578ecba5aeb1f5d6ced62b2c2f836 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 01:02:50 +0000
Subject: [PATCH 1054/1386] python3Packages.imgw-pib: 2.4.1 -> 2.4.3

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

diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix
index ed303cde63e0..0aa17abffc1d 100644
--- a/pkgs/development/python-modules/imgw-pib/default.nix
+++ b/pkgs/development/python-modules/imgw-pib/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "imgw-pib";
-  version = "2.4.1";
+  version = "2.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "imgw-pib";
     tag = finalAttrs.version;
-    hash = "sha256-KF9YQKGX6mTINZN09PNVLYFqMe1cITN4P9ge1Q+NGJk=";
+    hash = "sha256-aGsvgAdj5PlVvLgE+PsgDUzmgDeXhsBJBNnxLn/K8XU=";
   };
 
   build-system = [ setuptools ];

From 9f1699c4467932c9d0e064d3f707b4386ccae629 Mon Sep 17 00:00:00 2001
From: Alex Spaulding <aspauldingcode@gmail.com>
Date: Wed, 15 Jul 2026 18:03:56 -0700
Subject: [PATCH 1055/1386] beeper: 4.2.957 -> 4.2.985

Restore AppImage type-2 magic for 4.2.985+ extracts. Add
aspauldingcode as maintainer.
---
 pkgs/by-name/be/beeper/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 23af3cace5f0..a2e262f622fb 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  runCommand,
   fetchurl,
   appimageTools,
   makeWrapper,
@@ -10,13 +11,21 @@
 }:
 let
   pname = "beeper";
-  version = "4.2.957";
+  version = "4.2.985";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-wUGUwWopQ8ox2+UP5hXIIF2XVLQmZyhfb712S8JjTGk=";
+    hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM=";
   };
+  # Beeper 4.2.985+ ships AppImages without the type-2 magic bytes
+  # (ASCII "AI" + 0x02 at ELF offset 8) that appimageTools.extract requires.
+  linuxSrc = runCommand "Beeper-${version}-appimage" { inherit src; } ''
+    cp $src $out
+    chmod +w $out
+    printf 'AI\x02' | dd of=$out bs=1 seek=8 conv=notrunc status=none
+  '';
   appimageContents = appimageTools.extract {
-    inherit pname version src;
+    inherit pname version;
+    src = linuxSrc;
 
     postExtract = ''
       appRoot="$out/resources/app"
@@ -35,7 +44,6 @@ let
 
       # hide version status element on about page otherwise an error message is shown
       sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $appRoot/build-browser/*.css
-
     '';
   };
 in
@@ -89,6 +97,7 @@ appimageTools.wrapAppImage {
     maintainers = with lib.maintainers; [
       jshcmpbll
       zh4ngx
+      aspauldingcode
     ];
     platforms = [ "x86_64-linux" ];
   };

From 0cbb0842fd3bfcf5a45e33b00fe955a751c1a9dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 01:45:05 +0000
Subject: [PATCH 1056/1386] julia-mono: 0.062 -> 0.63

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

diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix
index 4a1757da4311..607b56df83ec 100644
--- a/pkgs/by-name/ju/julia-mono/package.nix
+++ b/pkgs/by-name/ju/julia-mono/package.nix
@@ -7,12 +7,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "JuliaMono-ttf";
-  version = "0.062";
+  version = "0.63";
 
   src = fetchzip {
     url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
     stripRoot = false;
-    hash = "sha256-f9hjo3B4q2WBl0j86fHny8bYUqldYSC0pP4uoWOI8Zk=";
+    hash = "sha256-e1tQPtSnDeFhODCT+qtJd3IuGzUHW9VMZP85Nff9SSk=";
   };
 
   nativeBuildInputs = [ installFonts ];

From cfb5c7c7d6da9f95b7e3e1c7e6953fcb23af56f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 01:48:15 +0000
Subject: [PATCH 1057/1386] libretro.dolphin: 0-unstable-2026-06-28 ->
 0-unstable-2026-07-12

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

diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix
index 3975f8f5e6fc..3b96117dcb04 100644
--- a/pkgs/applications/emulators/libretro/cores/dolphin.nix
+++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix
@@ -20,13 +20,13 @@
 }:
 mkLibretroCore {
   core = "dolphin";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-07-12";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "dolphin";
-    rev = "894fdda35688f3ac33c680ef6fe17ce965a16bf1";
-    hash = "sha256-Dkvv8EgQjLjyt0muSVF0Cnex/3xUcZXvWTzgUw61Sv0=";
+    rev = "0b766a68cc835775b3216500bb9af2f5d4602b12";
+    hash = "sha256-JaUiDc4/vEWjEXe6H9+i6pft2DTsl5my5wyFmtbjdR0=";
     fetchSubmodules = true;
   };
 

From e55b25bac44b2852848d03a9c87a93f1cd19247f Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 15 Jul 2026 21:56:09 -0400
Subject: [PATCH 1058/1386] brave: 1.92.139 -> 1.92.140

https://community.brave.app/t/release-channel-1-92-140/655684
---
 pkgs/by-name/br/brave/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index a63f06c2ddf4..a5721a172127 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,20 +3,20 @@
 
 let
   pname = "brave";
-  version = "1.92.139";
+  version = "1.92.140";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-CkCpXgP4InjfjuhKqG66OjuZcqq7VLLK3/n+7fXpMj0=";
+      hash = "sha256-erH7ydVvVykPKYyrIRsn/FCh/ZCU0G+WrubOtfAxFYA=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-UFQV8iBsa6HdUhGGngpi341o41yRoenkxbG2M90O62A=";
+      hash = "sha256-IB2jRvtO30OAqyEZRgeuyNU9eLgIXJj7rLOooZcDuKY=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-65qGzjXZfY5eTWbxTA9R3jN2F0CdkXnHXGVfw3spujo=";
+      hash = "sha256-g7R8Sz3apcIMrQX6xqWiz0MMDru4hQQj5Uauq59BE/o=";
     };
   };
 

From 895505880493a9a4073da5c8df87a346df42bad2 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Fri, 10 Jul 2026 08:21:55 -0400
Subject: [PATCH 1059/1386] linuxPackages.xpadneo: 0.10.2 -> 0.10.4

---
 pkgs/os-specific/linux/xpadneo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index fbe1aad2053a..a80affc65552 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpadneo";
-  version = "0.10.2";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = "xpadneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GeQls+DeJrzduBRQw0rc9hf58Ncd5fRmn6Xwn0kMaXs=";
+    hash = "sha256-yaCC+/hRoLQAdR6L9ek5aED8+o8iv0OwfiamWxB7ACc=";
   };
 
   setSourceRoot = ''

From 6a7227f26ce9d9a29e0f8dd68fa2bf7c2a9cee59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:06:01 +0000
Subject: [PATCH 1060/1386] cloudflared: 2026.6.1 -> 2026.7.2

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

diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix
index 384532faa0c8..9d18a1b6c502 100644
--- a/pkgs/by-name/cl/cloudflared/package.nix
+++ b/pkgs/by-name/cl/cloudflared/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudflared";
-  version = "2026.6.1";
+  version = "2026.7.2";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     tag = finalAttrs.version;
-    hash = "sha256-TQW0XnYS96sX/+dTGocKzz91fJG58cSV3jGZI3TBaeg=";
+    hash = "sha256-fuJfvm5c63koMl46sJmZOiWuNKpOwH17MD20XD7q6s0=";
   };
 
   vendorHash = null;

From 4486d9505d9e767832470f2ff791ce8e10691b37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:15:39 +0000
Subject: [PATCH 1061/1386] automatic-timezoned: 2.0.126 -> 2.0.143

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

diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index a9a0557fbcdc..b77dc283face 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "automatic-timezoned";
-  version = "2.0.126";
+  version = "2.0.143";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-e6r8XfzwIdcGlQwN64bfSQ481b1ViLI+9jTxUYNsA3w=";
+    sha256 = "sha256-bbdhvQ9THiBRf1rLExXQiwlrkgZBFZlaV2CUszDmwo4=";
   };
 
-  cargoHash = "sha256-0iUBZXybkK6y19RsZXSibcSRh4jEYwSSYUDyCI3ihOc=";
+  cargoHash = "sha256-J7h1hVp8wK6UlkstcLCq4uMKJ9ZyLwGR75tcxpWnHT8=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From 929e1a048e6cf646a955b43e321fa52ab470a0a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:17:41 +0000
Subject: [PATCH 1062/1386] python3Packages.aiomelcloudhome: 0.1.9 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/aiomelcloudhome/default.nix b/pkgs/development/python-modules/aiomelcloudhome/default.nix
index 25675dc9696f..05e689c78721 100644
--- a/pkgs/development/python-modules/aiomelcloudhome/default.nix
+++ b/pkgs/development/python-modules/aiomelcloudhome/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aiomelcloudhome";
-  version = "0.1.9";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwindouna";
     repo = "aiomelcloudhome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aYaV7+Lj7LShO0HqoUjSFAMTOHY5piMdSACOVizGgco=";
+    hash = "sha256-OmeKkxx9/+3QYWMlv5fLplSVEOW3fPYurgBoqle8OFI=";
   };
 
   build-system = [ hatchling ];

From 30c066ab2f3672bc31dccea69c920371e3e07e6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:18:50 +0000
Subject: [PATCH 1063/1386] python3Packages.pyhelty: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/pyhelty/default.nix b/pkgs/development/python-modules/pyhelty/default.nix
index f015cd4c58e9..73ad70ca8c1f 100644
--- a/pkgs/development/python-modules/pyhelty/default.nix
+++ b/pkgs/development/python-modules/pyhelty/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyhelty";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ebaschiera";
     repo = "pyhelty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-w7RbTXab6CPQ4yispLa8t/wcx0bZQ1rXiXPhpqVH17k=";
+    hash = "sha256-mNUiVly29UIrD4woLY7IX45Ts5VXNmZw9toJ4zb39Jw=";
   };
 
   build-system = [ hatchling ];

From fb0142357e305d6a361a77ef5018891ec8da8b5f Mon Sep 17 00:00:00 2001
From: "Nakul S." <nakulsodhi@protonmail.com>
Date: Wed, 15 Jul 2026 21:23:29 -0500
Subject: [PATCH 1064/1386] mesa: 26.1.4 -> 26.1.5

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

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 28c2bb9f83d5..2e24b7e1e61c 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "26.1.4";
+  version = "26.1.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-PiuqafeJY7aGvb/T8rksTgManWiH9tjxbsi/W1vlFDM=";
+    hash = "sha256-7p0WyvVF6QHDmYjYvacR2MJjRDNNHYG5YGuPZb+hcTg=";
   };
 
   meta = {

From 9104e3f5b69b0ea23778d1344af8c7a6753216de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:28:59 +0000
Subject: [PATCH 1065/1386] prometheus-redis-exporter: 1.86.0 -> 1.87.0

---
 pkgs/by-name/pr/prometheus-redis-exporter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix
index 2869d2f5676a..353805132402 100644
--- a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.86.0";
+  version = "1.87.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-N7IW1u/ifo8S0yRmdRYFAXfqke/GUVy5omrEqaCZ/3I=";
+    sha256 = "sha256-c2+3pV81p8TxJQ3QUKFnwXKHlV9Gl8Ezghv8rH4dVGg=";
   };
 
-  vendorHash = "sha256-muGgriK1DDkKk4DOWf7m+W6/qquwYwqgTOzyNGbjV+U=";
+  vendorHash = "sha256-WvQx0UzORuDZPM0IDk2q4l6pfrecrUvzD3jP3vqV1Zo=";
 
   ldflags = [
     "-X main.BuildVersion=${version}"

From 527e9b1055d3e1e66395281bb21b206a36504aa2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:39:56 +0000
Subject: [PATCH 1066/1386] resterm: 0.44.6 -> 0.46.4

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

diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix
index fb04e282b187..f71c28a0c679 100644
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.44.6";
+  version = "0.46.4";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J8lvI5h3K7Ny8jkoBBLJX4qCSHkByDGWKHxDkVjAzUI=";
+    hash = "sha256-Fpt/ZYdLC4OVA9Aj8NXJ76TY1ofxifXfjqD6irVV6cM=";
   };
 
-  vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84=";
+  vendorHash = "sha256-K6edyYLkVQwEZBAfRwgckUJI8dmo/ZxFRjEkExtyLxY=";
 
   # modernc.org/libc (via modernc.org/sqlite) tries to read /etc/protocols
   modPostBuild = ''

From 725f036116753bee0ad99c3fb3f938b718505554 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:42:13 +0000
Subject: [PATCH 1067/1386] sshified: 1.2.6 -> 1.2.7

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

diff --git a/pkgs/by-name/ss/sshified/package.nix b/pkgs/by-name/ss/sshified/package.nix
index 18c8327b6667..1ace8b919232 100644
--- a/pkgs/by-name/ss/sshified/package.nix
+++ b/pkgs/by-name/ss/sshified/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sshified";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "hoffie";
     repo = "sshified";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YY9ZFIH4ST9xQRD7IkjC9rm+QTlfde5+2qR/reH9oHU=";
+    hash = "sha256-yeG0LqgRknAnN4rLV/659YJpxk3hBxDKX1BIioJ9P2M=";
   };
 
   vendorHash = null;

From f440a349a2fc9f1c94eb80d8022f6901ab9abe39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:48:09 +0000
Subject: [PATCH 1068/1386] termsvg: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix
index e425b69c1ce7..e74789380e27 100644
--- a/pkgs/by-name/te/termsvg/package.nix
+++ b/pkgs/by-name/te/termsvg/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "termsvg";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "MrMarble";
     repo = "termsvg";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tNvr8ptMortP7iI6GwT4AGbqTvNFposca8I2JribGnk=";
+    hash = "sha256-wV5b0HXf+DVSn5FbPU9/AXTaNKyenbxEGB9yI29e/cc=";
   };
 
-  vendorHash = "sha256-BoXRLWhQmfvMIN658MiXGCFMbnvuXfv/H/jCE6h4aWk=";
+  vendorHash = "sha256-6cXckWJFc/nYlz0HeLHXaXWNFR7HLEfU10gd2K2zgq0=";
 
   ldflags = [
     "-s"

From 9ca2e133f07c2541c0622b6afcf2237f2675ab01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 02:58:54 +0000
Subject: [PATCH 1069/1386] vscode-extensions.jnoortheen.nix-ide: 0.5.9 ->
 0.5.10

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5931a7d01d98..48d805e3c831 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2592,8 +2592,8 @@ let
         mktplcRef = {
           publisher = "jnoortheen";
           name = "nix-ide";
-          version = "0.5.9";
-          hash = "sha256-hPOcp6Yksgfu1+In21/gJ3MthV8JUV5WaRpYHvo5GGk=";
+          version = "0.5.10";
+          hash = "sha256-5rNqQRFLryzeIezUiqgvSY8Vz5n48367RHQrFDxpoD8=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";

From 42e33f8873ff790768ba1ad78ae61be5c12eafdd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 03:05:12 +0000
Subject: [PATCH 1070/1386] python3Packages.types-markdown: 3.10.2.20260211 ->
 3.10.2.20260712

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

diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix
index b978957aa54b..a4f7f7800271 100644
--- a/pkgs/development/python-modules/types-markdown/default.nix
+++ b/pkgs/development/python-modules/types-markdown/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "types-markdown";
-  version = "3.10.2.20260211";
+  version = "3.10.2.20260712";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_markdown";
     inherit (finalAttrs) version;
-    hash = "sha256-ZhZDEPiMEaWMbHBglMb4xTfEGONSXTO3Ynal+9ZrAc4=";
+    hash = "sha256-Ja6hcoJJDzWraxeod3Gr0vR5GFqv+Oj0oANQQ/AvLFI=";
   };
 
   build-system = [ setuptools ];

From 866ade6731ad00ccec3cf4a4475e31f185acdb0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 03:22:04 +0000
Subject: [PATCH 1071/1386] roslyn-ls: 5.9.0-1.26314.1 -> 5.9.0-1.26319.6

---
 pkgs/by-name/ro/roslyn-ls/deps.json   | 30 +++++++++++++--------------
 pkgs/by-name/ro/roslyn-ls/package.nix |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index f231b367b081..107bb2673f97 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -85,15 +85,15 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "5.9.0-1.26306.2",
-    "hash": "sha256-GdxMDFLl+/+UaJHVKzchPi6Dy23WBPvvZW6Ez+XJc2w=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.9.0-1.26306.2/microsoft.codeanalysis.analyzers.5.9.0-1.26306.2.nupkg"
+    "version": "5.9.0-1.26314.1",
+    "hash": "sha256-eIH9cgoG7C9Q/DgIz4u8YccZpvuV+0e/wNVhHBZJMZU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.9.0-1.26314.1/microsoft.codeanalysis.analyzers.5.9.0-1.26314.1.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "5.9.0-1.26312.114",
-    "hash": "sha256-vCAz49NzwPMKTrwF93rEyiLrtHyWvImhB/Upqeh3mBQ=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.9.0-1.26312.114/microsoft.codeanalysis.bannedapianalyzers.5.9.0-1.26312.114.nupkg"
+    "version": "5.9.0-1.26318.105",
+    "hash": "sha256-th/gB+lr8eukOvYS3mgqOH1xw/MZB92DGtvzxQ1dhCY=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.9.0-1.26318.105/microsoft.codeanalysis.bannedapianalyzers.5.9.0-1.26318.105.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
@@ -115,9 +115,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-    "version": "5.9.0-1.26312.114",
-    "hash": "sha256-Eke4nmBnkDrCRILYpXoMzj/6wffm5twnbwkjX00JMsU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.9.0-1.26312.114/microsoft.codeanalysis.publicapianalyzers.5.9.0-1.26312.114.nupkg"
+    "version": "5.9.0-1.26318.105",
+    "hash": "sha256-tmvcJ968qvZO0IxSAqGWvRY/Cf3sVoE3lgLKjEKdwMU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.9.0-1.26318.105/microsoft.codeanalysis.publicapianalyzers.5.9.0-1.26318.105.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -481,9 +481,9 @@
   },
   {
     "pname": "Roslyn.Diagnostics.Analyzers",
-    "version": "5.9.0-1.26312.114",
-    "hash": "sha256-aUngqGTjpzYR2uPNHPfvhUApEqx3Sea50vpMU0yCVZ0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.9.0-1.26312.114/roslyn.diagnostics.analyzers.5.9.0-1.26312.114.nupkg"
+    "version": "5.9.0-1.26318.105",
+    "hash": "sha256-OtO3MoCsN12zTiqc2a5kcSe8Gz3bYsLlrRztvMiWTRg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.9.0-1.26318.105/roslyn.diagnostics.analyzers.5.9.0-1.26318.105.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.bundle_green",
@@ -547,9 +547,9 @@
   },
   {
     "pname": "System.CommandLine",
-    "version": "3.0.0-preview.6.26312.114",
-    "hash": "sha256-0/D51nnC0jWdrqEUMIVj557NST8zSDwquxrVIRtyyN4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.6.26312.114/system.commandline.3.0.0-preview.6.26312.114.nupkg"
+    "version": "3.0.0-preview.6.26318.105",
+    "hash": "sha256-Tk8jtUmyXXdA/vbu4JvRits1TFmoFILzrVwv4ltyF68=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.6.26318.105/system.commandline.3.0.0-preview.6.26318.105.nupkg"
   },
   {
     "pname": "System.ComponentModel.Composition",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index c84bc8ad1068..febb9ba8e20b 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -38,18 +38,18 @@ in
 buildDotnetModule (finalAttrs: {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.144.9-prerelease";
+  vsVersion = "2.145.15-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${finalAttrs.vsVersion}";
-    hash = "sha256-Cq1ynxtNaguLhVSSR04wUkqrn4/0YmwGxHfBZC4zMS8=";
+    hash = "sha256-lQWmk+NYx2dUsD97manGi9s5i9KNBocNrVok3j/6gIw=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.9.0-1.26314.1";
+  version = "5.9.0-1.26319.6";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From 7e9e7179fb90c6ed0d109900f42fd1338269e947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 20:40:30 -0700
Subject: [PATCH 1072/1386] python3Packages.coverage: 7.14.1 -> 7.15.2

Diff: https://github.com/coveragepy/coveragepy/compare/7.14.1...7.15.2

Changelog: https://github.com/coveragepy/coveragepy/blob/7.15.2/CHANGES.rst
---
 pkgs/development/python-modules/coverage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 7b3f87af3b58..5393245ba843 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "coverage";
-  version = "7.14.1";
+  version = "7.15.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "coveragepy";
     repo = "coveragepy";
     tag = finalAttrs.version;
-    hash = "sha256-3/Q6TQfoZNM7bHjviw/C70i2ZgjobHnynmqX9qvreYQ=";
+    hash = "sha256-ZkZ2TAq1JoI1Sl8gPSBEvLX6yP/uf0Lfc4vaWfjCNEY=";
   };
 
   build-system = [ setuptools ];

From 8c36759238323e5dcdc15ba6f768e22f75ca09a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 20:43:14 -0700
Subject: [PATCH 1073/1386] python3Packages.cucumber-expressions: 19.0.1 ->
 20.0.0

Diff: https://github.com/cucumber/cucumber-expressions/compare/v19.0.1...v20.0.0

Changelog: https://github.com/cucumber/cucumber-expressions/blob/v20.0.0/CHANGELOG.md
---
 .../python-modules/cucumber-expressions/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix
index 548b0e83a5df..a1a2d912dabf 100644
--- a/pkgs/development/python-modules/cucumber-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-expressions/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "cucumber-expressions";
-  version = "19.0.1";
+  version = "20.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cucumber";
     repo = "cucumber-expressions";
     tag = "v${version}";
-    hash = "sha256-RosIA8LaXdpnqJYfowB4d1gWZTd8OfuetiBLNYX5dRc=";
+    hash = "sha256-aPxD6snSQCA0y5tagvMy95bVtsk0qGf4KglTsuCGolU=";
   };
 
   sourceRoot = "${src.name}/python";

From 62ab41a79dca976a0c1864f557b8a20c93733a7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 20:45:12 -0700
Subject: [PATCH 1074/1386] python3Packages.cucumber-expressions: use
 finalAttrs

---
 .../python-modules/cucumber-expressions/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix
index a1a2d912dabf..cc794395545c 100644
--- a/pkgs/development/python-modules/cucumber-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-expressions/default.nix
@@ -7,7 +7,7 @@
   pyyaml,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cucumber-expressions";
   version = "20.0.0";
   pyproject = true;
@@ -15,11 +15,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cucumber";
     repo = "cucumber-expressions";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-aPxD6snSQCA0y5tagvMy95bVtsk0qGf4KglTsuCGolU=";
   };
 
-  sourceRoot = "${src.name}/python";
+  sourceRoot = "${finalAttrs.src.name}/python";
 
   postPatch = ''
     substituteInPlace pyproject.toml \
@@ -36,10 +36,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/cucumber/cucumber-expressions/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/cucumber/cucumber-expressions/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Human friendly alternative to Regular Expressions";
     homepage = "https://github.com/cucumber/cucumber-expressions/tree/main/python";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.dotlambda ];
   };
-}
+})

From 3dce8ff7830be100a37f88c7835e2bfd7b79588c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 03:47:44 +0000
Subject: [PATCH 1075/1386] mouser: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/by-name/mo/mouser/package.nix b/pkgs/by-name/mo/mouser/package.nix
index fd74ae98cb08..e51d8b9c2544 100644
--- a/pkgs/by-name/mo/mouser/package.nix
+++ b/pkgs/by-name/mo/mouser/package.nix
@@ -12,7 +12,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mouser";
-  version = "3.6.0";
+  version = "3.7.0";
   pyproject = false;
 
   __structuredAttrs = true;
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "TomBadash";
     repo = "Mouser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ESfkpswENa91wL1WSfDL/Wpu4sjhT8qibJ0wsEYHX+0=";
+    hash = "sha256-Pjcx7YChgu7R8Kdv8fOJcxq98nwh/izpjbOO+4/cdk4=";
   };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [

From 173a569dbf2a3ea2c865f59cd7c71347930f5405 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 03:48:09 +0000
Subject: [PATCH 1076/1386] losange: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/lo/losange/package.nix b/pkgs/by-name/lo/losange/package.nix
index 6f50fabfc121..be9b2cee7f1a 100644
--- a/pkgs/by-name/lo/losange/package.nix
+++ b/pkgs/by-name/lo/losange/package.nix
@@ -21,7 +21,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "losange";
-  version = "0.10.1";
+  version = "0.10.2";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "tymmesyde";
     repo = "losange";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mr54/vnaopLwG9lhFiZJGgxWH/VaGitROVEeV7GSyHM=";
+    hash = "sha256-GRWDtua4QaJP6Te/EUXu0YmUJYdYbMrdNxj0WiE/B7w=";
   };
 
-  cargoHash = "sha256-LJ8EpxEIN8wojSmQ+WVshYRxGFAC9sUk5tnh3I2J408=";
+  cargoHash = "sha256-e7ENEIEpnwdI50bQnlP9iV0vmsNOlfNaR0UJ6mHsi2g=";
 
   buildInputs = [
     mpv

From 56578f40d8868d91257faf9d40b33bf06fad3d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 20:46:42 -0700
Subject: [PATCH 1077/1386] python3Packages.cucumber-tag-expressions: 9.1.0 ->
 10.0.0

Diff: https://github.com/cucumber/tag-expressions/compare/v9.1.0...v10.0.0

Changelog: https://github.com/cucumber/tag-expressions/blob/v10.0.0/CHANGELOG.md
---
 .../python-modules/cucumber-tag-expressions/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
index 745250882b32..b4f20a78cfe5 100644
--- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
@@ -10,21 +10,21 @@
 
 buildPythonPackage rec {
   pname = "cucumber-tag-expressions";
-  version = "9.1.0";
+  version = "10.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cucumber";
     repo = "tag-expressions";
     tag = "v${version}";
-    hash = "sha256-jkuez7C3YDGmv484Lmc5PszVbnVXkcC12RryvTJkxxg=";
+    hash = "sha256-GXgFACoes5g8E+I24tYuI3KVzFhZaFB3Gr4TJXKBpQs=";
   };
 
   sourceRoot = "${src.name}/python";
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "uv_build>=0.10.0,<0.11.0" uv_build
+      --replace-fail "uv_build>=0.11.0,<0.12.0" uv_build
   '';
 
   build-system = [

From 8f2a7d595ccbc55f888089556a02b87dfae2784e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 20:47:29 -0700
Subject: [PATCH 1078/1386] python3Packages.cucumber-tag-expressions: use
 finalAttrs

---
 .../cucumber-tag-expressions/default.nix               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
index b4f20a78cfe5..cc74c9fe0bbd 100644
--- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
@@ -8,7 +8,7 @@
   uv-build,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cucumber-tag-expressions";
   version = "10.0.0";
   pyproject = true;
@@ -16,11 +16,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cucumber";
     repo = "tag-expressions";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GXgFACoes5g8E+I24tYuI3KVzFhZaFB3Gr4TJXKBpQs=";
   };
 
-  sourceRoot = "${src.name}/python";
+  sourceRoot = "${finalAttrs.src.name}/python";
 
   postPatch = ''
     substituteInPlace pyproject.toml \
@@ -38,10 +38,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/cucumber/tag-expressions/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/cucumber/tag-expressions/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     homepage = "https://github.com/cucumber/tag-expressions";
     description = "Provides tag-expression parser for cucumber/behave";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ maxxk ];
   };
-}
+})

From 7df5dd5c46015001bc0a6553de129dc665afb587 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 03:49:59 +0000
Subject: [PATCH 1079/1386] budget-tracker-tui: 1.4.0 -> 1.4.1

---
 pkgs/by-name/bu/budget-tracker-tui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/budget-tracker-tui/package.nix b/pkgs/by-name/bu/budget-tracker-tui/package.nix
index ad6125fbebfe..c4cf146c31af 100644
--- a/pkgs/by-name/bu/budget-tracker-tui/package.nix
+++ b/pkgs/by-name/bu/budget-tracker-tui/package.nix
@@ -6,7 +6,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "budget-tracker-tui";
-  version = "1.4.0";
+  version = "1.4.1";
 
   __structuredAttrs = true;
 
@@ -14,9 +14,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Feromond";
     repo = "budget_tracker_tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rVNAYMfTGYRepeNSlm+d/bJq11lRNFZjpoQjQpclSzY=";
+    hash = "sha256-vNpnW9SIjuSnvNtBW8wzDNCCVpw3z/2nv9bremTMqww=";
   };
-  cargoHash = "sha256-u9XlckBJCRzpmY+Hs5x9cBWtxIN1zwMuIYMCuS7i6rQ=";
+  cargoHash = "sha256-eMzqi2uEaLmHEQtegiT2aWOJCq0tIdywtv1rl99kyys=";
 
   passthru.updateScript = nix-update-script { };
 

From 844d254b632e1c9c1582b68807696c8d07c08377 Mon Sep 17 00:00:00 2001
From: RoGreat <roguegreat@gmail.com>
Date: Tue, 14 Jul 2026 23:57:00 -0500
Subject: [PATCH 1080/1386] home-assistant-custom-components.eero: init at
 1.8.1

---
 .../custom-components/eero/package.nix        | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/eero/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/eero/package.nix b/pkgs/servers/home-assistant/custom-components/eero/package.nix
new file mode 100644
index 000000000000..e5fd06afac1e
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/eero/package.nix
@@ -0,0 +1,44 @@
+{
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  pypng,
+  pyqrcode,
+}:
+
+buildHomeAssistantComponent rec {
+  version = "1.8.1";
+  owner = "schmittx";
+  domain = "eero";
+
+  src = fetchFromGitHub {
+    owner = "schmittx";
+    repo = "home-assistant-eero";
+    tag = version;
+    hash = "sha256-iAY5ZlJaSZedykIOiRxULbrs+b8iK0pGed3fHbF3b8E=";
+  };
+
+  # no tests
+  doCheck = false;
+
+  ignoreVersionRequirement = [
+    "pypng"
+    "pyqrcode"
+  ];
+
+  dependencies = [
+    pypng
+    pyqrcode
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Custom component to allow control of Eero networks in Home Assistant";
+    homepage = "https://github.com/schmittx/home-assistant-eero";
+    changelog = "https://github.com/schmittx/home-assistant-eero/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ RoGreat ];
+  };
+}

From ffb6fb0a133b2d5c09ce40b62808628840d76008 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 04:09:34 +0000
Subject: [PATCH 1081/1386] python3Packages.aioimmich: 0.16.1 -> 0.16.3

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

diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix
index 74355dbce0a7..f7b2d1d51d22 100644
--- a/pkgs/development/python-modules/aioimmich/default.nix
+++ b/pkgs/development/python-modules/aioimmich/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "aioimmich";
-  version = "0.16.1";
+  version = "0.16.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "aioimmich";
     tag = "v${version}";
-    hash = "sha256-/Y4wSiaXpQXn0V+g56rL62fdE7SWl9L4sBeEL3nkGD8=";
+    hash = "sha256-Q79OpJWxspTjCdeUV8ymsXDfT2+kPiEfcaCGKWquOyY=";
   };
 
   postPatch = ''

From 702057b5bfed7baa21c414ceb9c61672b1a1b8b2 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 26 Jun 2026 16:36:05 -0700
Subject: [PATCH 1082/1386] adslib: 0-unstable-2026-04-27 -> 113.0.34-1

---
 pkgs/by-name/ad/adslib/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ad/adslib/package.nix b/pkgs/by-name/ad/adslib/package.nix
index 72f9602714ac..d5ea2a987392 100644
--- a/pkgs/by-name/ad/adslib/package.nix
+++ b/pkgs/by-name/ad/adslib/package.nix
@@ -5,18 +5,17 @@
   meson,
   ninja,
   pkg-config,
-  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "adslib";
-  version = "0-unstable-2026-04-27";
+  version = "113.0.34-1";
 
   src = fetchFromGitHub {
     owner = "stlehmann";
     repo = "ADS";
-    rev = "77953d58f2690436e82db9954e2e55878c5edaa4";
-    hash = "sha256-UDPuzqD1krEZa7436k1NvE0lJUmNYG4kiP5fstoRDMc=";
+    tag = finalAttrs.version;
+    hash = "sha256-Kh8BDioZdwSdATHPgZ7Ar3/E0y3eRRpG/38/2uHZEEQ=";
   };
 
   nativeBuildInputs = [
@@ -27,12 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     # Downstream consumers (e.g. pyads) load the shared library as
-    # `adslib.so` rather than the meson default `libadslib.so`.
-    ln -s libadslib.so $out/lib/adslib.so
+    # `adslib.so` rather than the meson default `libAdsLib.so`.
+    ln -s libAdsLib.so $out/lib/adslib.so
   '';
 
-  passthru.updateScript = unstableGitUpdater { };
-
   meta = {
     description = "Beckhoff protocol to communicate with TwinCAT devices";
     homepage = "https://github.com/stlehmann/ADS";

From 7221f0f2a67df0158bd7520a30f32677356dc0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Jul 2026 21:47:59 -0700
Subject: [PATCH 1083/1386] parla: 0.6.6 -> 0.6.8

Diff: https://github.com/trufae/parla/compare/0.6.6...0.6.8

Changelog: https://github.com/trufae/parla/releases/tag/0.6.8
---
 pkgs/by-name/pa/parla/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/parla/package.nix b/pkgs/by-name/pa/parla/package.nix
index 088e1b0ce231..1de6d1d09658 100644
--- a/pkgs/by-name/pa/parla/package.nix
+++ b/pkgs/by-name/pa/parla/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "parla";
-  version = "0.6.6";
+  version = "0.6.8";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "trufae";
     repo = "parla";
     tag = finalAttrs.version;
-    hash = "sha256-ZSI/dABNaApCXKJkLGXFp1Fp221Axurj/Z3O9Q9pQZk=";
+    hash = "sha256-buUu3+HhK00rRg3ry6m8yBvH/wln7tUJfB5eXCwLCKc=";
   };
 
   nativeBuildInputs = [

From 6b3e51df76a977f1914eb1e384e1247ddf5da37a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 05:26:37 +0000
Subject: [PATCH 1084/1386] python3Packages.oelint-data: 1.5.9 -> 1.5.10

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

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 0833fb4a5239..81c1f3d2286f 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-data";
-  version = "1.5.9";
+  version = "1.5.10";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = finalAttrs.version;
-    hash = "sha256-kVTuRhP9T6kyhgavLsKtxNQz/7fW7LYDLR23rj+WGRM=";
+    hash = "sha256-8lz1Y0lbsrFPJNWWaxSVFSpd23L5MODe71n+VknfPy8=";
   };
 
   build-system = [

From dbac79cad870862655d09c43dc8f9d167c9b1b5f Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 21:18:27 -0400
Subject: [PATCH 1085/1386] sequoia-sq: 1.3.1 -> 1.4.0

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sq/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index fa1fa8f41622..353851c697c6 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sequoia-sq";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lM+j1KtH3U/lbPXnKALAP75YokDufbdz8s8bjb0VXUY=";
+    hash = "sha256-+6QVRp0zDJIIv23YlAI/cspHuGc+YcWdPfJZIOxQRW8=";
   };
 
-  cargoHash = "sha256-3z1Qm/eeVlH0/x3C8PSSPIlQaRKk1U6mRlEiKk0AaVQ=";
+  cargoHash = "sha256-I6hPpRpILV+iU9erfVBQOXuICx4IvWvGyHWdep7jRm4=";
 
   nativeBuildInputs = [
     pkg-config
@@ -47,6 +47,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env.ASSET_OUT_DIR = "/tmp/";
 
+  # key store daemon binds a loopback socket
+  __darwinAllowLocalNetworking = true;
+
   doCheck = true;
 
   postInstall = ''

From da71f23be546b9a09cf370cc4abac87f945f740c Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 21:24:19 -0400
Subject: [PATCH 1086/1386] sequoia-sq: write build assets to target dir

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sq/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 353851c697c6..f7fcabf05a9e 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
   '';
 
-  env.ASSET_OUT_DIR = "/tmp/";
+  env.ASSET_OUT_DIR = "target";
 
   # key store daemon binds a loopback socket
   __darwinAllowLocalNetworking = true;
@@ -53,12 +53,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doCheck = true;
 
   postInstall = ''
-    installManPage /tmp/man-pages/*.*
+    installManPage ${finalAttrs.env.ASSET_OUT_DIR}/man-pages/*.*
     installShellCompletion \
       --cmd sq \
-      --bash /tmp/shell-completions/sq.bash \
-      --fish /tmp/shell-completions/sq.fish \
-      --zsh /tmp/shell-completions/_sq
+      --bash ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sq.bash \
+      --fish ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sq.fish \
+      --zsh ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/_sq
   '';
 
   passthru.updateScript = nix-update-script { };

From adf9c9fe56cf0a4480a7b0b4ca294f8bbb2c2bd5 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 21:57:13 -0400
Subject: [PATCH 1087/1386] sequoia-sq: enable structuredAttrs and strictDeps

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sq/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index f7fcabf05a9e..7345fdf7f24d 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -25,6 +25,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-I6hPpRpILV+iU9erfVBQOXuICx4IvWvGyHWdep7jRm4=";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook

From f9640ca49ddfd8b9d5e7eac60f263fe27a915e80 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 22:01:10 -0400
Subject: [PATCH 1088/1386] sequoia-sq: add versionCheckHook

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sq/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 7345fdf7f24d..764f5af492ce 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -10,6 +10,7 @@
   openssl,
   cacert,
   sqlite,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -54,6 +55,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __darwinAllowLocalNetworking = true;
 
   doCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "version";
 
   postInstall = ''
     installManPage ${finalAttrs.env.ASSET_OUT_DIR}/man-pages/*.*

From 94e565a31d646629b276a630b3d6ca15707e1abc Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 13 Jul 2026 22:03:02 -0400
Subject: [PATCH 1089/1386] sequoia-sq: add anish to maintainers

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/by-name/se/sequoia-sq/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 764f5af492ce..383f556a1ad6 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -79,6 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       minijackson
       doronbehar
       dvn0
+      anish
     ];
     mainProgram = "sq";
   };

From e3ca059c7f06bb6c0ef7012028dcd551fcd7921d Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 16 Jul 2026 07:54:28 +0200
Subject: [PATCH 1090/1386] claude-code: 2.1.210 -> 2.1.211

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 6bd58d1851a3..2e2cab1296a5 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.210",
-  "commit": "88e9fbf39bf4efa5bca44549b7fd9461628657e6",
-  "buildDate": "2026-07-14T15:12:31Z",
+  "version": "2.1.211",
+  "commit": "17a4b6d7b2ee1936b95e595054c7e7d38fddafb7",
+  "buildDate": "2026-07-15T16:42:49Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "1b471d62d1117482689d75447f5e050c640da717a5a3c91e6c13792450f8c662",
-      "size": 241509968
+      "checksum": "5a728a76198b6eca7f3c7cdbff43bab44b77b48c2108f7a3107d889773382629",
+      "size": 242445680
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "892f2c878050d8829e67119328dd9768345fba18a58c169212b70597c9175c40",
-      "size": 251025552
+      "checksum": "33049eb14cf4702b992b7eda41ec077fc6e76539f7fd046e6d32538757235da4",
+      "size": 251966736
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "84feb193c1d91f3b5eba836ed47c0e4dee953195abba950917c3e101eff174e8",
-      "size": 257932016
+      "checksum": "1fff7e8f947c07b19d10b1fbf714b7e547e9536253b9b58230d8adbc4624f867",
+      "size": 258849520
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "e7d2ceb53ed4c2ced1fe7fc1c6331c98dc5f7b4c9b2722d9c5fa3dd5dff6f719",
-      "size": 261081912
+      "checksum": "8272c8a474ac9ea1bc35f19b9f7c7e7dc4dc4eb6d5ad3e484b19335ac72446b2",
+      "size": 262023992
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "17f617e24a05533cea8a344f44f0a25b6fb20ee467500601c3cd8392064ec528",
-      "size": 251180216
+      "checksum": "ca094a85ea464b2ebec2ecfcc9e2c056573d4ca95ebe12ffae2c7dccb722e17b",
+      "size": 252097720
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "03012f856faa1a9409d9add13936794f168e530c9746c8a099dec6ce8415c32b",
-      "size": 255742336
+      "checksum": "c99bd7934ac841d5be6ee7d3644cb63bccef2cd495c6c1bb982a1b1deac1b466",
+      "size": 256680320
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "29aa99c436f0d4125780691123b756176d83b59cc7d492304cd4694292d3f04f",
-      "size": 252385952
+      "checksum": "3d8509ae7de11d77dbdc711aa320fc6d5064ce795464a8670696611b57093caf",
+      "size": 253293728
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "4a603da0a33d49478e55938898ddd06c4ec5d1ec7f443d92dd4352665faaef05",
-      "size": 246736544
+      "checksum": "a0f9bab0dbdda9b43a8765d54e329e44484d9dd7d4f40cf31db6eee27a2da41c",
+      "size": 247643808
     }
   },
   "sdkCompat": {

From 25378654cd48b5276208a098cba7691470a110f4 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 16 Jul 2026 07:54:29 +0200
Subject: [PATCH 1091/1386] vscode-extensions.anthropic.claude-code: 2.1.210 ->
 2.1.211

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../vscode/extensions/anthropic.claude-code/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 634ab22464ac..81658a231b91 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-uWghjE/Ue+i2kUD4KedN4NDTllgiZPMFFXbT0RQnGrE=";
+          hash = "sha256-JswgBhADhoEUug2h1ZZ7OtFjFUVgCxiqIaWCYCMf+Sw=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-pIwEx6+1Wc+MazqJQYA4h9oOqNOOA8MyJcJOd9Bx2ZM=";
+          hash = "sha256-+TBwLHUsPx+TiFP+5Gg59Yii76IERNbBQT3RLidogSo=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-Iq5C55YrV5ud74a218pTPIyq1oJisbDRNNefkzjpGs4=";
+          hash = "sha256-Xglh5yLP4QoeMxqqUUAJyuyehN9hdDookhjwU6znRX4=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.210";
+      version = "2.1.211";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 09be24a28271318d67fa85754e390178955d200d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 06:13:58 +0000
Subject: [PATCH 1092/1386] scdl: 3.0.6 -> 3.0.7

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

diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix
index 76ee23aac1a9..9969f6356b78 100644
--- a/pkgs/by-name/sc/scdl/package.nix
+++ b/pkgs/by-name/sc/scdl/package.nix
@@ -7,12 +7,12 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "scdl";
-  version = "3.0.6";
+  version = "3.0.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-kAvK1KqfVK6axQXTkBtcMxc7OHLPYNfIyy2n+97LhB4=";
+    hash = "sha256-3jwruTldVZ/j+i0X0+EW6JX8CwGQAZOGi2894MTrmVk=";
   };
 
   build-system = [ python3Packages.setuptools ];

From c30dcbe477b362f7e1edbaeaa595e7cdbed4839a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 06:40:38 +0000
Subject: [PATCH 1093/1386] octavePackages.statistics: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index dd7e397834f4..91f0e3fa568a 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -11,13 +11,13 @@
 
 buildOctavePackage rec {
   pname = "statistics";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "statistics";
     tag = "release-${version}";
-    hash = "sha256-1u/uXrbRNT14TbW89J8noCnwShD/B/Wz0cpurmsTzTU=";
+    hash = "sha256-aFFGpdcD6ppm/5VYEKd+X2QMRKyU4SkwtJYpK4/L1qI=";
   };
 
   requiredOctavePackages = [

From b38ad120704650cad8ea2339d4aec12d0c9bd972 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 06:56:07 +0000
Subject: [PATCH 1094/1386] python3Packages.python-bsblan: 6.1.6 -> 6.1.7

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

diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index 067dda6325b6..edaff773587f 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-bsblan";
-  version = "6.1.6";
+  version = "6.1.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "liudger";
     repo = "python-bsblan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1nq1m1jGks4YPn64pUz8lKlES2PwvdfsMlRFYiAEbYg=";
+    hash = "sha256-ZjhGFEJOUyRz2RKCok/CT0ytInY1juHDqKurGsO5KFo=";
   };
 
   postPatch = ''

From d71c01fe3bc846b41e9e04462b70ad9a318603ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 07:10:37 +0000
Subject: [PATCH 1095/1386] cni-plugin-flannel: 1.9.1-flannel1 ->
 1.9.1-flannel2

---
 pkgs/by-name/cn/cni-plugin-flannel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cni-plugin-flannel/package.nix b/pkgs/by-name/cn/cni-plugin-flannel/package.nix
index f838aa3c82c1..136fb2887c3d 100644
--- a/pkgs/by-name/cn/cni-plugin-flannel/package.nix
+++ b/pkgs/by-name/cn/cni-plugin-flannel/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cni-plugin-flannel";
-  version = "1.9.1-flannel1";
+  version = "1.9.1-flannel2";
 
   src = fetchFromGitHub {
     owner = "flannel-io";
     repo = "cni-plugin";
     rev = "v${version}";
-    sha256 = "sha256-iCSYr7S4oC8a5ijBgqMO/Gn0x/2had372Tx7lkg+X9I=";
+    sha256 = "sha256-ApPv1sQQZSevvP9gem9bTRWRZzHtcDHWNFTwEdCPJ6s=";
   };
 
-  vendorHash = "sha256-PVkhwoGepRhD6VFJxhPA2tZ+zOkhQw0aI2yIWVYQnz8=";
+  vendorHash = "sha256-WoVjhj2r4hVLBFYUYwpwuB7rpvoZFBDLpaEbLrxuFj4=";
 
   ldflags = [
     "-s"

From 2ab89ffc971a306411975baedf213e28eac70fd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 07:44:19 +0000
Subject: [PATCH 1096/1386] kythe: 0.0.75 -> 0.0.76

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

diff --git a/pkgs/by-name/ky/kythe/package.nix b/pkgs/by-name/ky/kythe/package.nix
index b9d536501b3a..47fba89db82b 100644
--- a/pkgs/by-name/ky/kythe/package.nix
+++ b/pkgs/by-name/ky/kythe/package.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.0.75";
+  version = "0.0.76";
   pname = "kythe";
 
   src = fetchurl {
     url = "https://github.com/kythe/kythe/releases/download/v${finalAttrs.version}/kythe-v${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-ZFZh3kt32UeqAl8AYbvrwjhqRVWtgyI/3k+Vb4/jAGo=";
+    sha256 = "sha256-7qQw91Y9uAXJnk0aQnymDXrvAc7HZpmGUpz+LCYpY1Y=";
   };
 
   buildInputs = [ binutils ];

From 2b07bc1b847b6257feeb9d230fdb1487a025e0db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 07:44:51 +0000
Subject: [PATCH 1097/1386] tzf-rs: 1.3.3 -> 1.3.6

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

diff --git a/pkgs/by-name/tz/tzf-rs/package.nix b/pkgs/by-name/tz/tzf-rs/package.nix
index 41598820c8ba..a18cdfcb2967 100644
--- a/pkgs/by-name/tz/tzf-rs/package.nix
+++ b/pkgs/by-name/tz/tzf-rs/package.nix
@@ -6,7 +6,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tzf-rs";
-  version = "1.3.3";
+  version = "1.3.6";
 
   __structuredAttrs = true;
 
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "ringsaturn";
     repo = "tzf-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pdh301znFcqsrXyo75W8NcIFKJnWowjoJIV9WpdeWVU=";
+    hash = "sha256-rvnykaYvQ992ehVwVds9UtTH9b4iydxac1JtNfKmYv0=";
   };
 
   buildFeatures = [
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "export-geojson"
   ];
 
-  cargoHash = "sha256-8Ma5WhUKJCFE3X26/dl2B1QeMtwjGY2Ux1DmRge5v2M=";
+  cargoHash = "sha256-Pm/89K4RKdjxT/LKfJzYlhTOqz40sXo8PMj7q1FHj3M=";
 
   passthru.updateScript = nix-update-script { };
 

From 75610b07a1830f82d70eb215e8f88a70166f6e4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 07:51:00 +0000
Subject: [PATCH 1098/1386] litmusctl: 1.26.0 -> 1.27.0

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

diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix
index b752a5686ce2..81905c937951 100644
--- a/pkgs/by-name/li/litmusctl/package.nix
+++ b/pkgs/by-name/li/litmusctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "litmusctl";
-  version = "1.26.0";
+  version = "1.27.0";
 
   nativeBuildInputs = [
     installShellFiles
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     owner = "litmuschaos";
     repo = "litmusctl";
     rev = "${finalAttrs.version}";
-    hash = "sha256-Zo21QH6uO1uKcLbuirLiIXS4qOI40zbamt1G9sL0IWg=";
+    hash = "sha256-jVbWgwW7qkGLY2T0SbK0Y/GItLj1BfLn1cloPyItpvI=";
   };
 
   vendorHash = "sha256-Lkvc8dBr/nvKczx83/KXKLe5FskGpI/17GIrl2y/E1I=";

From 8fca7c698184db77869a41c40609cd9248836727 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 16 Jul 2026 08:35:54 +0200
Subject: [PATCH 1099/1386] libgcrypt: fix riscv64-linux build

---
 pkgs/by-name/li/libgcrypt/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix
index 08fa5886de73..20f8cad0a141 100644
--- a/pkgs/by-name/li/libgcrypt/package.nix
+++ b/pkgs/by-name/li/libgcrypt/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   gettext,
   libgpg-error,
   enableCapabilities ? false,
@@ -24,6 +25,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-fOM8JJIiGgQ2+WqFACFenz49y1/SanV81BXnqEO6vV4=";
   };
 
+  patches = lib.optionals stdenv.hostPlatform.isRiscV64 [
+    # Remove in next release
+    # https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5
+    # zvkned AES corrupts CBC/CFB/CTR/OCB/XTS output on VLEN>128 hardware
+    (fetchpatch {
+      url = "https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5.patch";
+      hash = "sha256-1LSrIwsN0n5IBRDZ+9MJTEjzY+/T6LQO6hX1ke8hSuc=";
+    })
+  ];
+
   outputs = [
     "bin"
     "lib"

From bed958b104e3271d01bd075535fa60b96b2c994d Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sun, 12 Jul 2026 05:15:59 +0000
Subject: [PATCH 1100/1386] draupnir: add patch for package-lock.json

Adds draupnir.git#4e63164 as patch in order to resolve an issue where the package-lock.json was out of sync with package.json, resolves a regression where draupnir builds under Nix now fail.
---
 pkgs/by-name/dr/draupnir/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 4152c07609d2..590a7a4e298f 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -13,6 +13,7 @@
   cctools,
   nixosTests,
   nix-update-script,
+  fetchpatch2,
 }:
 let
   nodeSources = srcOnly nodejs_24;
@@ -36,7 +37,14 @@ buildNpmPackage (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool;
 
-  npmDepsHash = "sha256-DvQM9Kr9Hc7/1OEZadZ1GvpAjfRmbdIcA6UDuFBQ+vo=";
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/the-draupnir-project/Draupnir/commit/4e63164046153c656050c6d0a325c79f1492153a.patch?full_index=1";
+      hash = "sha256-dVG0BAE8pATfGdcHvTV8jTC+OQP0gMB7v396MtJlG4o=";
+    })
+  ];
+
+  npmDepsHash = "sha256-7WAfSFfPQJ9d/U9hk5wypasSoU2JwkoCq/nKAnzFf1o=";
 
   preBuild = ''
     # install proper version and branch info

From dbb2261b641060fa5752446893cc1f35555986fc Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:00:58 -0500
Subject: [PATCH 1101/1386] =?UTF-8?q?yaziPlugins.clipboard:=200-unstable-2?=
 =?UTF-8?q?026-05-22=20=E2=86=92=200-unstable-2026-07-14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compare: https://github.com/XYenon/clipboard.yazi/compare/0ac03203a88a6ca85539378fbb1b73b75fe8521e...4533c7f1b16196ad32749e35344bdc82a624871b
---
 pkgs/by-name/ya/yazi/plugins/clipboard/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix
index 5d65b9642326..3b4a38a4b0a8 100644
--- a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "clipboard.yazi";
-  version = "0-unstable-2026-05-22";
+  version = "0-unstable-2026-07-14";
 
   src = fetchFromGitHub {
     owner = "XYenon";
     repo = "clipboard.yazi";
-    rev = "0ac03203a88a6ca85539378fbb1b73b75fe8521e";
-    hash = "sha256-Ug0lEL+lR3xH1ps4fNljbs2DyExz0P5M2waWR9XTcEQ=";
+    rev = "4533c7f1b16196ad32749e35344bdc82a624871b";
+    hash = "sha256-lThDO1b9iq+N6x/F9fKEWlNPpgJBTfxpY2xjyZF22mM=";
   };
 
   meta = {

From edca056e2a681ec3112e361402142e973a9e6006 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:01:25 -0500
Subject: [PATCH 1102/1386] =?UTF-8?q?yaziPlugins.gvfs:=200-unstable-2026-0?=
 =?UTF-8?q?3-29=20=E2=86=92=200-unstable-2026-07-13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compare: https://github.com/boydaihungst/gvfs.yazi/compare/3abc0a258f9d7aeaa453a2d0d6e103c5a305953d...c5a0bb924eceeeb8b44bfc00aba0a97ba0287fa3
---
 pkgs/by-name/ya/yazi/plugins/gvfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/gvfs/default.nix b/pkgs/by-name/ya/yazi/plugins/gvfs/default.nix
index 078da3e2925f..beeec6c593ab 100644
--- a/pkgs/by-name/ya/yazi/plugins/gvfs/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/gvfs/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "gvfs.yazi";
-  version = "0-unstable-2026-03-29";
+  version = "0-unstable-2026-07-13";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "gvfs.yazi";
-    rev = "3abc0a258f9d7aeaa453a2d0d6e103c5a305953d";
-    hash = "sha256-UHneVJ+YXyDuPrZS+PZbs9n9h+VN5M2QG36FdprBkJc=";
+    rev = "c5a0bb924eceeeb8b44bfc00aba0a97ba0287fa3";
+    hash = "sha256-hSHEN/F4uc1FFScB5lLRAKryLwP+O7I9vgEgobGbQyw=";
   };
 
   meta = {

From af555d53e73e9686d4c13d52c6ff4d35126a98e0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:01:32 -0500
Subject: [PATCH 1103/1386] luaPackages.compat53: 0.15.0-1 -> 0.15.1-1

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

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 5146a9936fe4..3121768da02a 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -471,15 +471,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "compat53";
-      version = "0.15.0-1";
+      version = "0.15.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/compat53-0.15.0-1.rockspec";
-          sha256 = "0389ghggjdbfxxa6nrb7364z55dmb832qyb8v4474nzcws0b0aqf";
+          url = "mirror://luarocks/compat53-0.15.1-1.rockspec";
+          sha256 = "0x2vpfvsb6qqybx42aawa1mvnzlhlndy9z99g1707lixd4849fkl";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.15.0.zip";
-        sha256 = "164hcigjz7my1zlgccdbvsld89bvz6y16v82rjc8n2qa8ah5j45d";
+        url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.15.1.zip";
+        sha256 = "03gfs74lj58qd9mrd9y0bz5f6mq9qd8my5bb2xg5lx6wvagdlvim";
       };
 
       disabled = luaOlder "5.1" || luaAtLeast "5.6";

From b3fbdcfcc0fc611dee52e89cefb3aae05ea894d5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:01:36 -0500
Subject: [PATCH 1104/1386] =?UTF-8?q?yaziPlugins.keep-preferences:=200-uns?=
 =?UTF-8?q?table-2026-05-25=20=E2=86=92=200-unstable-2026-07-15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compare: https://github.com/XYenon/keep-preferences.yazi/compare/45d93faa8f1da3f4c2fabf68398204fd576705f7...0d32befc027b2ad31b8893bb2832f0f160442a0c
---
 pkgs/by-name/ya/yazi/plugins/keep-preferences/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/keep-preferences/default.nix b/pkgs/by-name/ya/yazi/plugins/keep-preferences/default.nix
index 44495c862b37..406be6db7b24 100644
--- a/pkgs/by-name/ya/yazi/plugins/keep-preferences/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/keep-preferences/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "keep-preferences.yazi";
-  version = "0-unstable-2026-05-25";
+  version = "0-unstable-2026-07-15";
 
   src = fetchFromGitHub {
     owner = "XYenon";
     repo = "keep-preferences.yazi";
-    rev = "45d93faa8f1da3f4c2fabf68398204fd576705f7";
-    hash = "sha256-uNReRmj9slKE/7WYA0gfE5eTO60CdFrFMH1/V3GwvFg=";
+    rev = "0d32befc027b2ad31b8893bb2832f0f160442a0c";
+    hash = "sha256-fdZIouyrWxcFGv51NVYylQRba6PGEzFqEP6mrUQiC9s=";
   };
 
   meta = {

From 8b7b74c9cb17a6bfe7e5f218f37df3a3e632e763 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:01:45 -0500
Subject: [PATCH 1105/1386] =?UTF-8?q?yaziPlugins.mediainfo:=200-unstable-2?=
 =?UTF-8?q?026-06-06=20=E2=86=92=200-unstable-2026-07-13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compare: https://github.com/boydaihungst/mediainfo.yazi/compare/a6d30a1c85faabe9bab215b83efb3c646b4c2924...e079a001f4fefd69007e515bbede4e16b95a811e
---
 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 03d86c88dd55..65e148c38625 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 = "0-unstable-2026-06-06";
+  version = "0-unstable-2026-07-13";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "a6d30a1c85faabe9bab215b83efb3c646b4c2924";
-    hash = "sha256-s2/6ljln64oVbKVFTGbRdxB8x9ASCo7FKDvC65eyDWM=";
+    rev = "e079a001f4fefd69007e515bbede4e16b95a811e";
+    hash = "sha256-RIVcKJO89R4oaE6sJuFcV8pFK4nvWtq6ILAXehu4FIY=";
   };
 
   meta = {

From ecbc12c408a585d32e258af16253a49c36077b65 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:07:02 -0500
Subject: [PATCH 1106/1386] luaPackages.luarocks-build-treesitter-parser:
 6.0.2-1 -> 6.1.1-1

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

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 3121768da02a..8b8e40d11c59 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -3825,15 +3825,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luarocks-build-treesitter-parser";
-      version = "6.0.2-1";
+      version = "6.1.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luarocks-build-treesitter-parser-6.0.2-1.rockspec";
-          sha256 = "0lwz15983gp29smykm3z6blhfd3ah3yi96j0g6di74nkz2kmfqk7";
+          url = "mirror://luarocks/luarocks-build-treesitter-parser-6.1.1-1.rockspec";
+          sha256 = "1hijvszf33l0yv1lwvp8187p0gwixr0cmf3ryvsvgcgas0fbb6nl";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/lumen-oss/luarocks-build-treesitter-parser/archive/v6.0.2.zip";
-        sha256 = "17877av310icqrv961ffhq852xx90wnpcxvqnylm476pndi1bf0f";
+        url = "https://github.com/lumen-oss/luarocks-build-treesitter-parser/archive/v6.1.1.zip";
+        sha256 = "1fg2fsxwc5qs2ll188s0rmz06gdxzfhwpg5wy6nwlwcg3y6x42ny";
       };
 
       disabled = luaOlder "5.1";

From 8aa7c3c56dd221af48a4370a49c46d4c0c42bd02 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 16 Jul 2026 10:07:55 +0200
Subject: [PATCH 1107/1386] rundeck: 6.0.0 -> 6.0.1

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

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index 4262070f1475..4f5849efa18c 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "6.0.0-20260629";
+  version = "6.0.1-20260715";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-3pB2mLme62jzJy5CxMhp77CqqEQ8FM6BpxHcX2q6Y1w=";
+    hash = "sha256-TuA09wAHLIkF5ynK1kihXGNHYb61TmKp/uX9dApBO7k=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5b94d39771b2eede9dfe235afa760848e7941ec5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:09:09 -0500
Subject: [PATCH 1108/1386] luaPackages.neotest: 5.19.0-1 -> 5.19.2-1

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

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 8b8e40d11c59..ffb620dfa7de 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -5011,15 +5011,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "neotest";
-      version = "5.19.0-1";
+      version = "5.19.2-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/neotest-5.19.0-1.rockspec";
-          sha256 = "1gfxf6v9q19xfn8kyklg2k4mj2fh4w03vyhq0drcmm4901vcvcz1";
+          url = "mirror://luarocks/neotest-5.19.2-1.rockspec";
+          sha256 = "01dlqkl877z7b4rvxbrw56z7804lwdy9k7vzy0zld7lvbhhxi3ha";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neotest/neotest/archive/e37147bca240d5b790bb61dc7d13cea214897079.zip";
-        sha256 = "1pbk3x8yi5hvb275gzz0c8gjykzpam1pcxxlb2l6qr1pzz0kvj7r";
+        url = "https://github.com/nvim-neotest/neotest/archive/4e2cd42c4252ee9d2435571d9adcdbc1d47931fe.zip";
+        sha256 = "01n0fr2k5fqj3xj0gng81d7abjr64b1ad0f0fp5qpc8wxnjk5agj";
       };
 
       disabled = luaOlder "5.1";

From 19ec1b17bd15ae25de3589a1e049557cdf045c52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 08:09:33 +0000
Subject: [PATCH 1109/1386] fabric-ai: 1.4.455 -> 1.4.459

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

diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index 8a62a2677564..f44a85433ad4 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fabric-ai";
-  version = "1.4.455";
+  version = "1.4.459";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-folZ+Y5l76SKo65RJAK7kZX6DJ/AL+iLkcV8NX+1DTA=";
+    hash = "sha256-HlOctDrdp1iksU2PU3LDDqaHdCtyTzJhToNkU7cqMPU=";
   };
 
-  vendorHash = "sha256-DfI0SYMX1wfJ8V0tFYpjzCgqhR7H/0J1p5R3aNcrXTw=";
+  vendorHash = "sha256-l7LeD4FV7TCuqek36R8FcrXcjHmTwGkQpJobp15Auts=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;

From ce57f1294040b35214e54ec585268fdd2ee7519e Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Wed, 8 Jul 2026 10:25:51 +0200
Subject: [PATCH 1110/1386] doc/using: clarify security support status

This is currently the status quo as per discussion in the NixOS
Security Discussions channel. Let's state it clearly to avoid people
being surprised.
---
 doc/using/platform-support.chapter.md | 50 +++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/doc/using/platform-support.chapter.md b/doc/using/platform-support.chapter.md
index 061c1b128d42..4422694e6288 100644
--- a/doc/using/platform-support.chapter.md
+++ b/doc/using/platform-support.chapter.md
@@ -1,16 +1,16 @@
 # Platform Support {#chap-platform-support}
 
-Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is.
+Packages receive varying degrees of support, both in terms of maintainer and security team attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is.
 
 ## Tiers {#sec-platform-tiers}
 
 ### Tier 1 {#sec-platform-tier1}
 
-[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, platform-specific patches are freely applied, and most packages are expected to work.
+[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, security fixes are treated with urgency, platform-specific patches are freely applied, and most packages are expected to work.
 
 ### Tier 2 {#sec-platform-tier2}
 
-[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support.
+[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional and secure with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support.
 
 ### Tier 3 {#sec-platform-tier3}
 
@@ -22,25 +22,25 @@ Platform Tiers [4 through 7](https://github.com/NixOS/rfcs/blob/master/rfcs/0046
 
 ## Breakdown {#sec-platform-breakdown}
 
-| Triple                                | Support Tier | Channel Blockers | Hydra Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support |
-| ------------------------------------- | ------------ | ---------------- | ------------- | -------------- | ------------------ | ----------------------- |
-| `x86_64-unknown-linux-gnu`            | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️            | ✔️            | ✔️                 | ✔️                      |
-| `aarch64-unknown-linux-gnu`           | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ✔️                      |
-| `x86_64-unknown-linux-musl`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
-| `aarch64-unknown-linux-musl`          | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
-| `x86_64-unknown-unknown-freebsd`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `arm64-apple-darwin`                  | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ❌                       |
-| `i686-unknown-linux-gnu`              | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
-| `riscv32-unknown-linux-gnu`           | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌             | ❌             | ❌                  | ✔️                      |
-| `riscv64-unknown-linux-gnu`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `loongarch64-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `armv6l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `armv6l-unknown-linux-musleabihf`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `armv7l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `armv5tel-unknown-linux-gnueabi`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `mips64el-unknown-linux-gnuabi64`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `mips64el-unknown-linux-gnuabin32`    | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `mipsel-unknown-linux-gnu`            | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `powerpc64le-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
-| `s390x-unknown-linux-gnu`             | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| Triple                                | Support Tier                                                                                   | Channel Blockers | Hydra Support | Security Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support |
+|---------------------------------------|------------------------------------------------------------------------------------------------|------------------|---------------|------------------|----------------|--------------------|-------------------------|
+| `x86_64-unknown-linux-gnu`            | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many             | ✔️             | ✔️                | ✔️              | ✔️                  | ✔️                       |
+| `aarch64-unknown-linux-gnu`           | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some             | ✔️             | ✔️                | ✔️              | ✔️                  | ✔️                       |
+| `x86_64-unknown-linux-musl`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | Limited       | ❌               | ❌             | ✔️                  | ✔️                       |
+| `aarch64-unknown-linux-musl`          | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | Limited       | ❌               | ❌             | ✔️                  | ✔️                       |
+| `x86_64-unknown-unknown-freebsd`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `arm64-apple-darwin`                  | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some             | ✔️             | ✔️                | ✔️              | ✔️                  | ❌                      |
+| `i686-unknown-linux-gnu`              | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | Limited       | ❌               | ❌             | ✔️                  | ✔️                       |
+| `riscv32-unknown-linux-gnu`           | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None             | ❌            | ❌               | ❌             | ❌                 | ✔️                       |
+| `riscv64-unknown-linux-gnu`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `loongarch64-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `armv6l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `armv6l-unknown-linux-musleabihf`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `armv7l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `armv5tel-unknown-linux-gnueabi`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `mips64el-unknown-linux-gnuabi64`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `mips64el-unknown-linux-gnuabin32`    | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `mipsel-unknown-linux-gnu`            | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `powerpc64le-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |
+| `s390x-unknown-linux-gnu`             | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None             | ❌            | ❌               | ❌             | ✔️                  | ✔️                       |

From 772e74b818d8f60e3554c9b1eebb44bf7708abf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 08:42:58 +0000
Subject: [PATCH 1111/1386] qrupdate: 1.1.5 -> 1.2.0

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

diff --git a/pkgs/by-name/qr/qrupdate/package.nix b/pkgs/by-name/qr/qrupdate/package.nix
index 0947f6267cf3..70bf3aedb09f 100644
--- a/pkgs/by-name/qr/qrupdate/package.nix
+++ b/pkgs/by-name/qr/qrupdate/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qrupdate";
-  version = "1.1.5";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "mpimd-csc";
     repo = "qrupdate-ng";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dHxLPrN00wwozagY2JyfZkD3sKUD2+BcnbjNgZepzFg=";
+    hash = "sha256-d5bc9JJOM3Tn41yZfqq3/rPMqZQxxICJo49oELSwxjc=";
   };
 
   cmakeFlags =

From 15c4f513474374b85e8bdeda76d4113f22299f17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 08:42:59 +0000
Subject: [PATCH 1112/1386] zed-editor: 1.10.0 -> 1.11.3

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index d662d9af996a..79d1d0739e53 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -98,7 +98,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "1.10.0";
+  version = "1.11.3";
 
   outputs = [
     "out"
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KLoowntT7rrUWJdZ+uA2qvKih+Ygo58RIxd5jR7fFYE=";
+    hash = "sha256-1T1MlbnRQgN9Y6bSxPScpsRW3diRCganwhJ5WcLi0dU=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail 'builder.include(&glib_path_config);' 'builder.include("${lib.getLib glib}/lib/glib-2.0/include");'
   '';
 
-  cargoHash = "sha256-HzDxvX72H3nLmfI0nIGZISpoF5vTiPj+hT/pz/6MUF4=";
+  cargoHash = "sha256-zBWVbJKvfzxoNptgczK3cPcF3ESS7P41gQC+r0l78Y0=";
 
   __structuredAttrs = true;
 

From 5dba23de0db904712c558dc584a509aadbda225e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 08:48:57 +0000
Subject: [PATCH 1113/1386] vscode-extensions.foam.foam-vscode: 0.44.1 ->
 0.44.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5931a7d01d98..355bc583002e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1760,8 +1760,8 @@ let
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.44.1";
-          hash = "sha256-OH4i4cGh/ivHQNAI55FHjM9ZjnhMaJSnsuQUnxub9/g=";
+          version = "0.44.2";
+          hash = "sha256-jz1j8KzD5PDZ+P5V7yLo1BEmcW+q+D2nYKzYEf7Sg2w=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";

From b39eb8a2a594c58b8b5266f27bc44f4b4f95d13c Mon Sep 17 00:00:00 2001
From: TheSast <27977196+TheSast@users.noreply.github.com>
Date: Thu, 16 Jul 2026 08:51:52 +0000
Subject: [PATCH 1114/1386] nixos/rename: fix typo in ecryptfs option removal
 message

---
 nixos/modules/rename.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index aff53c5526ac..54664ae769ba 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -511,7 +511,7 @@ in
       services.simplesamlphp has been vulnerable and unmaintained in nixpkgs.
     '')
     (mkRemovedOptionModule [ "security" "pam" "enableEcryptfs" ] ''
-      security.pam.enableFscrypt was removed since it was unmaintained in nixpkgs.
+      security.pam.enableEcryptfs was removed since it was unmaintained in nixpkgs.
     '')
     (mkRemovedOptionModule [ "security" "rngd" ] ''
       rngd is not necessary for any device that the kernel recognises

From 862c515c13e6ef249c9368c48bebf56ee5f3f2c1 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 Jul 2026 10:56:42 +0200
Subject: [PATCH 1115/1386] python3Packages.snuggs: remove click & uneeded
 patch

---
 pkgs/development/python-modules/snuggs/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix
index dd7b45d8864b..8ef0ffa6614a 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/pkgs/development/python-modules/snuggs/default.nix
@@ -2,8 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
-  click,
   numpy,
   setuptools,
   pyparsing,
@@ -26,17 +24,7 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ setuptools ];
 
-  patches = [
-    # Use non-strict xfail for failing tests
-    # https://github.com/mapbox/snuggs/pull/28
-    (fetchpatch {
-      url = "https://github.com/sebastic/snuggs/commit/3b8e04a35ed33a7dd89f0194542b22c7bde867f4.patch";
-      hash = "sha256-SfW4l4BH94rPdskRVHEsZM0twmlV9IPftRU/BBZsjBU=";
-    })
-  ];
-
   dependencies = [
-    click
     numpy
     pyparsing
   ];

From 513f0c006e5fbe1070092009ba7a4228c7bbd86e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 09:02:40 +0000
Subject: [PATCH 1116/1386] turso-cli: 1.0.29 -> 1.0.30

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

diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index be694e643727..21e56c494334 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "turso-cli";
-  version = "1.0.29";
+  version = "1.0.30";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jsvXglCf/FyJ3tasnOywXLA20k94yzbojPdX+dZVPfw=";
+    hash = "sha256-oV4lc4lbFM0G5d20P3xp2JwYOWRUc8o/v+ZTg30XL14=";
   };
 
   vendorHash = "sha256-4OIJVL3N2mWOw7ZDP4xFCxa9zmUTPCA8N79TVoi1lys=";

From 5d794a1546989d3d3f643de45bffd6a19702e59e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 09:26:00 +0000
Subject: [PATCH 1117/1386] glaze: 7.8.4 -> 7.9.0

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index 28c216a5d45d..96bf10e34cd2 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glaze";
-  version = "7.8.4";
+  version = "7.9.0";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AyDdyj3uN+IZWGItO87NLMIXRU8Irq8gBI3Q3zqKKzU=";
+    hash = "sha256-vNhxBdGaM70YABfwczvJcAFIYdEGIUGE8Sp2sgkTcaQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From 2fdbe55932e7d91002a1f5f346c7f9bbd30c9939 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 09:29:47 +0000
Subject: [PATCH 1118/1386] python3Packages.oelint-parser: 8.11.5 -> 8.11.6

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

diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index a42dbd7cd982..f3f59f4463e5 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-parser";
-  version = "8.11.5";
+  version = "8.11.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = finalAttrs.version;
-    hash = "sha256-DwbpF1H5fY854YKqB/8ppg6gMS2VhMzoyY8yr/DsfBk=";
+    hash = "sha256-lRfSrWZqkTsDjJzYXg4juPpxmrHHp3hvatyN3TdPAVw=";
   };
 
   pythonRelaxDeps = [ "regex" ];

From e74588f83020182d282b568a72d437ff1d5c1574 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 09:31:23 +0000
Subject: [PATCH 1119/1386] wireproxy: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/by-name/wi/wireproxy/package.nix b/pkgs/by-name/wi/wireproxy/package.nix
index f2416df91cc9..2a97fd76056c 100644
--- a/pkgs/by-name/wi/wireproxy/package.nix
+++ b/pkgs/by-name/wi/wireproxy/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "wireproxy";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "windtf";
     repo = "wireproxy";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-R1G/VtyQsl7yoDwZw+24qTdeq//qYQTQwzAPvH8f+ls=";
+    hash = "sha256-TnwkBkLMYc8TLvgDnzNSKvJy1MBXtjeVo+nY8ePf/T4=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     "-X main.version=v${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-T6RN7f05bNVL7gfhaAR0+lKZWqXvMcgjiyPldCmmvU4=";
+  vendorHash = "sha256-3X/0JHT0f6C7nlhD6Bh0hxyDcPZ3xqf6+wxa5VygXgo=";
 
   passthru.tests.version = testers.testVersion {
     package = wireproxy;

From f771f20b231bd72d17d17c5b8ad558bc30153ae5 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 16 Jul 2026 11:34:31 +0200
Subject: [PATCH 1120/1386] coqPackages.smtcoq: improve formatting

---
 .../coq-modules/smtcoq/default.nix            | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix
index 8ffe698cea6f..032b02af9416 100644
--- a/pkgs/development/coq-modules/smtcoq/default.nix
+++ b/pkgs/development/coq-modules/smtcoq/default.nix
@@ -43,36 +43,12 @@ mkCoqDerivation {
 
   inherit version;
   defaultVersion =
+    let
+      case = case: out: { inherit case out; };
+    in
     with lib.versions;
-    lib.switch coq.version [
-      {
-        case = isEq "8.19";
-        out = "SMTCoq-2.2+8.19";
-      }
-      {
-        case = isEq "8.18";
-        out = "SMTCoq-2.2+8.18";
-      }
-      {
-        case = isEq "8.17";
-        out = "SMTCoq-2.2+8.17";
-      }
-      {
-        case = isEq "8.16";
-        out = "SMTCoq-2.2+8.16";
-      }
-      {
-        case = isEq "8.15";
-        out = "SMTCoq-2.2+8.15";
-      }
-      {
-        case = isEq "8.14";
-        out = "SMTCoq-2.2+8.14";
-      }
-      {
-        case = isEq "8.13";
-        out = "SMTCoq-2.2+8.13";
-      }
+    lib.switch coq.coq-version [
+      (case (range "8.13" "8.19") "SMTCoq-2.2+${coq.coq-version}")
     ] null;
 
   propagatedBuildInputs = [

From ccfdda5636e1aceed02046b3b053c4c49bd4cf97 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 16 Jul 2026 11:29:55 +0200
Subject: [PATCH 1121/1386] coqPackages.smtcoq: SMTCoq-2.2+8.19 ->
 SMTCoq-2.3+8.20

---
 pkgs/development/coq-modules/smtcoq/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix
index 032b02af9416..a3aeba4881ea 100644
--- a/pkgs/development/coq-modules/smtcoq/default.nix
+++ b/pkgs/development/coq-modules/smtcoq/default.nix
@@ -25,6 +25,7 @@ mkCoqDerivation {
   pname = "smtcoq";
   owner = "smtcoq";
 
+  release."SMTCoq-2.3+8.20".hash = "sha256-ScWtdwSpFBf/PryPuvI/SkhgqWyYhcX3FCOqoXNho7Q=";
   release."SMTCoq-2.2+8.19".hash = "sha256-9Wv8AXRRyOHG/cjA/V9tSK55R/bofDMLTkDpuwYWkks=";
   release."SMTCoq-2.2+8.18".hash = "sha256-1iJAruI5Qn9nTZcUDjk8t/1Q+eFkYLOe9Ee0DmK03w8=";
   release."SMTCoq-2.2+8.17".hash = "sha256-kaodsyVUl1+QQagzoBTIjxbdD4X3IaaH0x2AsVUL+Z0=";
@@ -48,6 +49,7 @@ mkCoqDerivation {
     in
     with lib.versions;
     lib.switch coq.coq-version [
+      (case (isEq "8.20") "SMTCoq-2.3+${coq.coq-version}")
       (case (range "8.13" "8.19") "SMTCoq-2.2+${coq.coq-version}")
     ] null;
 

From f0eacaa7b5166bc988a2ba23882dda684d7c3804 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 16 Jul 2026 11:13:18 +0200
Subject: [PATCH 1122/1386] coqPackages.smtcoq: now depends on trakt

---
 .../coq-modules/smtcoq/default.nix            | 112 ++++++++++--------
 1 file changed, 63 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix
index a3aeba4881ea..ced7a87640ee 100644
--- a/pkgs/development/coq-modules/smtcoq/default.nix
+++ b/pkgs/development/coq-modules/smtcoq/default.nix
@@ -6,6 +6,7 @@
   zchaff,
   cvc5,
   stdlib,
+  trakt,
   version ? null,
 }:
 
@@ -21,59 +22,72 @@
 #   };
 # in
 
-mkCoqDerivation {
-  pname = "smtcoq";
-  owner = "smtcoq";
+let
+  derivation = mkCoqDerivation {
+    pname = "smtcoq";
+    owner = "smtcoq";
+    opam-name = "rocq-smtcoq";
 
-  release."SMTCoq-2.3+8.20".hash = "sha256-ScWtdwSpFBf/PryPuvI/SkhgqWyYhcX3FCOqoXNho7Q=";
-  release."SMTCoq-2.2+8.19".hash = "sha256-9Wv8AXRRyOHG/cjA/V9tSK55R/bofDMLTkDpuwYWkks=";
-  release."SMTCoq-2.2+8.18".hash = "sha256-1iJAruI5Qn9nTZcUDjk8t/1Q+eFkYLOe9Ee0DmK03w8=";
-  release."SMTCoq-2.2+8.17".hash = "sha256-kaodsyVUl1+QQagzoBTIjxbdD4X3IaaH0x2AsVUL+Z0=";
-  release."SMTCoq-2.2+8.16".hash = "sha256-Hwm8IFlw97YiOY6H63HyJlwIXvQHr9lqc1+PgTnBtkw=";
-  release."SMTCoq-2.2+8.15".hash = "sha256-+GYOasJ32KJyOfqJlTtFmsJ2exd6gdueKwHdeMPErTo=";
-  release."SMTCoq-2.2+8.14".hash = "sha256-jqnF33E/4CqR1HSrLmUmLVCKslw9h3bbWi4YFmFYrhY=";
-  release."SMTCoq-2.2+8.13".hash = "sha256-AVpKU/SLaLYnCnx6GOEPGJjwbRrp28Fs5O50kJqdclI=";
-  release."SMTCoq-2.1+8.16".rev = "4996c00b455bfe98400e96c954839ceea93efdf7";
-  release."SMTCoq-2.1+8.16".hash = "sha256-k53e+frUjwq+ZZKbbOKd/EfVC40QeAzB2nCsGkCKnHA=";
-  release."SMTCoq-2.1+8.14".rev = "e11d9b424b0113f32265bcef0ddc962361da4dae";
-  release."SMTCoq-2.1+8.14".hash = "sha256-4a01/CRHUon2OfpagAnMaEVkBFipPX3MCVmSFS1Bnt4=";
-  release."SMTCoq-2.1+8.13".rev = "d02269c43739f4559d83873563ca00daad9faaf1";
-  release."SMTCoq-2.1+8.13".hash = "sha256-VZetGghdr5uJWDwZWSlhYScoNEoRHIbwqwJKSQyfKKg=";
+    release."SMTCoq-2.3+8.20".hash = "sha256-ScWtdwSpFBf/PryPuvI/SkhgqWyYhcX3FCOqoXNho7Q=";
+    release."SMTCoq-2.2+8.19".hash = "sha256-9Wv8AXRRyOHG/cjA/V9tSK55R/bofDMLTkDpuwYWkks=";
+    release."SMTCoq-2.2+8.18".hash = "sha256-1iJAruI5Qn9nTZcUDjk8t/1Q+eFkYLOe9Ee0DmK03w8=";
+    release."SMTCoq-2.2+8.17".hash = "sha256-kaodsyVUl1+QQagzoBTIjxbdD4X3IaaH0x2AsVUL+Z0=";
+    release."SMTCoq-2.2+8.16".hash = "sha256-Hwm8IFlw97YiOY6H63HyJlwIXvQHr9lqc1+PgTnBtkw=";
+    release."SMTCoq-2.2+8.15".hash = "sha256-+GYOasJ32KJyOfqJlTtFmsJ2exd6gdueKwHdeMPErTo=";
+    release."SMTCoq-2.2+8.14".hash = "sha256-jqnF33E/4CqR1HSrLmUmLVCKslw9h3bbWi4YFmFYrhY=";
+    release."SMTCoq-2.2+8.13".hash = "sha256-AVpKU/SLaLYnCnx6GOEPGJjwbRrp28Fs5O50kJqdclI=";
+    release."SMTCoq-2.1+8.16".rev = "4996c00b455bfe98400e96c954839ceea93efdf7";
+    release."SMTCoq-2.1+8.16".hash = "sha256-k53e+frUjwq+ZZKbbOKd/EfVC40QeAzB2nCsGkCKnHA=";
+    release."SMTCoq-2.1+8.14".rev = "e11d9b424b0113f32265bcef0ddc962361da4dae";
+    release."SMTCoq-2.1+8.14".hash = "sha256-4a01/CRHUon2OfpagAnMaEVkBFipPX3MCVmSFS1Bnt4=";
+    release."SMTCoq-2.1+8.13".rev = "d02269c43739f4559d83873563ca00daad9faaf1";
+    release."SMTCoq-2.1+8.13".hash = "sha256-VZetGghdr5uJWDwZWSlhYScoNEoRHIbwqwJKSQyfKKg=";
 
-  releaseRev = v: v;
+    releaseRev = v: v;
 
-  inherit version;
-  defaultVersion =
-    let
-      case = case: out: { inherit case out; };
-    in
-    with lib.versions;
-    lib.switch coq.coq-version [
-      (case (isEq "8.20") "SMTCoq-2.3+${coq.coq-version}")
-      (case (range "8.13" "8.19") "SMTCoq-2.2+${coq.coq-version}")
-    ] null;
+    inherit version;
+    defaultVersion =
+      let
+        case = case: out: { inherit case out; };
+      in
+      with lib.versions;
+      lib.switch coq.coq-version [
+        (case (isEq "8.20") "SMTCoq-2.3+${coq.coq-version}")
+        (case (range "8.13" "8.19") "SMTCoq-2.2+${coq.coq-version}")
+      ] null;
 
-  propagatedBuildInputs = [
-    cvc5
-    # veriT'  # c.f. comment above
-    zchaff
-    stdlib
-  ]
-  ++ (with coq.ocamlPackages; [
-    findlib
-    num
-    zarith
-  ]);
-  mlPlugin = true;
-  nativeBuildInputs = (with pkgs; [ gnumake42 ]) ++ (with coq.ocamlPackages; [ ocamlbuild ]);
+    propagatedBuildInputs = [
+      cvc5
+      # veriT'  # c.f. comment above
+      zchaff
+      stdlib
+    ]
+    ++ (with coq.ocamlPackages; [
+      findlib
+      num
+      zarith
+    ]);
+    useDuneifVersion = v: v != null && (v == "dev" || lib.versions.isGt "SMTCoq-2.3+8.20" v);
+    mlPlugin = true;
+    nativeBuildInputs = (with pkgs; [ gnumake42 ]) ++ (with coq.ocamlPackages; [ ocamlbuild ]);
 
-  # This is meant to ease future troubleshooting of cvc5 build failures
-  passthru = { inherit cvc5; };
+    # This is meant to ease future troubleshooting of cvc5 build failures
+    passthru = { inherit cvc5; };
 
-  meta = {
-    description = "Communication between Coq and SAT/SMT solvers";
-    maintainers = with lib.maintainers; [ siraben ];
-    license = lib.licenses.cecill-b;
-    platforms = lib.platforms.unix;
+    meta = {
+      description = "Communication between Coq and SAT/SMT solvers";
+      maintainers = with lib.maintainers; [ siraben ];
+      license = lib.licenses.cecill-b;
+      platforms = lib.platforms.unix;
+    };
   };
-}
+  patched-derivation1 = derivation.overrideAttrs (
+    o:
+    lib.optionalAttrs
+      (o.version != null && (o.version == "dev" || lib.versions.isGt "SMTCoq-2.3+8.20" o.version))
+      {
+        propagatedBuildInputs = o.propagatedBuildInputs ++ [ trakt ];
+      }
+  );
+in
+patched-derivation1

From 6212eaa047ecbe9a52b35547b47b8392734dc0e0 Mon Sep 17 00:00:00 2001
From: John Mark Gabriel Caguicla <jmg.caguicla@guarandoo.me>
Date: Thu, 26 Jun 2025 20:08:49 +0800
Subject: [PATCH 1123/1386] epson_202101w: init at 1.0.2

---
 pkgs/by-name/ep/epson-202101w/package.nix | 92 +++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 pkgs/by-name/ep/epson-202101w/package.nix

diff --git a/pkgs/by-name/ep/epson-202101w/package.nix b/pkgs/by-name/ep/epson-202101w/package.nix
new file mode 100644
index 000000000000..53c2c0a969f5
--- /dev/null
+++ b/pkgs/by-name/ep/epson-202101w/package.nix
@@ -0,0 +1,92 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  rpmextract,
+  autoreconfHook,
+  autoPatchelfHook,
+  file,
+  libjpeg,
+  cups,
+}:
+
+let
+  version = "1.0.2";
+in
+stdenv.mkDerivation {
+  pname = "epson-202101w";
+  inherit version;
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchurl {
+    # NOTE: Don't forget to update the webarchive link too!
+    urls = [
+      "https://download3.ebz.epson.net/dsc/f/03/00/15/15/02/f5cba2761f2f501363cdbf7e1b9b9879b0715aa5/epson-inkjet-printer-202101w-1.0.2-1.src.rpm"
+      "https://web.archive.org/web/20250609030209if_/https://download3.ebz.epson.net/dsc/f/03/00/15/15/02/f5cba2761f2f501363cdbf7e1b9b9879b0715aa5/epson-inkjet-printer-202101w-1.0.2-1.src.rpm"
+    ];
+    sha256 = "17lz5cccknabp8cbkplhv1sn92m5w5md01rhhycbngp10zdmyhcz";
+  };
+
+  nativeBuildInputs = [
+    rpmextract
+    autoreconfHook
+    autoPatchelfHook
+    file
+  ];
+
+  buildInputs = [
+    libjpeg
+    cups
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  unpackPhase = ''
+    rpmextract $src
+    tar -zxf epson-inkjet-printer-202101w-${version}.tar.gz
+    tar -zxf epson-inkjet-printer-filter-${version}.tar.gz
+    for ppd in epson-inkjet-printer-202101w-${version}/ppds/*; do
+      substituteInPlace $ppd --replace "/opt/epson-inkjet-printer-202101w" "$out"
+      substituteInPlace $ppd --replace "/cups/lib" "/lib/cups"
+    done
+    cd epson-inkjet-printer-filter-${version}
+  '';
+
+  preConfigure = ''
+    chmod +x configure
+  '';
+
+  postInstall = ''
+    cd ../epson-inkjet-printer-202101w-${version}
+    cp -a lib64 resource watermark $out
+    mkdir -p $out/share/cups/model/epson-inkjet-printer-202101w
+    cp -a ppds $out/share/cups/model/epson-inkjet-printer-202101w/
+    cp -a Manual.txt $out/doc/
+    cp -a README $out/doc/README.driver
+  '';
+
+  meta = {
+    homepage = "https://www.openprinting.org/driver/epson-202101w";
+    description = "Epson printer driver (L1210, L1250, L3200, L3210)";
+    longDescription = ''
+      This software is a filter program used with the Common UNIX Printing
+      System (CUPS) under Linux. It supplies high quality printing with
+      Seiko Epson Color Ink Jet Printers.
+
+      To use the driver adjust your configuration.nix file:
+        services.printing = {
+          enable = true;
+          drivers = [ pkgs.epson-202101w ];
+        };
+    '';
+    license = with lib.licenses; [
+      lgpl21
+      epson
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      caguiclajmg
+    ];
+  };
+}

From 3f72a0cb8cfa85c3007350a885f4236ba0705352 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 10:00:04 +0000
Subject: [PATCH 1124/1386] lstk: 0.15.0 -> 0.17.0

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

diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix
index 8f1a9569cef2..ac93856533fa 100644
--- a/pkgs/by-name/ls/lstk/package.nix
+++ b/pkgs/by-name/ls/lstk/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lstk";
-  version = "0.15.0";
+  version = "0.17.0";
 
   __structuredAttrs = true;
 
@@ -15,10 +15,10 @@ buildGoModule (finalAttrs: {
     owner = "localstack";
     repo = "lstk";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-OqJhHJFSQ8tJDcFizXky40W5nedSroUVXGrXAWTHnlQ=";
+    sha256 = "sha256-btwXEUstvJ2z+ixVH5QeOVOhrE7AmLNESKVSTmEmNiU=";
   };
 
-  vendorHash = "sha256-ZWezMbvUUwOoWMU+zHL4hHMKAncI/oCsWMaLt5qN+YM=";
+  vendorHash = "sha256-86yg2+SZ+pnCi0wTjfqyO68adVaDjT24SgCbPVgd1Ho=";
 
   excludedPackages = "test/integration";
 

From b6085fc0204f47886b5f0dea0d8b1e519a5b747a Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Mon, 27 Apr 2026 15:49:35 +0200
Subject: [PATCH 1125/1386] nixos/vnstat: add RFC-42 settings

---
 nixos/modules/services/monitoring/vnstat.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix
index 062d181b059a..ea7181856c95 100644
--- a/nixos/modules/services/monitoring/vnstat.nix
+++ b/nixos/modules/services/monitoring/vnstat.nix
@@ -6,17 +6,32 @@
 }:
 let
   cfg = config.services.vnstat;
+  settingsFormat = pkgs.formats.keyValue { };
 in
 {
   options.services.vnstat = {
     enable = lib.mkEnableOption "update of network usage statistics via vnstatd";
     package = lib.mkPackageOption pkgs "vnstat" { };
+    settings = lib.mkOption {
+      type = lib.types.submodule { freeformType = settingsFormat.type; };
+      default = { };
+      description = ''
+        Configuration for vnstat. Refer to
+        [https://humdi.net/vnstat/man/vnstat.conf.html]
+        or {manpage}`vnstat.conf(5)` for more information.
+      '';
+      example = {
+        AlwaysAddNewInterfaces = 1;
+      };
+    };
   };
 
   config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ cfg.package ];
 
+    environment.etc."vnstat.conf".source = settingsFormat.generate "vnstat.conf" cfg.settings;
+
     users = {
       groups.vnstatd = { };
 

From ec074b03336784bb5dc91bef6255e872a768ae7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 10:05:38 +0000
Subject: [PATCH 1126/1386] vscode-extensions.yoshi47.selection-path-copier:
 1.5.0 -> 1.6.0

---
 .../extensions/yoshi47.selection-path-copier/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
index a309d6d7ddc9..8933fcac2d30 100644
--- a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
   mktplcRef = {
     publisher = "yoshi47";
     name = "selection-path-copier";
-    version = "1.5.0";
-    hash = "sha256-ip8dsU8B2vghINPSftvfC5OtM0bjIP0V3JAMt5skmdg=";
+    version = "1.6.0";
+    hash = "sha256-KnV9WariqK3GMjoQARtamxriBkL0Pi9y7+fhfwObCWE=";
   };
   meta = {
     description = "Copy file paths with line numbers, code snippets, and GitHub permalinks in multiple formats";

From 6d3c620fa6d2c55014a4f9b9b5d66a26b7c47a09 Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Mon, 27 Apr 2026 15:50:31 +0200
Subject: [PATCH 1127/1386] nixos/vnstat: add hmenke as maintainer

---
 nixos/modules/services/monitoring/vnstat.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix
index ea7181856c95..4aaa89668c19 100644
--- a/nixos/modules/services/monitoring/vnstat.nix
+++ b/nixos/modules/services/monitoring/vnstat.nix
@@ -74,4 +74,8 @@ in
       };
     };
   };
+
+  meta = {
+    maintainers = with lib.maintainers; [ hmenke ];
+  };
 }

From d5c86e51d81e7c38e3bfc51b659bd20009c449ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 10:17:50 +0000
Subject: [PATCH 1128/1386] troubadix: 26.4.6 -> 26.7.1

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

diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index 51d633c04f1b..3eaac270204c 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "troubadix";
-  version = "26.4.6";
+  version = "26.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wZpxwgIGvl4cVpPNrsYa5eGbAUgdf4lOxP2f537FYQI=";
+    hash = "sha256-qGByIyO9JmCDNs1BMpO5gjt27Av502NB92vaOcUpuaA=";
   };
 
   pythonRelaxDeps = [

From da0f840372ddcad083ab115c0ce06232b6ffa550 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 10:21:05 +0000
Subject: [PATCH 1129/1386] python3Packages.xcaplib: 2.0.2-unstable-2026-01-23
 -> 2.0.2-unstable-2026-07-09

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

diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix
index 791f466bc9e7..12f4947f726d 100644
--- a/pkgs/development/python-modules/xcaplib/default.nix
+++ b/pkgs/development/python-modules/xcaplib/default.nix
@@ -12,14 +12,14 @@
 buildPythonPackage {
   pname = "xcaplib";
   # latest commit is needed for python 3.13 compat.
-  version = "2.0.2-unstable-2026-01-23";
+  version = "2.0.2-unstable-2026-07-09";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AGProjects";
     repo = "python3-xcaplib";
-    rev = "2bdce48bcec6c80618da1b04cd9a437297993e56";
-    hash = "sha256-/htvXj9rLlJxcgJoUh4OG8PcCVIJ46ghzzqLZicONVc=";
+    rev = "73cc7f405f2a10fd113b5cbbc80e4b3fc5537236";
+    hash = "sha256-67go56VUKbZOyaofpurfN50acpzBrzzmjrGqh7mUKZg=";
   };
 
   build-system = [

From ee8b23cf07c1d80f28656c20222d2c29aa44f06d Mon Sep 17 00:00:00 2001
From: tar <git@mothzarella.dev>
Date: Thu, 16 Jul 2026 10:07:13 +0000
Subject: [PATCH 1130/1386] vesktop: migrate from electron_40 to electron_42

electron_40 is EOL and marked insecure. Use electron_42 instead.

Resolves: #542512
---
 pkgs/by-name/ve/vesktop/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index eb1d9e2317e6..13c5d5da879d 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -8,7 +8,7 @@
   makeDesktopItem,
   copyDesktopItems,
   vencord,
-  electron_40,
+  electron_42,
   libicns,
   pipewire,
   libpulseaudio,
@@ -26,7 +26,7 @@
   withSystemVencord ? false,
 }:
 let
-  electron = electron_40;
+  electron = electron_42;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
@@ -89,9 +89,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   preBuild = ''
     # Validate electron version matches upstream package.json
-    if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1 | tr -d '^'`" != "${lib.versions.major electron.version}" ]
-    then
-      echo "ERROR: electron version mismatch between package.json and nixpkgs"
+    expectedMajor="$(jq -r '.devDependencies.electron | ltrimstr("^") | split(".") | .[0]' < package.json)"
+    actualMajor="${lib.versions.major electron.version}"
+    if [ "$actualMajor" -lt "$expectedMajor" ] 2>/dev/null; then
+      echo "ERROR: nixpkgs electron version (major $actualMajor) is older than upstream package.json requirement (major $expectedMajor)"
       exit 1
     fi
 

From 642a5990fa87e1983976c32999585a7a387514e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 10:46:19 +0000
Subject: [PATCH 1131/1386] kubectl-gadget: 0.54.0 -> 0.54.1

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

diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix
index 07e90bcf2d78..7a54d490998c 100644
--- a/pkgs/by-name/ku/kubectl-gadget/package.nix
+++ b/pkgs/by-name/ku/kubectl-gadget/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-gadget";
-  version = "0.54.0";
+  version = "0.54.1";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T0UywAmNHk+tmE2eHnxHPpOulNAa+juEMqA2Bth044I=";
+    hash = "sha256-eG316yAUxW6w5kn53szdgcd3q4czkrLWgG953gNYPsg=";
   };
 
   vendorHash = "sha256-35bloouMwEuaZOC7ygz3sOJqoJoldDD4XHeCdBxx56U=";

From abcb99b715b6117f00d76f32afa5b61fe93756fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 10:53:04 +0000
Subject: [PATCH 1132/1386] python3Packages.gto: 1.9.0 -> 1.10.1

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

diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix
index 880a1e5c7ef6..af5b9e92dbba 100644
--- a/pkgs/development/python-modules/gto/default.nix
+++ b/pkgs/development/python-modules/gto/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gto";
-  version = "1.9.0";
+  version = "1.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "gto";
     tag = finalAttrs.version;
-    hash = "sha256-LXYpOnk9W/ellG70qZLihmvk4kvVcwZfE5buPNU2qzQ=";
+    hash = "sha256-pzXU7H4ysu0IBHEtSduA7ogNqmRVWagTI5E4P0z/Wio=";
   };
 
   build-system = [

From edfa702a597cc638519e43ba597ea1b5cd0c125b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 16 Jul 2026 12:57:53 +0200
Subject: [PATCH 1133/1386] rectangle: 0.96 -> 0.98

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

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index c0cd0994b03f..0fdec5ef846d 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -136,13 +136,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rectangle";
-  version = "0.96";
+  version = "0.98";
 
   src = fetchFromGitHub {
     owner = "rxhanson";
     repo = "Rectangle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3FDCptlNztmexfFDRD/XX9fVuEHVG+EzcrqksJeI+fo=";
+    hash = "sha256-GGK9mMxllVg0rfcrTg5aUYaECwV7mNCPLwXM+tKazN8=";
   };
 
   nativeBuildInputs = [

From 2b54d4d8564870790987867a2cdcca4e52d52a1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 11:01:31 +0000
Subject: [PATCH 1134/1386] python3Packages.msgraph-core: 1.4.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index 58ad118486c1..918f3cc58184 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "msgraph-core";
-  version = "1.4.0";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python-core";
     tag = "v${version}";
-    hash = "sha256-1fgLW6tpaDMOIaAU92ty9JYx/bZxDs4VjNPDCPIze/A=";
+    hash = "sha256-oF9ipN8jEMFeC4b0jGlNPQWsk8/dTAmLzS4R/xfXZfk=";
   };
 
   build-system = [ setuptools ];

From 3c8b479ce0f79121dbd922691ececc6d6cf7f140 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 11:15:10 +0000
Subject: [PATCH 1135/1386] feishu-cli: 1.34.0 -> 1.35.0

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

diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix
index 1c8ef3b171d0..73d830b8c7ec 100644
--- a/pkgs/by-name/fe/feishu-cli/package.nix
+++ b/pkgs/by-name/fe/feishu-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "feishu-cli";
-  version = "1.34.0";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "riba2534";
     repo = "feishu-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LyWUk64tt2mxs9+4U4BkF3Kb8O/B94iJqGLsTohOWNI=";
+    hash = "sha256-0FEVwpONZcN2DsYVzlY5EDsQwN81DjP9Xc857ro4quw=";
   };
 
   vendorHash = "sha256-vRefU38o9Q4Q96aXoUXUggcRsfQePjlUrSsNERJH3YU=";

From 5e670cae3538ed92bc426ab3ef73775b3bc2d5c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 11:21:14 +0000
Subject: [PATCH 1136/1386] bant: 0.2.10 -> 0.3.0

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

diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index e5a72fca577d..483a5596f221 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -20,13 +20,13 @@ let
 in
 buildBazelPackage rec {
   pname = "bant";
-  version = "0.2.10";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "bant";
     rev = "v${version}";
-    hash = "sha256-jFUPCNVoX4I69ibH+w6c41Gqlu8HosQ3DXQWa3lqUsc=";
+    hash = "sha256-T/BQRYCFAHkaGi5T485I9vbr3g7PzgIEHC27w6mg/3A=";
   };
 
   bazelFlags = [

From bf619da4fb5133ca7313a76a24530f52344a5ac9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 11:28:37 +0000
Subject: [PATCH 1137/1386] modrinth-app-unwrapped: 0.15.7 -> 0.15.11

---
 pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 5d75e4a1c064..8b6a52acdebf 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -31,13 +31,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
-  version = "0.15.7";
+  version = "0.15.11";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QBWRvctC9gPHLU8tX/GWJocx7hcNOfnTYeVY3Qbx2jo=";
+    hash = "sha256-F5jMmc0Rqnabxe7ayKbRjA0OZ+WRINILnB3bsyXJP5M=";
   };
 
   patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '1.0.0-local' '${finalAttrs.version}'
   '';
 
-  cargoHash = "sha256-HeEdvmf7ZR5/suanmJMYN3F/O/Xrk9Qza4l4kGahpf0=";
+  cargoHash = "sha256-UO8X/MvY5p1zkv53Xqig2itvP4x5XSXBzp1FDa+4YF0=";
 
   mitmCache = gradle.fetchDeps {
     inherit (finalAttrs) pname;
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-pbEKD8xkO7+//m0PBcAL62q0LC5YEKR+wOPGnzXIRJk=";
+    hash = "sha256-T5Qa47iXM+nic/nnRqGE6bGlDPpV1SEMT5KpX5TMaAQ=";
   };
 
   nativeBuildInputs = [

From cc04ca75c2a61951e8246332512bd232d5449d3c Mon Sep 17 00:00:00 2001
From: Sebastian Kowalak <skowalak@phoenixcontact-sb.io>
Date: Thu, 16 Jul 2026 13:42:29 +0200
Subject: [PATCH 1138/1386] nono: skip broken tests on darwin

---
 pkgs/by-name/no/nono/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix
index 991c68597803..9a5187275e82 100644
--- a/pkgs/by-name/no/nono/package.nix
+++ b/pkgs/by-name/no/nono/package.nix
@@ -128,6 +128,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "environment_allow_vars_default_allows_all"
       "environment_allow_vars_prefix_patterns"
       "environment_allow_vars_with_profile"
+
+      "tool_sandbox::macos::tests::executable_shape_baseline_grants_env_shebang_target_interpreter"
+      "tool_sandbox::macos::tests::macos_runtime_baseline_does_not_grant_system_volumes_data"
+      "env_nono_capability_elevation_accepts_truthy"
+      "env_nono_trust_override_accepts_truthy"
+      "env_nono_trust_proxy_ca_accepts_truthy"
+      "dry_run_does_not_modify_workspace"
+      "rollback_restores_file_after_write"
     ]
   );
 

From 4809a53a82a5005ea9b0a364c949fafe8682907f Mon Sep 17 00:00:00 2001
From: aaravrav <37036762+aaravrav@users.noreply.github.com>
Date: Thu, 19 Mar 2026 10:06:07 +0530
Subject: [PATCH 1139/1386] amnezia-vpn: fix missing system tray and window
 icons

---
 pkgs/by-name/am/amnezia-vpn/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index a72a875d43f4..0b03d491a6ec 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -109,6 +109,13 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "int nVersion = 1;" "int nVersion = 0;"
     substituteInPlace client/ui/qautostart.cpp \
       --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN"
+    # https://github.com/amnezia-vpn/amnezia-client/pull/2372
+    substituteInPlace client/ui/systemtray_notificationhandler.cpp \
+      --replace-fail 'm_systemTrayIcon.show();' ''' \
+      --replace-fail 'setTrayState(Vpn::ConnectionState::Disconnected);' 'setTrayState(Vpn::ConnectionState::Disconnected); m_systemTrayIcon.show();'
+    substituteInPlace client/main.cpp \
+      --replace-fail '#include "version.h"' $'#include "version.h"\n#include <QIcon>' \
+      --replace-fail 'app.setApplicationDisplayName(APPLICATION_NAME);' $'app.setApplicationDisplayName(APPLICATION_NAME);\n    app.setWindowIcon(QIcon::fromTheme("AmneziaVPN"));'
     substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \
       --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/icons/hicolor/512x512/apps/AmneziaVPN.png"
     substituteInPlace deploy/data/linux/AmneziaVPN.service \

From 4bf136ff556334774decc59b40021314ac988fc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 11:52:35 +0000
Subject: [PATCH 1140/1386] luau-lsp: 1.68.1 -> 1.69.0

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

diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index a2c108728a95..0928dc206081 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau-lsp";
-  version = "1.68.1";
+  version = "1.69.0";
 
   src = fetchFromGitHub {
     owner = "JohnnyMorganz";
     repo = "luau-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-XxXAK/BaJcgel1vOATVbQVBxsxEYv9vr0w4JjmU64fM=";
+    hash = "sha256-fVmc/Ky1fbS4hnh2pOw1idaZFCq0KFHE2hTVQQmYmfM=";
     fetchSubmodules = true;
   };
 

From 6e8b58cddc8438dbb68f8e292aa556e828685072 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 11:57:18 +0000
Subject: [PATCH 1141/1386] python3Packages.perplexityai: 0.39.0 -> 0.41.0

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

diff --git a/pkgs/development/python-modules/perplexityai/default.nix b/pkgs/development/python-modules/perplexityai/default.nix
index a179c437f835..ff7301fc209d 100644
--- a/pkgs/development/python-modules/perplexityai/default.nix
+++ b/pkgs/development/python-modules/perplexityai/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "perplexityai";
-  version = "0.39.0";
+  version = "0.41.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     owner = "perplexityai";
     repo = "perplexity-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2uBWvur6R7i1Y8oT2MTac1j+f/UMEmdbaKowDbrc0pA=";
+    hash = "sha256-zpGDrde+9az8K5KvEsuZXEaRdzPPPQmGGf9MmoyMpUo=";
   };
 
   # Can't use relaxPythonDeps as this is a version lock in the build system

From 1cb22c69681dca6a984743955fdbfd104ffeb6fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 12:15:16 +0000
Subject: [PATCH 1142/1386] python3Packages.databricks-sdk: 0.119.0 -> 0.121.0

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

diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index 29e81219d64f..dd6f00ccfd04 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "databricks-sdk";
-  version = "0.119.0";
+  version = "0.121.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
     owner = "databricks";
     repo = "databricks-sdk-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tdlFT0Rg0VGjtJ9UZSDu6zt5O+fXdmr484+3n4D0p8M=";
+    hash = "sha256-EvTh2zxQE7xSzxaipI8qeG0tK/Bnk8bDKbWKdMDO0F4=";
   };
 
   build-system = [

From 1fe86fe8067ac9218d46aaf85ce72178413d9b6b Mon Sep 17 00:00:00 2001
From: "Katja Ramona Sophie Kwast (zaphyra)" <git@zaphyra.eu>
Date: Thu, 16 Jul 2026 14:17:46 +0200
Subject: [PATCH 1143/1386] gomuks-web: 26.06 -> 26.07

https://github.com/gomuks/gomuks/releases/tag/v0.2607.0
---
 pkgs/by-name/go/gomuks-web/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix
index 8e63af527577..0ee8671cb9a6 100644
--- a/pkgs/by-name/go/gomuks-web/package.nix
+++ b/pkgs/by-name/go/gomuks-web/package.nix
@@ -11,17 +11,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "gomuks-web";
-  version = "26.06";
+  version = "26.07";
 
   src = fetchFromGitHub {
     owner = "gomuks";
     repo = "gomuks";
     tag = "v0.${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.0";
-    hash = "sha256-Q4hu3bcB16iuqASZvlv7nDvxj8CFX66qWp6DHIUTmh4=";
+    hash = "sha256-OgcmRBuVFTPzAVgNVDUZcfdgxHi4mtUcbmfTRPx/f9M=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-iuSu5MvNRt+eCZ9wxUwMo6X0joos7q9WPyXBwhn/0yE=";
+  vendorHash = "sha256-wNscq9FDJb9+WqKCBZ9YD+EQ/Sc2PAznunKP6hrs+Ms=";
 
   nativeBuildInputs = [
     nodejs
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
     npmRoot = "web";
     npmDeps = fetchNpmDeps {
       src = "${finalAttrs.src}/web";
-      hash = "sha256-RiOes+tmAxhA9IkyA6yWQXTjjXyZg2Z8FmPTgcmCg/g=";
+      hash = "sha256-C+zEMI2wmO3EvefpswTk9Tq3AV1Acfi+w3oO5WpxLIQ=";
     };
   };
 

From 432fe8d9657ddb15186286a0ccd90b5668bb9252 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 12:38:08 +0000
Subject: [PATCH 1144/1386] badger: 4.9.3 -> 4.9.4

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

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index 0943bdf6f3fd..d574e5839dce 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "badger";
-  version = "4.9.3";
+  version = "4.9.4";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B4DXzcgfkYcHqcK8F7NGbLcZWPmojMW4poRfCLv2DXI=";
+    hash = "sha256-v/E53imP3wxf7n1nlA0izjdSDkq1mwx7//BcLDPugY4=";
   };
 
   vendorHash = "sha256-KDIwEH83nPMJPJGTN3UgO00pjYwR17XqGdPXioP1YcY=";

From 56ef6c77f4fae27ac66d55e64aa489d12ef13469 Mon Sep 17 00:00:00 2001
From: Christoph Jabs <christoph.jabs@helsinki.fi>
Date: Thu, 16 Jul 2026 15:31:45 +0300
Subject: [PATCH 1145/1386] cargo-llvm-cov: 0.8.5 -> 0.8.7

---
 pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock  | 153 +++++++++------------
 pkgs/by-name/ca/cargo-llvm-cov/package.nix |   4 +-
 2 files changed, 64 insertions(+), 93 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
index 4f2c0388d604..a9c07eec84e6 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
+++ b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
@@ -13,31 +13,31 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
 
 [[package]]
 name = "bstr"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
+checksum = "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530"
 dependencies = [
  "memchr",
  "regex-automata",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -48,25 +48,24 @@ checksum = "ebb068a5ba5b65a7cdba869497ca2a352e88e6093c4909ddf4d12d9d3151ee9c"
 
 [[package]]
 name = "camino"
-version = "1.2.2"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
+checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0"
 
 [[package]]
 name = "cargo-config2"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7dacdd4a7586d602c2543e0217304bebc6502bde82154209cd8f09f24a7718"
+checksum = "25ada53f7339c78084fb37d7e17f34e76537541c4fbb02fa3a2baa14b8faad37"
 dependencies = [
  "serde",
  "serde_derive",
  "toml",
- "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "cargo-llvm-cov"
-version = "0.8.5"
+version = "0.8.7"
 dependencies = [
  "anyhow",
  "build-context",
@@ -123,26 +122,25 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "filetime"
-version = "0.2.27"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
+checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
 dependencies = [
  "cfg-if",
  "libc",
- "libredox",
 ]
 
 [[package]]
 name = "fs-err"
-version = "3.3.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0"
+checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a"
 dependencies = [
  "autocfg",
 ]
@@ -179,21 +177,9 @@ checksum = "803ec87c9cfb29b9d2633f20cba1f488db3fd53f2158b1024cbefb47ba05d413"
 
 [[package]]
 name = "libc"
-version = "0.2.183"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
-
-[[package]]
-name = "libredox"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
-dependencies = [
- "bitflags",
- "libc",
- "plain",
- "redox_syscall",
-]
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "linux-raw-sys"
@@ -203,15 +189,15 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "normpath"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b"
+checksum = "b9985ef7269fa99f3b12437bb698381da2428743ab90f20393f399fa14cab21a"
 dependencies = [
  "windows-sys 0.61.2",
 ]
@@ -224,9 +210,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "opener"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2fa337e0cf13357c13ef1dc108df1333eb192f75fc170bea03fcf1fd404c2ee"
+checksum = "b2b03ff07a220d0d0ec9a1f0f238951b7967a5a2e96aefcd21a117b1083415e9"
 dependencies = [
  "bstr",
  "normpath",
@@ -243,12 +229,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -260,36 +240,27 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.39.2"
+version = "0.39.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -299,9 +270,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.14"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -310,15 +281,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
+checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
 
 [[package]]
 name = "rustix"
@@ -335,15 +306,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "ruzstd"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01"
+checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8"
 
 [[package]]
 name = "same-file"
@@ -385,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "itoa",
  "memchr",
@@ -398,9 +369,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.4"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
  "serde_core",
 ]
@@ -429,9 +400,9 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
 
 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -440,9 +411,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.45"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973"
+checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
 dependencies = [
  "filetime",
  "libc",
@@ -480,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "1.0.7+spec-1.1.0"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd28d57d8a6f6e458bc0b8784f8fdcc4b99a437936056fa122cb234f18656a96"
+checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c"
 dependencies = [
  "serde_core",
  "serde_spanned",
@@ -493,18 +464,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.0.1+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.10+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
  "winnow",
 ]
@@ -625,9 +596,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 
 [[package]]
 name = "xattr"
@@ -641,6 +612,6 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 853476334d0d..74e2d855cce3 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -25,7 +25,7 @@
 
 let
   pname = "cargo-llvm-cov";
-  version = "0.8.5";
+  version = "0.8.7";
 
   owner = "taiki-e";
   homepage = "https://github.com/${owner}/${pname}";
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     inherit owner;
     repo = "cargo-llvm-cov";
     rev = "v${version}";
-    sha256 = "sha256-acd2qauvcVPxDjMuFXkaUxDL4kXoDSCVKDG7ki2pK/Y=";
+    sha256 = "sha256-flHZfjwEEIBEJHYGozlRgH9OHTJHgAR+OZxYJS/vHpQ=";
   };
 
   # Upstream doesn't include the lockfile so we need to add it back

From e365f12aca41d3d2af0ad79711243326436a41d5 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 17 Jul 2026 00:48:08 +1200
Subject: [PATCH 1146/1386] nix-unit: 2.34.2 -> 2.35.0

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

diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix
index a958b1ebcd78..c789215e7f9a 100644
--- a/pkgs/by-name/ni/nix-unit/package.nix
+++ b/pkgs/by-name/ni/nix-unit/package.nix
@@ -17,17 +17,17 @@ let
   # We pin the nix version to a known working one here as upgrades can likely break the build.
   # Since the nix language is rather stable we don't always need to have the latest and greatest for unit tests
   # On each update of nix unit we should re-evaluate what version we need.
-  nixComponents = nixVersions.nixComponents_2_34;
+  nixComponents = nixVersions.nixComponents_2_35;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nix-unit";
-  version = "2.34.2";
+  version = "2.35.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-unit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eG+ETC+lvHDLhlKgQB6/lGfpqr56Lt3+j1pHOeb4tK4=";
+    hash = "sha256-eXyZw2ddCKT5xMY8SDnV6lkr61zvSc7CNJeJSAjKqN4=";
   };
 
   buildInputs = [

From b8e3d23844a6c3019bc35ea60a00ab01441b917a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 12:59:26 +0000
Subject: [PATCH 1147/1386] tanka: 0.37.5 -> 0.38.0

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

diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix
index e69621393ae9..887ec3916968 100644
--- a/pkgs/by-name/ta/tanka/package.nix
+++ b/pkgs/by-name/ta/tanka/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tanka";
-  version = "0.37.5";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tanka";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jfDaS4kHHfX94dK1pCVyPdesYTZP/9Vzd1y2Sv7Snzw=";
+    sha256 = "sha256-Nr0l5QBpYktOwGsGVY8Ee5sC1RuRelOF05Z6aiSE2Yw=";
   };
 
-  vendorHash = "sha256-gcoUkMygjVVTIaf5Y77ipViaB44/r1MNjJyaUiLafLQ=";
+  vendorHash = "sha256-Upp3aEaAgPwHleP+kZ3Jf34agDIiHIc3x/IVtujDhFg=";
 
   doCheck = false;
   # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK

From 0a0efaad01a06654169e7bdddc533478cdab95c4 Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Thu, 16 Jul 2026 21:02:57 +0800
Subject: [PATCH 1148/1386] layerx: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/by-name/la/layerx/package.nix b/pkgs/by-name/la/layerx/package.nix
index 42204ebc8f64..39bc78ea88dd 100644
--- a/pkgs/by-name/la/layerx/package.nix
+++ b/pkgs/by-name/la/layerx/package.nix
@@ -10,14 +10,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "layerx";
-  version = "1.5.2";
+  version = "1.5.3";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "deveshctl";
     repo = "layerx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2FttqXnc6o8EXbLBk7BpLS0Xf6ZozydD7a5gFspPQoo=";
+    hash = "sha256-HboWzfDiiVMwMXkrOyxUvZ+V4Hi11cEqODfWT7b5+dw=";
   };
 
   vendorHash = "sha256-7wbyz6fKB3HMFhKJVIWrOIczLfqF4yInyszdh2Ky8WU=";

From 12814ca04809d0082b07bb5c1271c9f3563588bb Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Jul 2026 23:13:23 +1000
Subject: [PATCH 1149/1386] nix-eval-jobs: 2.34.3 -> 2.35.0

Diff: https://github.com/NixOS/nix-eval-jobs/compare/v2.34.3...v2.35.0
---
 pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 8acb3bc46666..7b6b3d62b0a1 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
-  version = "2.34.3";
+  version = "2.35.0";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "nix-eval-jobs";
     tag = "v${version}";
-    hash = "sha256-YaVQAgBxWbUBFHXLBLzdUyVvuA/DDw80SEnn9iq0Veo=";
+    hash = "sha256-/C5wyGYe4uMKKH26vy3knpwP/hvjOHO/58cySL8ADC4=";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e00dc626823..781c47987efa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10810,7 +10810,7 @@ with pkgs;
     );
 
   nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
-    nixComponents = nixVersions.nixComponents_2_34;
+    nixComponents = nixVersions.nixComponents_2_35;
   };
 
   nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;

From f6cf38182b0ec42e5e319081094b0b35ffa659c5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 16 Jul 2026 15:06:45 +0200
Subject: [PATCH 1150/1386] python3Packages.amaranth: 0.5.8 -> 0.5.9

Changelog: https://github.com/amaranth-lang/amaranth/blob/v0.5.9/docs/changes.rst
---
 pkgs/development/python-modules/amaranth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index 83764d4dc228..e3a8e3191cbe 100644
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "amaranth";
-  version = "0.5.8";
+  version = "0.5.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "amaranth-lang";
     repo = "amaranth";
     tag = "v${version}";
-    hash = "sha256-hqMgyQJRz1/5C9KB3nAI2RKPZXZUl3zhfZbk9M1hTxs=";
+    hash = "sha256-FwRraLPTzRKpdmzHpoAI0V/qTigT89VP+B3ue++t+Vg=";
   };
 
   postPatch = ''

From c8e2ff06a7e2c5e94475d64105f7f019c53b1841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 16 Jul 2026 15:24:25 +0200
Subject: [PATCH 1151/1386] music-assistant-desktop: 0.5.7 -> 0.5.9

Diff: https://github.com/music-assistant/desktop-app/compare/0.5.7...0.5.9

Changelog: https://github.com/music-assistant/desktop-app/releases/tag/0.5.9
---
 pkgs/by-name/mu/music-assistant-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant-desktop/package.nix b/pkgs/by-name/mu/music-assistant-desktop/package.nix
index 725fd160b963..765490cdff45 100644
--- a/pkgs/by-name/mu/music-assistant-desktop/package.nix
+++ b/pkgs/by-name/mu/music-assistant-desktop/package.nix
@@ -32,13 +32,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "music-assistant-desktop";
-  version = "0.5.7";
+  version = "0.5.9";
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "desktop-app";
     tag = finalAttrs.version;
-    hash = "sha256-KKyIYSSIC134t46H7YOFNCdj4M/VoBrX9jN5aX/kSlc=";
+    hash = "sha256-hkG0e/WlnEQXdaYlE9tebzzE63l4RuwCVjHQVTcTo6Y=";
   };
 
   patches = [

From a4a3c6d2dfa34cb40a1b6f626c3d376392104813 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 13:24:59 +0000
Subject: [PATCH 1152/1386] libretro.snes9x: 0-unstable-2026-07-05 ->
 0-unstable-2026-07-13

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

diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
index aee94c8e128b..ac4657b975c3 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2026-07-05";
+  version = "0-unstable-2026-07-13";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "51ef0275df25fc6347d241e3b5325b52b6e96582";
-    hash = "sha256-+f6u8VUHNLI9pb2AFLyEoGQtGzNIkeWS2wvF9PYDIm8=";
+    rev = "b5cc7651f9fc02189cb51b5a43848877db5aec42";
+    hash = "sha256-htwL5m49J+ku7h79Eu4y74LKiHkbL3UE3+LAXE52ZY8=";
   };
 
   makefile = "Makefile";

From 6042a858016a127d647586cf381f61bf6fcf35da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 13:32:28 +0000
Subject: [PATCH 1153/1386] libretro-shaders-slang: 0-unstable-2026-06-28 ->
 0-unstable-2026-07-15

---
 pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 9894a9927121..c69961f1a1c7 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-07-15";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "b5108ca29a50796011fedf1435025673a17dba98";
-    hash = "sha256-jJQnp3oWlaariLCAZ9tcn19xX8eCIGck7xwC3vMYqIg=";
+    rev = "3b0d6aa1d134a168478cd9c904a866d969f8882b";
+    hash = "sha256-wSrKcrX5GcTXfaxxjyd7COAFsaZsed8pYtScqGo+LA8=";
   };
 
   dontConfigure = true;

From 4b1a16ac0bd10c4273c4b928ee4b8d306265a552 Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Mon, 27 Apr 2026 16:04:36 +0200
Subject: [PATCH 1154/1386] nixos/vnstat: add NixOS test

---
 nixos/tests/all-tests.nix          |  1 +
 nixos/tests/vnstat.nix             | 26 ++++++++++++++++++++++++++
 pkgs/by-name/vn/vnstat/package.nix |  3 +++
 3 files changed, 30 insertions(+)
 create mode 100644 nixos/tests/vnstat.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 56b81080e417..f321b6872c5a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1844,6 +1844,7 @@ in
   };
   virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };
   vm-variant = handleTest ./vm-variant.nix { };
+  vnstat = runTest ./vnstat.nix;
   vscode-remote-ssh = handleTestOn [ "x86_64-linux" ] ./vscode-remote-ssh.nix { };
   vscodium = import ./vscodium.nix { inherit runTest; };
   vsftpd = runTest ./vsftpd.nix;
diff --git a/nixos/tests/vnstat.nix b/nixos/tests/vnstat.nix
new file mode 100644
index 000000000000..eae44e1a92d3
--- /dev/null
+++ b/nixos/tests/vnstat.nix
@@ -0,0 +1,26 @@
+{ lib, ... }:
+{
+  name = "vnstat";
+  meta.maintainers = with lib.maintainers; [ hmenke ];
+
+  containers.machine = {
+    services.vnstat = {
+      enable = true;
+      settings = {
+        AlwaysAddNewInterfaces = 1;
+      };
+    };
+  };
+
+  testScript = ''
+    start_all()
+
+    machine.wait_for_unit("vnstat.service")
+
+    machine.succeed("vnstat --iflist")
+    machine.fail("vnstat -i dummy0")
+    machine.succeed("ip link add dummy0 type dummy")
+    machine.succeed("ip link set dummy0 up")
+    machine.wait_until_succeeds("vnstat -i dummy0", timeout=10)
+  '';
+}
diff --git a/pkgs/by-name/vn/vnstat/package.nix b/pkgs/by-name/vn/vnstat/package.nix
index 30c88749b3e8..136d6c43b4be 100644
--- a/pkgs/by-name/vn/vnstat/package.nix
+++ b/pkgs/by-name/vn/vnstat/package.nix
@@ -7,6 +7,7 @@
   ncurses,
   sqlite,
   check,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  passthru.tests = { inherit (nixosTests) vnstat; };
+
   meta = {
     description = "Console-based network statistics utility for Linux";
     longDescription = ''

From 13484259fde9e9fb743cdbdce584505a58332122 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 16 Jul 2026 15:46:53 +0200
Subject: [PATCH 1155/1386] coqPackages.stalmarck-tactic: enable compilation on
 master

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

diff --git a/pkgs/development/coq-modules/stalmarck/default.nix b/pkgs/development/coq-modules/stalmarck/default.nix
index 50eea900a422..3f9a243f8eec 100644
--- a/pkgs/development/coq-modules/stalmarck/default.nix
+++ b/pkgs/development/coq-modules/stalmarck/default.nix
@@ -38,8 +38,11 @@ let
           "Coq tactic and verified tool for proving tautologies using Stålmarck's algorithm"
         else
           "A two-level approach to prove tautologies using Stålmarck's algorithm in Coq.";
+      duneOverride = lib.optionalAttrs (version == "8.20.0" || defaultVersion == "8.20.0") {
+        dune = dune.override { version = "3.21.1"; };
+      };
     in
-    mkRocqDerivation.override { dune = dune.override { version = "3.21.1"; }; } {
+    mkRocqDerivation.override duneOverride {
       useCoq = true;
       namePrefix = [ "coq" ];
       inherit

From 745503aa8803b33e17012ba211ac609f5541edbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 13:54:59 +0000
Subject: [PATCH 1156/1386] vscode-extensions.danielsanmedium.dscodegpt: 3.23.1
 -> 3.24.12

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5931a7d01d98..ad51182bffe6 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1174,8 +1174,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.23.1";
-          hash = "sha256-B97cImVKnholhZV0ZBru/gpeVSaTHOFfQywwmjk+kq8=";
+          version = "3.24.12";
+          hash = "sha256-2vpFCxF65Y/VfyTHDO0wLAe0+m/lc0+iloEI//FdaQg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From 3068460c4fd8a185b7a4c1d08235898476eb3225 Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Thu, 16 Jul 2026 20:20:12 +0800
Subject: [PATCH 1157/1386] mautrix-telegram: fix crash and unbreak
 default-python build

Two independent issues currently break mautrix-telegram on master:

1. setuptools 81+ removed the pkg_resources module, causing a crash on
   startup (ModuleNotFoundError: No module named 'pkg_resources'). The
   upstream Python version is unmaintained (the main branch was rewritten
   in Go), so pkg_resources is replaced with the standard library
   importlib.resources, available since Python 3.9.

2. The default python3 is now 3.14, but telethon is
   `disabled = pythonAtLeast "3.14"` (only because telethon's *tests*
   fail on 3.14). mautrix-telegram's tulir-telethon fork was derived via
   telethon.overrideAttrs and thus inherited the disable, breaking the
   default build. Build tulir-telethon standalone so it is no longer
   affected by telethon's test-only disable (this fork already skips the
   test suite).

Assisted-by: opencode (glm-5.2)
---
 .../0002-use-importlib-resources.patch        | 36 +++++++++++++
 pkgs/by-name/ma/mautrix-telegram/package.nix  | 50 +++++++++++++------
 2 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch

diff --git a/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch b/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch
new file mode 100644
index 000000000000..bcacda11ca52
--- /dev/null
+++ b/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch
@@ -0,0 +1,36 @@
+diff --git a/mautrix_telegram/web/public/__init__.py b/mautrix_telegram/web/public/__init__.py
+index cde3735..d911779 100644
+--- a/mautrix_telegram/web/public/__init__.py
++++ b/mautrix_telegram/web/public/__init__.py
+@@ -23,7 +23,7 @@ import time
+ 
+ from aiohttp import web
+ from mako.template import Template
+-import pkg_resources
++from importlib.resources import files
+ 
+ from mautrix.types import UserID
+ from mautrix.util.signed_token import sign_token, verify_token
+@@ -45,11 +45,11 @@ class PublicBridgeWebsite(AuthAPI):
+         self.secret_key = "".join(random.choices(string.ascii_lowercase + string.digits, k=64))
+ 
+         self.login = Template(
+-            pkg_resources.resource_string("mautrix_telegram", "web/public/login.html.mako")
++            files("mautrix_telegram").joinpath("web/public/login.html.mako").read_bytes()
+         )
+ 
+         self.mx_login = Template(
+-            pkg_resources.resource_string("mautrix_telegram", "web/public/matrix-login.html.mako")
++            files("mautrix_telegram").joinpath("web/public/matrix-login.html.mako").read_bytes()
+         )
+ 
+         self.app = web.Application(loop=loop)
+@@ -58,7 +58,7 @@ class PublicBridgeWebsite(AuthAPI):
+         self.app.router.add_route("GET", "/matrix-login", self.get_matrix_login)
+         self.app.router.add_route("POST", "/matrix-login", self.post_matrix_login)
+         self.app.router.add_static(
+-            "/", pkg_resources.resource_filename("mautrix_telegram", "web/public/")
++            "/", str(files("mautrix_telegram").joinpath("web/public/"))
+         )
+ 
+     def make_token(self, mxid: str, endpoint: str = "/login", expires_in: int = 900) -> str:
diff --git a/pkgs/by-name/ma/mautrix-telegram/package.nix b/pkgs/by-name/ma/mautrix-telegram/package.nix
index 4a80fc9c9b36..2f6546a74b33 100644
--- a/pkgs/by-name/ma/mautrix-telegram/package.nix
+++ b/pkgs/by-name/ma/mautrix-telegram/package.nix
@@ -3,24 +3,43 @@
   fetchPypi,
   fetchFromGitHub,
   python3,
+  openssl,
 
   withE2BE ? true,
 }:
 
 let
-  tulir-telethon = python3.pkgs.telethon.overrideAttrs (
-    finalAttrs: previousAttrs: {
-      version = "1.99.0a6";
-      pname = "tulir_telethon";
-      src = fetchFromGitHub {
-        owner = "tulir";
-        repo = "Telethon";
-        tag = "v${finalAttrs.version}";
-        hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w=";
-      };
-      dontUsePytestCheck = true;
-    }
-  );
+  # tulir-telethon is a fork of telethon used only by mautrix-telegram. It is
+  # built standalone rather than via telethon.overrideAttrs so it does not
+  # inherit telethon's `disabled = pythonAtLeast "3.14"` (which exists only
+  # because telethon's *tests* fail on 3.14). This fork skips the test suite.
+  #
+  # Kept as a local let binding rather than a top-level package: the upstream
+  # Python version is EOL (being rewritten in Go), so splitting it out would
+  # only add maintenance surface for code that will soon be replaced.
+  tulir-telethon = python3.pkgs.buildPythonPackage {
+    pname = "tulir_telethon";
+    version = "1.99.0a6";
+    pyproject = true;
+    src = fetchFromGitHub {
+      owner = "tulir";
+      repo = "Telethon";
+      tag = "v1.99.0a6";
+      hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w=";
+    };
+    postPatch = ''
+      substituteInPlace telethon/crypto/libssl.py --replace-fail \
+        "ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'"
+    '';
+    build-system = [
+      python3.pkgs.setuptools
+    ];
+    dependencies = with python3.pkgs; [
+      pyaes
+      rsa
+    ];
+    dontUsePytestCheck = true;
+  };
 in
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "mautrix-telegram";
@@ -36,7 +55,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   build-system = with python3.pkgs; [ setuptools ];
 
-  patches = [ ./0001-Re-add-entrypoint.patch ];
+  patches = [
+    ./0001-Re-add-entrypoint.patch
+    ./0002-use-importlib-resources.patch
+  ];
 
   pythonRelaxDeps = [
     "mautrix"

From 2add52cc3e44fbe3e760f9f429744ed33f3ea7c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:10:29 +0000
Subject: [PATCH 1158/1386] maigret: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix
index 428650819675..2322b0d6fd76 100644
--- a/pkgs/by-name/ma/maigret/package.nix
+++ b/pkgs/by-name/ma/maigret/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "maigret";
-  version = "0.6.2";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "soxoj";
     repo = "maigret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KgSf0lM8euahWRYT+acuoH6C+NN08IzkVGzytfnvHEg=";
+    hash = "sha256-iKWPIDxuwoNzyWZAiziWU2Q7VDFgGqAcxYjcw6L/5Ho=";
   };
 
   pythonRelaxDeps = true;

From 745487006e12262667d4acf568362df7c75296d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:11:57 +0000
Subject: [PATCH 1159/1386] cargo-shear: 1.13.1 -> 1.13.2

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

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index ff89dd62390d..d0ee4ba4e9fd 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-shear";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchCrate {
     pname = "cargo-shear";
     version = finalAttrs.version;
-    hash = "sha256-Luf6/kG0MgnBDyMLZGUSadPI60DOx5Jra3I3ezOGM4w=";
+    hash = "sha256-69OwhT4vc4xwvuVxZ0C7F/Us01TsuYJnnTKT6PHsOF8=";
   };
 
-  cargoHash = "sha256-d+3ZfygD4CzHLgT45KcCw2rr313eVO7PhGZpgJpbxW8=";
+  cargoHash = "sha256-x0lZ8E/P9IaPSdzUo2O3t5qR2I3959So9uaAm4PBM4E=";
 
   env = {
     # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54

From 8e28c091025b9544569498648e8914182bdae84c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:20:10 +0000
Subject: [PATCH 1160/1386] jsign: 7.4 -> 7.5

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

diff --git a/pkgs/by-name/js/jsign/package.nix b/pkgs/by-name/js/jsign/package.nix
index 2dfbd3b1a734..f12100177111 100644
--- a/pkgs/by-name/js/jsign/package.nix
+++ b/pkgs/by-name/js/jsign/package.nix
@@ -18,13 +18,13 @@ maven.buildMavenPackage rec {
   pname = "jsign";
   # For build from non-release, increment version by one and add -SNAPSHOT
   # e.g. 7.3-SNAPSHOT
-  version = "7.4";
+  version = "7.5";
 
   src = fetchFromGitHub {
     owner = "ebourg";
     repo = "jsign";
     tag = version;
-    hash = "sha256-r19w9k6Iuk6AQGC3l2yu6Ocn740BtE7DjtFLXUdhdw8=";
+    hash = "sha256-Eg23jy5K4F8pL0qqt7Ut/9NOXR9UfnQD7S7qtX9vAjk=";
   };
 
   mvnHash = "sha256-zxlwb2id8yAw/yxTjD6jyAkPJx9IazrPQYGacQGLEK8=";

From e8ddd49ea964d0f1c0caf400343985ebe771d4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 16 Jul 2026 16:21:59 +0200
Subject: [PATCH 1161/1386] topgrade: 17.7.0 -> 17.8.0

Diff: https://github.com/topgrade-rs/topgrade/compare/v17.7.0...v17.8.0

Changelog: https://github.com/topgrade-rs/topgrade/releases/tag/v17.8.0
---
 pkgs/by-name/to/topgrade/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 45ef928a6052..ea32487e6167 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topgrade";
-  version = "17.7.0";
+  version = "17.8.0";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2oydjlPZLWlGNvahsRK7kG5gxEKEHMDNxteaOeYupPA=";
+    hash = "sha256-Cvyvk7Q9BpNGNDXYwSwUpAqF8RWNGZ3SVKDOzPrjzFs=";
   };
 
-  cargoHash = "sha256-8pK6ZUlMNcczbmMJvQUsJKp0RoXnimnkbAc7SzrIcJQ=";
+  cargoHash = "sha256-RPYJNcF6TUEH1a0ErcdqOs8RQcnBZu3sTiw6X1d15D8=";
 
   nativeBuildInputs = [
     installShellFiles

From f73cda9494111cbe3cde23754ecac88e05355fc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:31:16 +0000
Subject: [PATCH 1162/1386] terraform-providers.splunk-terraform_signalfx:
 9.30.3 -> 9.33.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0af26cda2a49..c8c23e914e72 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1247,13 +1247,13 @@
     "vendorHash": "sha256-VmrvdRsNk2s6GQw7t8Aj0ASAEgQ/9v1TxnNIO9TderI="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-bWZ5TvTVoYA6J67mi24rSzf5Qf6jk0RUgiC9CAa1s1o=",
+    "hash": "sha256-xdB2VAacBGFAeVd60Zy6MWSmx6BFJ7ciZKSTXYdRZY0=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.30.3",
+    "rev": "v9.33.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg="
+    "vendorHash": "sha256-m7Op/K3Xo9nKgVg9bTHmpmPiFpCB6Ek/kgj76P+ViGQ="
   },
   "spotinst_spotinst": {
     "hash": "sha256-OX2uclduqzLPlRNHmji8X+PrEV78gdsE/W/SND4cVRA=",

From dfc90edeb19d8292ac22609781e5506fb4d79880 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Jul 2026 17:36:47 +0300
Subject: [PATCH 1163/1386] python3Packages.beets: add doCheck argument for
 easier overriding

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

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index f1662aeef83b..2543b9fdfdf3 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -88,6 +88,7 @@
   extraNativeBuildInputs ? [ ],
 
   # tests
+  doCheck ? true,
   pytestCheckHook,
   pytest-cov-stub,
   pytest-factoryboy,
@@ -194,6 +195,8 @@ buildPythonPackage (finalAttrs: {
   ]
   ++ finalAttrs.finalPackage.passthru.plugins.wrapperBins;
 
+  inherit doCheck;
+
   __darwinAllowLocalNetworking = true;
 
   disabledTestPaths =

From eb808e50bec53dc9526e2241f8e6a99b9f041bf3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Jul 2026 16:22:29 +0300
Subject: [PATCH 1164/1386] python3Packages.beets: use lib.pipe for plugins.all
 (readability)

Also use `lib.recursiveUpdate` for future plugin attributes.
---
 .../python-modules/beets/default.nix          | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 2543b9fdfdf3..aaa19af69e67 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -419,23 +419,20 @@ buildPythonPackage (finalAttrs: {
         lib.throwIf (finalAttrs.finalPackage.passthru.plugins.builtins.${plugName}.deprecated or false)
           "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
       ) pluginOverrides;
-      all =
-        lib.mapAttrs
-          (
-            n: a:
-            {
-              name = n;
-              enable = !disableAllPlugins;
-              builtin = false;
-              propagatedBuildInputs = [ ];
-              testPaths = [ "test/plugins/test_${n}.py" ];
-              wrapperBins = [ ];
-            }
-            // a
-          )
-          (
-            lib.recursiveUpdate finalAttrs.finalPackage.passthru.plugins.base finalAttrs.finalPackage.passthru.plugins.overrides
-          );
+      all = lib.pipe finalAttrs.finalPackage.passthru.plugins.base [
+        (base: lib.recursiveUpdate base finalAttrs.finalPackage.passthru.plugins.overrides)
+        (lib.mapAttrs (
+          n: a:
+          lib.recursiveUpdate {
+            name = n;
+            enable = !disableAllPlugins;
+            builtin = false;
+            propagatedBuildInputs = [ ];
+            testPaths = [ "test/plugins/test_${n}.py" ];
+            wrapperBins = [ ];
+          } a
+        ))
+      ];
       enabled = lib.filterAttrs (_: p: p.enable) finalAttrs.finalPackage.passthru.plugins.all;
       disabled = lib.filterAttrs (_: p: !p.enable) finalAttrs.finalPackage.passthru.plugins.all;
       disabledTestPaths = lib.flatten (

From c43f9cfcf9414cb21c33e54d6a571fe71b7f5231 Mon Sep 17 00:00:00 2001
From: Ushitora Anqou <ushitora@anqou.net>
Date: Thu, 16 Jul 2026 23:07:34 +0900
Subject: [PATCH 1165/1386] minikube: set libvirt to PATH to avoid
 PROVIDER_KVM2_NOT_FOUND error

`minikube start --driver=kvm2` requires `virsh` command. Without it, the
following error is incurred:

  Exiting due to PROVIDER_KVM2_NOT_FOUND: The 'kvm2' provider was not
  found: exec: "virsh": executable file not found in $PATH

This commit adds libvirt to PATH to avoid this error.
---
 pkgs/by-name/mi/minikube/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix
index f1f2064bea3d..1594840e771a 100644
--- a/pkgs/by-name/mi/minikube/package.nix
+++ b/pkgs/by-name/mi/minikube/package.nix
@@ -72,6 +72,7 @@ buildGoModule (finalAttrs: {
     installBin out/minikube
 
     wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false \
+      --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ])} \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ])
       }

From 79835e4005b43c1e944dcaf3f642eec41f2b9d35 Mon Sep 17 00:00:00 2001
From: staticdev <staticdev-support@proton.me>
Date: Wed, 15 Jul 2026 17:47:22 +0200
Subject: [PATCH 1166/1386] python3Packages.beets: add single-plugin passthru
 tests

Add a positive `beet --help` check for every functional built-in plugin,
with only that plugin enabled.

Assisted-by: Codex (GPT-5)
Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 .../python-modules/beets/default.nix          | 105 +++++++++++++++---
 1 file changed, 92 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index aaa19af69e67..47269e66701a 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -278,7 +278,9 @@ buildPythonPackage (finalAttrs: {
         bench.testPaths = [ ];
         bpd = { };
         bpm.testPaths = [ ];
-        bpsync.testPaths = [ ];
+        bpsync = {
+          testPaths = [ ];
+        };
         bucket = { };
         chroma = {
           propagatedBuildInputs = [ pyacoustid ];
@@ -291,10 +293,15 @@ buildPythonPackage (finalAttrs: {
           propagatedBuildInputs = [ requests ];
           testPaths = [ ];
         };
-        discogs.propagatedBuildInputs = [
-          discogs-client
-          requests
-        ];
+        discogs = {
+          propagatedBuildInputs = [
+            discogs-client
+            requests
+          ];
+          singlePluginTest.config = {
+            user_token = "test";
+          };
+        };
         duplicates.testPaths = [ ];
         edit = { };
         embedart = {
@@ -337,7 +344,10 @@ buildPythonPackage (finalAttrs: {
           testPaths = [ ];
         };
         limit = { };
-        listenbrainz = { };
+        listenbrainz.singlePluginTest.config = {
+          token = "test";
+          username = "test";
+        };
         loadext = {
           propagatedBuildInputs = [ requests ];
           testPaths = [ ];
@@ -366,11 +376,14 @@ buildPythonPackage (finalAttrs: {
         plexupdate = { };
         random = { };
         replace = { };
-        replaygain.wrapperBins = [
-          aacgain
-          ffmpeg
-          mp3gain
-        ];
+        replaygain = {
+          singlePluginTest.config.backend = "gstreamer";
+          wrapperBins = [
+            aacgain
+            ffmpeg
+            mp3gain
+          ];
+        };
         rewrite.testPaths = [ ];
         scrub.testPaths = [ ];
         smartplaylist = { };
@@ -378,7 +391,10 @@ buildPythonPackage (finalAttrs: {
           propagatedBuildInputs = [ soco ];
           testPaths = [ ];
         };
-        spotify = { };
+        spotify.singlePluginTest.setup = ''
+          mkdir -p $HOME/.config/beets
+          echo '{"access_token":"test"}' > $HOME/.config/beets/spotify_token.json
+        '';
         subsonicplaylist = {
           propagatedBuildInputs = [ requests ];
           testPaths = [ ];
@@ -428,6 +444,10 @@ buildPythonPackage (finalAttrs: {
             enable = !disableAllPlugins;
             builtin = false;
             propagatedBuildInputs = [ ];
+            singlePluginTest = {
+              config = { };
+              setup = "";
+            };
             testPaths = [ "test/plugins/test_${n}.py" ];
             wrapperBins = [ ];
           } a
@@ -497,7 +517,66 @@ buildPythonPackage (finalAttrs: {
           -c $out/config.yaml \
           mpdstats --help 2> $out/mpdstats-help-stderr || true
       '';
-    };
+    }
+    # Build and start beets once for each supported built-in plugin. Keeping the
+    # plugins isolated makes missing optional dependencies visible.
+    // lib.pipe finalAttrs.finalPackage.passthru.plugins.all [
+      # Deprecated plugins are not useful regression targets.
+      (lib.filterAttrs (_: pluginAttrs: !(pluginAttrs.deprecated or false)))
+      (lib.concatMapAttrs (
+        pluginName: pluginAttrs:
+        let
+          testConfig = {
+            plugins = [ pluginName ];
+          }
+          # Some plugins do not accept an empty attribute set as config.
+          // lib.optionalAttrs (pluginAttrs.singlePluginTest.config != { }) {
+            ${pluginName} = pluginAttrs.singlePluginTest.config;
+          };
+          beetsWithSinglePlugin = beets.override {
+            disableAllPlugins = true;
+            pluginOverrides = {
+              ${pluginName}.enable = true;
+            };
+            # The runCommand below is the relevant check; avoid running
+            # the full upstream test suite once per plugin. NOTE that
+            # testing whether any plugin's `testPaths` is incorrect, is
+            # done for all plugins via the `beets-minimal` derivation.
+            doCheck = false;
+          };
+        in
+        {
+          "with-single-plugin-${pluginName}" = beetsWithSinglePlugin;
+          "single-plugin-${pluginName}" = runCommand "beets-single-plugin-${pluginName}-test" { } ''
+            set -euo pipefail
+            export HOME=$(mktemp -d)
+            ${pluginAttrs.singlePluginTest.setup}
+            mkdir $out
+
+            cat <<'EOF' > $out/config.yaml
+            ${lib.generators.toYAML { } testConfig}
+            EOF
+
+            status=0
+            ${lib.getExe beetsWithSinglePlugin} \
+              -c "$out/config.yaml" \
+              --help > "$out/stdout" 2> "$out/stderr" || status=$?
+
+            # beet exits successfully when a plugin fails to load, so its
+            # stderr must also be checked for the diagnostic.
+            if (( status != 0 )) || grep -Fq "error loading plugin" "$out/stderr"; then
+              {
+                printf '%s\n' '----- stdout -----'
+                cat "$out/stdout"
+                printf '%s\n' '----- stderr -----'
+                cat "$out/stderr"
+              } >&2
+              exit 1
+            fi
+          '';
+        }
+      ))
+    ];
   };
 
   meta = {

From bfbb7882ca10e7c1282b49daeb186bc9badd3b9f Mon Sep 17 00:00:00 2001
From: staticdev <staticdev-support@proton.me>
Date: Thu, 16 Jul 2026 10:12:27 +0200
Subject: [PATCH 1167/1386] python3Packages.beets: mark bpsync plugin
 deprecated

The plugin depends on the retired Beatport API and is no longer functional.

Assisted-by: Codex (GPT-5)
---
 pkgs/development/python-modules/beets/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 47269e66701a..9e6efcc22558 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -279,6 +279,8 @@ buildPythonPackage (finalAttrs: {
         bpd = { };
         bpm.testPaths = [ ];
         bpsync = {
+          # plugin retired: https://github.com/beetbox/beets/issues/3862.
+          deprecated = true;
           testPaths = [ ];
         };
         bucket = { };

From 206650be46b6e20ce5e730a25b62a04fa0d65d28 Mon Sep 17 00:00:00 2001
From: staticdev <staticdev-support@proton.me>
Date: Thu, 16 Jul 2026 14:22:13 +0200
Subject: [PATCH 1168/1386] python3Packages.beets: fix plugin dependencies

Add the runtime dependencies required by the metasync and tidal plugins.

Assisted-by: Codex (GPT-5)
---
 pkgs/development/python-modules/beets/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 9e6efcc22558..9817e6718439 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -59,6 +59,7 @@
   aacgain,
   beautifulsoup4,
   chromaprint,
+  dbus-python,
   discogs-client,
   ffmpeg,
   flac,
@@ -363,7 +364,10 @@ buildPythonPackage (finalAttrs: {
         mbsubmit = { };
         mbsync = { };
         mbpseudo = { };
-        metasync.testPaths = [ ];
+        metasync = {
+          propagatedBuildInputs = [ dbus-python ];
+          testPaths = [ ];
+        };
         missing.testPaths = [ ];
         mpdstats.propagatedBuildInputs = [ python-mpd2 ];
         mpdupdate = {
@@ -405,7 +409,7 @@ buildPythonPackage (finalAttrs: {
         substitute = {
           testPaths = [ ];
         };
-        tidal = { };
+        tidal.propagatedBuildInputs = [ requests-oauthlib ];
         the = { };
         titlecase.propagatedBuildInputs = [ titlecase ];
         thumbnails = {

From 683e8fa08bbd9e88785228618c6ea3deb62dc6c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@pyxel.be>
Date: Wed, 15 Jul 2026 17:44:58 +0200
Subject: [PATCH 1169/1386] geographiclib: fix multi-output CMake import prefix

The dev/out output split moved lib/cmake into $dev while the shared library and executables stayed in $out. The exported targets file uses relative ${_IMPORT_PREFIX} paths, so find_package(GeographicLib) resolved libraries and binaries under $dev and failed to link.

Drop the dev output so lib/cmake ships alongside the library in $out and ${_IMPORT_PREFIX} resolves correctly; keep the doc output split off.

Assisted-by: Claude Code Opus 4.8
---
 pkgs/by-name/ge/geographiclib/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix
index 9f915f128d89..34069f754fd7 100644
--- a/pkgs/by-name/ge/geographiclib/package.nix
+++ b/pkgs/by-name/ge/geographiclib/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   outputs = [
-    "dev"
     "doc"
     "out"
   ];

From 90791e4c643f5d15154389a5114055f9cb7d71f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@pyxel.be>
Date: Wed, 15 Jul 2026 17:44:58 +0200
Subject: [PATCH 1170/1386] supercell-wx: drop geographiclib single-output
 workaround

geographiclib now ships its CMake package files alongside the shared library in $out, so find_package(GeographicLib) works with the default multi-output package.

Assisted-by: Claude Code Opus 4.8
---
 pkgs/by-name/su/supercell-wx/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 9631281f6046..3425406e42e6 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -126,10 +126,7 @@ buildStdenv.mkDerivation (finalAttrs: {
     boost
     bzip2
     geos
-    # FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ?
-    (geographiclib.overrideAttrs {
-      outputs = [ "out" ];
-    })
+    geographiclib
     glew
     glm
     gtest

From 13df38b2190fb111fa73d42f9dd07b05e74e080f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:49:33 +0000
Subject: [PATCH 1171/1386] home-assistant-custom-components.llm_intents: 1.8.2
 -> 1.8.3

---
 .../home-assistant/custom-components/llm_intents/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/llm_intents/package.nix b/pkgs/servers/home-assistant/custom-components/llm_intents/package.nix
index a27acf6b976a..0731b72a3a5f 100644
--- a/pkgs/servers/home-assistant/custom-components/llm_intents/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/llm_intents/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent (finalAttrs: {
   owner = "skye-harris";
   domain = "llm_intents";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     inherit (finalAttrs) owner;
     repo = "llm_intents";
     tag = finalAttrs.version;
-    hash = "sha256-UYWt+PpG0M1DE1nHqLJ/npp29JyfNz19Pyb1Jv3LM48=";
+    hash = "sha256-WqPemaBKTiOiO3nT0PDQqhRMjvLAA3WNOGM1stbapBE=";
   };
 
   dependencies = [

From 5c0ea6b2d536f6e582c73abda4b7fd015c291a86 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Jul 2026 17:52:11 +0300
Subject: [PATCH 1172/1386] python3Packages.beets: remove gstreamer test

This test is almost identical to `single-plugin-gstreamer`, and the
latter is actually stricter.
---
 .../python-modules/beets/default.nix            | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 9817e6718439..b4bb0db3c641 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -469,23 +469,6 @@ buildPythonPackage (finalAttrs: {
       );
     };
     tests = {
-      gstreamer =
-        runCommand "beets-gstreamer-test"
-          {
-            meta.timeout = 60;
-          }
-          ''
-            set -euo pipefail
-            export HOME=$(mktemp -d)
-            mkdir $out
-
-            cat << EOF > $out/config.yaml
-            replaygain:
-              backend: gstreamer
-            EOF
-
-            ${finalAttrs.finalPackage}/bin/beet -c $out/config.yaml > /dev/null
-          '';
       with-new-builtin-plugin = finalAttrs.finalPackage.overrideAttrs (
         newAttrs: oldAttrs: {
           postPatch = (oldAttrs.postPatch or "") + ''

From 7d0a2d954be797111acb2cde707ff44749faa3f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:53:44 +0000
Subject: [PATCH 1173/1386] python3Packages.cometx: 3.6.6 -> 3.6.7

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

diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix
index d770b390bec1..ed39d9af4291 100644
--- a/pkgs/development/python-modules/cometx/default.nix
+++ b/pkgs/development/python-modules/cometx/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "cometx";
-  version = "3.6.6";
+  version = "3.6.7";
 
   pyproject = true;
   build-system = [ setuptools ];
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "comet-ml";
     repo = "cometx";
     tag = version;
-    hash = "sha256-Ub7Ucn/Xgaedymqjgiouy685PPr3tULAvJNLeqAgf78=";
+    hash = "sha256-7jq/W1IEu6RZhKHMWdGC9b3xCGnS4hrZIPcQZ2NpIt4=";
   };
 
   dependencies = [

From f36d19c3430adce08596a4dcea6d0433fa2ca1a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:57:58 +0000
Subject: [PATCH 1174/1386] terraform-providers.sysdiglabs_sysdig: 3.8.2 ->
 3.9.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0af26cda2a49..4b860d5f799b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1283,11 +1283,11 @@
     "vendorHash": "sha256-nbiLH+J051XxTx+z8xGrp/DPYB7g9S4clFSWcZUKnAg="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-r14FsYrLqcZLcQlm25qOCKICTAb3dMBkphRAHiUeXrs=",
+    "hash": "sha256-VeIgHhCHyNgAcv2NIBAWCJIwGHE3nqYeCxGd4VSUymU=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v3.8.2",
+    "rev": "v3.9.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
   },

From 40d47072d410b4a14ac055c525e9a049fdb17768 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 16 Jul 2026 12:00:18 -0300
Subject: [PATCH 1175/1386] piped: use nix-update-script

unstableGitUpdater only rewrites src, so pnpmDeps.hash goes stale on
updates. nix-update-script also refreshes pnpmDeps.

Assisted-by: Grok (xAI)
---
 pkgs/by-name/pi/piped/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index 4891ae99b3ce..eb21c29f7fbe 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -5,7 +5,7 @@
   fetchPnpmDeps,
   pnpmConfigHook,
   fetchFromGitHub,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 let
   pnpm = pnpm_10;
@@ -42,7 +42,9 @@ buildNpmPackage rec {
     hash = "sha256-o5NKMMIVPkKiPx++ALcZ+3oN80DMQHPwQqGT4f4q5P8=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
 
   meta = {
     homepage = "https://github.com/TeamPiped/Piped";

From 662c39e77671de4b84ef1840e0914429079f372a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 15:08:06 +0000
Subject: [PATCH 1176/1386] python3Packages.types-tabulate: 0.10.0.20260308 ->
 0.10.0.20260508

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

diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix
index 17fda46c0c30..c7de63c50d47 100644
--- a/pkgs/development/python-modules/types-tabulate/default.nix
+++ b/pkgs/development/python-modules/types-tabulate/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-tabulate";
-  version = "0.10.0.20260308";
+  version = "0.10.0.20260508";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_tabulate";
     inherit version;
-    hash = "sha256-ck3LEzD/ul9G089uKfRQifzLjoWAHm56ye+xGVv3vqE=";
+    hash = "sha256-jlHxWeiySXaElwauLtHcmtuo670ICxfklOu2aozJLHQ=";
   };
 
   build-system = [ setuptools ];

From aea32a03a4928172b803256a694bd7a059894726 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 15:11:37 +0000
Subject: [PATCH 1177/1386] python3Packages.general-sam: 1.0.3 -> 1.0.4.post0

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

diff --git a/pkgs/development/python-modules/general-sam/default.nix b/pkgs/development/python-modules/general-sam/default.nix
index 9611dfaf988d..955c9df7a6cb 100644
--- a/pkgs/development/python-modules/general-sam/default.nix
+++ b/pkgs/development/python-modules/general-sam/default.nix
@@ -10,19 +10,19 @@
 
 buildPythonPackage rec {
   pname = "general-sam";
-  version = "1.0.3";
+  version = "1.0.4.post0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ModelTC";
     repo = "general-sam-py";
     rev = "v${version}";
-    hash = "sha256-++6Z9Ocee4QFN1u0nK/g9uGdmB1UYnfHhhJj74zboCE=";
+    hash = "sha256-bpJL6kpcpMWNNUOSLUnRLsAi7yp3fl0WKzvfXiGwYeE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-8HHIM1Abz5KxnVphFFNJp6L3D6iPeoB7qVmxy11CUZs=";
+    hash = "sha256-kmc1sGlSTQHdLaW7fDk0AmkEDmttEEljVEsc6inLRuw=";
   };
 
   build-system = [

From e45b4c3064d70c5c82f93022a9f662a02478024e Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Thu, 16 Jul 2026 15:16:30 +0000
Subject: [PATCH 1178/1386] python3Packages.autopxd2: 3.2.2 -> 3.2.3

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

diff --git a/pkgs/development/python-modules/autopxd2/default.nix b/pkgs/development/python-modules/autopxd2/default.nix
index a76919118895..ac98e106b73b 100644
--- a/pkgs/development/python-modules/autopxd2/default.nix
+++ b/pkgs/development/python-modules/autopxd2/default.nix
@@ -11,13 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-autopxd2";
-  version = "3.2.2";
+  version = "3.2.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchPypi {
     pname = "autopxd2";
     inherit version;
-    hash = "sha256-fzq5xy7vPjxwgaEyBXk3Ke9JnySJ3PM5WAucFCZ/IP8=";
+    hash = "sha256-Zf44gmkuWvp8lfrScq4GAhOisLYu4scyuNp1Cn3lnVc=";
   };
 
   build-system = [
@@ -34,6 +35,13 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestMarks = [
+    # downloads headers at runtime
+    "real_headers"
+    # needs clang2 python module
+    "libclang"
+  ];
+
   enabledTestPaths = [
     "test/"
   ];

From 53dbe095e4e30782b5cb2325d01fec34c6065784 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 15:22:02 +0000
Subject: [PATCH 1179/1386] cue: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix
index 4f0fce9998ec..fdecd5294637 100644
--- a/pkgs/by-name/cu/cue/package.nix
+++ b/pkgs/by-name/cu/cue/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cue";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "cue-lang";
     repo = "cue";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+mfGN2IX83JMwLsduBfj2h7Eeve6mmLpmXGFRxz/UfI=";
+    hash = "sha256-77IRLWlBlJ76yr9UzVpKuxZ9XbYFdGDdv/jPUojw8yc=";
   };
 
   vendorHash = "sha256-dTUg6EnU6xKCGve9ksxqBF3BaoBdVlXFU8pTyZtV+RA=";

From 86ccc1be5745f66a239f37a92817e71d7f1ecede Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 16 Jul 2026 12:22:04 -0300
Subject: [PATCH 1180/1386] piped: 0-unstable-2024-11-04 ->
 0-unstable-2026-07-06

Assisted-by: Grok (xAI)
---
 pkgs/by-name/pi/piped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index eb21c29f7fbe..e09939daa812 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildNpmPackage rec {
   pname = "piped";
-  version = "0-unstable-2024-11-04";
+  version = "0-unstable-2026-07-06";
 
   src = fetchFromGitHub {
     owner = "TeamPiped";
     repo = "piped";
-    rev = "7866c06801baef16ce94d6f4dd0f8c1b8bc88153";
-    hash = "sha256-o3TwE0s5rim+0VKR+oW9Rv3/eQRf2dgRQK4xjZ9pqCE=";
+    rev = "335b10d0c02e407b4ba9113e32912b0d783ad455";
+    hash = "sha256-vcXmsgDZJ3v/1XNXtU3v9GWlDJBatXK9peTPVQe5De0=";
   };
 
   nativeBuildInputs = [ pnpm ];
@@ -39,7 +39,7 @@ buildNpmPackage rec {
       pnpm
       ;
     fetcherVersion = 4;
-    hash = "sha256-o5NKMMIVPkKiPx++ALcZ+3oN80DMQHPwQqGT4f4q5P8=";
+    hash = "sha256-55nG7tfXtxnyfZop+8Wg8rSFOHQi0TjRc0QT16erX1E=";
   };
 
   passthru.updateScript = nix-update-script {

From e55ac21e86f162fd4fd4a9130675902e11cf9397 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 16 Jul 2026 11:26:08 -0400
Subject: [PATCH 1181/1386] versitygw: re-enable tests

---
 pkgs/by-name/ve/versitygw/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix
index 1b569b45971c..df2c75f61e10 100644
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@@ -19,10 +19,11 @@ buildGoModule (finalAttrs: {
 
   vendorHash = "sha256-8WrGFLIoXmHQmyFGhOjBAFkaYZ1xhx0aldpyZULfAL4=";
 
-  subPackages = [ "./cmd/versitygw" ];
-
-  # Require access to online S3 services
-  doCheck = false;
+  excludedPackages = [
+    "plugins/noop"
+    "tests/checker"
+    "tests/rest_scripts"
+  ];
 
   # Needed for "versitygw --version" to not show placeholders
   ldflags = [
@@ -31,10 +32,11 @@ buildGoModule (finalAttrs: {
     "-X main.Version=v${finalAttrs.version}"
   ];
 
+  # requires real s3
+  checkFlags = [ "-skip=^TestIntegration$" ];
+
   doInstallCheck = true;
-
   nativeInstallCheckInputs = [ versionCheckHook ];
-
   versionCheckProgramArg = "--version";
 
   passthru = {

From 1832ac1ae314de31e6783ae0047ce02de8f827be Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 03:02:34 -0500
Subject: [PATCH 1182/1386] vimPlugins: update on 2026-07-16

---
 .../editors/vim/plugins/generated.nix         | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 6b3394d59395..101a5f87efa9 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1610,12 +1610,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "0-unstable-2026-07-11";
+    version = "0-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "012273e4bbf3e143224a272ad2efd10b69a000ba";
-      hash = "sha256-8npfL3fYQ05dHWGm46bdRS3tMOyooXhyxM0gpI0Ompw=";
+      rev = "fd128e380624c34f12a201690944bf657f861361";
+      hash = "sha256-W5tHY4U87eCAiOerNMAeqcbz1JlMZ6YGqSC0TBhI6t4=";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2310,12 +2310,12 @@ final: prev: {
 
   catppuccin-vim = buildVimPlugin {
     pname = "catppuccin-vim";
-    version = "0-unstable-2026-06-30";
+    version = "0-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "vim";
-      rev = "029e9a878a58eba039e47847a2f17e10acefb3f5";
-      hash = "sha256-gDq7vXIBc2mY8DMl+A6Ps0qPvAIR3NDhCRxBgqMOYCM=";
+      rev = "78c40a773e56d05e1c4e29216c45a483bdd67351";
+      hash = "sha256-xOf5PwhgVWwMGtJt+om9z0MULrMLoO6AmaJ/G/vWGrk=";
     };
     meta.homepage = "https://github.com/catppuccin/vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -3484,12 +3484,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-07-07";
+    version = "0.0.82-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "0ff79c0056910e574af2b2aa31aa359065705c4b";
-      hash = "sha256-Pp+qMv4Inc4JsrK59XDS+5CX/F9bEd4Pp4Cb611K+lk=";
+      rev = "d1689a4876305e5fc6691910c8ee6f1eb5da2219";
+      hash = "sha256-6AjcLD8gh3rG3uXj8LjdXr5pbzIKwtu+14ZcCVwXCuI=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.license = unfree;
@@ -3652,12 +3652,12 @@ final: prev: {
 
   cole-nvim = buildVimPlugin {
     pname = "cole.nvim";
-    version = "0-unstable-2026-05-29";
+    version = "0-unstable-2026-07-14";
     src = fetchFromGitHub {
       owner = "thekylehuang";
       repo = "cole.nvim";
-      rev = "1920cfa31c717e1f73a5a6e5a2c02a44b5faeb5c";
-      hash = "sha256-k153XzTkkBm1qF6iKK8fzmAHIPnoIbXEAxAOQIoAPo0=";
+      rev = "74f6a8e1bbce0d9a845a339d849bca3c0bec7aaa";
+      hash = "sha256-TJxpLhabIl73I9O6Soi9TEd/9Xa7FVfpV7sNrza64oM=";
     };
     meta.homepage = "https://github.com/thekylehuang/cole.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9325,12 +9325,12 @@ final: prev: {
 
   lspsaga-nvim = buildVimPlugin {
     pname = "lspsaga.nvim";
-    version = "0-unstable-2026-05-14";
+    version = "0-unstable-2026-07-16";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "3e33a6a6c5d379f3d4fae77fae6b53b762a0a30f";
-      hash = "sha256-hkXvv5NgW+wnbR7wGtAs+aUDv/4o/T5Mv7rGhk1qR3U=";
+      rev = "cf6fc9473bba1d332eda9887855ea29ed9b37701";
+      hash = "sha256-ggw3U/LXNCDaSmXmHWEV9coOjoDW6v0JvD5BGSvDCaM=";
     };
     meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11034,12 +11034,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-07-12";
+    version = "1.4.0-unstable-2026-07-16";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "e3a0a2bfcc5e7dc26f11e102e26ff6c1f43582fb";
-      hash = "sha256-fflB8jO6lwvLctuKDAdobWvksHEfNNrHsx6pEJdmwEQ=";
+      rev = "50bdc4130d9e30d28d0b209544d49ee472f6bf12";
+      hash = "sha256-hsYouOS+ImmA6HnwqFRq3RMBTsn87oHrnijMqvargU4=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11118,12 +11118,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-07-09";
+    version = "3.0.0-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "a0847c4bea5a5f92a36e3f3bf7da99d7d685d3ac";
-      hash = "sha256-37iNw57kC+fFk+hEgHKd07+NNDKP2g0YAmLwPYw6NyQ=";
+      rev = "95295edaa26e8e8db5a9bc4119256e602311c6bc";
+      hash = "sha256-hAswp9Ba5xfFfBS+NKjLOoSky+SRrLfd8fdFC46Dq2s=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11611,12 +11611,12 @@ final: prev: {
 
   neotest-python = buildVimPlugin {
     pname = "neotest-python";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-python";
-      rev = "51c453d57f8d5156671b42ea57fafa2e1c9fb641";
-      hash = "sha256-M0FROtTXMiAmmo83m1WwSQ5px5I6awV4I3/UY+sTYAc=";
+      rev = "1b56ca4ba51c6014f986d6548ee629bdc95589d1";
+      hash = "sha256-9FL0qWTdkeX57ujRvSa9QqO/ZIthlzLSJyKHtNitbSg=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-python/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12436,12 +12436,12 @@ final: prev: {
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "0-unstable-2026-07-11";
+    version = "0-unstable-2026-07-14";
     src = fetchFromGitHub {
       owner = "catgoose";
       repo = "nvim-colorizer.lua";
-      rev = "149fbd9f5e25511b0a8bad3ccecd43d1bc584f86";
-      hash = "sha256-jRqUMQuJVxMfQpLZ0A7hlwIXPqcip990Ay5X140uh0Y=";
+      rev = "72a05f62c52241bc7441c820eb53946f92b2e6a4";
+      hash = "sha256-hdnk816SBKWD/Ula4hjQ3o14I3+fBmEengfo72S4+8U=";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
     meta.license = unfree;
@@ -12657,12 +12657,12 @@ final: prev: {
 
   nvim-dap-ui = buildVimPlugin {
     pname = "nvim-dap-ui";
-    version = "4.0.0-unstable-2026-04-05";
+    version = "4.0.0-unstable-2026-07-14";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49";
-      hash = "sha256-J/gUD4X//JtC2HB3HBeONivCQdMnXDnZJWd6jFF9+nk=";
+      rev = "cc9dd33aade7f20bae414d0cba163bc60d4d4b43";
+      hash = "sha256-za3/6W1J6aMvNZQq8ANCq+TGHKHJtSxR/C5t3/oL3DI=";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14152,12 +14152,12 @@ final: prev: {
 
   ocaml-nvim = buildVimPlugin {
     pname = "ocaml.nvim";
-    version = "1.0.0-unstable-2026-07-03";
+    version = "1.0.0-unstable-2026-07-16";
     src = fetchFromGitHub {
       owner = "tarides";
       repo = "ocaml.nvim";
-      rev = "333647c7d16aa0e28a6d7cf15f2716111bec53af";
-      hash = "sha256-+RUoWuV9YEOsx+jOTa8No5OyoeO6iVUuSsrtHmYKpb4=";
+      rev = "e12ded73f461d392cc2cad579a39733ebe34de61";
+      hash = "sha256-3NiRM02g7BU+MzCybSfsyZdODcPA+RbuNU9QOmmoCxo=";
     };
     meta.homepage = "https://github.com/tarides/ocaml.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16086,12 +16086,12 @@ final: prev: {
 
   seoul256-vim = buildVimPlugin {
     pname = "seoul256.vim";
-    version = "0-unstable-2026-05-20";
+    version = "0-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "seoul256.vim";
-      rev = "88997adf362f57c3eadedde6b8c1393fe218c02c";
-      hash = "sha256-Em9vpXJmUyLfBHOLHVQQUGsOuluwyx+J4Q5vU8akyS0=";
+      rev = "0357ff3e44faab66c98bc98dfc89c834e37012da";
+      hash = "sha256-TEu6ybYthrtTd7k2HkQEEH1z2iImU0I6SEclt87oAGQ=";
     };
     meta.homepage = "https://github.com/junegunn/seoul256.vim/";
     meta.license = unfree;
@@ -17926,12 +17926,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "1.0.0-unstable-2026-06-27";
+    version = "1.0.0-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "f72f46057151de65ece4c280f67db84c63d64c76";
-      hash = "sha256-U9SSaB68n/rDaeyQfRk0SnEwKW7MKG9gUaFG0ivt70A=";
+      rev = "a229fe0efadb4d9bfa92cad16175bb4e93fa70d4";
+      hash = "sha256-a79rQSpPyCH/zbunrW9NxtsnwKVcQiwLzhW/1YNl3a4=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17940,12 +17940,12 @@ final: prev: {
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "01-unstable-2026-06-21";
+    version = "01-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "65a386074124f211536dc04f7427cbcbd80ee183";
-      hash = "sha256-hRgKzVnFtpAsI4dxmOTdSdi02+VEvTydbdTU+HqyhzI=";
+      rev = "1ee9f7bbb3e5928b84ab0bedaf04f6ad9dafdfb2";
+      hash = "sha256-fwFxfq0Kr/EPdx4r9qTjzvjxkQsNoAD9KvB6kP3NwlE=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
     meta.license = unfree;
@@ -25098,12 +25098,12 @@ final: prev: {
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2.5.1-unstable-2026-05-17";
+    version = "2.5.1-unstable-2026-07-16";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "a5323f4930e3f1f48c0329e50bd218ba61577aaf";
-      hash = "sha256-sBCZ/EEuGoqCBSg3Jh1o05sSuAJNOdortEB7b4sR2Z4=";
+      rev = "3d3d2db7ecd43c0181b20fede11d26f090dbc0d9";
+      hash = "sha256-dR+h9pPglZmpOsrmOUJpwVDcx5m+RqeNMjsoWcGhMsQ=";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";

From bebc151d6a42cd3db4b76c81bde80eb010e520b1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 10:28:52 -0500
Subject: [PATCH 1183/1386] vimPlugins.vague-nvim: 2.1.3 -> 2.1.4

---
 pkgs/applications/editors/vim/plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 101a5f87efa9..ee0564d465d1 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -18770,12 +18770,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2.1.3";
+    version = "2.1.4";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      tag = "v2.1.3";
-      hash = "sha256-ULBLMmJQe93N3uOPx6h8wif+38g0OSC7haklfVJyZdA=";
+      tag = "v2.1.4";
+      hash = "sha256-57dHWOUPFIyFdLEs9RDv0cateLRc8XAqT4TmDUSQyV4=";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";

From 75b92863ae36bc61270180f585091aa9357887ce Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 10:28:30 -0500
Subject: [PATCH 1184/1386] vimPlugins.typst-preview-nvim: 1.4.2-unstable ->
 1.5.0

---
 pkgs/applications/editors/vim/plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index ee0564d465d1..b57879ccb1eb 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -18504,12 +18504,12 @@ final: prev: {
 
   typst-preview-nvim = buildVimPlugin {
     pname = "typst-preview.nvim";
-    version = "1.4.2-unstable-2026-03-30";
+    version = "1.5.0";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "typst-preview.nvim";
-      rev = "87db18b8d19c8b0eed399f52e4c527ce5afe4817";
-      hash = "sha256-EUYiHzDWJQM9Guk6ZM5GWE/etB+GHM48myRg/BPtOV0=";
+      tag = "v1.5.0";
+      hash = "sha256-UTugVfydwGTmf5RomQ0R72Yf6fSz8gGeY/fg51qW454=";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";

From 1e213b72729fd03777973819836a3609c77eb2d3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 10:27:48 -0500
Subject: [PATCH 1185/1386] vimPlugins.command-t: 8.1 -> 8.2

---
 pkgs/applications/editors/vim/plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index b57879ccb1eb..440ec124e940 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3778,12 +3778,12 @@ final: prev: {
 
   command-t = buildVimPlugin {
     pname = "command-t";
-    version = "8.1";
+    version = "8.2";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
-      tag = "8.1";
-      hash = "sha256-yp3kqhHQMtUFFPfbqgnrmmclx6r39k3ohen4Ys3s3BU=";
+      tag = "8.2";
+      hash = "sha256-Q2fYHr9GFQvkoyoAOkvxJDArtqMxq7352eSGQNHBFZ8=";
     };
     meta.homepage = "https://github.com/wincent/command-t/";
     meta.license = getLicenseFromSpdxId "BSD-2-Clause";

From 2dad175f41836b019ba34a40c8a762b214acc4d0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 16 Jul 2026 10:27:30 -0500
Subject: [PATCH 1186/1386] vimPlugins.bitbake: 6.0.1 -> 6.0.2

---
 pkgs/applications/editors/vim/plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 440ec124e940..d89e9c1bc531 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1736,12 +1736,12 @@ final: prev: {
 
   bitbake = buildVimPlugin {
     pname = "bitbake";
-    version = "6.0.1";
+    version = "6.0.2";
     src = fetchFromGitHub {
       owner = "openembedded";
       repo = "bitbake";
-      tag = "yocto-6.0.1";
-      hash = "sha256-ReX6cGzy6IOfMR1z90U5QWdWLkRqO524zXcp/7xBfBk=";
+      tag = "yocto-6.0.2";
+      hash = "sha256-Jho1X7udSvh413u8ueRqR8z1Q7E2qcotdkzl9azBu7g=";
     };
     meta.homepage = "https://github.com/openembedded/bitbake/";
     meta.license = unfree;

From 0e3b50058626e27787422d241efcf75416aecd5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 15:37:39 +0000
Subject: [PATCH 1187/1386] terraform-providers.temporalio_temporalcloud: 1.5.0
 -> 1.6.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0af26cda2a49..e8d73cc3b2c1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1310,13 +1310,13 @@
     "vendorHash": "sha256-ZuH+uIv+iRQgUooyXsryICItSRglk1AGGWMVb+o1ILs="
   },
   "temporalio_temporalcloud": {
-    "hash": "sha256-gWboOWDlfoMIlfmeGOom83T/ymMW8leqO0tzrG5xhmk=",
+    "hash": "sha256-7xj+/RzXtMXN9IWjua0+cAH5zyMMCIqlOzvFqNsAFHk=",
     "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
     "owner": "temporalio",
     "repo": "terraform-provider-temporalcloud",
-    "rev": "v1.5.0",
+    "rev": "v1.6.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-7ZoJg1HEVj5Nygr46lmBZeJDfZuU4F90yntrgkBVgGg="
+    "vendorHash": "sha256-QvtirfTfnvy7CBNUng07OZnbXLHJAyRlf1I9Mur44N4="
   },
   "tencentcloudstack_tencentcloud": {
     "hash": "sha256-1UBML3E5ZnOcsdGZlZ5qkaqQsE1+Q9Uw9R8FeWJXFSw=",

From ba84bc11c4f0721bb8e874e9644e495dce883f65 Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <lucc@posteo.de>
Date: Tue, 14 Jul 2026 06:28:19 +0200
Subject: [PATCH 1188/1386] afew: 3.0.1 -> 4.0.0

Changelog:
https://github.com/afewmail/afew/blob/master/NEWS.md#afew-400-2026-07-16
---
 pkgs/by-name/af/afew/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix
index d5aa04249411..5928db88c1a4 100644
--- a/pkgs/by-name/af/afew/package.nix
+++ b/pkgs/by-name/af/afew/package.nix
@@ -9,17 +9,17 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "afew";
-  version = "3.0.1";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff";
+    hash = "sha256-d6WfXt4K5nLawwdsWXHgy0+nMJXqxs9QQ0xmVeX1m3Q=";
   };
 
   nativeBuildInputs = with python3Packages; [
     sphinxHook
-    setuptools_80
+    setuptools
     setuptools-scm
   ];
 
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   propagatedBuildInputs = with python3Packages; [
     chardet
     dkimpy
-    notmuch
+    notmuch2
     setuptools
   ];
 

From f6a8557194015f5152637b00d17232ccb302f60e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 16 Jul 2026 17:33:37 +0200
Subject: [PATCH 1189/1386] afew: 4.0.0 -> 4.0.1

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

diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix
index 5928db88c1a4..4b9534b4e0ea 100644
--- a/pkgs/by-name/af/afew/package.nix
+++ b/pkgs/by-name/af/afew/package.nix
@@ -9,12 +9,12 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "afew";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-d6WfXt4K5nLawwdsWXHgy0+nMJXqxs9QQ0xmVeX1m3Q=";
+    hash = "sha256-LPKSD4aMAREtf5Y4A9oa6Sh5lv/uuLpamcP35SBgA/M=";
   };
 
   nativeBuildInputs = with python3Packages; [

From 45d3f8a556372563769f52efbb4e5753246a8816 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 16 Jul 2026 17:37:37 +0200
Subject: [PATCH 1190/1386] afew: use build-system, dependencies

Also drop the propagated dependency on setuptools, it's not needed
anymore since 4.0.0.
---
 pkgs/by-name/af/afew/package.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix
index 4b9534b4e0ea..aa07786b61df 100644
--- a/pkgs/by-name/af/afew/package.nix
+++ b/pkgs/by-name/af/afew/package.nix
@@ -17,10 +17,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hash = "sha256-LPKSD4aMAREtf5Y4A9oa6Sh5lv/uuLpamcP35SBgA/M=";
   };
 
-  nativeBuildInputs = with python3Packages; [
-    sphinxHook
-    setuptools
-    setuptools-scm
+  build-system = [
+    python3Packages.setuptools
+    python3Packages.setuptools-scm
+  ];
+
+  nativeBuildInputs = [
+    python3Packages.sphinxHook
   ];
 
   sphinxBuilders = [
@@ -28,11 +31,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "man"
   ];
 
-  propagatedBuildInputs = with python3Packages; [
-    chardet
-    dkimpy
-    notmuch2
-    setuptools
+  dependencies = [
+    python3Packages.chardet
+    python3Packages.dkimpy
+    python3Packages.notmuch2
   ];
 
   nativeCheckInputs = [

From 767e694c18923bb94aed604aedc26f23a0a6f60b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 15:41:50 +0000
Subject: [PATCH 1191/1386] vscode-extensions.databricks.databricks: 2.12.1 ->
 2.12.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5931a7d01d98..97c8873f3aae 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1226,8 +1226,8 @@ let
         mktplcRef = {
           name = "databricks";
           publisher = "databricks";
-          version = "2.12.1";
-          hash = "sha256-GKm3rZMvU/5Ii01GjUg7rE15TnOtDTh0LwkDVsuSLfY=";
+          version = "2.12.3";
+          hash = "sha256-/hFBw6STQG4zycS44em1DlaQSpKGP4w7YlH+fu/cHlA=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";

From 7d51e81aab159c2076b44b8362714a65c9135d0d Mon Sep 17 00:00:00 2001
From: Mateusz Wykurz <wykurz@gmail.com>
Date: Thu, 16 Jul 2026 09:56:58 -0600
Subject: [PATCH 1192/1386] rcp: 0.36.0 -> 0.37.0

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

diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index fa067775f0f5..40f8072897e8 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -6,16 +6,16 @@
 
 pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rcp";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "wykurz";
     repo = "rcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-laGQWJbke+q0dAdqR8opXw4oQm6wdJJT0/t/A9c7d9s=";
+    hash = "sha256-svJA9QyqwpY1xzOQ09qFlZwrGp3HZXW9T2AICVJfqOs=";
   };
 
-  cargoHash = "sha256-+T9aGsewRHdmKMtZisXv4st+9kBTNtEZnPraLz8S4e8=";
+  cargoHash = "sha256-QJr6kM520OWxje7Q5FZWgJH1IS8j+Jv1vNf7VyCINNA=";
 
   env.RUSTFLAGS = "--cfg tokio_unstable";
 

From a2df430578412e2157e5729a03516a602972adfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 16:06:31 +0000
Subject: [PATCH 1193/1386] python3Packages.aiosomecomfort: 0.0.37 -> 0.0.38

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

diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix
index 28537fbea3f2..4501a1d32ced 100644
--- a/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiosomecomfort";
-  version = "0.0.37";
+  version = "0.0.38";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkmer";
     repo = "AIOSomecomfort";
     tag = version;
-    hash = "sha256-xyGJsSgxE/UwTEfA2BzVHvgqG1c47/SokLHrysPkFAU=";
+    hash = "sha256-tjJazA5MFIr3Z3I8l9g6SngH6U616e9jWXfMrim2wPo=";
   };
 
   build-system = [

From ed63bc544bf85cf825326d794e8634945de1583f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 16:16:27 +0000
Subject: [PATCH 1194/1386] protonup-rs: 0.12.2 -> 0.14.0

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

diff --git a/pkgs/by-name/pr/protonup-rs/package.nix b/pkgs/by-name/pr/protonup-rs/package.nix
index a5c53575ab0e..a5b9771fa77b 100644
--- a/pkgs/by-name/pr/protonup-rs/package.nix
+++ b/pkgs/by-name/pr/protonup-rs/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protonup-rs";
-  version = "0.12.2";
+  version = "0.14.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-u5SvZuuHPRBwOTUlVmtg9nY98INqKvSnHE83I8UsA0E=";
+    hash = "sha256-FHT//OHxMm7FXm/L+tZ+diGwbQ1i4EABKuFKO9SPm1M=";
   };
 
-  cargoHash = "sha256-LKZaTwJur4eBLFPtsMZEmaqTzFAxLJEytl61KMs2+Y4=";
+  cargoHash = "sha256-NOLYmJx0SvZ6azk34Ha/3512VSx+UHsepQQIYrHdLwM=";
 
   checkFlags = [
     # Requires internet access

From c8055bf4329756debe449ef8cfaeefe1065fdbb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 16:25:09 +0000
Subject: [PATCH 1195/1386] cutecosmic: 0.1-unstable-2026-03-25 ->
 0.1-unstable-2026-07-11

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

diff --git a/pkgs/by-name/cu/cutecosmic/package.nix b/pkgs/by-name/cu/cutecosmic/package.nix
index cbdd6ae9c449..12835a8cc0f5 100644
--- a/pkgs/by-name/cu/cutecosmic/package.nix
+++ b/pkgs/by-name/cu/cutecosmic/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cutecosmic";
-  version = "0.1-unstable-2026-03-25";
+  version = "0.1-unstable-2026-07-11";
 
   src = fetchFromGitHub {
     owner = "IgKh";
     repo = "cutecosmic";
-    rev = "441c5ac05b85dd7afeaf02689af7de7428717c6b";
-    hash = "sha256-NMRP9QeN+57pUyA0/xynITJyWrCu/Eg2ZvGzDBzfmvQ=";
+    rev = "3f518924fbccc1b62f4d9e8db6c9eda7490959c9";
+    hash = "sha256-bombgw+vxn8LQ60ZWMrIJuwejsyJd+2dNkAjQBzVj3w=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 0b3dea1c3f8a26f81837ef31db943445f464431e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 16:32:58 +0000
Subject: [PATCH 1196/1386] python3Packages.pysigma-backend-sqlite: 1.1.3 ->
 1.2.0

---
 .../python-modules/pysigma-backend-sqlite/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
index 4fb73f501161..523142bab12e 100644
--- a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pysigma-backend-sqlite";
-  version = "1.1.3";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-backend-sqlite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+QiRfuLdhRo8wlQG3EM2wGD1VhlauuMrbrX8NDflguA=";
+    hash = "sha256-IANILJpA6b3uHzscVlSvQjux7LBkdj/rKtxM1nwWvs0=";
   };
 
   pythonRelaxDeps = [ "pysigma" ];

From 4596ab92394e69a5553387a7ba7fdd3ff2152ae4 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 16 Jul 2026 12:36:56 -0400
Subject: [PATCH 1197/1386] pi-coding-agent: 0.80.7 -> 0.80.8

Changelog: https://github.com/earendil-works/pi/blob/main/packages/coding-agent/CHANGELOG.md
---
 pkgs/by-name/pi/pi-coding-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index 74052c202f84..4f6ca2cfe83b 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -12,16 +12,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.80.7";
+  version = "0.80.8";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s7dD82fugvWRvqL1VTcEwCIR5JI6t7VeFHR9NdMtG00=";
+    hash = "sha256-wCsZA1gb9sFri6OdTWBf0UCXYxqxlbImG8iE6K+D9u4=";
   };
 
-  npmDepsHash = "sha256-Bd/NIt3lyQR5Y7P+HksPxMQvJc0AjVfDi1M1bH3/eOg=";
+  npmDepsHash = "sha256-WdSQHKKOVzEFxUQH3QnSVzs+HpJPATnCQ701nbRB0lc=";
 
   npmWorkspace = "packages/coding-agent";
 

From 0454542a18d8945babf66f2ed4d2fb9bf37a9b37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 16:44:49 +0000
Subject: [PATCH 1198/1386] karate: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/by-name/ka/karate/package.nix b/pkgs/by-name/ka/karate/package.nix
index 9fc9eaa9186d..f1e87419b209 100644
--- a/pkgs/by-name/ka/karate/package.nix
+++ b/pkgs/by-name/ka/karate/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "karate";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar";
-    sha256 = "sha256-ImFhqjBMYXREOZ+0j0IIARmtNQpCf71m2nUxZQusKKo=";
+    sha256 = "sha256-XrDmWpl1aforNvsnJU4V4TUUoCTU+7D8NTgTrJHjmOE=";
   };
   dontUnpack = true;
 

From 0f41d748ea37ef58b948f1ac06094921f51d6c87 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 17 Jul 2026 01:48:16 +0900
Subject: [PATCH 1199/1386] herdr: add shell completions

Shell completions (excluding nushell) were introduced in v0.7.2:
https://github.com/ogulcancelik/herdr/commit/13cb5d9ae6aa314744ce5362b5d156182f06b503
---
 pkgs/by-name/he/herdr/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/he/herdr/package.nix b/pkgs/by-name/he/herdr/package.nix
index 103b51823232..43b65453d13e 100644
--- a/pkgs/by-name/he/herdr/package.nix
+++ b/pkgs/by-name/he/herdr/package.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   fetchFromGitHub,
   zig_0_15,
+  installShellFiles,
   cctools,
   xcbuild,
   versionCheckHook,
@@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [
     zig_0_15.hook
+    installShellFiles
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     cctools
@@ -53,6 +55,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
   '';
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd herdr \
+      --bash <("$out/bin/herdr" completion bash) \
+      --fish <("$out/bin/herdr" completion fish) \
+      --zsh <("$out/bin/herdr" completion zsh)
+  '';
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 

From 31ab8f0df3651f5a6a61c110bb7547d727e854f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 17:03:02 +0000
Subject: [PATCH 1200/1386] owmods-gui: 0.15.6 -> 0.15.7

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

diff --git a/pkgs/by-name/ow/owmods-gui/package.nix b/pkgs/by-name/ow/owmods-gui/package.nix
index 6e364c17b342..0986a2c42ed3 100644
--- a/pkgs/by-name/ow/owmods-gui/package.nix
+++ b/pkgs/by-name/ow/owmods-gui/package.nix
@@ -21,12 +21,12 @@
 }:
 let
   pname = "owmods-gui";
-  version = "0.15.6";
+  version = "0.15.7";
   src = fetchFromGitHub {
     owner = "ow-mods";
     repo = "ow-mod-man";
     tag = "gui_v${version}";
-    hash = "sha256-2jf9yjvWvE6If2ChdbgdLwSJtyj4AYSKkV9E7jgQ3G8=";
+    hash = "sha256-xGohK7ki82gvfTnjPUdpamnvPDf8vpuAuC0gjRvx7mQ=";
   };
   frontend = buildNpmPackage {
     pname = "owmods-gui-ui";
@@ -37,7 +37,7 @@ let
     src = "${src}/owmods_gui/frontend";
 
     packageJSON = "${src}/owmods_gui/frontend/package.json";
-    npmDepsHash = "sha256-Ske3EFiLDPMLI2ln65pZL22pExT/OfT0v0x+TxiZjQo=";
+    npmDepsHash = "sha256-+2PlfZijwYeGXDYycwgOfjbZCRazHs/O3iDDuKLIwxM=";
 
     postBuild = ''
       cp -r ../dist/ $out
@@ -57,7 +57,7 @@ in
 rustPlatform.buildRustPackage {
   inherit pname version src;
 
-  cargoHash = "sha256-UsqkamsWyJ+SUOD8Ab0wZIfcL6NBe0kKbLXSm7rFOGM=";
+  cargoHash = "sha256-oYTz7Dzdv9prHzDSSjX9PozzKToMXRW6qs8Y2dfYQ8A=";
 
   buildNoDefaultFeatures = true;
   buildFeatures = [

From 2267e8a541284ffc1b50f726aff07de67e3cde06 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Thu, 16 Jul 2026 11:48:23 -0300
Subject: [PATCH 1201/1386] sage: work around ipython and scipy regressions

---
 .../patches/ipython-9_15-workaround.patch     | 24 +++++++++++++++++++
 .../sage/patches/scipy-1_18-workaround.patch  | 13 ++++++++++
 pkgs/by-name/sa/sage/sage-src.nix             |  8 +++++++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch
 create mode 100644 pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch

diff --git a/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch b/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch
new file mode 100644
index 000000000000..ada5974798f7
--- /dev/null
+++ b/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch
@@ -0,0 +1,24 @@
+diff --git a/src/sage/doctest/test.py b/src/sage/doctest/test.py
+index 812f8167c12..38e553ad5bd 100644
+--- a/src/sage/doctest/test.py
++++ b/src/sage/doctest/test.py
+@@ -468,6 +468,7 @@ Test the ``--debug`` option::
+         s...: b = 5
+         s...: a + b
+         8
++    ...
+     sage:
+     <BLANKLINE>
+     Returning to doctests...
+diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
+index 56fc16a205c..be2ae2a1b3d 100644
+--- a/src/sage/tests/cmdline.py
++++ b/src/sage/tests/cmdline.py
+@@ -327,6 +327,7 @@ be ignored. In Pdb, we run the ``help`` command::
+     **********************************************************************
+     Previously executed commands:
+         s...: assert True is False
++    ...
+     sage:
+     <BLANKLINE>
+     Returning to doctests...
diff --git a/pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch b/pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch
new file mode 100644
index 000000000000..5c4c4454c54d
--- /dev/null
+++ b/pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sage/plot/plot3d/plot3d.py b/src/sage/plot/plot3d/plot3d.py
+index bdf15a85e9d..36580eeab6b 100644
+--- a/src/sage/plot/plot3d/plot3d.py
++++ b/src/sage/plot/plot3d/plot3d.py
+@@ -316,7 +316,7 @@ class _Coordinates:
+             ....: [ 0.16763356,  0.19993708,  0.31403568,  0.47359696, 0.55282422],
+             ....: [ 0.16763356,  0.25683223,  0.16649297,  0.10594339, 0.55282422]])
+             sage: import scipy.interpolate
+-            sage: f=scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev
++            sage: f=lambda *x: scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev(*x).item()
+             sage: spherical_plot3d(f,(0,2*pi),(0,pi))
+             Graphics3d Object
+         """
diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index a277be1af4bd..035a899d6e6e 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -130,6 +130,14 @@ stdenv.mkDerivation rec {
       url = "https://github.com/sagemath/sage/commit/926f32aab22f81ddb9fda874a20fee84c7bfacc3.patch?full_index=1";
       hash = "sha256-EMn/fr5WlRQtFj5GHo02kczasmKaiqFfRSVZo2uvOPI=";
     })
+
+    # work around https://github.com/ipython/ipython/issues/15207, which
+    # will likely be properly fixed in IPython 9.16.
+    ./patches/ipython-9_15-workaround.patch
+
+    # work around https://github.com/scipy/scipy/issues/25471, which is
+    # fixed as part of SciPy 1.18.1.
+    ./patches/scipy-1_18-workaround.patch
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

From c790223a69627a1228408a0ca7fac106c87e724a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 17:09:33 +0000
Subject: [PATCH 1202/1386] pyfa: 2.67.0 -> 2.68.0

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

diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index 034254572c8a..3a75269e3d9d 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -11,7 +11,7 @@
   copyDesktopItems,
 }:
 let
-  version = "2.67.0";
+  version = "2.68.0";
 in
 python3Packages.buildPythonApplication rec {
   inherit version;
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
     owner = "pyfa-org";
     repo = "Pyfa";
     tag = "v${version}";
-    hash = "sha256-LS8KW6dZe/CYdA1LvZlq1vL8YllnDZkD9WEEDOToY1M=";
+    hash = "sha256-obx4YG75XxpdlaFlmFmkXdkazHERhm5boOzSx7zDRQs=";
   };
 
   desktopItems = [

From cb0155c34e05c17d11911463666ea4ecb8de3367 Mon Sep 17 00:00:00 2001
From: Tiago Ferreira <me@tiferrei.com>
Date: Mon, 13 Apr 2026 23:17:46 +0100
Subject: [PATCH 1203/1386] mas: add updateScript

---
 pkgs/by-name/ma/mas/package.nix |  4 ++++
 pkgs/by-name/ma/mas/update.sh   | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100755 pkgs/by-name/ma/mas/update.sh

diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix
index 5e34f52f41bc..2b46f7eec175 100644
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -9,6 +9,7 @@
   versionCheckHook,
   zsh,
 }:
+
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mas";
   version = "7.0.0";
@@ -60,6 +61,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Mac App Store command line interface";
     homepage = "https://github.com/mas-cli/mas";
@@ -67,6 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "mas";
     maintainers = with lib.maintainers; [
       zachcoyle
+      tiferrei
     ];
     platforms = [
       "aarch64-darwin"
diff --git a/pkgs/by-name/ma/mas/update.sh b/pkgs/by-name/ma/mas/update.sh
new file mode 100755
index 000000000000..6ed1b5b71a3c
--- /dev/null
+++ b/pkgs/by-name/ma/mas/update.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nurl gnused
+
+set -eu
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+NIX_DRV="$ROOT/package.nix"
+
+VERSION="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/mas-cli/mas/releases/latest \
+  | jq -r '.tag_name | ltrimstr("v")')"
+
+URL="https://github.com/mas-cli/mas/releases/download/v${VERSION}/mas-${VERSION}-arm64.pkg"
+HASH=$(nurl --hash --expr \
+    "(import <nixpkgs> { }).fetchurl { url = \"$URL\"; }")
+
+sed -i "s/version = \".*\"/version = \"$VERSION\"/" "$NIX_DRV"
+sed -i "/arm64.pkg\";/{n; s|hash = \"sha256-.\{44\}\"|hash = \"$HASH\"|}" "$NIX_DRV"

From e4946acfec6bfe82b2a62e61776c60860f3b80c0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 16 Jul 2026 13:13:07 -0400
Subject: [PATCH 1204/1386] elephant: 2.21.0 -> 2.22.0

Changelog: https://github.com/abenz1267/elephant/releases/tag/v2.22.0
---
 pkgs/by-name/el/elephant/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/elephant/package.nix b/pkgs/by-name/el/elephant/package.nix
index 93df5966a194..b2e446a8e4ce 100644
--- a/pkgs/by-name/el/elephant/package.nix
+++ b/pkgs/by-name/el/elephant/package.nix
@@ -31,16 +31,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "elephant";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "elephant";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=";
+    hash = "sha256-frlaSpCf/e94OqO5Glp1NW96bemc+BhrKoPu+4X1FyI=";
   };
 
-  vendorHash = "sha256-EWXZ+9/QDRpidpVHBcfJgp0xoc3YtRsiC/UTk1R+FSY=";
+  vendorHash = "sha256-ssX+ZQ6v+XcwC/RuIZ+rO/9zZwZnotudj8bvZNM7M3g=";
 
   buildInputs = [ protobuf ];
   nativeBuildInputs = [

From d9ab107c28c81fdf400b85bd351a06b6c50ee395 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 16 Jul 2026 13:25:29 -0400
Subject: [PATCH 1205/1386] mimir: 3.1.2 -> 3.1.3

Changelog: https://github.com/grafana/mimir/releases/tag/mimir-3.1.3
---
 pkgs/by-name/mi/mimir/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index c20fd10fea90..d27bfd6ab61e 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "mimir";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     rev = "mimir-${finalAttrs.version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-8GvpmCanVlsObH1mwPA/TsHzNp3f0hzF7fURIDHy/DU=";
+    hash = "sha256-OXzYV42v9coPPp1zbITDOepmccioF+rBfRMoVUZaTeY=";
   };
 
   vendorHash = null;

From 72f5048d567d34839d7d7cfa5baf451e58895af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 16 Jul 2026 10:21:21 -0700
Subject: [PATCH 1206/1386] python3Packages.paho-mqtt: use upstream patch for
 generating SSL certs

---
 .../python-modules/paho-mqtt/default.nix       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
index b0ea0015bb42..1d71451e962b 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -3,9 +3,11 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   hatchling,
   openssl,
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -28,10 +30,13 @@ buildPythonPackage rec {
     hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY=";
   };
 
-  postPatch = ''
-    substituteInPlace tests/ssl/gen.sh \
-      --replace-fail "c_rehash certs" "#c_rehash certs"
-  '';
+  patches = [
+    (fetchpatch {
+      name = "generate-ssl-certs-in-a-test-fixture.patch";
+      url = "https://github.com/eclipse-paho/paho.mqtt.python/pull/931.diff";
+      hash = "sha256-A7rWwpR4PnCi77F1VqsQKHBxHNrdeHgmVM6BGMeUpjs=";
+    })
+  ];
 
   build-system = [
     hatchling
@@ -40,6 +45,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     openssl
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   __darwinAllowLocalNetworking = true;
@@ -51,10 +57,6 @@ buildPythonPackage rec {
 
     # paho.mqtt not in top-level dir to get caught by this
     export PYTHONPATH=".:$PYTHONPATH"
-
-    pushd tests/ssl
-    HOME="$(mktemp -d)" ./gen.sh
-    popd
   '';
 
   disabledTests = [

From 2a16da6f0b24abab9aeb977a48111a5f9402baba Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 16 Jul 2026 13:30:02 -0400
Subject: [PATCH 1207/1386] mimir: remove adamcstephens as maintainer

---
 pkgs/by-name/mi/mimir/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index d27bfd6ab61e..f06783ebd4c5 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -67,7 +67,6 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       happysalada
       bryanhonof
-      adamcstephens
     ];
   };
 })

From 85a93bcb9eb7c3e0c04b731af2b8f75656fcc4b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 17:31:28 +0000
Subject: [PATCH 1208/1386] biome: 2.5.0 -> 2.5.4

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

diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 21e65a8d6c90..0a577ee4ef5e 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.5.0";
+  version = "2.5.4";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-d8MhD749rkLWeCKDBxhw2aF3G09h8kug5w2Q40JSkt4=";
+    hash = "sha256-x8oMtugVmN8Z7obBsiZxLZ5Ikj/oGPXEgg/8M8dsRvc=";
   };
 
-  cargoHash = "sha256-z1KgScoH9retj0qNd6eOTjejjQypfVkha0ae71Z6TSg=";
+  cargoHash = "sha256-yV+lvPLPGtWCtbA39NVH1T1Sl1qn1MTsQIVRo3c9+Dg=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 799cd29f25eb0decfb941e95283aeb183fda251b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 17:52:02 +0000
Subject: [PATCH 1209/1386] argocd: 3.4.4 -> 3.4.5

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

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 032bec4677c0..b39cc55f242b 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "argocd";
-  version = "3.4.4";
+  version = "3.4.5";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I3udVhmPpOA2Lf1mkJqG+d+mGpfM16HIKBkEnTiAw0c=";
+    hash = "sha256-hM7ss948dr7KntUGwiFDhr1OrbI+LAJlDgUMnegm+es=";
   };
 
   ui = stdenv.mkDerivation {
@@ -45,7 +45,7 @@ buildGoModule (finalAttrs: {
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-w6jFNWKvcwxyeiSy+Pqb43qOfMOXF5UHr2VpyQD2dFw=";
+  vendorHash = "sha256-yzVSMdupFdrYUWMCPFhiYTnjCDGZo4Se0osXbCvB7gM=";
 
   # Set target as ./cmd per cli-local
   # https://github.com/argoproj/argo-cd/blob/master/Makefile

From 9d7f8062fd1d8cba2d3758e88bbb668e38f4e3d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 17:52:42 +0000
Subject: [PATCH 1210/1386] tutanota-desktop: 353.260630.0 -> 355.260710.0

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

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 3ac0daebc409..4bcdbca68547 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "353.260630.0";
+  version = "355.260710.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-ZJdiufoyZQxZncxyJZd1rhVyBMlkep+8uvchO/D/Krs=";
+    hash = "sha256-HlR9dXXxnXwUTM0Xlovu1+G5rgH87dYxLgbp2qyAFbM=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 146b1e2702c38ab8dcd4037952fd4b1479a212c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 17:54:25 +0000
Subject: [PATCH 1211/1386] pnpm: 11.11.0 -> 11.13.1

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

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 087fdf2b6647..1da0155ebc96 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -61,8 +61,8 @@ let
       hash = "sha256-zLXEecqxsAYhMlv+fUyaioAx56Ul1ySeJ17L7IGwjbI=";
     };
     "11" = {
-      version = "11.11.0";
-      hash = "sha256-he8u/yFqGukIBMAMjfv6ZoU1NkRlDRCQaok8Ba7c2IQ=";
+      version = "11.13.1";
+      hash = "sha256-EAErV9I7lnO8U0Fo/1axrGVbpKJzf/N/bZ0ZpVFEr6o=";
     };
   };
 

From ea0ab2eac441daa211581c5b5e071975aebecf79 Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Thu, 16 Jul 2026 19:57:28 +0200
Subject: [PATCH 1212/1386] autopush-rs: 1.82.1 -> 1.82.2

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

diff --git a/pkgs/by-name/au/autopush-rs/package.nix b/pkgs/by-name/au/autopush-rs/package.nix
index 0ab3b4fe426e..2fcc3e9db310 100644
--- a/pkgs/by-name/au/autopush-rs/package.nix
+++ b/pkgs/by-name/au/autopush-rs/package.nix
@@ -47,7 +47,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "autopush";
-  version = "1.82.1";
+  version = "1.82.2";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -61,10 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "mozilla-services";
     repo = "autopush-rs";
     tag = finalAttrs.version;
-    hash = "sha256-wOnuYh18q2XDAcCUBGsidAMvOi10s4njVKDLhtNJEoU=";
+    hash = "sha256-do0EllSpXlJtPM9FnIWgwKemXHhDcj0P+aH6rnt4poE=";
   };
 
-  cargoHash = "sha256-FiMEDc2wxQPkM50cNKzP8yo90HGMakn6JUl/xheaciQ=";
+  cargoHash = "sha256-tXkNjgHW4sVWNCQehumbDW1H2azelqyqp5Wxk8M6sPc=";
 
   nativeBuildInputs = [
     pkg-config

From 2dc8ac259367fa3929412024b53570fc99054858 Mon Sep 17 00:00:00 2001
From: Jasper Chan <jasperchan515@gmail.com>
Date: Thu, 16 Jul 2026 14:11:40 -0400
Subject: [PATCH 1213/1386] python3Packages.inventree: fix dependencies

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

diff --git a/pkgs/development/python-modules/inventree/default.nix b/pkgs/development/python-modules/inventree/default.nix
index 77cd0f9b1439..ef66862333ac 100644
--- a/pkgs/development/python-modules/inventree/default.nix
+++ b/pkgs/development/python-modules/inventree/default.nix
@@ -7,10 +7,8 @@
   setuptools,
 
   # dependencies
-  coveralls,
-  invoke,
-  pillow,
   requests,
+  urllib3,
 
   # tests
   pytestCheckHook,
@@ -34,10 +32,8 @@ buildPythonPackage (finalAttrs: {
   ];
 
   dependencies = [
-    coveralls
-    invoke
-    pillow
     requests
+    urllib3
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From da563ef16172476bc6ef79a69b014640fb427ae0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 18:24:53 +0000
Subject: [PATCH 1214/1386] mcp-grafana: 0.17.1 -> 0.17.2

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

diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index dfbce63aae9d..09e2c6a48648 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcp-grafana";
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "mcp-grafana";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nuG17gscAzGzxehlR+UkVo6NyGM0swiKXSx0N95ffvU=";
+    hash = "sha256-8cImJIND4S3ISkfNBCdP05AgNuAJNKOCtI9o47MR7tw=";
   };
 
   vendorHash = "sha256-SovR9UxTqN397oczKgJqlJ9iOFnCrZGqPWhhfcjSNPg=";

From 631700aded9b426f4e8807e86c8c1536c86f91c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 18:31:45 +0000
Subject: [PATCH 1215/1386] python3Packages.elevenlabs: 2.56.0 -> 2.58.0

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

diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index d3d9d321a2ae..01e8bbd1b746 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "elevenlabs";
-  version = "2.56.0";
+  version = "2.58.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ps4W8uSv2eH5DSJpDBmaitrv+AegA+UJKjiiAfK5gOQ=";
+    hash = "sha256-lMDGcT1PloUmj+9oZY2QYlXyg47P8UAO484c/oVEmjg=";
   };
 
   build-system = [ poetry-core ];

From 4c2ba5f85cb450346c020e8c05a73cbe7f9684fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 18:50:56 +0000
Subject: [PATCH 1216/1386] spotatui: 0.40.1 -> 0.40.2

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

diff --git a/pkgs/by-name/sp/spotatui/package.nix b/pkgs/by-name/sp/spotatui/package.nix
index 4f9f66905945..f6fd30cd38f8 100644
--- a/pkgs/by-name/sp/spotatui/package.nix
+++ b/pkgs/by-name/sp/spotatui/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spotatui";
-  version = "0.40.1";
+  version = "0.40.2";
 
   src = fetchFromGitHub {
     owner = "LargeModGames";
     repo = "spotatui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kuiL3d5gB37X/WampwDI1r21fP/HWWWR+HDUmKFIhHw=";
+    hash = "sha256-HdgTWpS1moLIBYyWOtW6Vfd/l8rRyKwORMQHhnqTxFk=";
   };
 
-  cargoHash = "sha256-7j4EdJJy8AZjYYbfa3rotnJeekCBJkZapCI2z6XE3hM=";
+  cargoHash = "sha256-WWGh4NZ6BkDoHAvBxr+iy0NrAf34ocO++IOi0C7LiPY=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withPipewireVisualizer rustPlatform.bindgenHook;
 

From b4e645d4937d1be79c3b00e2cb3c0b5e23b0e5c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 18:56:31 +0000
Subject: [PATCH 1217/1386] libretro.stella: 0-unstable-2026-06-28 ->
 0-unstable-2026-07-16

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index e33d2c161206..bfb7842100db 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-07-16";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "62522a804dec6b5aa683fa5e37f5f6c48aefded1";
-    hash = "sha256-YALzsYJwZDtVkVx9yvkkEZ1AHxT4fAc+epoFDwStmSI=";
+    rev = "61f4282f57934df94e08a2db79ec492aaab5b805";
+    hash = "sha256-2pEQzl3aUq5ya9297Aj4MYN2ePkg/dyCvJavRWkyE1U=";
   };
 
   makefile = "Makefile";

From fee76ef093078cb94cf9c37aa7de32f7536265f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 18:58:52 +0000
Subject: [PATCH 1218/1386] jetbrains-toolbox: 3.6.1.85592 -> 3.6.2.85969

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

diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index 39b4e819df0d..3399a8f136a2 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "jetbrains-toolbox";
-  version = "3.6.1.85592";
+  version = "3.6.2.85969";
 
   updateScript = ./update.sh;
 
@@ -57,9 +57,9 @@ let
         aarch64 = "-arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-GhrN3oGdNqE4cYJmSAeRATk2yS6AVF6z+/VIb7ttoJc=";
-        aarch64-linux = "sha256-vI0niFirdAnYKF7+1+ACD31i86PgpPXUfKPkHttusRo=";
-        aarch64-darwin = "sha256-islydrfr1j2OlC3wyzGss+NlzjcyrMydYSv6fjFf4D0=";
+        x86_64-linux = "sha256-2XvsZ5WrdmDGTigKWJCUJB2VkHj+Z3M8QClp6YoIIRw=";
+        aarch64-linux = "sha256-/8j7vJGTCvj57I1kqUCyBSDoJA8Tr0MUaomhb0Um7vA=";
+        aarch64-darwin = "sha256-esf/AfRDGoWV05KWb7CfJBRQvkcs3bG5/IldcTuNZOA=";
       };
     in
     selectKernel {

From 7add644c033afec1cb013f143b8c201fc7ecf653 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 19:21:03 +0000
Subject: [PATCH 1219/1386] regal: 0.41.1 -> 0.42.0

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

diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
index a1740942f85c..c87b71545d1b 100644
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "regal";
-  version = "0.41.1";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "regal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mrNdzzwgLmP3PNnoVI4vC05rq9vGCnlWHquwXh1HDX0=";
+    hash = "sha256-52kYnkOEhNk491vaoCSgR47frmN/mFCKyHqWnIBcEE8=";
   };
 
-  vendorHash = "sha256-kp0EkieTIzC+nO9fFnUQMP4COCY9wxe4Nb2kSUgnInA=";
+  vendorHash = "sha256-Vl6u/dwtG8RBpSQUrS5rAQ0Hag2R5X6rVQe9PHb/4U8=";
 
   # Only build the main binary, exclude build/lsp/main.go
   subPackages = [ "." ];

From 7d7f1a08ac7f30faf3060eb88d9a24d039154749 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 19:22:05 +0000
Subject: [PATCH 1220/1386] par-lang: 0-unstable-2026-06-24 ->
 0-unstable-2026-07-15

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

diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix
index 3c69167e1598..53353c009c84 100644
--- a/pkgs/by-name/pa/par-lang/package.nix
+++ b/pkgs/by-name/pa/par-lang/package.nix
@@ -19,13 +19,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "par-lang";
-  version = "0-unstable-2026-06-24";
+  version = "0-unstable-2026-07-15";
 
   src = fetchFromGitHub {
     owner = "par-team";
     repo = "par-lang";
-    rev = "fb93d7dd2c21a7825a57c74d6f22b250bb25d9bc";
-    hash = "sha256-9NKBjOMyemgPX/r7ot/RLut1FqWl8RfuuHhXUnkv1IM=";
+    rev = "8b10f081aee0bb553ce5eecf2886e4c8360acc77";
+    hash = "sha256-kDPUQCUHPUM4d9M+ljPPPw3H9MulWbsxCMsVe6+VpoI=";
   };
 
   cargoHash = "sha256-8lG+cKN3/W+LYWhmOfDwGiq6u3nlLJaD5uNABaY0zRY=";

From c0ba1b6842ff3ead5fbd5998ca7d92df6608694f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 19:29:42 +0000
Subject: [PATCH 1221/1386] mcelog: 211 -> 212

---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 0153382cd358..6822d23d9fae 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mcelog";
-  version = "211";
+  version = "212";
 
   src = fetchFromGitHub {
     owner = "andikleen";
     repo = "mcelog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u0T6AVy5pxBwU1bkKGP5RG5Bmp0UikwHbV/ij/V3ljE=";
+    hash = "sha256-5nsaL0WYsFo8Lqt2pPBcuAokF/2+veCOxaF7AmFjRNo=";
   };
 
   postPatch = ''

From a468bacd7deccf0f8c5435221e6d5fccfb278aee Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Thu, 16 Jul 2026 20:33:39 +0100
Subject: [PATCH 1222/1386] kanarenshu: 0.1.1 -> 0.1.4

Diff: https://github.com/nuixyz/kanarenshu/compare/v0.1.1...v0.1.4

Changelog: https://github.com/nuixyz/kanarenshu/releases/tag/v0.1.4
---
 pkgs/by-name/ka/kanarenshu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/kanarenshu/package.nix b/pkgs/by-name/ka/kanarenshu/package.nix
index 27b39c78ed7c..e8e848d5f344 100644
--- a/pkgs/by-name/ka/kanarenshu/package.nix
+++ b/pkgs/by-name/ka/kanarenshu/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "kanarenshu";
-  version = "0.1.1";
+  version = "0.1.4";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "nuixyz";
     repo = "kanarenshu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ea3wDS5AsXXFvhff3RoYj1HTcVrUq3Cd4Vjz80R2seI=";
+    hash = "sha256-ROpZXGvleciJf+B3KVSIcsSES9+mtdLhcPFtGBpEmqY=";
   };
 
   vendorHash = "sha256-ES9+l6aDY8Y38yi4ufw2bpBPCW58L2oSlfXzh1TWGRE=";

From c75351ac7958f70a8fa6ad251419fbade994e877 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Thu, 16 Jul 2026 20:35:31 +0100
Subject: [PATCH 1223/1386] zennotes-desktop: 2.13.3 -> 2.13.5

Diff: https://github.com/ZenNotes/zennotes/compare/v2.13.3...v2.13.5

Changelog: https://github.com/ZenNotes/zennotes/releases/tag/v2.13.5
---
 pkgs/by-name/ze/zennotes-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ze/zennotes-desktop/package.nix b/pkgs/by-name/ze/zennotes-desktop/package.nix
index b153a483b5aa..df31f8015190 100644
--- a/pkgs/by-name/ze/zennotes-desktop/package.nix
+++ b/pkgs/by-name/ze/zennotes-desktop/package.nix
@@ -13,14 +13,14 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "zennotes-desktop";
-  version = "2.13.3";
+  version = "2.13.5";
   npmDepsHash = "sha256-7dchbcGAZm+PlVsES76sYD9NOqeCulEKC7S0zLERvvY=";
 
   src = fetchFromGitHub {
     owner = "ZenNotes";
     repo = "zennotes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9/fvHSUf0rWwljhN/Vqoui7ZdGL6nvN6svM8iwYQF7A=";
+    hash = "sha256-/cTALzPtoagq1VGsWzitF/9SdKqXidBLPQet4vatVuU=";
   };
 
   npmWorkspace = "apps/desktop";

From 8c4803105f25eb444889863a6fefd579b89fd03e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 19:35:51 +0000
Subject: [PATCH 1224/1386] bomly: 0.16.1 -> 0.18.0

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

diff --git a/pkgs/by-name/bo/bomly/package.nix b/pkgs/by-name/bo/bomly/package.nix
index 281ef18c8064..02667684cf59 100644
--- a/pkgs/by-name/bo/bomly/package.nix
+++ b/pkgs/by-name/bo/bomly/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "bomly";
-  version = "0.16.1";
+  version = "0.18.0";
 
   __structuredAttrs = true;
 
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
     owner = "bomly-dev";
     repo = "bomly-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RJqYRCnE4lqR68lP9hL9hTOxXS3cPEgspBn2JgvffyM=";
+    hash = "sha256-U7h9U4wiKohJQUauD8lmTScEWpT0kHZobJnJp8u0VbI=";
   };
 
-  vendorHash = "sha256-W7FfqWV86D8fXZ4nm/0IVZuqocgo8/Sd9DA1Ef4SJ/4=";
+  vendorHash = "sha256-rO1hymsyc6Ar7PtNLymP66tKK6X6mwVz4kQt4UzzwDI=";
 
   # .gitattributes excludes all testdata from the GitHub tarball
   postPatch = ''

From 1a74923ede6d804d7e6f5c27790465bf69aa3ce3 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 03:29:59 +0100
Subject: [PATCH 1225/1386] yashiki: 0.14.0 -> 0.15.2

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

diff --git a/pkgs/by-name/ya/yashiki/package.nix b/pkgs/by-name/ya/yashiki/package.nix
index fdcf7936644c..9dea110516b6 100644
--- a/pkgs/by-name/ya/yashiki/package.nix
+++ b/pkgs/by-name/ya/yashiki/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yashiki";
-  version = "0.14.0";
+  version = "0.15.2";
 
   __structuredAttrs = true;
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "typester";
     repo = "yashiki";
     tag = "yashiki-v${finalAttrs.version}";
-    hash = "sha256-ePZ8ONdvj3gaQps+5Ua0OLeFdzNdJhoB9yw6pC7qoEQ=";
+    hash = "sha256-nsmUuhi0yy6x6POC4qLbMib4fxS3QRjlK6QgCiVEnyQ=";
   };
 
-  cargoHash = "sha256-JMrftBKyD188SZqEGI4fA/MrfEK8JLKSeEqrQxhSs3U=";
+  cargoHash = "sha256-3JxtsSipMbMxQO58ZLJbQVrOFFC7FoVguNpqdoL+ziQ=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -42,8 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     cp resources/icon/Assets.car "$app/Contents/Resources/Assets.car"
     substitute Info.plist.template "$app/Contents/Info.plist" \
-      --replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}" \
-      --replace-fail "<string>yashiki-launcher</string>" "<string>yashiki</string>"
+      --replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}"
 
     installShellCompletion --cmd yashiki --zsh completions/zsh/_yashiki
   '';

From eed21873ad308522389e1c4944c0647592ae4fa8 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 03:30:18 +0100
Subject: [PATCH 1226/1386] yashiki: add Br1ght0ne to maintainers

---
 pkgs/by-name/ya/yashiki/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ya/yashiki/package.nix b/pkgs/by-name/ya/yashiki/package.nix
index 9dea110516b6..ded87d22567a 100644
--- a/pkgs/by-name/ya/yashiki/package.nix
+++ b/pkgs/by-name/ya/yashiki/package.nix
@@ -61,7 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/typester/yashiki/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
-    maintainers = with lib.maintainers; [ anntnzrb ];
+    maintainers = with lib.maintainers; [
+      anntnzrb
+      Br1ght0ne
+    ];
     mainProgram = "yashiki";
     platforms = lib.platforms.darwin;
   };

From 0d685d4908d048190d51ba4a72b8f57b15e14343 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 11 Jul 2026 16:55:50 -0500
Subject: [PATCH 1227/1386] citrix-workspace: fix icaroot passthru

passthru.icaroot used an output placeholder outside a derivation string
context, so module consumers received an unresolved path. Define the
derivation with finalAttrs, then derive icaroot from finalPackage to
expose the actual store path.
---
 pkgs/by-name/ci/citrix-workspace/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix
index 21f67549a1d9..f3f0c2498c67 100644
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -109,12 +109,12 @@ let
 
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "citrix-workspace";
   version = "26.04.0.105";
 
   src = requireFile rec {
-    name = "linuxx64-${version}.tar.gz";
+    name = "linuxx64-${finalAttrs.version}.tar.gz";
     sha256 = "1kl6b1ldjd9gb6cmvhxf6ggvc3amq1kz0qwjlb1fp6dxx0pivwm8";
 
     message = ''
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
 
       https://www.citrix.com/downloads/workspace-app/betas-and-tech-previews/workspace-app-tp-gcc11-for-linux.html
 
-      (if you do not find version ${version} there, try at
+      (if you do not find version ${finalAttrs.version} there, try at
       https://www.citrix.com/downloads/workspace-app/)
 
       Once you have downloaded the file, please use the following command and re-run the
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
   __structuredAttrs = true;
   sourceRoot = ".";
   preferLocalBuild = true;
-  passthru.icaroot = "${placeholder "out"}/opt/citrix-icaclient";
+  passthru.icaroot = "${finalAttrs.finalPackage}/opt/citrix-icaclient";
 
   nativeBuildInputs = [
     autoPatchelfHook
@@ -435,4 +435,4 @@ stdenv.mkDerivation rec {
     ];
     homepage = "https://www.citrix.com/downloads/workspace-app/betas-and-tech-previews/workspace-app-tp-gcc11-for-linux.html";
   };
-}
+})

From 5349cbc9bb06a6e7fdf11a93daed79d58a22b5a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 21:55:48 +0000
Subject: [PATCH 1228/1386] ocamlPackages.charon: 2026.07.01 -> 2026.07.16

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

diff --git a/pkgs/development/ocaml-modules/charon/default.nix b/pkgs/development/ocaml-modules/charon/default.nix
index 8851bc9ddbe2..b3dbaf0c2ade 100644
--- a/pkgs/development/ocaml-modules/charon/default.nix
+++ b/pkgs/development/ocaml-modules/charon/default.nix
@@ -16,14 +16,14 @@
 
 buildDunePackage (finalAttrs: {
   pname = "charon";
-  version = "2026.07.01";
+  version = "2026.07.16";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "AeneasVerif";
     repo = "charon";
     tag = "nightly-${finalAttrs.version}";
-    hash = "sha256-luHH/Bj5MfeIrjkxBP4sCNa4mQZwJLcFhsuWaJQP5E0=";
+    hash = "sha256-n0dY7T8HMbNPTibD53Vpd4ZS/0KNqEfazPJJxy4Uk3g=";
   };
 
   propagatedBuildInputs = [

From 8eba732ecaa51ffb4c9d935809dfcce144d908d7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 16 Jul 2026 19:39:01 +0000
Subject: [PATCH 1229/1386] ocamlPackages.aeneas: 2026.07.01 ->
 2026.07.16-bc2eb6f

---
 pkgs/development/ocaml-modules/aeneas/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/aeneas/default.nix b/pkgs/development/ocaml-modules/aeneas/default.nix
index ec4b15d39064..13e23a8839e4 100644
--- a/pkgs/development/ocaml-modules/aeneas/default.nix
+++ b/pkgs/development/ocaml-modules/aeneas/default.nix
@@ -17,7 +17,8 @@
 
 buildDunePackage (finalAttrs: {
   pname = "aeneas";
-  inherit (charon) version;
+  # Keep aeneas and charon in sync
+  version = "${charon.version}-bc2eb6f";
   __structuredAttrs = true;
 
   minimalOCamlVersion = "5.1";
@@ -26,7 +27,7 @@ buildDunePackage (finalAttrs: {
     owner = "AeneasVerif";
     repo = "aeneas";
     tag = "nightly-${finalAttrs.version}";
-    hash = "sha256-uQAGj3moRftf1OWIuzfRoFsO/tv0Hhx3X/8qRU0yOqk=";
+    hash = "sha256-V5+3pPpDhcrRGA9kmYmod3/pScwfYZEj6MJKsuhbROk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

From 4048e0a65a90a83bec6cea87b30e48c36e7e7a3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 14:39:52 +0000
Subject: [PATCH 1230/1386] postgresqlPackages.pg_safeupdate:
 1.6-unstable-2026-06-29 -> 1.7

---
 pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
index a517e7a62c45..6c20a7e14b15 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg-safeupdate";
-  version = "1.6-unstable-2026-06-29";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "eradman";
     repo = "pg-safeupdate";
-    rev = "404fcd265f3242b432a16756bfdd078e3a4b6e0f";
-    hash = "sha256-8Y27TfcY6+QO2Fb9wi6zlKzHlDdlIB38/RffMV7MPF0=";
+    tag = finalAttrs.version;
+    hash = "sha256-V1P6gdFHwAFd4g8CrSRdRrL1wKs3bFfin8LLDNhZcUI=";
   };
 
   meta = {

From 8fb92b0a611678a15fc0cb8cdc23f35e788bb3d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 19:52:34 +0000
Subject: [PATCH 1231/1386] nuclei-templates: 10.4.5 -> 10.4.6

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

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 37a0d5a9631d..a79a6c7d9961 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nuclei-templates";
-  version = "10.4.5";
+  version = "10.4.6";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6czf84bHyvHIT9rA2HUYqQe7lgODl4uRMP/8QepV3AU=";
+    hash = "sha256-Mv+W1CmUUAs6KntuTBgrp5JDlvyMC1C2Ddm5AGDPtbU=";
   };
 
   installPhase = ''

From 2fd66d40c7a48c9d7bb92c756f27c39104e77fae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 20:13:16 +0000
Subject: [PATCH 1232/1386] vscode-extensions.svelte.svelte-vscode: 110.2.1 ->
 110.3.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5931a7d01d98..e477ab7144ee 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4551,8 +4551,8 @@ let
         mktplcRef = {
           name = "svelte-vscode";
           publisher = "svelte";
-          version = "110.2.1";
-          hash = "sha256-NcidslqM4AVrobOaxW1EBpMoBCTn2Bej86phIVU2psc=";
+          version = "110.3.0";
+          hash = "sha256-vVLnjFOpOmfmkwP0Yz7zONrBgpNDFfFZ0TAAicxdZ64=";
         };
         meta = {
           changelog = "https://github.com/sveltejs/language-tools/releases";

From 0b3e905bf9e89c314ade61cbb4915d9697c8b456 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 17 Jul 2026 00:16:52 +0400
Subject: [PATCH 1233/1386] =?UTF-8?q?martin:=201.10.1=20=E2=86=92=201.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ma/martin/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix
index 7c1807168515..f957e7424d17 100644
--- a/pkgs/by-name/ma/martin/package.nix
+++ b/pkgs/by-name/ma/martin/package.nix
@@ -7,6 +7,7 @@
   rustPlatform,
   pkg-config,
   curl,
+  libuv,
   libz,
   openssl,
   postgresql,
@@ -16,21 +17,21 @@
 
 let
   # check package.metadata.mln in https://github.com/maplibre/maplibre-native-rs/blob/main/Cargo.toml
-  mlnRelease = "core-9b6325a14e2cf1cc29ab28c1855ad376f1ba4903";
+  mlnRelease = "core-fa8a9c8e3261ce64940127aecc1d52f540c21c57";
   mlnHeaders = fetchurl {
     url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/maplibre-native-headers.tar.gz";
-    hash = "sha256-VjVEc/+IZTBG9ixP/i7oeel+7gy3+DhSEOi2UDIqeLc=";
+    hash = "sha256-SqZaqePNbqBZoUgMJIsZf0zqKc8EAwInYNRciv/jX1A=";
   };
   mlnLibrary = fetchurl (
     let
       sources = {
         aarch64-linux = {
           url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-arm64-vulkan.a";
-          hash = "sha256-PHFNdzcG3+kngZmziMccCTnwBUbtsS2RAUNkTyNYXmc";
+          hash = "sha256-iug/ZEIoM0LUczPkVbzVelILoc1uzsM519V2em7Va4U=";
         };
         x86_64-linux = {
           url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-x64-vulkan.a";
-          hash = "sha256-T9H7NiXHv+hbMgOd5QetQzxjIX1Ufn6gNmBJJ/7Ha50=";
+          hash = "sha256-FoUFDoUw+eM/aaXMfO7iuoUrv8gUGVdBW1tiqxjYCbI=";
         };
       };
     in
@@ -46,18 +47,18 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "martin";
-  version = "1.10.1";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "maplibre";
     repo = "martin";
     tag = "martin-v${finalAttrs.version}";
-    hash = "sha256-Zu3vkU7HQcSqzCL7n0uX4M+DxBDMC0Sii7esxM9AtpA=";
+    hash = "sha256-zCiyJw79KBrK/JqZFx93cPeCnS02/HrH+F1A6EBras0=";
   };
 
   patches = [ ./dont-build-webui.patch ];
 
-  cargoHash = "sha256-OPuUvm4ez5TZUWwJ6D6fqy++cCiVt7f1qP6OPdsOEDA=";
+  cargoHash = "sha256-1VSErzoJ0Xdzefaq++8lCGnJfh7LyQCsWmq1xSl4iqg=";
 
   webui = buildNpmPackage {
     pname = "martin-ui";
@@ -71,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       ln -sf ${finalAttrs.src}/demo/frontend/public/favicon.ico public/_/assets/favicon.ico
     '';
 
-    npmDepsHash = "sha256-lX5FSWAQyy4Sa7OPnNyTYttjHiPuYxgrPsmZpwCnpO8=";
+    npmDepsHash = "sha256-4BNjrYMAB8VBwCD4bREWw2vXwE9FCdfOFHsRgYNdiBI=";
 
     buildPhase = ''
       runHook preBuild
@@ -99,6 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [
     curl
+    libuv
     libz
     openssl
   ];

From 7812a64698104d7f86d762307097e5e0329b1e44 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 16 Jul 2026 20:05:25 +0000
Subject: [PATCH 1234/1386] opencode{,-desktop}: 1.17.20 -> 1.18.3

https://github.com/anomalyco/opencode/releases#release-v1.18.3
https://github.com/anomalyco/opencode/releases#release-v1.18.2
https://github.com/anomalyco/opencode/releases#release-v1.18.1
https://github.com/anomalyco/opencode/releases#release-v1.18.0
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 368b43a575f9..7191e168b064 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,7 +16,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.17.20";
+  version = "1.18.3";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gHfkwCi6Kjn5ppsuyhyM2vyaLmAoNdWth6Xz4LaV7Hk=";
+    hash = "sha256-Wdkzms59oHw3M/Em2RH7BPhZME8AtLmtNFSnsUxO1V4=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-3NAzmlzVBcLSRXxpNOyW5DKfD1i2HReST2jlKgrtOKc=";
+    outputHash = "sha256-1NUtprMH8GnSUqQ+mHQSC+JLU7lwzHe6XXYHe129WmE=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From 1acf3b049e97abdf6eee95340e44787382cd2aa7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 20:27:36 +0000
Subject: [PATCH 1235/1386] terraform-providers.huaweicloud_huaweicloud: 1.94.0
 -> 1.95.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0af26cda2a49..f817aee2c3b7 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -724,11 +724,11 @@
     "vendorHash": "sha256-6knIcS3hkzt3R1IC1hA6EKOceJl51/pJXpftEaZjgtY="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-yuBbgu3DtnwMLwgFZtHpI6yo8p0Pzl6AtlqbW2cWi+c=",
+    "hash": "sha256-1WVZ5NOvVFuRIWJQpFy9lRvlt5GbOHINFISABexcb/M=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.94.0",
+    "rev": "v1.95.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From ad3a37cccda253e26041b0252badaca4eee7c363 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 20:28:37 +0000
Subject: [PATCH 1236/1386] istioctl: 1.30.2 -> 1.30.3

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

diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index 78605d13c195..6f6c8618c5d1 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "istioctl";
-  version = "1.30.2";
+  version = "1.30.3";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = finalAttrs.version;
-    hash = "sha256-Ejt6MjBmkWnYWHp9TiWYO6e1VV/+TN6cVZXYK3+B5Fc=";
+    hash = "sha256-9HIDkNpLwwGN80NIweQ6DowKR0x26E0LkMuzl3qsGNs=";
   };
-  vendorHash = "sha256-cHW8FSYuZpl1GuWKsJLnAxCMOLvuaRwN1oL+xjwYspI=";
+  vendorHash = "sha256-19ziol7/8UOw78kW5epqzrR6GO0k+CwQGkq1l7XKMaw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5d672bbbc59ea31cfd4ea785011b13210c2982a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 20:34:25 +0000
Subject: [PATCH 1237/1386] roon-server: 2.67.1661 -> 2.70.1671

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

diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix
index cf8da75d7d3e..7c92324111f7 100644
--- a/pkgs/by-name/ro/roon-server/package.nix
+++ b/pkgs/by-name/ro/roon-server/package.nix
@@ -16,7 +16,7 @@
   stdenv,
 }:
 let
-  version = "2.67.1661";
+  version = "2.70.1671";
   urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version;
 in
 stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
-    hash = "sha256-5IvAJCTcWaIHTkWZYT7zPTPSjvLuQigF4BHH4l0wTR0=";
+    hash = "sha256-vYFhYMGFyu/eaQnVoRij9aUP9aZvxBj8N7yHmXD7904=";
   };
 
   dontConfigure = true;

From 2116c17d575c0aad22bcc2e874418ce8ed6d0526 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 20:42:37 +0000
Subject: [PATCH 1238/1386] glooctl: 1.21.11 -> 1.21.12

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

diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 0c8f258217dc..f4a854bae6d6 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glooctl";
-  version = "1.21.11";
+  version = "1.21.12";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-inW2L8BzZnupDmgOR53pPQlATQRoTo4/VGDZD8fvUQ8=";
+    hash = "sha256-7qVyVTvkWxSU9SiOdnpyHf+x6sJizkNkaa0yK3NKdF4=";
   };
 
   vendorHash = "sha256-BMaRuW8NUIsTnPvIbMWd4tgt7IUUU7VjK64DMNP5hC0=";

From 0941abff3ca68ff53127b8b776ec9716221fe218 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 9 Jul 2026 09:23:21 -0700
Subject: [PATCH 1239/1386] python3Packages.greencell-client: init at 1.0.3

---
 .../greencell-client/default.nix              | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/greencell-client/default.nix

diff --git a/pkgs/development/python-modules/greencell-client/default.nix b/pkgs/development/python-modules/greencell-client/default.nix
new file mode 100644
index 000000000000..0edf06e1da85
--- /dev/null
+++ b/pkgs/development/python-modules/greencell-client/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "greencell-client";
+  version = "1.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "csg-sa";
+    repo = "greencell-client";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yj2vyAWv1wPsEUZEEc2fUfTLid6xfhZvHZebkIMA778=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "greencell_client" ];
+
+  meta = {
+    description = "Library for communication with Greencell devices used by the Home Assistant integration";
+    homepage = "https://github.com/csg-sa/greencell-client";
+    changelog = "https://github.com/csg-sa/greencell-client/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3604c024a57..c12b3bf04385 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7169,6 +7169,8 @@ self: super: with self; {
 
   greenback = callPackage ../development/python-modules/greenback { };
 
+  greencell-client = callPackage ../development/python-modules/greencell-client { };
+
   greeneye-monitor = callPackage ../development/python-modules/greeneye-monitor { };
 
   # built-in for pypi

From ad43266fcade57132d0e74fe724703621299bc72 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 16 Jul 2026 13:47:28 -0700
Subject: [PATCH 1240/1386] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index faa30054e360..4423fd3ef691 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2463,8 +2463,9 @@
     "greencell" =
       ps: with ps; [
         aiohasupervisor
+        greencell-client
         paho-mqtt
-      ]; # missing inputs: greencell_client
+      ];
     "greeneye_monitor" =
       ps: with ps; [
         greeneye-monitor
@@ -8145,6 +8146,7 @@
     "graphite"
     "gree"
     "green_planet_energy"
+    "greencell"
     "greeneye_monitor"
     "group"
     "growatt_server"

From 3b9dc345d637620cd137ec6c9adaf9444e828659 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 20:52:38 +0000
Subject: [PATCH 1241/1386] nufmt: 0-unstable-2026-07-05 ->
 0-unstable-2026-07-16

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

diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index 7222a9bc675a..ae3aa762b58c 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -7,13 +7,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "nufmt";
-  version = "0-unstable-2026-07-05";
+  version = "0-unstable-2026-07-16";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nufmt";
-    rev = "de410853fc4d0f04e101a2573ebba8c15978ea33";
-    hash = "sha256-tNdoHiSZRi0PMUtlHqD5vjjPNDzNyZ73QnCOw8rmEPs=";
+    rev = "cae92f70d4f04aca062a9d1ce935dedaa71052f3";
+    hash = "sha256-MQ3M/8UmCPt93OLu5ZWkSqbQLZeHpR5QKnzPzu37slw=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-MLfhuFjYv2Vi3BGJFzbmi+xhhm6M0a4oOe7wpHtfObc=";
 
-  # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/de410853fc4d0f04e101a2573ebba8c15978ea33
+  # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/cae92f70d4f04aca062a9d1ce935dedaa71052f3
   postPatch = ''
     substituteInPlace tests/ground_truth.rs --replace-fail \
       '        let path = PathBuf::from(target_dir).join("debug").join(exe_name);' \

From a12cc3fd0161d847897e3280830da9acb7077e00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:05:27 +0000
Subject: [PATCH 1242/1386] nu_scripts: 0-unstable-2026-07-02 ->
 0-unstable-2026-07-15

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

diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 0355a62e8350..454b6a692fa7 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2026-07-02";
+  version = "0-unstable-2026-07-15";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "4af42d7f10993ee488ae37762a0e7034b9a004f6";
-    hash = "sha256-Q+RxZ7j1odpxbZXdex2gfJ7uUqmIpNk1W/Cq39K1g0s=";
+    rev = "e0b8d1e0c167efa32e9f4c69761b67dc625cb529";
+    hash = "sha256-hIjJLoeep28PxivoGl2f5jihb0ljrp6ObrWZ9oyeWi4=";
   };
 
   installPhase = ''

From 7611b0cb303dbf764062c8a86ec093762fcd06d6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 16 Jul 2026 21:08:39 +0000
Subject: [PATCH 1243/1386] csharp-ls: 0.25.0 -> 0.26.0

Diff:
https://github.com/razzmatazz/csharp-language-server/compare/0.25.0...0.26.0

Changelog:
https://github.com/razzmatazz/csharp-language-server/releases/tag/0.26.0
---
 pkgs/by-name/cs/csharp-ls/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix
index decfbf629b2a..f74f4d300085 100644
--- a/pkgs/by-name/cs/csharp-ls/package.nix
+++ b/pkgs/by-name/cs/csharp-ls/package.nix
@@ -11,9 +11,9 @@ in
 
 buildDotnetGlobalTool (finalAttrs: {
   pname = "csharp-ls";
-  version = "0.25.0";
+  version = "0.26.0";
 
-  nugetHash = "sha256-w+zbCCR7ns8a5TqAOlwi5nE3AKWF9xhWG2jLmKbpzeI=";
+  nugetHash = "sha256-KwOYeu8Hu3CL/lanv7NwNkx8ggPmmqZ3o3WUu+IaFbA=";
 
   inherit dotnet-sdk;
   dotnet-runtime = dotnet-sdk;

From e97166c7b0913eaffd21e04ffb05af2402d6fb30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:13:37 +0000
Subject: [PATCH 1244/1386] python3Packages.stanza: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix
index 2c8cde03e1cf..d76befaf0aba 100644
--- a/pkgs/development/python-modules/stanza/default.nix
+++ b/pkgs/development/python-modules/stanza/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "stanza";
-  version = "1.13.0";
+  version = "1.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stanfordnlp";
     repo = "stanza";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+quLNaxaGCUpsg3PH11nEMeKjIoHsKaBqK4FdIHlaMM=";
+    hash = "sha256-+yt3FIOe51zzQVOm19LKYhlmoCANTQ299qLtP4JHF+Q=";
   };
 
   build-system = [ setuptools ];

From 06840591deb34431eb3a03e04773f4de195770db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:19:10 +0000
Subject: [PATCH 1245/1386] postgresqlPackages.pgsql-http: 1.7.1 -> 1.7.2

---
 pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
index 10e47558eb4f..01cde386a1a8 100644
--- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgsql-http";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "pramsey";
     repo = "pgsql-http";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vTOLAv0TYks8ubQa/y7+XjaIZuHEfh2wi2I38UNJ7NM=";
+    hash = "sha256-ML7lfzGWUjGuclwQ+U+y9i2WsYA2Q9zR4Xt6JNG+y3w=";
   };
 
   buildInputs = [ curl ];

From 38de0900df94ab0de033923d7359107403910b1e Mon Sep 17 00:00:00 2001
From: Tol Wassman <tol@tol.sh>
Date: Thu, 16 Jul 2026 02:36:04 +0000
Subject: [PATCH 1246/1386] firefox-beta-unwrapped: 152.0b10 -> 153.0b13

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 2212b456dfb0..83fb6538eb5b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "152.0b10";
+  version = "153.0b13";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "531117225f690736e529d654766136878e3c719ec500860fcd578d9bf93f2e46f2887f0c4ba21dd17884cc41bda37fbd735c998091a0e1b0eb72d5d43f4f2339";
+    sha512 = "fecfb1837d1907d54ed52bc40113804b6637352c2cbe6eb906f950d7749cbece32446b42c392102fa9e16591949619237dc2dbeb13bec18697ddd42e9ce8d4dd";
   };
 
   meta = {

From f4f8338f0eed090c91b59755ddd1b6a8f8d965ad Mon Sep 17 00:00:00 2001
From: Tol Wassman <tol@tol.sh>
Date: Thu, 16 Jul 2026 02:40:47 +0000
Subject: [PATCH 1247/1386] Revert "buildMozillaMach: backport BZ 2047651 patch
 for 153"

This reverts commit 0374b4e5acc7609fe2cd0a67e48826e709df64f6.
---
 .../build-mozilla-mach/default.nix             | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index f8298a4c6fe8..58f3f6000a56 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -349,24 +349,6 @@ buildStdenv.mkDerivation {
       # https://bugzilla.mozilla.org/show_bug.cgi?id=2046162
       ./153-cbindgen-0.29.4-compat.patch
     ]
-    ++
-      # Fixes `ld.lld: error: undefined symbol: FREEBL_GetVector`
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=2047651
-      lib.optionals
-        (
-          lib.versionAtLeast version "153"
-          && lib.versionOlder version "154"
-          # We don't set --with-system-nss on Darwin, so it should be
-          # unaffected.
-          && !stdenv.hostPlatform.isDarwin
-        )
-        [
-          (fetchpatch {
-            name = "link-freebl-explicitly-for-system-nss-builds.patch";
-            url = "https://hg-edge.mozilla.org/mozilla-central/raw-rev/1a56071ddc0fe97a55c3b825e1dd33c8422b9fc1";
-            hash = "sha256-+HiU7RMPmV7I7SIzjP0Q6iSDJL/vBjc3UcwUTg57lNQ=";
-          })
-        ]
     ++ extraPatches;
 
   postPatch = ''

From ffb5b4b00089f53578e47d4030d8f62cf2960fdc Mon Sep 17 00:00:00 2001
From: Tol Wassman <tol@tol.sh>
Date: Thu, 16 Jul 2026 18:25:58 +0000
Subject: [PATCH 1248/1386] firefox-devedition-unwrapped: 153.0b11 -> 153.0b13

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index c7133df13e16..23e821f4494e 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "153.0b11";
+  version = "153.0b13";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b9cba9de51157db94ae421fcb82e2172e3a3b5026b01b1049c858e45302603dde9e8d859a163d1ec00e225788516fb769c1b7b1a4bd4f4ed3785c9552aab4e78";
+    sha512 = "ee1a699ab3f390031e7eb85b6cc394d3431cc2e2960e97cabc393cc4edad1bd1a2ba62e7d834e2ae52fa7fcf3a08c6194c1801ba7e62fa3ceb98ee08ac27981d";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From d2e9859262bf98362e474a90724bf68b9858d8b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:27:56 +0000
Subject: [PATCH 1249/1386] cog: 0.1.22 -> 0.1.23

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

diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix
index 7cfc53f6f6b7..017d59d0c538 100644
--- a/pkgs/by-name/co/cog/package.nix
+++ b/pkgs/by-name/co/cog/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cog";
-  version = "0.1.22";
+  version = "0.1.23";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "cog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hYXTZlV8128cKchF2vMkr4QJxYI+yJA75LtuTmMpR5U=";
+    hash = "sha256-uMlxFWMdrFF61FBinXi03QP1dGdQxaQWIyqv9eQCBP4=";
   };
 
-  vendorHash = "sha256-5y6spoRzl4yJ5GpiHHvGHJIdEFnsUdpIiuoWmym5GJY=";
+  vendorHash = "sha256-MY+rS6lF2p8cTDB2faxBwu1VpyMy/ZvadpRdGC8/SRU=";
 
   subPackages = [ "cmd/cli" ];
 

From 6c47bd4d28b4d15c11a94c6598139bf487b1e816 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 16 Jul 2026 21:27:29 +0000
Subject: [PATCH 1250/1386] python3Packages.fastdownload: cleanup, fix

---
 .../python-modules/fastdownload/default.nix   | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/fastdownload/default.nix b/pkgs/development/python-modules/fastdownload/default.nix
index 5f3b5a53a2b8..cc708867759f 100644
--- a/pkgs/development/python-modules/fastdownload/default.nix
+++ b/pkgs/development/python-modules/fastdownload/default.nix
@@ -2,33 +2,53 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   fastprogress,
   fastcore,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "fastdownload";
   version = "0.0.7";
-  format = "setuptools";
+  pyproject = true;
+  __structuredAttrs = true;
 
+  # No tag for 0.0.7 on GitHub
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo=";
   };
 
-  propagatedBuildInputs = [
+  # pkg_resources used to come with setuptools but was removed
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail \
+        "from pkg_resources import parse_version" \
+        "from packaging.version import parse as parse_version"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     fastprogress
     fastcore
   ];
 
-  # no real tests
-  doCheck = false;
   pythonImportsCheck = [ "fastdownload" ];
 
+  # no tests
+  doCheck = false;
+
   meta = {
-    homepage = "https://github.com/fastai/fastdownload";
     description = "Easily download, verify, and extract archives";
+    homepage = "https://github.com/fastai/fastdownload";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rxiao ];
   };
-}
+})

From 5ea8afe11a0311707f3c47f822ebe7a6760618ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:35:46 +0000
Subject: [PATCH 1251/1386] buildkit: 0.31.1 -> 0.31.2

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

diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index f84d146ccf31..65f9ab3f1884 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "buildkit";
-  version = "0.31.1";
+  version = "0.31.2";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lpcbCPsnvwMULeZgo1eQ0AqlfsyOMO/7b3ZOCoVTDKk=";
+    hash = "sha256-VAEZr2KerCKTeULZWM50n7P7qPjk9X9oTgpuK7+oWfU=";
   };
 
   vendorHash = null;

From 238fe5c7da8da1d1ed43bcddea729fd83fb2b602 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:42:22 +0000
Subject: [PATCH 1252/1386] python3Packages.manga-ocr: 0.1.14 -> 0.1.15

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

diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix
index 5cc8af9b270d..91371db031cb 100644
--- a/pkgs/development/python-modules/manga-ocr/default.nix
+++ b/pkgs/development/python-modules/manga-ocr/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "manga-ocr";
-  version = "0.1.14";
+  version = "0.1.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kha-white";
     repo = "manga-ocr";
     tag = "v${version}";
-    hash = "sha256-fCLgFeo6GYPSpCX229TK2MXTKt3p1tQV06phZYD6UeE=";
+    hash = "sha256-Inev2iGcDsudUV4zNzssDqglj0t6Uh/CbW3RuIDnbKE=";
   };
 
   build-system = [

From 3a707e29d60d524e46fb1c3cae8cac45b9dc7a96 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 16 Jul 2026 21:49:31 +0200
Subject: [PATCH 1253/1386] glasgow: print error message in case of firmware
 mismatch

If the firmware doesn't reproduce, this currently fails without any
error message.

Instead, print a proper error, and a diff with the desired firmware
image.
---
 pkgs/by-name/gl/glasgow/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix
index ef05b07e02b4..c193c2029b45 100644
--- a/pkgs/by-name/gl/glasgow/package.nix
+++ b/pkgs/by-name/gl/glasgow/package.nix
@@ -91,7 +91,11 @@ pythonPackages.buildPythonApplication rec {
       firmware/glasgow.ihex firmware/glasgow.ihex
 
     # Ensure the compiled firmware is exactly the same as the one shipped in the repo.
-    cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex
+    if ! cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex; then
+      echo >&2 "Firmware doesn't reproduce!"
+      diff -u software/glasgow/hardware/firmware.ihex firmware/glasgow.ihex
+      exit 1
+    fi
 
     cd software
     export PDM_BUILD_SCM_VERSION="${pdmVersion}"

From 5612eefc08d203a004ae748eea379301818f6a55 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 16 Jul 2026 21:50:42 +0000
Subject: [PATCH 1254/1386] python3Packages.plum-dispatch: init at 2.9.0

---
 .../python-modules/plum-dispatch/default.nix  | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/plum-dispatch/default.nix

diff --git a/pkgs/development/python-modules/plum-dispatch/default.nix b/pkgs/development/python-modules/plum-dispatch/default.nix
new file mode 100644
index 000000000000..ce871ac73b9a
--- /dev/null
+++ b/pkgs/development/python-modules/plum-dispatch/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
+  beartype,
+  rich,
+  typing-extensions,
+
+  # tests
+  ipython,
+  numpy,
+  pytestCheckHook,
+  sybil,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "plum-dispatch";
+  version = "2.9.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "beartype";
+    repo = "plum";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oQTM2Op/ymNYu0yCOADI9Is2RutwF+AYmhMLAkMe87s=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    beartype
+    rich
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "plum" ];
+
+  nativeCheckInputs = [
+    ipython
+    numpy
+    pytestCheckHook
+    sybil
+  ];
+
+  meta = {
+    description = "Multiple dispatch in Python";
+    homepage = "https://github.com/beartype/plum";
+    changelog = "https://github.com/beartype/plum/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a17588687475..0b53b02eb570 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13403,6 +13403,8 @@ self: super: with self; {
 
   plugwise = callPackage ../development/python-modules/plugwise { };
 
+  plum-dispatch = callPackage ../development/python-modules/plum-dispatch { };
+
   plum-py = callPackage ../development/python-modules/plum-py { };
 
   plumbum = callPackage ../development/python-modules/plumbum { };

From 391c0a2c09d0c8ae945287689e984a607c77e71f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 16 Jul 2026 21:50:59 +0000
Subject: [PATCH 1255/1386] python3Packages.fasttransform: init at 0.0.2

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

diff --git a/pkgs/development/python-modules/fasttransform/default.nix b/pkgs/development/python-modules/fasttransform/default.nix
new file mode 100644
index 000000000000..fb173c6beaa9
--- /dev/null
+++ b/pkgs/development/python-modules/fasttransform/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  fastcore,
+  numpy,
+  plum-dispatch,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "fasttransform";
+  version = "0.0.2";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "AnswerDotAI";
+    repo = "fasttransform";
+    tag = finalAttrs.version;
+    hash = "sha256-d41645xOXkFv4rjFBfOXepYHGbYiCbHN2O30aePVVxM=";
+  };
+
+  # pkg_resources used to come with setuptools but was removed
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail \
+        "from pkg_resources import parse_version" \
+        "from packaging.version import parse as parse_version"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    fastcore
+    numpy
+    plum-dispatch
+  ];
+
+  pythonImportsCheck = [ "fasttransform" ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Main building block of data pipelines in fastai";
+    homepage = "https://github.com/AnswerDotAI/fasttransform";
+    changelog = "https://github.com/AnswerDotAI/fasttransform/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b53b02eb570..5f9ae6fc14f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5900,6 +5900,8 @@ self: super: with self; {
 
   fasttext = callPackage ../development/python-modules/fasttext { };
 
+  fasttransform = callPackage ../development/python-modules/fasttransform { };
+
   fastuuid = callPackage ../development/python-modules/fastuuid { };
 
   faust-cchardet = callPackage ../development/python-modules/faust-cchardet { };

From 6c8de6f8b208257e05dd6a4a85f9190c54bfa2ec Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 16 Jul 2026 21:36:45 +0000
Subject: [PATCH 1256/1386] python3Packages.fastai: 2.8.6 -> 2.8.7

Changelog: https://github.com/fastai/fastai/blob/2.8.7/CHANGELOG.md
---
 .../python-modules/fastai/default.nix         | 67 +++++++++++++------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix
index 95098b61e44f..d1c56ae43b0a 100644
--- a/pkgs/development/python-modules/fastai/default.nix
+++ b/pkgs/development/python-modules/fastai/default.nix
@@ -1,53 +1,80 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  fastprogress,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  cloudpickle,
   fastcore,
   fastdownload,
-  torchvision,
+  fastprogress,
+  fasttransform,
   matplotlib,
+  packaging,
+  pandas,
   pillow,
+  plum-dispatch,
+  pyyaml,
+  requests,
   scikit-learn,
   scipy,
   spacy,
-  pandas,
-  requests,
+  torch,
+  torchvision,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "fastai";
-  version = "2.8.6";
-  format = "setuptools";
+  version = "2.8.7";
+  pyproject = true;
+  __structuredAttrs = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-eZW96Upogr6qws6lD8eX2kywuBmTXsbG7vaQKLwx9y8=";
+  src = fetchFromGitHub {
+    owner = "fastai";
+    repo = "fastai";
+    tag = finalAttrs.version;
+    hash = "sha256-qjBVqSVQV+v1Uc95Tz8NyLkKwCLdG+R7MkH+CugzY1Q=";
   };
 
-  propagatedBuildInputs = [
-    fastprogress
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    cloudpickle
     fastcore
     fastdownload
-    torchvision
+    fastprogress
+    fasttransform
     matplotlib
+    packaging
+    pandas
     pillow
+    plum-dispatch
+    pyyaml
+    requests
     scikit-learn
     scipy
     spacy
-    pandas
-    requests
+    torch
+    torchvision
   ];
 
-  doCheck = false;
   pythonImportsCheck = [ "fastai" ];
 
+  # Tests fail at collection with:
+  #   fixture 'f' not found
+  doCheck = false;
+
   meta = {
-    homepage = "https://github.com/fastai/fastai";
     description = "Fastai deep learning library";
+    homepage = "https://github.com/fastai/fastai";
     mainProgram = "configure_accelerate";
-    changelog = "https://github.com/fastai/fastai/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/fastai/fastai/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rxiao ];
   };
-}
+})

From 62ced583e53c569966b9132736b1b98c9f0ae3e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:57:00 +0000
Subject: [PATCH 1257/1386] pipeweaver: 0.1.6 -> 0.1.9

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

diff --git a/pkgs/by-name/pi/pipeweaver/package.nix b/pkgs/by-name/pi/pipeweaver/package.nix
index ac386a89f88c..cd64c4d802d8 100644
--- a/pkgs/by-name/pi/pipeweaver/package.nix
+++ b/pkgs/by-name/pi/pipeweaver/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (
 
       sourceRoot = "${finalAttrs.src.name}/web";
 
-      npmDepsHash = "sha256-ZX/3H/VdRdWC2j+mPA/0rZflDhslqTN1mqA9vvQRQG0=";
+      npmDepsHash = "sha256-kInUUBeau7alBB9GcIyrBf6PwYSEj4NTMoO1/lguRQU=";
 
       installPhase = ''
         runHook preInstall
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (
   in
   {
     pname = "pipeweaver";
-    version = "0.1.6";
+    version = "0.1.9";
 
     __structuredAttrs = true;
 
@@ -37,10 +37,10 @@ rustPlatform.buildRustPackage (
       owner = "pipeweaver";
       repo = "pipeweaver";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-wf3gxCLT5vOz+5+CpfmkX0stKoAOpQ6KIoW6xBNV1xk=";
+      hash = "sha256-aGZ5VfHv5DHPsGhFGXhQBl3DNt6J+h5daMu38LJshI4=";
     };
 
-    cargoHash = "sha256-Jv0fF6keg2NcUnCJhCId7rwPVZK1/Q9+otQNjp54RCI=";
+    cargoHash = "sha256-XC/jK70FZs8jF0A85MpoxcMmxF/FmExD/qfF4KL9Y0M=";
 
     nativeBuildInputs = [
       pkg-config

From 2c4d8909a933c8d8a8069c1268ca9eae721203a1 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Thu, 16 Jul 2026 23:57:31 +0200
Subject: [PATCH 1258/1386] shaarli: 0.16.1 -> 0.16.3

https://github.com/shaarli/Shaarli/releases/tag/v0.16.3

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/sh/shaarli/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shaarli/package.nix b/pkgs/by-name/sh/shaarli/package.nix
index 5af74ae6e02f..bf4b91ac53bc 100644
--- a/pkgs/by-name/sh/shaarli/package.nix
+++ b/pkgs/by-name/sh/shaarli/package.nix
@@ -2,15 +2,16 @@
   lib,
   stdenv,
   fetchurl,
+  unzip,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shaarli";
-  version = "0.16.1";
+  version = "0.16.3";
 
   src = fetchurl {
-    url = "https://github.com/shaarli/Shaarli/releases/download/v${finalAttrs.version}/shaarli-v${finalAttrs.version}-full.tar.gz";
-    sha256 = "sha256-SK9J8w8cekxiWBhz/Zp5pOfHgndfEEN5/Kcf6lXJBmA=";
+    url = "https://github.com/shaarli/Shaarli/releases/download/v${finalAttrs.version}/shaarli-v${finalAttrs.version}-full.zip";
+    sha256 = "sha256-qGZ/11NiQLp1Kj2ybDpmnM9YuwMsJbA8r2Juhys2JLQ=";
   };
 
   outputs = [
@@ -18,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
+  nativeBuildInputs = [ unzip ];
+
   patchPhase = ''
     substituteInPlace index.php \
       --replace "new ConfigManager();" "new ConfigManager(getenv('SHAARLI_CONFIG'));"

From 9a9e2dc9c575de2ac59de9166160bb13601ce6a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 13:33:54 +0000
Subject: [PATCH 1259/1386] postgresqlPackages.timescaledb-apache: 2.28.2 ->
 2.28.3

---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 41a6d2560714..4ef12e92497a 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,13 +13,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.28.2";
+  version = "2.28.3";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb";
     tag = finalAttrs.version;
-    hash = "sha256-oEH6h3OGwdDYIKAtwWpVgIQJdB+IJhN2U/WJu9aHlbQ=";
+    hash = "sha256-SoieJvdZQXazi2oJVShifYy0XXD1vdq/u2/Pw+KF2rU=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -105,7 +105,7 @@ postgresqlBuildExtension (finalAttrs: {
       lib.versionOlder postgresql.version "15"
       ||
         # Check after next package update.
-        lib.warnIf (finalAttrs.version != "2.28.2") "Is postgresql19Packages.timescaledb still broken?" (
+        lib.warnIf (finalAttrs.version != "2.28.3") "Is postgresql19Packages.timescaledb still broken?" (
           lib.versionAtLeast postgresql.version "19"
         );
   };

From 630ad2247768b3019568bd7439567a28f458f87b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:59:32 +0000
Subject: [PATCH 1260/1386] gdscript-formatter: 0.20.1 -> 0.21.0

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

diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix
index 006afb7e1012..a35349559076 100644
--- a/pkgs/by-name/gd/gdscript-formatter/package.nix
+++ b/pkgs/by-name/gd/gdscript-formatter/package.nix
@@ -8,20 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gdscript-formatter";
-  version = "0.20.1";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "GDQuest";
     repo = "GDScript-formatter";
     tag = finalAttrs.version;
-    hash = "sha256-T0NURMu/AWRC+z3VSv20cpdUEq+nczsdp+C9SlvObmg=";
+    hash = "sha256-lmKnTeGb7HFQ+xD3pxjiE9s+IvKwiMrrsKNB3OsIXcE=";
     # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files
     deepClone = true;
     # Avoid hash differences due to differences in .git
     leaveDotGit = false;
   };
 
-  cargoHash = "sha256-JGvtjxHfkMknilFCRJS3VzvN6yifDx0nTNTQua0qmlI=";
+  cargoHash = "sha256-38qzBoPLcI2dMCTaoEg3seNUrFcAf7RjAc6dv+BRcNg=";
 
   cargoBuildFlags = [
     "--bin=gdscript-formatter"

From b6595a154173206ea04ecc8211b0eb1a45b8eeb5 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 13 May 2026 01:10:08 +0200
Subject: [PATCH 1261/1386] chkcrontab: inline with usage

---
 pkgs/by-name/ch/chkcrontab/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ch/chkcrontab/package.nix b/pkgs/by-name/ch/chkcrontab/package.nix
index 55445ae320a3..04b8a2c8bc45 100644
--- a/pkgs/by-name/ch/chkcrontab/package.nix
+++ b/pkgs/by-name/ch/chkcrontab/package.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchPypi,
 }:
 
-with python3.pkgs;
-
-buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "chkcrontab";
   version = "1.7";
   pyproject = true;
@@ -22,7 +20,7 @@ buildPythonApplication (finalAttrs: {
       --replace-fail "'doc/chkcrontab.1'" ""
   '';
 
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
   meta = {
     description = "Tool to detect crontab errors";

From faded7ba04970a70f84a14d36099747ea88721b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 22:04:42 +0000
Subject: [PATCH 1262/1386] vscode-extensions.saoudrizwan.claude-dev: 3.89.2 ->
 4.0.8

---
 .../vscode/extensions/saoudrizwan.claude-dev/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index c4b9eee45455..2baf64ec3aa9 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.89.2";
-    hash = "sha256-lDt/xn1PFs0UDg0rOOun8Bl/FTXSjvQ//ETkoHFypAM=";
+    version = "4.0.8";
+    hash = "sha256-qSlz2wXQwpO1Wi9P40hVm+ACZ+VfCiV9LF3lnOkMoXA=";
   };
 
   meta = {

From 8408aabbfd4817203f1bf824c48d564c55ad1376 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 1 Jun 2026 23:56:11 +0200
Subject: [PATCH 1263/1386] python3Packages.amply: migrate to pyproject

---
 .../python-modules/amply/default.nix          | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix
index 444a4ad2c6f6..bf01340f1aa1 100644
--- a/pkgs/development/python-modules/amply/default.nix
+++ b/pkgs/development/python-modules/amply/default.nix
@@ -8,21 +8,28 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "amply";
   version = "0.1.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Z1tzt9dhE922z3Q8wW7ZJbzMTnLvZpkfDHNyBkYys8k=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [
+  build-system = [ setuptools-scm ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools_scm[toml]>=10.1.2" "setuptools_scm"
+  '';
+
+  dependencies = [
     docutils
     pyparsing
   ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "amply" ];
@@ -35,4 +42,4 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [ ris ];
     license = lib.licenses.epl10;
   };
-}
+})

From 7d016a42b8339f7e3843ab5b71b472656f37c42c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 22:19:45 +0000
Subject: [PATCH 1264/1386] aliyun-cli: 3.4.5 -> 3.4.7

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

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index f675965a2659..e18eb1595c6d 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliyun-cli";
-  version = "3.4.5";
+  version = "3.4.7";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q3jFqWET3mB0kOrLX4JAtza6j/4bXAEBjXzvSGCFgqw=";
+    hash = "sha256-h/69/noEMV4Yz9vl91Sqc1DMnQ4CBopeowfmPAM94i4=";
     fetchSubmodules = true;
   };
 

From ca4408c11878746739f7d361122218569d9be67a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 17 Jul 2026 08:30:20 +1000
Subject: [PATCH 1265/1386] Revert "nix-eval-jobs: 2.34.3 -> 2.35.0"

breaks hydra

This reverts commit 12814ca04809d0082b07bb5c1271c9f3563588bb.
---
 pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 7b6b3d62b0a1..8acb3bc46666 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
-  version = "2.35.0";
+  version = "2.34.3";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "nix-eval-jobs";
     tag = "v${version}";
-    hash = "sha256-/C5wyGYe4uMKKH26vy3knpwP/hvjOHO/58cySL8ADC4=";
+    hash = "sha256-YaVQAgBxWbUBFHXLBLzdUyVvuA/DDw80SEnn9iq0Veo=";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba594cfe225b..3f6706db97cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10804,7 +10804,7 @@ with pkgs;
     );
 
   nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
-    nixComponents = nixVersions.nixComponents_2_35;
+    nixComponents = nixVersions.nixComponents_2_34;
   };
 
   nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;

From f33fb952cd6b0291150ad358221711b68da90cbe Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Fri, 17 Jul 2026 00:52:04 +0200
Subject: [PATCH 1266/1386] userborn: 0.5.0 -> 1.0.0

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

diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix
index 0ef3a4a3cfd9..98310531867d 100644
--- a/pkgs/by-name/us/userborn/package.nix
+++ b/pkgs/by-name/us/userborn/package.nix
@@ -9,18 +9,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "userborn";
-  version = "0.5.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "userborn";
-    rev = finalAttrs.version;
-    hash = "sha256-mXXakR75Iz6AFf/TYgIHE8SxOri2HyReYUYTT3lCEPA=";
+    tag = finalAttrs.version;
+    hash = "sha256-ZVO1Q6iumGVKA/35RYUBV79i9ECqNmjeHXAyjxikUfE=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/rust/userborn";
 
-  cargoHash = "sha256-uAid5GsM9lasVQAYfeo9jwp4xg1MrXdJqtD0l6ME6OQ=";
+  cargoHash = "sha256-UNd4RMM8VbmRbEAr8ZDSbNwG07058jasMP0IqcIk7/E=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 

From e85ee3197471a1fec6b4eb92c14d6cf400738f8b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 17 Jul 2026 01:09:08 +0200
Subject: [PATCH 1267/1386] cc-token: fix version scheme

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

diff --git a/pkgs/by-name/cc/cc-token/package.nix b/pkgs/by-name/cc/cc-token/package.nix
index 8b45cad9987c..f8b55eed206d 100644
--- a/pkgs/by-name/cc/cc-token/package.nix
+++ b/pkgs/by-name/cc/cc-token/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule {
   pname = "cc-token";
-  version = "unstable-2025-12-04";
+  version = "1.1.2-unstable-2025-12-04";
 
   src = fetchFromGitHub {
     owner = "iota-uz";

From 830113efa8f4fe14a5363422474fb926f9db84ca Mon Sep 17 00:00:00 2001
From: Geoffry Song <goffrie@gmail.com>
Date: Thu, 16 Jul 2026 12:50:36 -0700
Subject: [PATCH 1268/1386] mergiraf: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 086cd2759348..e20edd45e41e 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -6,23 +6,27 @@
 
   # native check inputs
   git,
+  jujutsu,
   versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mergiraf";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromCodeberg {
     owner = "mergiraf";
     repo = "mergiraf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tqz1gNg2XIYO/dFETajF3XUs3A1+mY82U4pz+mMb/ws=";
+    hash = "sha256-PfGiPH7CU8z+Flj3X04XnRdWcv5K+hTZMfvHpM52Fic=";
   };
 
-  cargoHash = "sha256-8Geu6Cd83hTnd53/ZTKq1YIEMIX4oIgwzSS6h8RNaP8=";
+  cargoHash = "sha256-1MDjaaH2PcvQz0DKSTADRB+8YEUWP1GN2edHk4EDVGA=";
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [
+    git
+    jujutsu
+  ];
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 3368852e7f4a906e6def25895319a3419f56c4d4 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Sun, 12 Apr 2026 03:06:11 +0000
Subject: [PATCH 1269/1386] doc: add NFS file systems documentation

Add a new section to the NixOS manual documenting how to mount NFS.

fixes https://github.com/NixOS/nixpkgs/issues/76671
---
 .../configuration/file-systems.chapter.md     |  1 +
 .../configuration/nfs-file-systems.section.md | 52 +++++++++++++++++++
 nixos/doc/manual/redirects.json               |  9 ++++
 3 files changed, 62 insertions(+)
 create mode 100644 nixos/doc/manual/configuration/nfs-file-systems.section.md

diff --git a/nixos/doc/manual/configuration/file-systems.chapter.md b/nixos/doc/manual/configuration/file-systems.chapter.md
index 8a63a2b849cd..8b6a06c5720a 100644
--- a/nixos/doc/manual/configuration/file-systems.chapter.md
+++ b/nixos/doc/manual/configuration/file-systems.chapter.md
@@ -41,5 +41,6 @@ and non-critical by adding `options = [ "nofail" ];`.
 ```{=include=} sections
 luks-file-systems.section.md
 sshfs-file-systems.section.md
+nfs-file-systems.section.md
 overlayfs.section.md
 ```
diff --git a/nixos/doc/manual/configuration/nfs-file-systems.section.md b/nixos/doc/manual/configuration/nfs-file-systems.section.md
new file mode 100644
index 000000000000..3ac6792e0167
--- /dev/null
+++ b/nixos/doc/manual/configuration/nfs-file-systems.section.md
@@ -0,0 +1,52 @@
+# NFS File Systems {#sec-nfs-file-systems}
+
+[NFS][nfs] (Network File System) allows you to mount directories from remote machines over the network.
+
+[nfs]: https://en.wikipedia.org/wiki/Network_File_System
+[nfs-man]: https://man7.org/linux/man-pages/man5/nfs.5.html
+
+To mount NFS filesystems persistently, use the `fileSystems` option:
+
+```nix
+{
+  fileSystems."/mnt/data" = {
+    device = "server.example.com:/export/data";
+    fsType = "nfs";
+  };
+}
+```
+
+## Automounting {#sec-nfs-automount}
+
+To have NFS filesystems mounted on-demand instead of at boot, add the `noauto` and `x-systemd.automount` options:
+
+```nix
+{
+  fileSystems."/mnt/data" = {
+    device = "server.example.com:/export/data";
+    fsType = "nfs";
+    options = [
+      "noauto"
+      "x-systemd.automount"
+    ];
+  };
+}
+```
+
+## Ad-hoc Mounting {#sec-nfs-adhoc}
+
+To mount NFS filesystems ad-hoc using the `mount` command, enable NFS and required RPC services:
+
+```nix
+{
+  boot.supportedFilesystems = [ "nfs" ];
+}
+```
+
+Then you can mount filesystems manually:
+
+```shell
+$ sudo mount -t nfs server.example.com:/export/data /mnt/data
+```
+
+For more information on NFS mount options, see the [nfs(5) man page][nfs-man].
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index f767735f9e37..12cfdd1d9063 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -619,6 +619,15 @@
   "sec-luks-file-systems-fido2-systemd": [
     "index.html#sec-luks-file-systems-fido2-systemd"
   ],
+  "sec-nfs-file-systems": [
+    "index.html#sec-nfs-file-systems"
+  ],
+  "sec-nfs-automount": [
+    "index.html#sec-nfs-automount"
+  ],
+  "sec-nfs-adhoc": [
+    "index.html#sec-nfs-adhoc"
+  ],
   "sec-sshfs-file-systems": [
     "index.html#sec-sshfs-file-systems"
   ],

From c4c199dfbb53bb8ec038c81630f7c1bc4342e0be Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 17 Jul 2026 01:13:25 +0200
Subject: [PATCH 1270/1386] clipnotify: fix version scheme

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

diff --git a/pkgs/by-name/cl/clipnotify/package.nix b/pkgs/by-name/cl/clipnotify/package.nix
index bb3cc6b00a38..74bd082e9e40 100644
--- a/pkgs/by-name/cl/clipnotify/package.nix
+++ b/pkgs/by-name/cl/clipnotify/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "clipnotify";
-  version = "unstable-2018-02-20";
+  version = "0-unstable-2018-02-20";
 
   src = fetchFromGitHub {
     owner = "cdown";

From 9d14bb8ff82b091acf8f4155ff808035676db43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 16 Jul 2026 16:23:25 -0700
Subject: [PATCH 1271/1386] python3Packages.ocrmypdf: 17.8.0 -> 17.8.1

Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v17.8.0...v17.8.1

Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v17.8.1/docs/releasenotes/version17.md
---
 pkgs/development/python-modules/ocrmypdf/default.nix |  4 ++--
 pkgs/development/python-modules/ocrmypdf/paths.patch | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index 265ede72e8aa..2c8dadc1f9c6 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "ocrmypdf";
-  version = "17.8.0";
+  version = "17.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-E6SheIepSXQPxTCf6/vWeGpUs0x7VO+h86JhtSxK6e0=";
+    hash = "sha256-+KDn/x1BNqteodwhdr9QKzZ8/j5/wkzwQ+cWxOzz63g=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch
index 68309f5bbfd0..aedba6f13f93 100644
--- a/pkgs/development/python-modules/ocrmypdf/paths.patch
+++ b/pkgs/development/python-modules/ocrmypdf/paths.patch
@@ -1,5 +1,5 @@
 diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py
-index 5afd6e17..0db47849 100644
+index bcee06fe..cc81c161 100644
 --- a/src/ocrmypdf/_exec/ghostscript.py
 +++ b/src/ocrmypdf/_exec/ghostscript.py
 @@ -36,7 +36,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset(
@@ -12,7 +12,7 @@ index 5afd6e17..0db47849 100644
  
  log = logging.getLogger(__name__)
 diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py
-index 9f107a07..469aed48 100644
+index b44a72ec..5858de31 100644
 --- a/src/ocrmypdf/_exec/jbig2enc.py
 +++ b/src/ocrmypdf/_exec/jbig2enc.py
 @@ -13,7 +13,7 @@ from ocrmypdf._exec._probe import ToolProbe
@@ -30,11 +30,11 @@ index 9f107a07..469aed48 100644
  def convert_single(cwd, infile, outfile, threshold):
 -    args = ['jbig2', '--pdf', '-t', str(threshold), infile]
 +    args = ['@jbig2@', '--pdf', '-t', str(threshold), infile]
-     with open(outfile, 'wb') as fstdout:
+     with outfile.open('wb') as fstdout:
          proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE)
      proc.check_returncode()
 diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py
-index 94bcdbf0..c0ae0fa3 100644
+index 5550ca06..a7718be2 100644
 --- a/src/ocrmypdf/_exec/pngquant.py
 +++ b/src/ocrmypdf/_exec/pngquant.py
 @@ -11,7 +11,7 @@ from subprocess import PIPE
@@ -48,7 +48,7 @@ index 94bcdbf0..c0ae0fa3 100644
  
 @@ -27,7 +27,7 @@ def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max:
      """
-     with open(input_file, 'rb') as input_stream:
+     with input_file.open('rb') as input_stream:
          args = [
 -            'pngquant',
 +            '@pngquant@',
@@ -56,7 +56,7 @@ index 94bcdbf0..c0ae0fa3 100644
              '--skip-if-larger',
              '--quality',
 diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py
-index 861f2d50..010ef6a6 100644
+index 0ff118b0..e36a2e31 100644
 --- a/src/ocrmypdf/_exec/tesseract.py
 +++ b/src/ocrmypdf/_exec/tesseract.py
 @@ -117,7 +117,7 @@ class TesseractVersion(Version):

From 83db2e4722b6c4ecb791b3386c77a9bedefc42b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 16 Jul 2026 16:38:30 -0700
Subject: [PATCH 1272/1386] python3Packages.ocrmypdf: use finalAttrs

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

diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index 2c8dadc1f9c6..390167a22966 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -30,7 +30,7 @@
   installShellFiles,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ocrmypdf";
   version = "17.8.1";
   pyproject = true;
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ocrmypdf";
     repo = "OCRmyPDF";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     # The content of .git_archival.txt is substituted upon tarball creation,
     # which creates indeterminism if master no longer points to the tag.
     # See https://github.com/ocrmypdf/OCRmyPDF/issues/841
@@ -107,7 +107,7 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [
       dotlambda
     ];
-    changelog = "https://github.com/ocrmypdf/OCRmyPDF/blob/${src.tag}/docs/releasenotes/version17.md";
+    changelog = "https://github.com/ocrmypdf/OCRmyPDF/blob/${finalAttrs.src.tag}/docs/releasenotes/version17.md";
     mainProgram = "ocrmypdf";
   };
-}
+})

From 86292d1b1adce9c4daf2959c661b1d2d106ed3f4 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 16 Jul 2026 23:53:30 +0200
Subject: [PATCH 1273/1386] chromium,chromedriver: 150.0.7871.124 ->
 150.0.7871.128

https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_049796704.html

This update includes 7 security fixes.

CVEs:
CVE-2026-15899 CVE-2026-15900 CVE-2026-15901 CVE-2026-15902
CVE-2026-15903 CVE-2026-15904 CVE-2026-15905
---
 .../networking/browsers/chromium/info.json         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 02777cbbdca1..13ca006eb4db 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,9 +1,9 @@
 {
   "chromium": {
-    "version": "150.0.7871.124",
+    "version": "150.0.7871.128",
     "chromedriver": {
-      "version": "150.0.7871.125",
-      "hash_darwin_aarch64": "sha256-VCgkc6MeMPbt0F2ZVTJNn9yJbSYNhy1zr8KzPVaVi0I="
+      "version": "150.0.7871.129",
+      "hash_darwin_aarch64": "sha256-CtfrqG/AeXCg7Sl6LoidM+OhYvBWkRJoAxv3g68wqUw="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa",
-        "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=",
+        "rev": "81891e5ca708047763816c778216799ef14c66cb",
+        "hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -826,8 +826,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744",
-        "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY="
+        "rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f",
+        "hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",

From 14ef780695b27cffa727de1a1860f264e3a178e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 00:06:19 +0000
Subject: [PATCH 1274/1386] coc-rust-analyzer: 0-unstable-2026-07-01 ->
 0-unstable-2026-07-14

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

diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix
index 5fe6b0180c79..ef84afa75456 100644
--- a/pkgs/by-name/co/coc-rust-analyzer/package.nix
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage {
   pname = "coc-rust-analyzer";
-  version = "0-unstable-2026-07-01";
+  version = "0-unstable-2026-07-14";
 
   src = fetchFromGitHub {
     owner = "fannheyward";
     repo = "coc-rust-analyzer";
-    rev = "056c78eb619bdf985d4414cbf73abfc5226d5c04";
-    hash = "sha256-1WhU2GYUU2l3tKpb5F6VxY61HPOHqtuS6hbI+upCmH8=";
+    rev = "4e0c84fdbfb8252cc88d0d8ef8af6642a00b8abc";
+    hash = "sha256-XTerfjqPyyFlt4y1g1LlAN/JV0aXWEbwCb03YqkMySM=";
   };
 
   npmDepsHash = "sha256-ifDAM08pfdbqPl9G5s5cx8hGzldNuVc0DcXDyCGgkkI=";

From 2f0f770617f9b33e42616f3867defcf9f6f08226 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 00:14:16 +0000
Subject: [PATCH 1275/1386] python3Packages.vallox-websocket-api: 6.0.0 ->
 6.1.0

---
 .../python-modules/vallox-websocket-api/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix
index 88de8b8c9e52..d71141d813e9 100644
--- a/pkgs/development/python-modules/vallox-websocket-api/default.nix
+++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "vallox-websocket-api";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yozik04";
     repo = "vallox_websocket_api";
     tag = version;
-    hash = "sha256-i4KUXvDz6FCdQguZtpNybyIPC/gn+O3SAYWh2CIbAeI=";
+    hash = "sha256-tJuZl6sWOWpdfq5RJVCWehz6y0Du1VXz++aOWaf9WLY=";
   };
 
   build-system = [

From 2d22cda774b6faf93f92b1c90bb89e3759f2fb51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 00:31:06 +0000
Subject: [PATCH 1276/1386] libphonenumber: 9.0.34 -> 9.0.35

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

diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index 77d745e6a573..1007318b608f 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "9.0.34";
+  version = "9.0.35";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KWn58r2Dnh9DMwiESmrF/pN5LPuYe0G7z3TeM+Zp6ZA=";
+    hash = "sha256-bGbPTZJWdGTdnWQCK9yXqcqK0AkAOsmZ/rRR2a+IT7M=";
   };
 
   patches = [

From e97ff5490baa7c39f7cb8683791596e214c0375c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 18:06:17 +0000
Subject: [PATCH 1277/1386] blackfire: 2026.6.1 -> 2026.7.0

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

diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix
index 22d6d990aef6..07e82ae20747 100644
--- a/pkgs/by-name/bl/blackfire/package.nix
+++ b/pkgs/by-name/bl/blackfire/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "blackfire";
-  version = "2026.6.1";
+  version = "2026.7.0";
 
   src =
     passthru.sources.${stdenv.hostPlatform.system}
@@ -60,19 +60,19 @@ stdenv.mkDerivation rec {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
-        hash = "sha256-doeqXoS0B7AyzyhkLB9wUC6iuD0c2KIhAIEPeYaDC5E=";
+        hash = "sha256-GzhcK+7NrQEP48XFmOQ9PVrvvsUzrCy/VRcshTSic9E=";
       };
       "i686-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
-        hash = "sha256-bQWhiSw9/gGyGoLEyz6BHaRPNLxuqouiobBMfB5ytYk=";
+        hash = "sha256-F6U7YHSBE5Ogie2yBSGGUKt0XsE8jogKi2GP28H1Eeo=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
-        hash = "sha256-B+rhmnM2sVICVLDcYq2OEp402Wz6kywCRqeS95Vdzlw=";
+        hash = "sha256-eDJAjd/5omgUJ6sw5kCqxu7Ok2AYei/WGlXV96Ynd/U=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
-        hash = "sha256-Ofs9raAtx/duS8dXWfvjKGzhJr3j9+gkH8lP/VLfnkE=";
+        hash = "sha256-xzWw6us+9/r8lMMHZTgE++rX7ZZShAL7L7fOneALA4Q=";
       };
     };
 

From aa90ff5c1f6515463f795da8c5d67279a7ae8315 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Jul 2026 02:53:33 +0200
Subject: [PATCH 1278/1386] python3Packages.modbus-connection: 3.6.0 -> 3.7.0

https://github.com/home-assistant-libs/modbus-connection/releases/tag/3.7.0
---
 .../python-modules/modbus-connection/default.nix         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/modbus-connection/default.nix b/pkgs/development/python-modules/modbus-connection/default.nix
index 5d16c2544027..78574562ad56 100644
--- a/pkgs/development/python-modules/modbus-connection/default.nix
+++ b/pkgs/development/python-modules/modbus-connection/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "modbus-connection";
-  version = "3.6.0";
+  version = "3.7.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
     owner = "home-assistant-libs";
     repo = "modbus-connection";
     tag = finalAttrs.version;
-    hash = "sha256-qDrtLziEMH0lsJ2o3p/6lMlPTdNIFqCvhtpbMJ89uKw=";
+    hash = "sha256-Tys1o0hbAONGbb24mQcOz8mM8+numl5RO8zHZKmxLv4=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +49,11 @@ buildPythonPackage (finalAttrs: {
   ]
   ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
+  disabledTests = [
+    # tries to git clone https://github.com/sunspec/models
+    "test_official_model_catalogue_generates_and_imports"
+  ];
+
   pythonImportsCheck = [
     "modbus_connection"
   ];

From 94a5ed626668a4e102f0559dd5b2d32b89b082c6 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Fri, 17 Jul 2026 02:39:15 +0200
Subject: [PATCH 1279/1386] radare2: 6.1.4 -> 6.1.8

https://github.com/radareorg/radare2/releases/tag/6.1.8

Fixes #538888
Fixes #539166

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/development/tools/analysis/radare2/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 0819a899a1dd..2a5f4b29e7ed 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -25,6 +25,7 @@
   vte,
   xxhash,
   zlib,
+  zydis,
   useX11 ? false,
   rubyBindings ? false,
   luaBindings ? false,
@@ -40,8 +41,8 @@ let
   sdb = fetchFromGitHub {
     owner = "radareorg";
     repo = "sdb";
-    tag = "2.4.2"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap
-    hash = "sha256-JN27SkDqHtX83d1CPUF9hbVKwE/dwhDgn5MlCX9RPrc=";
+    tag = "2.4.6"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap
+    hash = "sha256-5DuHC5uL4gXBJPGW2awDq/5Ufdi1RoEJnm+eAU3X8S4=";
   };
 
   qjs = fetchFromGitHub {
@@ -53,13 +54,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "radare2";
-  version = "6.1.4";
+  version = "6.1.8";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     tag = finalAttrs.version;
-    hash = "sha256-3MwBtjR3XQMhbJHnD30OVedUEKcje5jDPszNynkGCT8=";
+    hash = "sha256-Gh+W0vWsIscbew1u5cuOXWC20azCxYuA7D+qVTkfEN0=";
   };
 
   mesonFlags = [
@@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonBool "use_sys_openssl" true)
     (lib.mesonBool "use_sys_xxhash" true)
     (lib.mesonBool "use_sys_zip" true)
+    (lib.mesonBool "use_sys_zydis" true)
     (lib.mesonBool "use_sys_zlib" true)
     (lib.mesonOption "r2_gittap" finalAttrs.version)
   ];
@@ -97,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     readline
     zlib
+    zydis
   ]
   ++ lib.optionals useX11 [
     gtkdialog

From 5d33618f8a97f5562261e33443f335908e71e375 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 01:00:49 +0000
Subject: [PATCH 1280/1386] python3Packages.gcsa: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/development/python-modules/gcsa/default.nix b/pkgs/development/python-modules/gcsa/default.nix
index 854385113b8c..a885bd85a81b 100644
--- a/pkgs/development/python-modules/gcsa/default.nix
+++ b/pkgs/development/python-modules/gcsa/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "gcsa";
-  version = "2.6.0";
+  version = "2.7.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "kuzmoyev";
     repo = "google-calendar-simple-api";
     rev = "v${version}";
-    hash = "sha256-I4IKuG9/4/JrEQ7PD1BwGFmCa1q3GOe4srHmpwt1OUU=";
+    hash = "sha256-lDmdV1F/EFtZEhq4ufH9nPvzNZ9msUGNZcmWiVTTTWc=";
   };
 
   propagatedBuildInputs = [

From 901d83dcd72407ec343aa59567415cf277b5bad8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Jul 2026 02:56:31 +0200
Subject: [PATCH 1281/1386] python3Packages.pydantic-graph: 2.8.0 -> 2.11.0

https://github.com/pydantic/pydantic-ai/releases/tag/v2.9.0
https://github.com/pydantic/pydantic-ai/releases/tag/v2.9.1
https://github.com/pydantic/pydantic-ai/releases/tag/v2.10.0
https://github.com/pydantic/pydantic-ai/releases/tag/v2.11.0
---
 pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index 5faee498d04f..bfa65316323f 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-graph";
-  version = "2.8.0";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KwuhRZWGOofglR5SVsUOijtgYnhVV3Fc9DLtUwL+KSU=";
+    hash = "sha256-nt51tvNcB01i6Z1+8ueIW6ffIiS3Jh9MC2hSNgzN+90=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_graph";

From 5f7f60bad7ef0c06171a07be606089e057f73446 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Jul 2026 02:57:06 +0200
Subject: [PATCH 1282/1386] python3Packages.pydantic-ai-slim: 2.8.0 -> 2.11.0

https://github.com/pydantic/pydantic-ai/releases/tag/v2.9.0
https://github.com/pydantic/pydantic-ai/releases/tag/v2.9.1
https://github.com/pydantic/pydantic-ai/releases/tag/v2.10.0
https://github.com/pydantic/pydantic-ai/releases/tag/v2.11.0

Fixes: GHSA-jpr8-2v3g-wgf9
---
 pkgs/development/python-modules/pydantic-ai-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index f07cfb90e3d2..443b0e98cfd2 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-ai-slim";
-  version = "2.8.0";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KwuhRZWGOofglR5SVsUOijtgYnhVV3Fc9DLtUwL+KSU=";
+    hash = "sha256-nt51tvNcB01i6Z1+8ueIW6ffIiS3Jh9MC2hSNgzN+90=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";

From 6f278e1520cd4ebf1d3fe64bffcc5164c0f9b6fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Jul 2026 03:06:46 +0200
Subject: [PATCH 1283/1386] python3Packages.sentry-sdk: 2.64.0 -> 2.66.0

https://github.com/getsentry/sentry-python/blob/2.66.0/CHANGELOG.md
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 6785d671b715..2592a2da464b 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -69,14 +69,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sentry-sdk";
-  version = "2.64.0";
+  version = "2.66.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = finalAttrs.version;
-    hash = "sha256-uAxHNyZgTpw6NoXGCw91AgsKQqlJkdgPsw/WdhFMhs4=";
+    hash = "sha256-0xHcTcJH7cNzQ16Yc+fkSKYE316Ztu6Bl7hTwtD97Ds=";
   };
 
   postPatch = ''

From 132f3c43c3d02a30948ad656e15bb0bc35bd2527 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 14 Jul 2026 16:20:51 +0000
Subject: [PATCH 1284/1386] python3Packages.stopit: fix build

---
 .../python-modules/stopit/default.nix         | 17 ++--
 .../python-modules/stopit/import_lib.patch    | 81 +++++++++++++++++++
 2 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/stopit/import_lib.patch

diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix
index d7803cc4b1fc..5f839255addf 100644
--- a/pkgs/development/python-modules/stopit/default.nix
+++ b/pkgs/development/python-modules/stopit/default.nix
@@ -6,29 +6,36 @@
 
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "stopit";
   version = "1.1.2";
-  format = "setuptools";
+  pyproject = true;
+  __structuredAttrs = true;
 
   # tests are missing from the PyPi tarball
   src = fetchFromGitHub {
     owner = "glenfant";
     repo = "stopit";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
     setuptools # for pkg_resources
   ];
 
+  patches = [
+    # https://github.com/glenfant/stopit/pull/34
+    ./import_lib.patch
+  ];
+
   pythonImportsCheck = [ "stopit" ];
 
   meta = {
     description = "Raise asynchronous exceptions in other thread, control the timeout of blocks or callables with a context manager or a decorator";
     homepage = "https://github.com/glenfant/stopit";
+    changelog = "https://github.com/glenfant/stopit/blob/${finalAttrs.version}/CHANGES.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/stopit/import_lib.patch b/pkgs/development/python-modules/stopit/import_lib.patch
new file mode 100644
index 000000000000..240e4b408e68
--- /dev/null
+++ b/pkgs/development/python-modules/stopit/import_lib.patch
@@ -0,0 +1,81 @@
+From 9204d1de2ae294b878ed726c8278b28696a91f87 Mon Sep 17 00:00:00 2001
+From: Jonathan Kamens <jik@jik6.kamens.us>
+Date: Wed, 25 Sep 2024 15:52:03 -0400
+Subject: [PATCH 1/2] Use importlib instead of pkg_resources to determine
+ package version
+
+`pkg_resources` is deprecated and no longer available for import by
+default as of Python 3.12.
+---
+ src/stopit/__init__.py | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/src/stopit/__init__.py b/src/stopit/__init__.py
+index 6ca0180..d2fb01e 100644
+--- a/src/stopit/__init__.py
++++ b/src/stopit/__init__.py
+@@ -7,19 +7,25 @@
+ Public resources from ``stopit``
+ """
+ 
+-import pkg_resources
++try:
++    from importlib.metadata import version
++    __version__ = version(__name__)
++except Exception:
++    # pkg_resources is deprecated as of Python 3.12 and no longer available for
++    # import by default.
++    try:
++        import pkg_resources
++    except Exception:
++        LOG.warning(
++            "Could not get the package version from importlib or pkg_resources")
++        __version__ = 'unknown'
++    else:
++        __version__ = pkg_resources.get_distribution(__name__).version
+ 
+ from .utils import LOG, TimeoutException
+ from .threadstop import ThreadingTimeout, async_raise, threading_timeoutable
+ from .signalstop import SignalTimeout, signal_timeoutable
+ 
+-# PEP 396 style version marker
+-try:
+-    __version__ = pkg_resources.get_distribution(__name__).version
+-except:
+-    LOG.warning("Could not get the package version from pkg_resources")
+-    __version__ = 'unknown'
+-
+ __all__ = (
+     'ThreadingTimeout', 'async_raise', 'threading_timeoutable',
+     'SignalTimeout', 'signal_timeoutable'
+
+From a2f6bde8a29cd281577426800b186802c68dbd86 Mon Sep 17 00:00:00 2001
+From: Jonathan Kamens <jik@jik7>
+Date: Mon, 28 Jul 2025 09:13:25 -0400
+Subject: [PATCH 2/2] Import LOG before trying to use it
+
+---
+ src/stopit/__init__.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/stopit/__init__.py b/src/stopit/__init__.py
+index d2fb01e..bbf7068 100644
+--- a/src/stopit/__init__.py
++++ b/src/stopit/__init__.py
+@@ -7,6 +7,8 @@
+ Public resources from ``stopit``
+ """
+ 
++from .utils import LOG, TimeoutException
++
+ try:
+     from importlib.metadata import version
+     __version__ = version(__name__)
+@@ -22,7 +24,6 @@
+     else:
+         __version__ = pkg_resources.get_distribution(__name__).version
+ 
+-from .utils import LOG, TimeoutException
+ from .threadstop import ThreadingTimeout, async_raise, threading_timeoutable
+ from .signalstop import SignalTimeout, signal_timeoutable
+ 

From 1b0fdf096c357ea62bd53d14b711112aebb65724 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 01:30:37 +0000
Subject: [PATCH 1285/1386] herdr: 0.7.3 -> 0.7.4

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

diff --git a/pkgs/by-name/he/herdr/package.nix b/pkgs/by-name/he/herdr/package.nix
index 43b65453d13e..854ac3a19e22 100644
--- a/pkgs/by-name/he/herdr/package.nix
+++ b/pkgs/by-name/he/herdr/package.nix
@@ -12,7 +12,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "herdr";
-  version = "0.7.3";
+  version = "0.7.4";
 
   __structuredAttrs = true;
 
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "ogulcancelik";
     repo = "herdr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q2yvMs/N6oAF8xnRIrMxEOOV6Aj8aAXQzuvcaux2enA=";
+    hash = "sha256-dBOQYLFitJ+E3XNz44Ag3CIrBxFj16CmVPp7qil0ssg=";
   };
 
-  cargoHash = "sha256-DRjcIJXWGxiA9c7xIiQoWU9az2EFjXsnFKu5sC933eE=";
+  cargoHash = "sha256-XHzZy2tKLbMQy4POmXowUcGf77ZPunG/oQ3P2wOoVls=";
 
   zigDeps = zig_0_15.fetchDeps {
     inherit (finalAttrs) pname version;

From 14448131882747fe76a797c6d5551227acb8135b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 01:37:59 +0000
Subject: [PATCH 1286/1386] broot: 1.57.0 -> 1.58.0

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

diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index 086ceaf8cb2e..bc3dc200e630 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "broot";
-  version = "1.57.0";
+  version = "1.58.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "broot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uRMa8zaXXM8KWUplYMyOLic/WITLU0eAbZ2VDgM/PBw=";
+    hash = "sha256-cvrqIgxR96GVD5HpDTjswnuiwuzfJNW0evJIwYTI2lQ=";
   };
 
-  cargoHash = "sha256-p4R8+PcRmjy/2q7lpfUevuYROPrCQEffmXx5vRrjwKs=";
+  cargoHash = "sha256-eel+0H5wYk4j/yB3E0M4+iqQXF7tLXm6gxv59rW2e1o=";
 
   nativeBuildInputs = [
     installShellFiles

From bc98e6046d5817b41831d976adb0077165c1e43d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 01:42:38 +0000
Subject: [PATCH 1287/1386] models-dev: sdk-v0.0.5-unstable-2026-07-07 ->
 sdk-v0.0.5-unstable-2026-07-17

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

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index ab296248c8e1..87326f81842d 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 let
   pname = "models-dev";
-  version = "sdk-v0.0.5-unstable-2026-07-07";
+  version = "sdk-v0.0.5-unstable-2026-07-17";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "models.dev";
-    rev = "f1a9be19f62c24474d27947d5236067504dd755a";
-    hash = "sha256-ty8l1jURV2uf245Xqm+I95qZ8gU9IjTGqR7+yLGxBUs=";
+    rev = "d15aa5a09dc0226f0a292699e35f14243e61d65e";
+    hash = "sha256-S1WzSYs9of11Onw/hK+stSmakjJJhq1rs6mcW8m+xlc=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 29fc7971a446c8eef85b328796ddedc2420494bc Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 16 Jul 2026 21:41:25 -0400
Subject: [PATCH 1288/1386] google-chrome: 150.0.7871.124 -> 150.0.7871.128

Release note: https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_049796704.html
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index a262b9f96d01..1a63064b22f6 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -179,11 +179,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "150.0.7871.124";
+    version = "150.0.7871.128";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-TGNqvSrB9vMXb1K7QBCqN9ErWsBMQNyp6rEZksHHXNw=";
+      hash = "sha256-g+1ZyFh467j6U5FevnBmyvxY0cBMHJVElIbm+dmaHvs=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -289,11 +289,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "150.0.7871.125";
+    version = "150.0.7871.129";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/kjpfr4hhda65lyoxi6u4o42bke_150.0.7871.125/GoogleChrome-150.0.7871.125.dmg";
-      hash = "sha256-ulMe+AP65d9VB2O7vhLnSX+dUfC7XqWd4GaOEQXGBac=";
+      url = "http://dl.google.com/release2/chrome/ggb3e3myl2poiiaqd2bbvqlrqa_150.0.7871.129/GoogleChrome-150.0.7871.129.dmg";
+      hash = "sha256-ym9rF6yrGMSibQDM4gKlAbOsIHnV1tPxyNq9KNLnR0I=";
     };
 
     dontPatch = true;

From cf40341cfab320a5ecee477acf7dedf405005bcd Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 16 Jul 2026 18:57:28 -0700
Subject: [PATCH 1289/1386] teehee: modernize slightly

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/te/teehee/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix
index 3442c8f0c498..0d60e53f1364 100644
--- a/pkgs/by-name/te/teehee/package.nix
+++ b/pkgs/by-name/te/teehee/package.nix
@@ -8,10 +8,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "teehee";
   version = "0.2.8";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "Gskartwii";
     repo = "teehee";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI=";
   };
 

From 2d0d4abb1aea2125e78dd2ef44b4a3bfa1e99dfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:00:29 +0000
Subject: [PATCH 1290/1386] libretro.beetle-pce-fast: 0-unstable-2026-07-03 ->
 0-unstable-2026-07-10

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index 5b806bb2dcc4..8a89ec55c87b 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2026-07-03";
+  version = "0-unstable-2026-07-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "744a9ffb6120e7531c153aa468f34adb3fab9057";
-    hash = "sha256-n5Mz0a2bIbQEDsX8PZzji58D8L/yFoQVghrMTg7Srd0=";
+    rev = "0bc6c86928343ca4202c5b6ef33fa4387c47fc12";
+    hash = "sha256-TgUueogxf5KZ1S5pt0WiYtoHXWQI81C6QUts1xJClh8=";
   };
 
   makefile = "Makefile";

From a221e35fa8e1270b2a0a520d33b4d31f4cb50455 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:11:02 +0000
Subject: [PATCH 1291/1386] pmtiles: 1.31.0 -> 1.31.1

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

diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index 1f0468702abb..eb155ef71e56 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "pmtiles";
-  version = "1.31.0";
+  version = "1.31.1";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OWf66RsOvYoJEsDI4rVsimX60uxuZoqTgIwAI7kxvs0=";
+    hash = "sha256-Hx20rNKmoxryD+/GClJpbXvjta6TUzaHJIRCu1f+lRU=";
   };
 
   vendorHash = "sha256-0u/04mpqhpRideIf8eOzgC7ZWNp4P2c2ssQvyWlcD4M=";

From db5479873095f4d155aa2aeac720be87ff8d1593 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:20:37 +0000
Subject: [PATCH 1292/1386] steam-unwrapped: 1.0.0.85 -> 1.0.0.87

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

diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix
index d654ba61f9b5..d64457af38db 100644
--- a/pkgs/by-name/st/steam-unwrapped/package.nix
+++ b/pkgs/by-name/st/steam-unwrapped/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "steam-unwrapped";
-  version = "1.0.0.85";
+  version = "1.0.0.87";
 
   src = fetchurl {
     # use archive url so the tarball doesn't 404 on a new release
     url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz";
-    hash = "sha256-fy03Si+0E87VuBJRUUViGdkYolWHK0u3cBbLzPOLt/E=";
+    hash = "sha256-ZJN10vk3f4AJqvPi/wmXgEHrkRSJfZxaOIbx2C4nuh8=";
   };
 
   patches = [

From 8236cf26cde7bf3638de8bb68f5cdf8d4c69e5eb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Jul 2026 04:22:49 +0200
Subject: [PATCH 1293/1386] python3Packages.glean-sdk: mark broken

https://hydra.nixos.org/job/nixpkgs/unstable/python313Packages.glean-sdk.aarch64-linux/all
https://hydra.nixos.org/job/nixpkgs/unstable/python313Packages.glean-sdk.x86_64-linux/all
---
 pkgs/development/python-modules/glean-sdk/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix
index 69d8006deb40..b78e50d2ea54 100644
--- a/pkgs/development/python-modules/glean-sdk/default.nix
+++ b/pkgs/development/python-modules/glean-sdk/default.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -57,7 +56,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "glean" ];
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = true; # fails to build since 2025-12
     description = "Telemetry client libraries and are a part of the Glean project";
     homepage = "https://mozilla.github.io/glean/book/index.html";
     license = lib.licenses.mpl20;

From 4dac83eae3bb6ace8021afcc6d55d2775bd7737b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:32:56 +0000
Subject: [PATCH 1294/1386] pomerium-cli: 0.32.2 -> 0.33.0

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

diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix
index 0f1409717ad0..e92bfb62d7aa 100644
--- a/pkgs/by-name/po/pomerium-cli/package.nix
+++ b/pkgs/by-name/po/pomerium-cli/package.nix
@@ -14,16 +14,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "pomerium-cli";
-  version = "0.32.2";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-t2Sp4zAIybUsxaBdQ9ev+EJsFpWqM8KWaE2UOI4xw5A=";
+    sha256 = "sha256-Rn/TUTqqUtd4vWfj51aRrdst25B9Weiajesa2AtcEt4=";
   };
 
-  vendorHash = "sha256-LzXcHGRBn99WhDsxLQKY3t8Zp4sw9Ec5CbA/rU/3SQ0=";
+  vendorHash = "sha256-Jr+sGTjFB/6cNggdbCL3PqwVaHqr/hWrVLLjdPbL82Y=";
 
   subPackages = [
     "cmd/pomerium-cli"

From 424d39ac5625e5025852e94b131bcc5f34664e43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:41:42 +0000
Subject: [PATCH 1295/1386] redpanda-client: 26.1.12 -> 26.1.13

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

diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index a5cdd62417a7..05b95b243c72 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "26.1.12";
+  version = "26.1.13";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-ZF9YzRW1b40syRCV+a5NOsS/SDwstVs1mI++dTDcpWc=";
+    sha256 = "sha256-vYAicA6tUJt4fz2HBvu+T5rKuVjUWP1QN9ViThkMrpA=";
   };
 in
 buildGoModule rec {

From bf13b635d62ab5c45b2a805baf141001f1924e93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:45:42 +0000
Subject: [PATCH 1296/1386] fluxcd: 2.9.1 -> 2.9.2

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

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index 27d051d0008e..f2ea364767e1 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -9,10 +9,10 @@
 }:
 
 let
-  version = "2.9.1";
-  srcHash = "sha256-aVJpUigIkGXsjvb40hEkZ2OiUghGcte3Msq4DMLIcbU=";
-  vendorHash = "sha256-TG41xOrAAVBsE6CJ4av6y3bxfudk6gV49+/xB9Qu5ME=";
-  manifestsHash = "sha256-DeTjdgOZyvrpQvIoXyVUfRIbHoJ9o74FRuTpVgT1/3I=";
+  version = "2.9.2";
+  srcHash = "sha256-a4925TZIqYqSk4/gyjwTeThOaQiIt1S3Md7b9eu7H20=";
+  vendorHash = "sha256-iPj7F/7u5MrxoZJ4qk6XONeUmAXkMckpXK/P0HNQ78A=";
+  manifestsHash = "sha256-uSfH2hcz1+rqHc9szCe4V40mTl6d+Li308WW9xLVXWs=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";

From a9fe53ff7228d4f7c8c91307f8f416de4404ed90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 03:00:29 +0000
Subject: [PATCH 1297/1386] tree-sitter-grammars.tree-sitter-elm: 5.9.2 ->
 5.9.4

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 818a738254e5..2282eced7c85 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -606,9 +606,9 @@
   };
 
   elm = {
-    version = "5.9.2";
+    version = "5.9.4";
     url = "github:elm-tooling/tree-sitter-elm";
-    hash = "sha256-NJRmII48Zo2xKxZmL88Dxskf352fGaCp8B14+x1XJHw=";
+    hash = "sha256-HFfpwThgWdd+pz8Ub042pKDKyFcuokHRGljhZ2xZFQU=";
     meta = {
       license = lib.licenses.mit;
     };

From 31252e5c081680bb4caa33082c0981659f90a9e5 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Thu, 16 Jul 2026 20:28:31 -0700
Subject: [PATCH 1298/1386] mpg123: move to by-name/

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

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/by-name/mp/mpg123/package.nix
similarity index 98%
rename from pkgs/applications/audio/mpg123/default.nix
rename to pkgs/by-name/mp/mpg123/package.nix
index ea1663b170e1..b216a5368895 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/by-name/mp/mpg123/package.nix
@@ -11,7 +11,7 @@
   libpulseaudio,
   withCoreAudio ? stdenv.hostPlatform.isDarwin,
   withJack ? stdenv.hostPlatform.isUnix,
-  jack,
+  libjack2,
   withConplay ? !stdenv.hostPlatform.isWindows,
   perl,
   writeScript,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals withPulse [ libpulseaudio ]
     ++ lib.optionals withCoreAudio [
     ]
-    ++ lib.optionals withJack [ jack ]
+    ++ lib.optionals withJack [ libjack2 ]
   );
 
   configureFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e00dc626823..e2be794ebde3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9083,10 +9083,6 @@ with pkgs;
     mopidy-ytmusic
     ;
 
-  mpg123 = callPackage ../applications/audio/mpg123 {
-    jack = libjack2;
-  };
-
   libmpg123 = mpg123.override {
     libOnly = true;
     withConplay = false;

From e6ab1a35dae78db38d01cdb74226b108756a8377 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 04:29:02 +0000
Subject: [PATCH 1299/1386] tt-smi: 5.3.1 -> 6.0.0

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

diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix
index 4d5a6cba38c9..5fc72ec4fbd4 100644
--- a/pkgs/by-name/tt/tt-smi/package.nix
+++ b/pkgs/by-name/tt/tt-smi/package.nix
@@ -8,7 +8,7 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tt-smi";
-  version = "5.3.1";
+  version = "6.0.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "tenstorrent";
     repo = "tt-smi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lZ9fd8tkwfmWHEAJ8+cwBja3U7vxAVWQWrgope9/VO4=";
+    hash = "sha256-039boJyMEVB3dsOLNzmG4LGnDwF/358snhgFcZklSQc=";
   };
 
   build-system = with python3Packages; [

From 3de3f9caeeba550e7b51143193f9f1ea87e5431d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 04:45:22 +0000
Subject: [PATCH 1300/1386] fluxcd-operator: 0.54.0 -> 0.55.0

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

diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix
index b952bde62d17..9a34b5c495cb 100644
--- a/pkgs/by-name/fl/fluxcd-operator/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "fluxcd-operator";
-  version = "0.54.0";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio-fluxcd";
     repo = "flux-operator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Bxzqm4I+wTj1k8ppa4cohsowmgc7H76EuHCYlCiJ5Qk=";
+    hash = "sha256-MWtjoTQuB6G/f9MnKOkIKlbI5tvaP5TLb5PvEySNLFM=";
   };
 
   vendorHash = "sha256-DW+dnakqnpSiV7MlzshGEzoy3Osv93dAsJYe4cR0sJ4=";

From 7b61c46426fe468a9b3b4d38ac912685c6251ea2 Mon Sep 17 00:00:00 2001
From: William Huebner <wilhueb@gmail.com>
Date: Thu, 16 Jul 2026 23:29:52 -0400
Subject: [PATCH 1301/1386] grafana-alloy: 1.16.0 -> 1.17.1

Changelog: https://github.com/grafana/alloy/blob/refs/tags/v1.17.1/CHANGELOG.md
---
 pkgs/by-name/gr/grafana-alloy/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 7a802ca30581..95e24d8005b3 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -15,23 +15,23 @@
 }:
 
 let
-  beylaVersion = "v3.9.5";
+  beylaVersion = "v3.9.8";
 in
 
 buildGoModule (finalAttrs: {
   pname = "grafana-alloy";
-  version = "1.16.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q5R2noxBZ3OPyZqmB+bx3iJKWFxC2WIprcgh9RwjLzk=";
+    hash = "sha256-4HjOerOe+v8GkKgID/oBm5Rt7nQiHjucAQkSYGY5zZs=";
   };
 
   npmDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/internal/web/ui";
-    hash = "sha256-vResNUT4auDsK9ngnJYfMUUOYr/ikPhrvakqCjGq2Q8=";
+    hash = "sha256-eGyKXsZzyDovsMY2U1uAOn22nyRTYGJT+kEh61857Ls=";
   };
 
   frontend = buildNpmPackage {
@@ -65,7 +65,7 @@ buildGoModule (finalAttrs: {
   modRoot = "collector";
 
   proxyVendor = true;
-  vendorHash = "sha256-uTIdurwLfxh27fb1CPCHbHmENk3S6VYNBaGT/5yh3Sc=";
+  vendorHash = "sha256-C6qVdSfTwmjseCjXKn5f9Q9mn3EBg31CQlLk5QY4YRY=";
 
   subPackages = [ "." ];
 

From 5c485513ee1d4bcfa7ecfd6564a17d3633afc7fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 04:53:47 +0000
Subject: [PATCH 1302/1386] fresh-editor: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix
index b33990aa1c9c..270143a61da4 100644
--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -13,16 +13,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fresh";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "sinelaw";
     repo = "fresh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fVBDjcX0AjUTH+vKV5H4NYmknJYfHNHRizuzjQTHYpA=";
+    hash = "sha256-ycB5wEDYlyTDdIk5lE26c2YFMmDGGqcMuSqwqDSyxs0=";
   };
 
-  cargoHash = "sha256-bsIyf63U7/GNZnCD8g6RBykCiArwlD5v1YhrZNsf1is=";
+  cargoHash = "sha256-HWuHKn+vJC3cdS6bKp5iw9VSTRHn/Q5Zsj6OHvmfYp0=";
 
   __structuredAttrs = true;
 

From eb6577f5d5e988227ddf049b45a6964374ba19d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 05:39:42 +0000
Subject: [PATCH 1303/1386] pvz-portable-unwrapped: 0.1.26 -> 0.1.27

---
 pkgs/by-name/pv/pvz-portable-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
index 99ec68180031..acb31ca70530 100644
--- a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
+++ b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pvz-portable-unwrapped";
-  version = "0.1.26";
+  version = "0.1.27";
 
   src = fetchFromGitHub {
     owner = "wszqkzqk";
     repo = "PvZ-Portable";
     tag = finalAttrs.version;
-    hash = "sha256-IsU/l7k7F79nfM6TYdbcofOmJKm6v55HR7HHAZc7sH0=";
+    hash = "sha256-kebgKQRju2CRboKRytkTEIjm7Hl+1KkIOdrvbwG/ufs=";
   };
 
   nativeBuildInputs = [

From 828c277614edbb6e81cf1ccdcec847b1eb31396e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 05:51:31 +0000
Subject: [PATCH 1304/1386] autobrr: 1.81.0 -> 1.82.1

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

diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index 7078ed821ede..7da263486503 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -16,12 +16,12 @@
 
 let
   pname = "autobrr";
-  version = "1.81.0";
+  version = "1.82.1";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-Xm5cYtQabHkoiVZ6v71qWKIpx44obzr0Om2hahFUyO8=";
+    hash = "sha256-dB/lk05v9L8GAF//N1We3byhsK+156rzRT+r9Q+EVD4=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {
@@ -46,7 +46,7 @@ let
         ;
       pnpm = pnpm_11;
       fetcherVersion = 4;
-      hash = "sha256-VDW1B8OVFZ72nBl8IYM5nXqit2za1Q8mXI6UhcmEeSo=";
+      hash = "sha256-wlikd38tAfgaSSD9L7DiSXRQFYcfVq5YA1eWs5NE4n8=";
     };
 
     postBuild = ''
@@ -65,7 +65,7 @@ buildGoModule (finalAttrs: {
     src
     ;
 
-  vendorHash = "sha256-mOsiQXuhhNSbViEFecmlNk549LyfUIuc8FxwDma9XNI=";
+  vendorHash = "sha256-tsGl0uiQV25aemEQvedZUISrlO4IPE+V87nl31m8hZI=";
 
   preBuild = ''
     cp -r ${finalAttrs.passthru.autobrr-web}/* web/dist

From d4a04ddf5c440ea1ed859cc7719994c01caa76a1 Mon Sep 17 00:00:00 2001
From: eveeifyeve <kbkk7250@outlook.com>
Date: Fri, 17 Jul 2026 15:56:56 +1000
Subject: [PATCH 1305/1386] python3Packages.generic: use finalAttrs

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

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 18b0a6f56c54..2a5145a02e75 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -6,13 +6,13 @@
   poetry-core,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "generic";
   version = "1.1.7";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-0U2uZihULrCEQ0WI01B1bIjy8wx+I0itX8+gH723zu0=";
   };
 
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   meta = {
     description = "Generic programming (Multiple dispatch) library for Python";
     homepage = "https://github.com/gaphor/generic";
-    changelog = "https://github.com/gaphor/generic/releases/tag/${version}";
+    changelog = "https://github.com/gaphor/generic/releases/tag/${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

From a5626b2f1d48f195ab988e84e73ee2ad296bf6b7 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 17 Jul 2026 08:04:38 +0200
Subject: [PATCH 1306/1386] claude-code: 2.1.211 -> 2.1.212

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 2e2cab1296a5..dd54af081d6b 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.211",
-  "commit": "17a4b6d7b2ee1936b95e595054c7e7d38fddafb7",
-  "buildDate": "2026-07-15T16:42:49Z",
+  "version": "2.1.212",
+  "commit": "8b2783a8f907ce5c5ad1241ecdbab0ff3301c617",
+  "buildDate": "2026-07-16T16:50:33Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "5a728a76198b6eca7f3c7cdbff43bab44b77b48c2108f7a3107d889773382629",
-      "size": 242445680
+      "checksum": "09ecba2ab2df9b6ee5b0695e26f65dea60fb3b6af3d3542ee09f466838d1e574",
+      "size": 244530512
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "33049eb14cf4702b992b7eda41ec077fc6e76539f7fd046e6d32538757235da4",
-      "size": 251966736
+      "checksum": "7681a0634c89fa4474e53c0c794e992944aebf3409a7a2b87ea9f9b0194ea341",
+      "size": 254080272
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "1fff7e8f947c07b19d10b1fbf714b7e547e9536253b9b58230d8adbc4624f867",
-      "size": 258849520
+      "checksum": "66e88634a8573a002702e6a9de0d80cb9bb7c9072f9e6f4486778539057dfd3c",
+      "size": 260946672
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "8272c8a474ac9ea1bc35f19b9f7c7e7dc4dc4eb6d5ad3e484b19335ac72446b2",
-      "size": 262023992
+      "checksum": "044a88cf3a5180776617fd3da1238dcbf9141ddec449a39cf7d2af1ac78e684e",
+      "size": 264096568
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "ca094a85ea464b2ebec2ecfcc9e2c056573d4ca95ebe12ffae2c7dccb722e17b",
-      "size": 252097720
+      "checksum": "6996b65fc90aa1e0b8f80824df77295d93fa43b12388915a762b58fd982a1d16",
+      "size": 254194872
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "c99bd7934ac841d5be6ee7d3644cb63bccef2cd495c6c1bb982a1b1deac1b466",
-      "size": 256680320
+      "checksum": "a17757970a1f7ef0c47a31ea8fa40798fd7796854ba9422e1a4175f3f149de2c",
+      "size": 258756992
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "3d8509ae7de11d77dbdc711aa320fc6d5064ce795464a8670696611b57093caf",
-      "size": 253293728
+      "checksum": "fe639693fd7e9a881c799867711abb7666dec2a5fefbaba41af6a09e71bcbefa",
+      "size": 255334560
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "a0f9bab0dbdda9b43a8765d54e329e44484d9dd7d4f40cf31db6eee27a2da41c",
-      "size": 247643808
+      "checksum": "adaa6e3dadb8016755ccd1907a5f249c1bc9bdb6c71d3f7dcea7d5db8f72d0a5",
+      "size": 249684640
     }
   },
   "sdkCompat": {

From 65c0f67b10df487e87ce278a61a70aa6f0326d32 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 17 Jul 2026 08:04:38 +0200
Subject: [PATCH 1307/1386] vscode-extensions.anthropic.claude-code: 2.1.211 ->
 2.1.212

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../vscode/extensions/anthropic.claude-code/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 81658a231b91..a38756a2b825 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-JswgBhADhoEUug2h1ZZ7OtFjFUVgCxiqIaWCYCMf+Sw=";
+          hash = "sha256-pPgl7MTzkBqZ/KatgAme7F6w873GLxZ1ZTYfkXzD4kw=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-+TBwLHUsPx+TiFP+5Gg59Yii76IERNbBQT3RLidogSo=";
+          hash = "sha256-gnaECK1yMNatDn/ZJ6od8wBQYMlJJ/Q49Z+Ur4SxWU8=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-Xglh5yLP4QoeMxqqUUAJyuyehN9hdDookhjwU6znRX4=";
+          hash = "sha256-g0DEP2f+ooEgYz8TFUYTMoVV83HGR2eK2dL5MWa92F8=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.211";
+      version = "2.1.212";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 750e2545166964a74f702f7b4d110ceb3fd8b347 Mon Sep 17 00:00:00 2001
From: Haylin Moore <me@haylinmoore.com>
Date: Thu, 16 Jul 2026 22:52:29 -0700
Subject: [PATCH 1308/1386] bandcampsync: init at 0.8.0

Adds bandcampsync, a Python tool to automatically download
purchases from bandcamp.com.
---
 pkgs/by-name/ba/bandcampsync/package.nix | 38 ++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/ba/bandcampsync/package.nix

diff --git a/pkgs/by-name/ba/bandcampsync/package.nix b/pkgs/by-name/ba/bandcampsync/package.nix
new file mode 100644
index 000000000000..3a598bfd55bf
--- /dev/null
+++ b/pkgs/by-name/ba/bandcampsync/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication (finalAttrs: {
+  pname = "bandcampsync";
+  version = "0.8.0";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "meeb";
+    repo = "bandcampsync";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-j370Kn95CQuGjwOoFMXNNQZ5odlR/0uiw02hN/UVAb8=";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    beautifulsoup4
+    curl-cffi
+  ];
+
+  pythonImportsCheck = [ "bandcampsync" ];
+
+  meta = {
+    description = "Download your Bandcamp purchases automatically";
+    homepage = "https://github.com/meeb/bandcampsync";
+    changelog = "https://github.com/meeb/bandcampsync/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.haylin ];
+    mainProgram = "bandcampsync";
+  };
+})

From 49b1862f30e37123c78ea927abf7970e1e5bfc07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 06:21:21 +0000
Subject: [PATCH 1309/1386] carapace-bridge: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix
index 61f067249e5b..edfe49711259 100644
--- a/pkgs/by-name/ca/carapace-bridge/package.nix
+++ b/pkgs/by-name/ca/carapace-bridge/package.nix
@@ -8,19 +8,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "carapace-bridge";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "carapace-sh";
     repo = "carapace-bridge";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+PxsIkNRG9lwmhdzW/KB+CUkjJUXpYNn82m1tqIo/NE=";
+    hash = "sha256-QlYRbGw7QRwMqJRJea0OoHCDQpYK7Uq6eFgc1JahEiI=";
   };
 
   # buildGoModule tries to run `go mod vendor` instead of `go work vendor` on
   # the workspace if proxyVendor is off
   proxyVendor = true;
-  vendorHash = "sha256-5d1LTwfYJe2RCNYNpKbO/3ofayTXDHD+OFul+wuXO0w=";
+  vendorHash = "sha256-YB8rBIrFgOBzdBLAXf5FjzB0d0dZmNEq8vXFZg1Rd10=";
 
   postPatch = ''
     substituteInPlace cmd/carapace-bridge/main.go \

From b7e5c56a202f9b34918bce4763ca99e8429ea264 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 06:23:18 +0000
Subject: [PATCH 1310/1386] acme-sh: 3.1.3 -> 3.1.4

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

diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix
index 7b4a65a071cc..daddea57ed14 100644
--- a/pkgs/by-name/ac/acme-sh/package.nix
+++ b/pkgs/by-name/ac/acme-sh/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "acme.sh";
-  version = "3.1.3";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "acmesh-official";
     repo = "acme.sh";
     tag = finalAttrs.version;
-    hash = "sha256-oWVTk4fKbplMY4NJWf9eTokiHSxPMZ8lgSoG4aF8DVk=";
+    hash = "sha256-xw10M4C6bqnxLxPeXE9dbFP/ajkpO2SQUJp56CeYysk=";
   };
 
   nativeBuildInputs = [

From 474bfcef861584a919380be6a2f22a19e6807a96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 06:44:01 +0000
Subject: [PATCH 1311/1386] fake-gcs-server: 1.54.0 -> 1.55.0

---
 pkgs/by-name/fa/fake-gcs-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fa/fake-gcs-server/package.nix b/pkgs/by-name/fa/fake-gcs-server/package.nix
index 786dc24d2f60..82a4f6e0466b 100644
--- a/pkgs/by-name/fa/fake-gcs-server/package.nix
+++ b/pkgs/by-name/fa/fake-gcs-server/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fake-gcs-server";
-  version = "1.54.0";
+  version = "1.55.0";
 
   src = fetchFromGitHub {
     owner = "fsouza";
     repo = "fake-gcs-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mskNNTytnqqFXP4REMz7KLgWL0ma/8hlQKSAABOGuvk=";
+    hash = "sha256-XbwiPWhudTUhiCA91n8av7oQ0USPA/vXHePfS7/jnOg=";
   };
 
-  vendorHash = "sha256-KNappojVBU1F9F3FqindXVDzOIy7IwYd7xVzbqQk6QE=";
+  vendorHash = "sha256-9zovcKQ3eiYWHCxUBXI39kgnjD4mR/4GGAZz65f7Of4=";
 
   # Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason.
   #

From 8a69e6e08a08bc8f0b0f95c34c4459afc7e56c1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 07:10:51 +0000
Subject: [PATCH 1312/1386] pkgsite: 0.2.0-unstable-2026-07-07 ->
 0.3.0-unstable-2026-07-16

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

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 678d072ed143..e7a9769ca64e 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0.2.0-unstable-2026-07-07";
+  version = "0.3.0-unstable-2026-07-16";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "0cc61a18508245cabd093f065961abd5df0af028";
-    hash = "sha256-tgLjEs9dt7TA9yRq/toUWPiorA4b20GnjmO6HJbFFd8=";
+    rev = "8d05c43dae2e668886572ee959babdb429ad6429";
+    hash = "sha256-xc/pPJIRGuTGrdh2VFwPY+uud98ST0HaFPUsa5GvvhQ=";
   };
 
-  vendorHash = "sha256-a53JKkoJmnSO+ShxUt68LEq9uDeNi/vN/d0OuhrIUvA=";
+  vendorHash = "sha256-NZzA9QxVSYuSjeZOiwUAXAPBrN00JLHQNPp1lXqtmCw=";
 
   subPackages = [ "cmd/pkgsite" ];
 

From dc7e7baf4790f01c937204f8c96107624eeb64a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Jun 2026 06:00:03 +0000
Subject: [PATCH 1313/1386] rtklib-ex: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/by-name/rt/rtklib-ex/package.nix b/pkgs/by-name/rt/rtklib-ex/package.nix
index 4856f21706de..c8e9a04f9696 100644
--- a/pkgs/by-name/rt/rtklib-ex/package.nix
+++ b/pkgs/by-name/rt/rtklib-ex/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rtklib-ex";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "rtklibexplorer";
     repo = "RTKLIB";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j00VEQvxOiAc3EQX3x2b3RxYkbtvCZ17ugnW6b6ChWU=";
+    hash = "sha256-IGjrLuw3q0J6NXv2+Y3N22+nBu31W63QkmZpuHuvQnc=";
   };
 
   nativeBuildInputs = [

From e58e0e8cfb1aab48dcbcaa9bb288311c4d8ee79a Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Tue, 14 Jul 2026 18:21:02 +0200
Subject: [PATCH 1314/1386] rust: add riscv32-none target platform

---
 pkgs/development/compilers/rust/binary.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index 5e0e8a633ba2..f540e775dfd9 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -118,6 +118,7 @@ rec {
         "armv6l-netbsd"
         "mipsel-netbsd"
         "riscv64-netbsd"
+        "riscv32-none"
         "x86_64-redox"
         "wasm32-wasi"
       ];

From 615937a234bff4436d917d01bbb80ef98db23ba0 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Tue, 14 Jul 2026 18:21:02 +0200
Subject: [PATCH 1315/1386] luna-soc: fix CSR register field collection on
 Python 3.14

---
 pkgs/development/python-modules/luna-soc/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/luna-soc/default.nix b/pkgs/development/python-modules/luna-soc/default.nix
index 6501a47440c0..9c702bf0f72d 100644
--- a/pkgs/development/python-modules/luna-soc/default.nix
+++ b/pkgs/development/python-modules/luna-soc/default.nix
@@ -26,6 +26,14 @@ buildPythonPackage rec {
     substituteInPlace pyproject.toml \
       --replace-fail '"setuptools-git-versioning<2"' "" \
       --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+
+    # Read CSR field annotations from the class, not the instance, so amaranth-soc
+    # works on Python 3.14 (PEP 649). https://github.com/greatscottgadgets/luna-soc/issues/48
+    substituteInPlace luna_soc/gateware/vendor/amaranth_soc/csr/reg.py \
+      --replace-fail 'if hasattr(self, "__annotations__"):' \
+                     'if getattr(type(self), "__annotations__", None):' \
+      --replace-fail 'filter_fields(self.__annotations__)' \
+                     'filter_fields(type(self).__annotations__)'
   '';
 
   build-system = [

From d9eba364faacac8b832e5ac916d3852b5e5f6455 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Tue, 14 Jul 2026 18:21:02 +0200
Subject: [PATCH 1316/1386] cynthion: build gateware bitstreams and moondancer
 firmware

Co-authored-by: sapphire-arches <1514748+sapphire-arches@users.noreply.github.com>
---
 .../python-modules/cynthion/build_gateware.py | 112 ++++++++++++++++++
 .../python-modules/cynthion/default.nix       |  67 ++++++++---
 .../python-modules/cynthion/moondancer.nix    |  54 +++++++++
 3 files changed, 217 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/cynthion/build_gateware.py
 create mode 100644 pkgs/development/python-modules/cynthion/moondancer.nix

diff --git a/pkgs/development/python-modules/cynthion/build_gateware.py b/pkgs/development/python-modules/cynthion/build_gateware.py
new file mode 100644
index 000000000000..d5c9b11ff534
--- /dev/null
+++ b/pkgs/development/python-modules/cynthion/build_gateware.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+
+# Builds the FPGA bitstreams `cynthion flash` needs, one set per revision, into
+# assets/<CynthionPlatformRevXDY>/{analyzer,facedancer,selftest}.bit
+
+import asyncio
+import inspect
+import logging
+import os
+import sys
+from pathlib import Path
+
+import cynthion.gateware.platform
+
+logging.basicConfig(level=logging.INFO, format="%(asctime)s:%(name)32s:%(message)s")
+
+logger = logging.getLogger("build-gateware")
+
+BITSTREAMS = ["analyzer", "facedancer", "selftest"]
+
+# Pin the nextpnr placer seed so place-and-route is deterministic. Some
+# bitstreams (e.g. CynthionPlatformRev1D3/analyzer) are marginal on timing, and
+# without a fixed seed a build can non-deterministically miss the constraint.
+NEXTPNR_SEED = 0
+
+
+async def build_bitstream(
+    semaphore: asyncio.Semaphore, assets_dir: Path, platform: str, bitstream: str
+) -> None:
+    async with semaphore:
+        log = logging.getLogger(f"build-gateware.{platform}.{bitstream}")
+        log.info("build started")
+
+        env = os.environ.copy()
+        env["LUNA_PLATFORM"] = f"cynthion.gateware.platform:{platform}"
+        env["AMARANTH_nextpnr_opts"] = f"--seed {NEXTPNR_SEED}"
+
+        out_dir = assets_dir / platform
+        out_dir.mkdir(parents=True, exist_ok=True)
+        out_path = out_dir / f"{bitstream}.bit"
+
+        process = await asyncio.create_subprocess_exec(
+            sys.executable,
+            "-m",
+            f"cynthion.gateware.{bitstream}.top",
+            "--output",
+            str(out_path),
+            env=env,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.STDOUT,
+        )
+
+        stdout, _ = await process.communicate()
+        log.info("\n%s", stdout.decode("utf-8", errors="replace"))
+
+        if process.returncode != 0:
+            raise RuntimeError(
+                f"{platform}/{bitstream} failed with exit code {process.returncode}"
+            )
+        log.info("build complete")
+
+
+def collect_platforms() -> set[str]:
+    platforms = {
+        name
+        for name, obj in inspect.getmembers(cynthion.gateware.platform)
+        if inspect.isclass(obj) and name.startswith("CynthionPlatform")
+    }
+
+    # Allow restricting the set of platforms during development/CI, e.g.
+    #   BUILD_GATEWARE_PLATFORMS="CynthionPlatformRev1D4"
+    only = os.getenv("BUILD_GATEWARE_PLATFORMS")
+    if only:
+        requested = set(only.split())
+        unknown = requested - platforms
+        if unknown:
+            raise ValueError(f"unknown platform(s): {', '.join(sorted(unknown))}")
+        platforms = requested
+
+    return platforms
+
+
+async def main() -> int:
+    assets_dir = Path(sys.argv[1])
+    max_workers = int(os.getenv("BUILD_GATEWARE_MAX_WORKERS") or 1)
+
+    platforms = collect_platforms()
+    logger.info(
+        "Building %d bitstream(s) for platforms: %s",
+        len(platforms) * len(BITSTREAMS),
+        ", ".join(sorted(platforms)),
+    )
+
+    semaphore = asyncio.Semaphore(max_workers)
+    logger.info("Building gateware with %d workers", max_workers)
+
+    results = await asyncio.gather(
+        *(
+            build_bitstream(semaphore, assets_dir, platform, bitstream)
+            for platform in sorted(platforms)
+            for bitstream in BITSTREAMS
+        ),
+        return_exceptions=True,
+    )
+
+    failures = [r for r in results if isinstance(r, BaseException)]
+    for failure in failures:
+        logger.error(failure)
+    return 1 if failures else 0
+
+
+sys.exit(asyncio.run(main()))
diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix
index b61edaeda1db..ab508ccc66d6 100644
--- a/pkgs/development/python-modules/cynthion/default.nix
+++ b/pkgs/development/python-modules/cynthion/default.nix
@@ -2,6 +2,14 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
+  callPackage,
+  python,
+
+  # gateware (FPGA toolchain)
+  nextpnr,
+  trellis,
+  which,
+  yosys,
 
   # build-system
   setuptools,
@@ -25,10 +33,8 @@
   pytestCheckHook,
   udevCheckHook,
 }:
-buildPythonPackage rec {
-  pname = "cynthion";
+let
   version = "0.2.5";
-  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
@@ -37,6 +43,14 @@ buildPythonPackage rec {
     hash = "sha256-Ju01eqBVZ7CD0pw4nIFML4LcCPXzC78dLpQru3a+5bU=";
   };
 
+  # Moondancer SoC firmware, required for `cynthion flash facedancer`.
+  moondancer = callPackage ./moondancer.nix { inherit src version; };
+in
+buildPythonPackage {
+  pname = "cynthion";
+  inherit version src;
+  pyproject = true;
+
   sourceRoot = "${src.name}/cynthion/python";
 
   postPatch = ''
@@ -45,14 +59,19 @@ buildPythonPackage rec {
       --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ udevCheckHook ];
+  nativeBuildInputs = [
+    udevCheckHook
 
-  build-system = [
-    setuptools
+    # Used by the gateware build in postInstall.
+    nextpnr
+    trellis
+    which
+    yosys
   ];
 
-  pythonRelaxDeps = [ "pygreat" ];
+  build-system = [ setuptools ];
 
+  pythonRelaxDeps = [ "pygreat" ];
   pythonRemoveDeps = [ "future" ];
 
   dependencies = [
@@ -71,18 +90,34 @@ buildPythonPackage rec {
     tqdm
   ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  # Build the per-revision FPGA bitstreams in parallel (see build_gateware.py).
+  enableParallelBuilding = true;
 
   pythonImportsCheck = [ "cynthion" ];
 
-  # Make udev rules available for NixOS option services.udev.packages
-  postInstall = ''
-    install -Dm444 \
-      -t $out/lib/udev/rules.d \
-      build/lib/cynthion/assets/54-cynthion.rules
-  '';
+  postInstall =
+    let
+      assets = "$out/${python.sitePackages}/cynthion/assets";
+    in
+    ''
+      # Build a bitstream set per hardware revision into assets/, where
+      # `cynthion flash` looks for them.
+      export BUILD_GATEWARE_MAX_WORKERS="''${NIX_BUILD_CORES:-1}"
+      PYTHONPATH="$out/${python.sitePackages}''${PYTHONPATH:+:$PYTHONPATH}" \
+        python ${./build_gateware.py} "${assets}"
+
+      # Install the moondancer SoC firmware for `cynthion flash facedancer`.
+      install -Dm444 ${moondancer}/bin/moondancer.bin "${assets}/moondancer.bin"
+
+      # Make udev rules available for NixOS option services.udev.packages
+      install -Dm444 \
+        -t $out/lib/udev/rules.d \
+        build/lib/cynthion/assets/54-cynthion.rules
+    '';
+
+  passthru = { inherit moondancer; };
 
   meta = {
     description = "Python package and utilities for the Great Scott Gadgets Cynthion USB Test Instrument";
diff --git a/pkgs/development/python-modules/cynthion/moondancer.nix b/pkgs/development/python-modules/cynthion/moondancer.nix
new file mode 100644
index 000000000000..e71d828dda1f
--- /dev/null
+++ b/pkgs/development/python-modules/cynthion/moondancer.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  src,
+  version,
+  stdenv,
+  llvmPackages,
+}:
+let
+  # Moondancer SoC firmware, cross-compiled for the bare-metal riscv32imac
+  # VexRiscv softcore inside the facedancer gateware.
+  cross = import ../../../.. {
+    localSystem = stdenv.hostPlatform.system;
+    crossSystem = lib.systems.examples.riscv32-embedded // {
+      rust.rustcTarget = "riscv32imac-unknown-none-elf";
+    };
+  };
+
+  inherit (cross) rustPlatform;
+in
+rustPlatform.buildRustPackage {
+  pname = "moondancer";
+
+  inherit version src;
+
+  sourceRoot = "${src.name}/firmware";
+
+  cargoHash = "sha256-G/9evh3G1xNRaaEh6lgDp3hnVlB3MaCwXuhGnGJCd0Q=";
+
+  # fails to build otherwise
+  auditable = false;
+
+  nativeBuildInputs = [
+    llvmPackages.bintools
+  ];
+
+  # lld strips live code without link-dead-code; memory.x (workspace root) and
+  # link.x (from riscv-rt) are the linker scripts.
+  RUSTFLAGS = "-C linker=lld -C link-arg=-Tmemory.x -C link-arg=-Tlink.x -C link-dead-code";
+
+  # cynthion flash needs a raw image, not an ELF (as upstream's
+  # `cargo objcopy -Obinary`).
+  postInstall = ''
+    llvm-objcopy -O binary \
+      $out/bin/moondancer \
+      $out/bin/moondancer.bin
+  '';
+
+  meta = {
+    description = "Moondancer SoC firmware for the Great Scott Gadgets Cynthion";
+    homepage = "https://github.com/greatscottgadgets/cynthion";
+    license = lib.licenses.bsd3;
+    platforms = [ "riscv32-none" ];
+  };
+}

From d765b04680dc10c0dbd59aa8d0944d6f9b05c5bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Jul 2026 12:44:33 +0200
Subject: [PATCH 1317/1386] python313Packages.boschshcpy: 0.4.8 -> 0.4.12

Diff: https://github.com/tschamm/boschshcpy/compare/v0.4.8...v0.4.12

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

diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index 40e93be1c24d..f58e40c2c84d 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boschshcpy";
-  version = "0.4.8";
+  version = "0.4.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tschamm";
     repo = "boschshcpy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VYraW9zeTQn2fvc1pdpF8Tx+iFRxoNQ6b98VphGao7k=";
+    hash = "sha256-a0ckgCctTzSPI/EUxcUHiQ1fLH6cVZM5qLLdyxc+tII=";
   };
 
   build-system = [ setuptools ];

From 16ed2b9336e01dfb248ed0f70f4dcda0976c3735 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Jul 2026 09:36:54 +0200
Subject: [PATCH 1318/1386] python3Packages.boschshcpy: 0.4.12 -> 0.6.2

Diff: https://github.com/tschamm/boschshcpy/compare/v0.4.12...v0.6.2

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

diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index f58e40c2c84d..e46257d913fc 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boschshcpy";
-  version = "0.4.12";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tschamm";
     repo = "boschshcpy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a0ckgCctTzSPI/EUxcUHiQ1fLH6cVZM5qLLdyxc+tII=";
+    hash = "sha256-Un+rcG78t3TdbKuBHOuDPq5+wjlA8jf0pE3zvuHzpjM=";
   };
 
   build-system = [ setuptools ];

From 41c9ec1e3ecca43599a9779b6a3471e8cfe593e0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Jul 2026 09:40:49 +0200
Subject: [PATCH 1319/1386] python313Packages.iamdata: 0.1.202607151 ->
 0.1.202607171

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202607151...v0.1.202607171

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202607171
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 22b30fdbdd5c..df4ab4e625dc 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202607151";
+  version = "0.1.202607171";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MGKX+QzsXyohsRHHy4qt+H4BemgvJesKwKzi2KrETr4=";
+    hash = "sha256-i4/vmq7Adxrmb6Ad/eFU5NwOseHo/uBMsN5UyyqDyqY=";
   };
 
   __darwinAllowLocalNetworking = true;

From 12c6e8c1c2384921c2e6e0385ea2a2d29a73ac09 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Jul 2026 09:42:52 +0200
Subject: [PATCH 1320/1386] python3Packages.tencentcloud-sdk-python: 3.1.133 ->
 3.1.135

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.133...3.1.135

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.135/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 ad792af8927e..c5453bc03a22 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.133";
+  version = "3.1.135";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-E9xxurSGAvJd4f2CGxI8IR9mSGTwGpOLqNMSEhrhOXY=";
+    hash = "sha256-UErVS8+/IUNjePhBcvpJE4hNxec3pU19eZBbwD+jDcA=";
   };
 
   build-system = [ setuptools ];

From 8bc54dc05f57da1b69f03631dd655d6f71994b7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 07:51:07 +0000
Subject: [PATCH 1321/1386] censor: 0.7.2 -> 0.8.0

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

diff --git a/pkgs/by-name/ce/censor/package.nix b/pkgs/by-name/ce/censor/package.nix
index f75d73689274..d922d13afe51 100644
--- a/pkgs/by-name/ce/censor/package.nix
+++ b/pkgs/by-name/ce/censor/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "censor";
-  version = "0.7.2";
+  version = "0.8.0";
   pyproject = false;
 
   src = fetchFromCodeberg {
     owner = "censor";
     repo = "Censor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-444EGJCNnRRkuTzm4HdapUvwphx9EavxeyAI0Sxh8G8=";
+    hash = "sha256-WxD2tK6vTYpvy/0BDzwAymdl4uCJNkgw7HBUrMrDlXQ=";
   };
 
   nativeBuildInputs = [

From ca5bd42822d1fb23931f774961d352864d10ed19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:04:12 +0000
Subject: [PATCH 1322/1386] ytdl-sub: 2026.06.23 -> 2026.07.16

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

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index ec2d3f77bafe..84b123ff8311 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ytdl-sub";
-  version = "2026.06.23";
+  version = "2026.07.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = finalAttrs.version;
-    hash = "sha256-VakqR66V90MIx6Bh5MS69iX1nZsFuTJ6YOJG90kf5s0=";
+    hash = "sha256-uvuwp6OqdL4mK3RF7rr2hrDhETgoOaNef7ZLPU95EQg=";
   };
 
   postPatch = ''

From 0bf650c1e8d1507f69e4eadc8e940b8c871f6d5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:22:02 +0000
Subject: [PATCH 1323/1386] mcp-server-fetch: 2026.7.4 -> 2026.7.10

---
 pkgs/by-name/mc/mcp-server-fetch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mc/mcp-server-fetch/package.nix b/pkgs/by-name/mc/mcp-server-fetch/package.nix
index e086399f3b6d..d4575f05da2e 100644
--- a/pkgs/by-name/mc/mcp-server-fetch/package.nix
+++ b/pkgs/by-name/mc/mcp-server-fetch/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mcp-server-fetch";
-  version = "2026.7.4";
+  version = "2026.7.10";
   pyproject = true;
 
   src = fetchFromGitHub {

From 83c9ad52ff6e9247b70da69634e691394a6d0485 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:37:26 +0000
Subject: [PATCH 1324/1386] androidStudioPackages.canary: 2026.1.3.3 ->
 2026.1.4.1

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 530acb7debf5..6623930e8771 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -26,9 +26,9 @@ let
     url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.9/android-studio-quail2-rc2-linux.tar.gz";
   };
   latestVersion = {
-    version = "2026.1.3.3"; # "Android Studio Quail 3 | 2026.1.3 Canary 3"
-    sha256Hash = "sha256-C8rbR+0iGNzsr7HtiNiFw++ZG9/t00/c1Ozr9ngssPs=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.3/android-studio-quail3-canary3-linux.tar.gz";
+    version = "2026.1.4.1"; # "Android Studio Quail 4 | 2026.1.4 Canary 1"
+    sha256Hash = "sha256-ynHUoMDsTNgKKRAU948k37ktAIlIm9A+md8KyVBTjl4=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.4.1/android-studio-quail4-canary1-linux.tar.gz";
   };
 in
 {

From 42f25b4b653b2ec198b3856db7fee9a3ccc8a1a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:47:18 +0000
Subject: [PATCH 1325/1386] tailwindcss_4: 4.3.2 -> 4.3.3

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

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 4851aada1613..76aeb0bea50f 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.3.2";
+  version = "4.3.3";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -21,9 +21,9 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-uACwZZ3GS58D7eVmAkTZQV13fVc5riiJKAh3yje+dCo=";
-      aarch64-linux = "sha256-OU3czCQCz6Or2X37pW81h3gaPW5s5m5lzq2hS+t2ZLg=";
-      x86_64-linux = "sha256-UDbE+0Mo4LzbtgZccNislFLg1MlHETp4io+U/TkEJcE=";
+      aarch64-darwin = "sha256-zfZGcCmHp0NGTf9NnGD9RIDRwec92Bmppn8QeIFdzp0=";
+      aarch64-linux = "sha256-Vf0LJBIU7/PeHo7k8ieWZi8tLnpJvPynR3z9C6w5gZU=";
+      x86_64-linux = "sha256-3GGzrGuMnKh0wMxMV7JAl5GmTFVAQEyl9TZzYLq8MTo=";
     }
     .${system} or throwSystem;
 in

From 2016d2705d6428b57d8ee5ab54b89eccd4e56db8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 01:14:55 +0000
Subject: [PATCH 1326/1386] fricas: 1.3.12 -> 1.3.13

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

diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 3cc948fd7e9f..1df8ccf65784 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fricas";
-  version = "1.3.12";
+  version = "1.3.13";
 
   src = fetchFromGitHub {
     owner = "fricas";
     repo = "fricas";
     rev = finalAttrs.version;
-    sha256 = "sha256-GUGJR65K1bPC0D36l4Yyj3GOsWtUrSKLu6JnlfjHzDc=";
+    sha256 = "sha256-vpClJwB91pCgc6DWy0I2XTfSWkt+7nEAkUK9zz4qh4A=";
   };
 
   buildInputs = [

From cfb1ce17c0bda0b5a9a53a19f6abacbcf6dab08b Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Fri, 17 Jul 2026 16:47:52 +0800
Subject: [PATCH 1327/1386] dolt: 2.1.11 -> 2.2.1

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 6078a0d850cf..1cf640005cbb 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "dolt";
-  version = "2.1.11";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bHQBnZpghqh01Voq9U5nOWKrvujx6n3xZNtZqUDIpeU=";
+    hash = "sha256-SyoTBkIjZ1yZQXYo1qcdU18Yo84U1xjkNYU4pYlX748=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-mvoy/ChZVGG9QxRGUG902Eda37SuJGjYLOi87OqjF68=";
+  vendorHash = "sha256-/NC/yKi/XJB0fhfgeH4Arao0lr+i16YsDGWlS5pmx+0=";
   proxyVendor = true;
   doCheck = false;
 

From c17259daaa38947c66c7d24a201ac8bb81c99945 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Tue, 7 Jul 2026 23:12:00 +0200
Subject: [PATCH 1328/1386] fricas: cleanup configurePhase

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/by-name/fr/fricas/package.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 1df8ccf65784..31bfcbd3a581 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fricas";
     repo = "fricas";
-    rev = finalAttrs.version;
-    sha256 = "sha256-vpClJwB91pCgc6DWy0I2XTfSWkt+7nEAkUK9zz4qh4A=";
+    tag = finalAttrs.version;
+    hash = "sha256-vpClJwB91pCgc6DWy0I2XTfSWkt+7nEAkUK9zz4qh4A=";
   };
 
   buildInputs = [
@@ -34,23 +34,16 @@ stdenv.mkDerivation (finalAttrs: {
     libxdmcp
   ];
 
-  # Remove when updating to next version
-  configurePhase = ''
-    runHook preConfigure
-
-    ./configure --prefix=$out --with-lisp='sbcl --dynamic-space-size 3072'
-
-    runHook postConfigure
-  '';
-
   dontStrip = true;
 
   meta = {
     homepage = "https://fricas.github.io";
     description = "Advanced computer algebra system";
+    changelog = "https://github.com/fricas/fricas/blob/${finalAttrs.src.tag}/ChangeLog";
     license = lib.licenses.bsd3;
 
     platforms = lib.platforms.linux;
     maintainers = [ ];
+    mainProgram = "fricas";
   };
 })

From 7dbe7817e4250fc1bfffc8f4c813ea4d788300cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:51:35 +0000
Subject: [PATCH 1329/1386] dblab: 0.43.0 -> 0.44.1

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

diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix
index dd286edde6a0..c58488066f67 100644
--- a/pkgs/by-name/db/dblab/package.nix
+++ b/pkgs/by-name/db/dblab/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dblab";
-  version = "0.43.0";
+  version = "0.44.1";
 
   src = fetchFromGitHub {
     owner = "danvergara";
     repo = "dblab";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SH5iSXo5QEZiguP2fW2mYMXWY4sPP4ImV+Y89hhm+ys=";
+    hash = "sha256-zf/51s9RoK59XLYWHSuZEt8/KfuZtZkRAfH6UCDHH6A=";
   };
 
   vendorHash = "sha256-widzVKA85qslxuuO/ledG+IUvr+vw2HUiD3kVbe2D2A=";

From dda0d2a27b98233a3803366b26bc0d4ba1f439a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:52:58 +0000
Subject: [PATCH 1330/1386] see-cat: 0.9.2 -> 0.10.0

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

diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix
index 76fdf573dd32..4ea12696ef0d 100644
--- a/pkgs/by-name/se/see-cat/package.nix
+++ b/pkgs/by-name/se/see-cat/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "see-cat";
-  version = "0.9.2";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "guilhermeprokisch";
     repo = "see";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3uyQW1PxLYxpissm96io5IrZ6uU4S4MdcS+O56CftxA=";
+    hash = "sha256-BmLMKTu9GHjO9/E31SBegC40qou7tvaX+dfG0GyXg/s=";
   };
 
-  cargoHash = "sha256-Sba5l5Jx/F+Iux3TYT3gMWBkN9yyVQ1n3MZCNl7q0u8=";
+  cargoHash = "sha256-Ct+NPJe7qMVC29s1dD0jDZN6iQElkf0kM3N9YH8Nh3Y=";
 
   meta = {
     description = "Cute cat(1) for the terminal";

From 298dc41cc61685e46b5d14e7c9769a4763ecf4d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:56:16 +0000
Subject: [PATCH 1331/1386] python3Packages.clarifai-grpc: 12.5.1 -> 12.6.0

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

diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index ab78f74e8d95..b17e03d7b280 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "clarifai-grpc";
-  version = "12.5.1";
+  version = "12.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     tag = finalAttrs.version;
-    hash = "sha256-CoG2q7Z6Rima3llFm7MIKqNuECgdf895EZNbqEApU0Y=";
+    hash = "sha256-5onPljZp/ML/f+Ik2kYHj24COcvKcc/82W+B3xYiX1E=";
   };
 
   build-system = [ setuptools ];

From abb7950c853e8b63935efcc2e0f7ae24bce61755 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:03:42 +0000
Subject: [PATCH 1332/1386] hasciicam: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/by-name/ha/hasciicam/package.nix b/pkgs/by-name/ha/hasciicam/package.nix
index ed85132e622f..5a62995bd69c 100644
--- a/pkgs/by-name/ha/hasciicam/package.nix
+++ b/pkgs/by-name/ha/hasciicam/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hasciicam";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "dyne";
     repo = "hasciicam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-agwNuIxO+o4HHkjd3TikYuVNgO0vlDPikcZoLDVLCUc=";
+    hash = "sha256-Zh/yJJHWcD79J2HvUD5h4itg4jlDvpVb4cSwMsB1QOg=";
   };
 
   __structuredAttrs = true;

From 4724778e8ead0833af15aaeffba3ca56db4ee5b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:07:14 +0000
Subject: [PATCH 1333/1386] apidog: 2.8.36 -> 2.8.38

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

diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix
index a4d99a38cbef..2fe2cfde48be 100644
--- a/pkgs/by-name/ap/apidog/package.nix
+++ b/pkgs/by-name/ap/apidog/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "apidog";
-  version = "2.8.36";
+  version = "2.8.38";
 
   src = fetchurl {
     url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
-    hash = "sha256-IlIt00NQw1InLba/3Zax25yRsn8ZbiBfuA6CRx6veTg=";
+    hash = "sha256-7wKTMshEYwBCqQ4BQzETclSd3+26PN0SySyLzMgcO1U=";
   };
 
   appimageContents = appimageTools.extract {

From 50771fa1d96431971d1f8eeefef69ef2d9012e68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:09:31 +0000
Subject: [PATCH 1334/1386] direwolf-unstable: 1.8.1-unstable-2026-07-06 ->
 1.8.1-unstable-2026-07-16

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

diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix
index 039ef7e2e0fb..e4b74e0b8e17 100644
--- a/pkgs/by-name/di/direwolf-unstable/package.nix
+++ b/pkgs/by-name/di/direwolf-unstable/package.nix
@@ -12,13 +12,13 @@
   inherit hamlibSupport gpsdSupport extraScripts;
 }).overrideAttrs
   (oldAttrs: {
-    version = "1.8.1-unstable-2026-07-06";
+    version = "1.8.1-unstable-2026-07-16";
 
     src = fetchFromGitHub {
       owner = "wb2osz";
       repo = "direwolf";
-      rev = "160cbb40a3828e47bc977b6f7d5499d1f1cf56e5";
-      hash = "sha256-q08QuyWGYqLLz77JXlkJetrYMVQwQVUgjIXz9J4Y9VA=";
+      rev = "078b2e8484be379d4e1eab139c6fd57c188c1754";
+      hash = "sha256-Wje8GsdMcUptQEVsG7Ww8nW3PUuk/Y67zsjf+KjPPB8=";
     };
 
     dontVersionCheck = true;

From 4678fe9cd8f389bfd3c4ad251d1a01db0f23b913 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:10:12 +0000
Subject: [PATCH 1335/1386] hydralauncher: 4.0.4 -> 4.0.5

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

diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix
index 4a851918421a..6a4348de37f5 100644
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "hydralauncher";
-  version = "4.0.4";
+  version = "4.0.5";
   src = fetchurl {
     url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-0ORi6JAhws3HgApmwv7sgC9gJE/KcKtKxgz3CKD6BSw=";
+    hash = "sha256-9TAsBiSJ9ZjGoKuHDbPibu/ZDBM9kdk9BlY5zKysVQ4=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname src version; };

From 71c1b60da5986c855b8b225e92a50cd3aa858e77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:21:01 +0000
Subject: [PATCH 1336/1386] jimtcl: 0.82 -> 0.84

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

diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix
index 73e0d6e568a6..e551e07e3308 100644
--- a/pkgs/by-name/ji/jimtcl/package.nix
+++ b/pkgs/by-name/ji/jimtcl/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jimtcl";
-  version = "0.82";
+  version = "0.84";
 
   src = fetchFromGitHub {
     owner = "msteveb";
     repo = "jimtcl";
     rev = finalAttrs.version;
-    sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
+    sha256 = "sha256-MvsC82PMmh7PP1sXNwZRNDNFU7r5LWRA6YqvuvZ9yZE=";
   };
 
   nativeBuildInputs = [

From 750770bcfe61cc544ed2275af3c6c6974d05cc21 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 17 Jul 2026 11:33:21 +0200
Subject: [PATCH 1337/1386] openocd: use jimtcl 0.82

---
 pkgs/by-name/op/openocd/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openocd/package.nix b/pkgs/by-name/op/openocd/package.nix
index e8fdd29854b7..8f71e54961a8 100644
--- a/pkgs/by-name/op/openocd/package.nix
+++ b/pkgs/by-name/op/openocd/package.nix
@@ -17,10 +17,19 @@
   extraHardwareSupport ? [ ],
 }:
 let
-
   isWindows = stdenv.hostPlatform.isWindows;
   notWindows = !isWindows;
 
+  # OpenOCD needs JimTcl 0.82 and fails to build with the latest version (0.84).
+  # When updating OpenOCD, check which JimTcl version its jimtcl submodule uses.
+  jimtcl_0_82 = jimtcl.overrideAttrs (oldAttrs: rec {
+    version = "0.82";
+    src = oldAttrs.src.override {
+      rev = version;
+      sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
+    };
+  });
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openocd";
@@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals notWindows [
     hidapi
-    jimtcl
+    jimtcl_0_82
     libftdi1
     libjaylink
   ]

From 4079c662ce0baa053b3427c86b1315afb1c6c303 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:39:54 +0000
Subject: [PATCH 1338/1386] razer-cli: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/by-name/ra/razer-cli/package.nix b/pkgs/by-name/ra/razer-cli/package.nix
index f35d5bbb9b45..aee7818fcec4 100644
--- a/pkgs/by-name/ra/razer-cli/package.nix
+++ b/pkgs/by-name/ra/razer-cli/package.nix
@@ -10,14 +10,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "razer-cli";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lolei";
     repo = "razer-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uwTqDCYmG/5dyse0tF/CPG+9SlThyRyeHJ0OSBpcQio=";
+    hash = "sha256-cxBzf7gDJB3B5TXH5H65P4zTXmbSj8mD0Li2OHxajyQ=";
   };
 
   build-system = with python3.pkgs; [

From 8d766b34fc65ebb89e5a6febdc433b86ffa4dd2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:40:28 +0000
Subject: [PATCH 1339/1386] terraform-providers.vultr_vultr: 2.31.2 -> 2.32.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 42666d2053b4..529b4734617a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1490,13 +1490,13 @@
     "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
   },
   "vultr_vultr": {
-    "hash": "sha256-TMja+5jeYxIjY/MvJwCR/2rsbHuF7RcPReQSzkksk7Q=",
+    "hash": "sha256-hK4/Pzj0UtWDLQS3cRMC73ZRr20HCWqI+jUlTUHcHaw=",
     "homepage": "https://registry.terraform.io/providers/vultr/vultr",
     "owner": "vultr",
     "repo": "terraform-provider-vultr",
-    "rev": "v2.31.2",
+    "rev": "v2.32.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OASLdReS245N4y0SQ4WY7kPNPpGTHptQgXlNqPlb3nM="
+    "vendorHash": "sha256-av/hIjHWw64WIJv3LVyVDu6IMUKCsM4VOLFZKB0IXjU="
   },
   "wgebis_mailgun": {
     "hash": "sha256-cz+KSvlm1mFe+NXn4IhiWYWT0/U+UAAA8SCNJgXvIKc=",

From e0299355540a1bba97cbaa03bf2a22d58b88ece5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:40:42 +0000
Subject: [PATCH 1340/1386] flood: 4.14.2 -> 4.15.0

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

diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 519b00b12135..c413e958d102 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -10,13 +10,13 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "flood";
-  version = "4.14.2";
+  version = "4.15.0";
 
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "flood";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gSjkpAGkvgRRh8WDpL/F7fS8KDxHRJUuWVqHGcFEGAc=";
+    hash = "sha256-wd+9owJi9W9pf6c1JuO0X/6JWxLq8XIypj6r4rQUemM=";
   };
 
   nativeBuildInputs = [ pnpm_10 ];
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 4;
-    hash = "sha256-yNRC5sCBn002gxUfHMUvh3DZeVYOokfz4MTvqXR2MzI=";
+    hash = "sha256-a1PoQ5pXw1SgyGFRa3+7AOr6vpyGyHxkMU7KQEFlZ04=";
   };
 
   passthru = {

From 1f3fb1a2ba518419021f4ac58be20d7dffe94b69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 09:42:35 +0000
Subject: [PATCH 1341/1386] dotter: 0.13.4 -> 0.13.5

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

diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix
index f99741bb48f6..58c4798435a5 100644
--- a/pkgs/by-name/do/dotter/package.nix
+++ b/pkgs/by-name/do/dotter/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dotter";
-  version = "0.13.4";
+  version = "0.13.5";
 
   src = fetchFromGitHub {
     owner = "SuperCuber";
     repo = "dotter";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cxabaCxbwP2YbnG2XfmVJWFTw9LGO0D1dlLy6fuux+M=";
+    hash = "sha256-xA/6j+wMTPx9p4aOHaqixlzUZcqgRazfJ1PwKaByTrw=";
   };
 
-  cargoHash = "sha256-KLU+4CYqTKEH8wuvinVS0Zs+nFgOer2ho8LXnLDNVKY=";
+  cargoHash = "sha256-0yBuaTwP2IxZjRzC8jMhZ8eNDdFHKyJjSP0ZH15F3LI=";
 
   nativeCheckInputs = [
     which

From ab3d098139bec2061f370240fd75dffb2064c584 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 10:10:36 +0000
Subject: [PATCH 1342/1386] dezoomify-rs: 2.16.0 -> 2.17.0

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

diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix
index 96df189c77aa..5b69579ed744 100644
--- a/pkgs/by-name/de/dezoomify-rs/package.nix
+++ b/pkgs/by-name/de/dezoomify-rs/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dezoomify-rs";
-  version = "2.16.0";
+  version = "2.17.0";
 
   __structuredAttrs = true;
 
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "lovasoa";
     repo = "dezoomify-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-45Vlgle605s3uvPh+Lr+KAk72AzIoolnSuhFzRCORC4=";
+    hash = "sha256-iRcRMzUW3K0pzRP9Y7ID29Kxpi3dPxRCC4WY+2ydAyE=";
   };
 
   nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  cargoHash = "sha256-tfeknHPrY11rSmHyEAUvJgCLDwmIpo9jk8BLgzgQCrc=";
+  cargoHash = "sha256-Tou+t4rbN/KfUAr9AVWD/aAzz+u50v9UZwo5mGXmjy4=";
 
   # hyper uses SystemConfiguration.framework to read system proxy settings.
   # Allow access to the Mach service to prevent the tests from failing.

From aa8931bdd5c85a90bd8d96af85b7a634a89fe7ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 10:16:50 +0000
Subject: [PATCH 1343/1386] qownnotes: 26.7.3 -> 26.7.7

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index c0ed53a4b757..65be7f8d2a9e 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "26.7.3";
+  version = "26.7.7";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8xlt9rH64B4A+vNFB67Wodrg2XLPF1fnSM3kKSxePKU=";
+    hash = "sha256-3m/JErBDXQeCu1ShITPJtZkf/c0PL/RrKJshV/CXYls=";
   };
 
   nativeBuildInputs = [

From 631a2a5cfd4701d50ec20975c0e70ae008983776 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 10:27:55 +0000
Subject: [PATCH 1344/1386] terraform-providers.selectel_selectel: 8.2.1 ->
 8.2.3

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 42666d2053b4..210ef850b96b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1202,13 +1202,13 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "selectel_selectel": {
-    "hash": "sha256-DKz+Cs8Jh480SnZsG7x+CE70pCP43GhQa9S1gl5oWl0=",
+    "hash": "sha256-ff8XqDp31pwbPmKe7RFMupwVWuhQoOTizFdTAfW5eek=",
     "homepage": "https://registry.terraform.io/providers/selectel/selectel",
     "owner": "selectel",
     "repo": "terraform-provider-selectel",
-    "rev": "v8.2.1",
+    "rev": "v8.2.3",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-PERDJ74FtXhK+HUd9EjYINpmUXVX+kHtkRbFf6gv8Ng="
+    "vendorHash": "sha256-zdAJOPL+4gEsESzG4XHSMhM9JkFPuoMudwNmVr6HJFE="
   },
   "siderolabs_talos": {
     "hash": "sha256-/NACmEpodBNx+Q2M9y3JnKpw9a3Y1eFDdTQ+48MXAc8=",

From c571adaefb071b8f9a08cbf1e7343153d1288019 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Fri, 17 Apr 2026 11:39:57 +0000
Subject: [PATCH 1345/1386] nixos/sshd: remove 'moduliFile' option, in favour
 of settings.ModuliFile

Per RFC42.

As a result, /etc/ssh/moduli will no longer exist, and sshd_config's ModuliFile will point to /nix/store/...
---
 .../modules/services/networking/ssh/sshd.nix  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index a948cd02bc4f..72702b605f3d 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -232,6 +232,10 @@ in
       "openssh"
       "banner"
     ] "Use services.openssh.settings.Banner instead.")
+    (lib.mkRenamedOptionModule
+      [ "services" "openssh" "moduliFile" ]
+      [ "services" "openssh" "settings" "ModuliFile" ]
+    )
   ];
 
   ###### interface
@@ -729,6 +733,14 @@ in
                 '';
                 example = "/etc/ssh/banner";
               };
+              ModuliFile = lib.mkOption {
+                type = lib.types.path;
+                default = "${config.services.openssh.package}/etc/ssh/moduli";
+                defaultText = lib.literalExpression ''"''${config.services.openssh.package}/etc/ssh/moduli"'';
+                description = ''
+                  Specifies the {manpage}`moduli(5)` file to use for Diffie-Hellman key exchange.
+                '';
+              };
             };
           }
         );
@@ -740,16 +752,6 @@ in
         description = "Verbatim contents of {file}`sshd_config`.";
       };
 
-      moduliFile = lib.mkOption {
-        example = "/etc/my-local-ssh-moduli;";
-        type = lib.types.path;
-        description = ''
-          Path to `moduli` file to install in
-          `/etc/ssh/moduli`. If this option is unset, then
-          the `moduli` file shipped with OpenSSH will be used.
-        '';
-      };
-
     };
 
     users.users = lib.mkOption {
@@ -770,14 +772,12 @@ in
       };
       users.groups.sshd = { };
 
-      services.openssh.moduliFile = lib.mkDefault "${cfg.package}/etc/ssh/moduli";
       services.openssh.sftpServerExecutable = lib.mkDefault "${cfg.package}/libexec/sftp-server";
 
       environment.etc =
         authKeysFiles
         // authPrincipalsFiles
         // {
-          "ssh/moduli".source = cfg.moduliFile;
           "ssh/sshd_config".source = sshconf;
         };
 

From a077c7d5a2f1185c19f88f97ccb1eff618d02036 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Fri, 17 Jul 2026 12:57:53 +0200
Subject: [PATCH 1346/1386] ungoogled-chromium: 150.0.7871.124-1 ->
 150.0.7871.128-1

https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_049796704.html

This update includes 7 security fixes.

CVEs:
CVE-2026-15899 CVE-2026-15900 CVE-2026-15901 CVE-2026-15902
CVE-2026-15903 CVE-2026-15904 CVE-2026-15905
---
 .../networking/browsers/chromium/info.json         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 13ca006eb4db..9f18dc8e1bec 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -837,7 +837,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "150.0.7871.124",
+    "version": "150.0.7871.128",
     "deps": {
       "depot_tools": {
         "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
@@ -849,16 +849,16 @@
         "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
       },
       "ungoogled-patches": {
-        "rev": "150.0.7871.124-1",
-        "hash": "sha256-3dwDG3YuX/l5bOLcC3lICM2qmGnwVAPPJraDRaHZSe8="
+        "rev": "150.0.7871.128-1",
+        "hash": "sha256-GxSsGTC68IEMPt85RLBCVDT0dTl7ZVVPc8o4vxc50H8="
       },
       "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa",
-        "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=",
+        "rev": "81891e5ca708047763816c778216799ef14c66cb",
+        "hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1663,8 +1663,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744",
-        "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY="
+        "rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f",
+        "hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",

From 2036e426ba98cc1590114f9b064cc3a8a24d7171 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 11:08:56 +0000
Subject: [PATCH 1347/1386] python3Packages.discogs-client: 2.8 -> 2.9

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

diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix
index ebb5871f554c..8422690700a5 100644
--- a/pkgs/development/python-modules/discogs-client/default.nix
+++ b/pkgs/development/python-modules/discogs-client/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "discogs-client";
-  version = "2.8";
+  version = "2.9";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "joalla";
     repo = "discogs_client";
     tag = "v${version}";
-    hash = "sha256-2mMBfOM5sOJsuoxrT3Ku99zDQ8wDw12zRloRLHRDRL0=";
+    hash = "sha256-UWiop9hg6KSpSq4SnTtvFbRHYTnLe/Ed/o65sf78MYo=";
   };
 
   propagatedBuildInputs = [

From 1e32bbc52a8ea0f461778cd4ff28980ab180b834 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 11:18:49 +0000
Subject: [PATCH 1348/1386] bruijn: 0-unstable-2026-07-05 ->
 0-unstable-2026-07-16

---
 pkgs/by-name/br/bruijn/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix
index 41327b681a4d..d96ef096eee4 100644
--- a/pkgs/by-name/br/bruijn/generated.nix
+++ b/pkgs/by-name/br/bruijn/generated.nix
@@ -22,10 +22,10 @@
 }:
 mkDerivation {
   pname = "bruijn";
-  version = "0-unstable-2026-07-05";
+  version = "0-unstable-2026-07-16";
   src = fetchzip {
-    url = "https://github.com/marvinborner/bruijn/archive/29a4a3e9620702f47d839a154d64489b8fdce1a7.tar.gz";
-    sha256 = "18vxzgd6faq8djgpav4na1nvp0jid44vd52gn9a8smwr2xk44wnz";
+    url = "https://github.com/marvinborner/bruijn/archive/9f1ac8856d09666a7444874f80b91b876929eecf.tar.gz";
+    sha256 = "18mcwp2xn7wgr81mgqr38irvkf24rf0nvwzi8janasq5favim0vy";
   };
   isLibrary = true;
   isExecutable = true;

From 1ce5a0d68801183d27c2edcdf329515c4d6aacde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 11:41:13 +0000
Subject: [PATCH 1349/1386] amnezia-vpn: 4.8.19.0 -> 4.8.21.0

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

diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index 0b03d491a6ec..c1bcad8b13f6 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -81,7 +81,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amnezia-vpn";
-  version = "4.8.19.0";
+  version = "4.8.21.0";
 
   __structuredAttrs = true;
 
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "amnezia-vpn";
     repo = "amnezia-client";
     tag = finalAttrs.version;
-    hash = "sha256-kftLofCyLA6DDfEXRPyy6Zx0JiQUEzpdYpTlvPihPZg=";
+    hash = "sha256-xNmbXLl+71DhzbGdSobkV1aYbj1XqC9A/3VPjDLsF7A=";
     fetchSubmodules = true;
   };
 

From cbeb94951ff1d30851fe4271844c09e8b2445c20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 11:45:08 +0000
Subject: [PATCH 1350/1386] wpprobe: 0.12.4 -> 0.12.5

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

diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix
index 0e8f47ad10d1..1923f88f1182 100644
--- a/pkgs/by-name/wp/wpprobe/package.nix
+++ b/pkgs/by-name/wp/wpprobe/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "wpprobe";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "Chocapikk";
     repo = "wpprobe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vwoMC0uWijyije8//Vtxc4NfRhRL+GnPTL5HGFUZxCQ=";
+    hash = "sha256-3mHF2RqHjZu7XmF9/5FrHrmhPg1J1Nm63nPdQ9zqKIA=";
   };
 
   vendorHash = "sha256-pAKFrdja+rH0kiJH6hToZwLjE8lLBHFAUCjnCLbgxVo=";

From 2030f9e1580da96591a24aba34bbcf07e893fe7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 11:51:40 +0000
Subject: [PATCH 1351/1386] svxlink: 25.05.1 -> 26.05

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

diff --git a/pkgs/by-name/sv/svxlink/package.nix b/pkgs/by-name/sv/svxlink/package.nix
index d2935678ac51..e938e7b96889 100644
--- a/pkgs/by-name/sv/svxlink/package.nix
+++ b/pkgs/by-name/sv/svxlink/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "svxlink";
-  version = "25.05.1";
+  version = "26.05";
 
   src = fetchFromGitHub {
     owner = "sm0svx";
     repo = "svxlink";
     tag = finalAttrs.version;
-    hash = "sha256-OyAR/6heGX6J53p6x+ZPXY6nzSv22umMTg0ISlWcjp8=";
+    hash = "sha256-Xo0r0tag4TrcPHdzO6cLkEZtDaMC5pNAc8dFVDPL/E0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

From 215b4e25939b7c32dfbc9f3c216d09d8d58def28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 11:58:31 +0000
Subject: [PATCH 1352/1386] rocketchat-desktop: 4.15.2 -> 4.15.6

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

diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
index 0f86bea5a978..d76e20d83395 100644
--- a/pkgs/by-name/ro/rocketchat-desktop/package.nix
+++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocketchat-desktop";
-  version = "4.15.2";
+  version = "4.15.6";
 
   src = fetchFromGitHub {
     owner = "RocketChat";
     repo = "Rocket.Chat.Electron";
     tag = finalAttrs.version;
-    hash = "sha256-wme3RKGaHuoOf7yyXH3PZ/0xL73LqS9rPqL8IcxyAkA=";
+    hash = "sha256-cCCE+d/YXUqTb5gMgcxsOjh2nDUZuuQ4L4QZYzIN4r0=";
   };
 
   patches = [

From 4cf8b9a7c50c1be35ac9d02359a953d274486e9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 12:29:31 +0000
Subject: [PATCH 1353/1386] osmo-hlr: 1.9.2 -> 1.9.3

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

diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix
index ccde871dae95..27e8fe9cceb6 100644
--- a/pkgs/by-name/os/osmo-hlr/package.nix
+++ b/pkgs/by-name/os/osmo-hlr/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-hlr";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hlr";
     rev = finalAttrs.version;
-    hash = "sha256-SYyL7evxxmXGwv2TLr8ZuIrbu+GliAyuz/sKTIveQvc=";
+    hash = "sha256-+wAwMP3zoFFOlZa4LhCr2hxP97mEZPViniwoOxpINyk=";
   };
 
   postPatch = ''

From 5b27903a7ba8b9af743b0603a40d4dceaec44826 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 12:34:21 +0000
Subject: [PATCH 1354/1386] libreswan: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/by-name/li/libreswan/package.nix b/pkgs/by-name/li/libreswan/package.nix
index 2295de6ae0d1..ae17e04d0078 100644
--- a/pkgs/by-name/li/libreswan/package.nix
+++ b/pkgs/by-name/li/libreswan/package.nix
@@ -51,11 +51,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libreswan";
-  version = "5.3.1";
+  version = "5.3.2";
 
   src = fetchurl {
     url = "https://download.libreswan.org/libreswan-${version}.tar.gz";
-    hash = "sha256-4/DlHYtkK/aTpqjMbx5ip2TP9BgKAjvzx+QtQ6Yt/p4=";
+    hash = "sha256-+5GK+gu5K9BDDB2oYe+AaIZNJdchMN8MYweh+dp2EIg=";
   };
 
   strictDeps = true;

From 3f659ad1617f7235f0279fb1772311553dec217d Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Fri, 17 Jul 2026 11:39:20 +0200
Subject: [PATCH 1355/1386] typst: 0.15.0 -> 0.15.1

Changelog: https://github.com/typst/typst/releases/tag/v0.15.1
Diff: https://github.com/typst/typst/compare/v0.15.0...v0.15.1
---
 pkgs/by-name/ty/typst/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index 74d000021995..ffc15e22a7fb 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typst";
-  version = "0.15.0";
+  version = "0.15.1";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "typst";
     repo = "typst";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-R8hgStbn/oWN+FklUkbuKnODTToRvvw3XSE0AxN/EG0=";
+    hash = "sha256-Z0DM/fBKIvA8y53GUlPrgthnXfOFbnzuPCOM9/ssrI8=";
     leaveDotGit = true;
     postFetch = ''
       cd $out
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-g+w0fkATxnWNcLuNrEMzI52psPKXMrsWqnHgfXNc8tI=";
+  cargoHash = "sha256-+/2L4o9d8UENPtJAD/sSqf5ysOfHJYZgnvhOAoRdK40=";
 
   nativeBuildInputs = [
     installShellFiles

From 4a9901681f4a38a2d75775d15bb4b130c1129e77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 12:55:40 +0000
Subject: [PATCH 1356/1386] cudatext: 1.234.6.0 -> 1.235.0.3

---
 pkgs/by-name/cu/cudatext/deps.json   | 4 ++--
 pkgs/by-name/cu/cudatext/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json
index f75d576ecf74..8afb270805e0 100644
--- a/pkgs/by-name/cu/cudatext/deps.json
+++ b/pkgs/by-name/cu/cudatext/deps.json
@@ -11,8 +11,8 @@
   },
   "ATFlatControls": {
     "owner": "Alexey-T",
-    "rev": "2026.05.06",
-    "hash": "sha256-qqFYaY9Bm6yMSlMlO/Uwot2Ix0TsxEb21d7X/zCvTyQ="
+    "rev": "2026.07.13",
+    "hash": "sha256-6SEQ3WLXHlxze+8Ob/TEA4MJT7Ow1kE1Ti7qL19fwrA="
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
diff --git a/pkgs/by-name/cu/cudatext/package.nix b/pkgs/by-name/cu/cudatext/package.nix
index d08496a0c29c..cdd7e988b932 100644
--- a/pkgs/by-name/cu/cudatext/package.nix
+++ b/pkgs/by-name/cu/cudatext/package.nix
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cudatext";
-  version = "1.234.6.0";
+  version = "1.235.0.3";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     tag = finalAttrs.version;
-    hash = "sha256-4ahclaXYtHPepQRtvcYyYyD42pEJMngO5DJMItudQd0=";
+    hash = "sha256-J8Ht+VPoRrtR9TcNEgsX/3Ci1Z7+SAbeSh9KzGIENvw=";
   };
 
   patches = [ ./proc_globdata.patch ];

From 2ad8504644ca6c3d50dbf1b4fa200c982020d2b0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 17 Jul 2026 09:23:06 -0400
Subject: [PATCH 1357/1386] walker: 2.16.2 -> 2.17.0

Changelog: https://github.com/abenz1267/walker/releases/tag/v2.17.0
---
 pkgs/by-name/wa/walker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix
index f3e31c5ea85e..1387775fd3f3 100644
--- a/pkgs/by-name/wa/walker/package.nix
+++ b/pkgs/by-name/wa/walker/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "walker";
-  version = "2.16.2";
+  version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "walker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fX3ErzTmHRO9z1SzHC2VZUgKOgRfO13X/joC5a3QN7Q=";
+    hash = "sha256-gxHJsrJZo2qbKK47Kf/9ho3i/HhRwkL8XvPnczGPd9E=";
   };
 
-  cargoHash = "sha256-gm7xQ7qHui8F+uJBWKh7Fen0Zfi/YqpbdgNSoqar0wA=";
+  cargoHash = "sha256-TkBdBgUa0fMN/Eddi0qycNjNgYaVECRFbrXixOEpQnc=";
 
   nativeBuildInputs = [
     gobject-introspection

From e095f5e38982e4d49abb9247e66733a05a94bfcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 12:50:33 +0000
Subject: [PATCH 1358/1386] xournalpp: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix
index 4df6311020bc..fc8eb756bec8 100644
--- a/pkgs/by-name/xo/xournalpp/package.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xournalpp";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JvB9Oh56ujg7L+q1wTuLsel9Wl2Fyoz9nnz0m/mGxAU=";
+    hash = "sha256-eSKGu0l3Hif+MlT+5jjLkUYUuglnONasyA6AQiHb32s=";
   };
 
   nativeBuildInputs = [
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildFlags = [ "translations" ];
 
-  postInstall = ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace $out/share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer \
       --replace-fail "Exec=xournalpp-thumbnailer" "Exec=$out/bin/xournalpp-thumbnailer"
   '';

From b423e510f58e18f8c6f5c534717ca85cc0f8a440 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 13:42:52 +0000
Subject: [PATCH 1359/1386] vscode-extensions.tsandall.opa: 0.23.0 -> 0.24.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index edea7eb451d3..4e0e972ca8e9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4826,8 +4826,8 @@ let
         mktplcRef = {
           name = "opa";
           publisher = "tsandall";
-          version = "0.23.0";
-          hash = "sha256-xya4Kxjc/uR4LFTZ5fAVOa0/cyHy8XHZkkapmODyMK4=";
+          version = "0.24.1";
+          hash = "sha256-wNlZM9/2K32W4vYPKzLiBCTqhV+SqgZzXGRxKoHoIaM=";
         };
         meta = {
           changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md";

From cd34e10e84dcdac4a2b5a0ea4adc41e2c2642560 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 13:43:12 +0000
Subject: [PATCH 1360/1386] recyclarr: 8.6.0 -> 8.7.0

---
 pkgs/by-name/re/recyclarr/deps.json   | 183 +++++++++++++++-----------
 pkgs/by-name/re/recyclarr/package.nix |   4 +-
 2 files changed, 106 insertions(+), 81 deletions(-)

diff --git a/pkgs/by-name/re/recyclarr/deps.json b/pkgs/by-name/re/recyclarr/deps.json
index 660bd6c13477..ea9da7b3bb89 100644
--- a/pkgs/by-name/re/recyclarr/deps.json
+++ b/pkgs/by-name/re/recyclarr/deps.json
@@ -11,18 +11,13 @@
   },
   {
     "pname": "Autofac",
-    "version": "9.1.0",
-    "hash": "sha256-TygJLo8rvWC/KCExg+Hy3eYc0sP+AdhpdlU6fOj11f0="
+    "version": "9.3.1",
+    "hash": "sha256-Nty0y69xfIVu1m09eRDxqo2FA57Koflt0VUxVyMdHT4="
   },
   {
     "pname": "Autofac.Extensions.DependencyInjection",
-    "version": "11.0.0",
-    "hash": "sha256-GjvG67HWkyam/GWtdU4Wh3pXY1cJ1i3loPVG9lga7vk="
-  },
-  {
-    "pname": "Autofac.Extras.AggregateService",
-    "version": "6.1.2",
-    "hash": "sha256-n0oHD3nD6apZfuAfZDKjH59LN7QOkoowm9BPeFDK5lw="
+    "version": "11.0.2",
+    "hash": "sha256-zpt49C03lFimNqr2G18guXS7rO4TFp/zMWiAN+hgE1U="
   },
   {
     "pname": "Autofac.Extras.Ordering",
@@ -64,11 +59,6 @@
     "version": "2.6.2",
     "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms="
   },
-  {
-    "pname": "Castle.Core",
-    "version": "4.4.1",
-    "hash": "sha256-J4NS8p9KqbuLl6JMmNwptsfccH37TfhAhPwX2mVQso0="
-  },
   {
     "pname": "Castle.Core",
     "version": "5.1.1",
@@ -76,23 +66,48 @@
   },
   {
     "pname": "CliWrap",
-    "version": "3.10.1",
-    "hash": "sha256-uH4SXiMkUIPw5RRyKtDTTCSkkr3BhBAPrxnC4O4ES4c="
+    "version": "3.10.2",
+    "hash": "sha256-PtRWN6tfZ/uT6o1JrLDj624feJgD5iDS4ywsYwEhQ6c="
   },
   {
     "pname": "coverlet.collector",
-    "version": "10.0.0",
-    "hash": "sha256-0cU5wHZfwQFJFXugC19kiRo9XU1jV4ApbDKuRaL72Vc="
+    "version": "10.0.1",
+    "hash": "sha256-6nZ5qWvy1SPYM9SfYbZEdGGrErdnOPluZXgJJ/hiarw="
   },
   {
     "pname": "Docker.DotNet.Enhanced",
-    "version": "3.131.1",
-    "hash": "sha256-oZhgICe/Em7dJ97U8zn59jB2jtszdNssRF3EWLXipDc="
+    "version": "4.2.0",
+    "hash": "sha256-e+poxFu+FJwPWuZ1JiiDJjZK+3inIDlIl7obZNGYcB8="
+  },
+  {
+    "pname": "Docker.DotNet.Enhanced.Handler.Abstractions",
+    "version": "4.2.0",
+    "hash": "sha256-EsFRWrwvnv8JOK9N3W/kDjzrO1Jh8St8wn2W9UDvh0Y="
+  },
+  {
+    "pname": "Docker.DotNet.Enhanced.LegacyHttp",
+    "version": "4.2.0",
+    "hash": "sha256-MptmUR15Soy74NWJC+ZCWTqJxZP/BEHjfZPYTUq5IeE="
+  },
+  {
+    "pname": "Docker.DotNet.Enhanced.NativeHttp",
+    "version": "4.2.0",
+    "hash": "sha256-9wMMHwBcSI+pJuB9R1QrtQ1VZOGbASeC1Ouu6nxXum8="
+  },
+  {
+    "pname": "Docker.DotNet.Enhanced.NPipe",
+    "version": "4.2.0",
+    "hash": "sha256-MOzo8ySnMneRV+KaeqUC2Hq8NuY2oDqginK6DeI7Zf4="
+  },
+  {
+    "pname": "Docker.DotNet.Enhanced.Unix",
+    "version": "4.2.0",
+    "hash": "sha256-zT4wLE8ZtandcwDZcq/VHhwxKAIPKF02EnigW+h/80U="
   },
   {
     "pname": "Docker.DotNet.Enhanced.X509",
-    "version": "3.131.1",
-    "hash": "sha256-/PBsQkdJS6R5fVS+OG9ujlIoUa3puRTvu0SMSF7VENQ="
+    "version": "4.2.0",
+    "hash": "sha256-zqimuvpFBmLh1TUUyVvZmjgCHIQbyb6T1suYArQMaFE="
   },
   {
     "pname": "Fare",
@@ -111,8 +126,8 @@
   },
   {
     "pname": "JetBrains.Annotations",
-    "version": "2025.2.4",
-    "hash": "sha256-YJpS77UH9tTETCKHr5M+bQOax1BLPFqIr/i+KLN9tEI="
+    "version": "2026.2.0",
+    "hash": "sha256-409CskrdaICXUplGs9sNplfTJfYElllVwIQwoDWfdmk="
   },
   {
     "pname": "Microsoft.ApplicationInsights",
@@ -121,38 +136,33 @@
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "18.4.0",
-    "hash": "sha256-px8qchiuY5rkujAZ1wGEjuuhZdZmsRSp+FCiTmRUA1A="
+    "version": "18.7.0",
+    "hash": "sha256-QonDzKnOwcYkkVP0T3PT9/QySgUILc/L/bcp6+l+tA8="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "10.0.6",
-    "hash": "sha256-CSd5RC5pMsmglpnE6Vm3JabMnbmziqtUGrZE5Rg7uF4="
+    "version": "10.0.9",
+    "hash": "sha256-4d8r6Vyune1Qb0kwqzfGPA7BK2nvaiOenTiJedzq6sU="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "10.0.6",
-    "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
+    "version": "10.0.9",
+    "hash": "sha256-pliaksEAQdxyPURUVSlXpfF3LzJB93zHaeEDsaF5QJE="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "10.0.6",
-    "hash": "sha256-34blBlrQ3FRS7iCS7/gxPZMa9xgDW0p3iEERqwgXFMA="
+    "version": "10.0.9",
+    "hash": "sha256-ouJa+84H/bfMi67v25hjEWhTIyBHaWTJAoEvArwbrGA="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "10.0.6",
-    "hash": "sha256-K3ODZC+Bwd3Tze5wF7BQvJJGlNObdf2PNA35F41jHTE="
+    "version": "10.0.9",
+    "hash": "sha256-YIqgDknwTq48X88Imdrfav3tmQ6tZwIOYsLt6dT40M8="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.4",
-    "hash": "sha256-0QhVYjk9Cxy6NFef9VKftGmscTZnvcD1bhBQoXz3mwA="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.6",
-    "hash": "sha256-lFiZb81kfBJK7J0b0A2UIpydPRT73Xcs57Gzf/+1xXc="
+    "version": "10.0.9",
+    "hash": "sha256-YzQpGAsrjLU18s016LmM7DMJKml0MzKl1bPPYJ/erEk="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -166,28 +176,28 @@
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
-    "version": "10.0.6",
-    "hash": "sha256-TGJjvsztoajNzOe0KeuOvtb2ZuNDbjq2NfPs15zo3kA="
+    "version": "10.0.9",
+    "hash": "sha256-nnhs4+Z8gNL89Dttjqt0FR6uWY5U6bQ1dIa0wwMiUno="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "10.0.6",
-    "hash": "sha256-9AbUvHuHhDPjtf6vsci2r6VfSg0BlmkJkMYmIqAQ2QA="
+    "version": "10.0.9",
+    "hash": "sha256-OoBCatkSA+QWbMfyFxeuEOIHb04ukPH32gNfCUsar2M="
   },
   {
     "pname": "Microsoft.Extensions.Http",
-    "version": "10.0.6",
-    "hash": "sha256-3REMteQjA7j5LDJ7wDnlWkJlVHHXx0+dgbiVlZQAi/c="
+    "version": "10.0.9",
+    "hash": "sha256-caid7Mp5UjoLLjpwfKuJq24mVWp+lLm7/l8DezPyNKw="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "10.0.6",
-    "hash": "sha256-tskLj/WXLK35gkuJAWaAhPjMW92N1JKOTzTLupR30pE="
+    "version": "10.0.9",
+    "hash": "sha256-644xYxPB+PtwGUTAKJV9wByXHWFkR5Ol0p08wFQwMm4="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.6",
-    "hash": "sha256-4ijpXt4PoTNcmF5dl/rEZkRWBAjukB229lXtBtJhxn4="
+    "version": "10.0.9",
+    "hash": "sha256-su2q/OZuG7nB3wnUTVcimy3oHSdetFh4hhmjI3f/ym8="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -196,23 +206,23 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "10.0.6",
-    "hash": "sha256-GJCULaUcN2FxCA9fKOLe5EDEtkKLrEuP2Kw0jRqospA="
+    "version": "10.0.9",
+    "hash": "sha256-/fc1g1SDJI81nOZRS7W4LZIAC0ssmasqaWhgJK+9rRs="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "10.0.6",
-    "hash": "sha256-T0HNAYrIsm1xzfBD1qLqziI5qwSsGXGmXSDdOgpC5s0="
+    "version": "10.0.9",
+    "hash": "sha256-XVKJrNjPo0hojY5V4xoLxedpvkqtr4GJqkCUhLKSTcQ="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "10.0.6",
-    "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
+    "version": "10.0.9",
+    "hash": "sha256-WEPtmlEexm6QSFR4ITlBHuUD5/bqMfecOxFe5hkbAPU="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "18.4.0",
-    "hash": "sha256-ak/emX4C4KQVzc0bSNK4bChS+dvb3FvxZbJNrmf/2+w="
+    "version": "18.7.0",
+    "hash": "sha256-m2cPE5Y7lQz1nmyjlaf4bf9LpABQa24wiga7HPN4LgQ="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -251,13 +261,13 @@
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "18.4.0",
-    "hash": "sha256-ERL2goDaM0vUElW25DM/5lI2WplE5E6g9mhTegY0bC8="
+    "version": "18.7.0",
+    "hash": "sha256-OJYJt3EhJ60HobDzET31dESe29BtqDd35Xjt8/2BQCQ="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "18.4.0",
-    "hash": "sha256-S4T/6xHvov8jDcbcuZAOoutMAEudUb3dMP7MyxVa8Fo="
+    "version": "18.7.0",
+    "hash": "sha256-i5XpKR5rgazQ5ZLPGE/F71h0Sp6Ko/ff1NzLo+lsE5M="
   },
   {
     "pname": "NETStandard.Library",
@@ -281,38 +291,53 @@
   },
   {
     "pname": "NUnit",
-    "version": "4.5.1",
-    "hash": "sha256-+BO4kpkiPEvC4R2wyqV/QMjpKc6jcGwARyc3Bk9skPU="
+    "version": "4.6.1",
+    "hash": "sha256-MLciW0cj9OO3gJ6FjqD/Kpp0S5yPYsTpSWtRTYG0Pvo="
   },
   {
     "pname": "NUnit.Analyzers",
-    "version": "4.12.0",
-    "hash": "sha256-OCEqlVwNNWfenzKnp7ECeF5ekASRzNZmv251bS2xGYo="
+    "version": "4.14.0",
+    "hash": "sha256-WULxpvd/t9VKLwhe4+rRJdS5B3j5xqK1AUxmhkg4SLY="
   },
   {
     "pname": "NUnit3TestAdapter",
     "version": "6.2.0",
     "hash": "sha256-sKQjvF/qlEgfrCKHt1OzT+QZdtPt4RBBZd2f0oD1ldg="
   },
+  {
+    "pname": "ReactiveUI.Disposables",
+    "version": "6.0.0",
+    "hash": "sha256-WK2rt1PZFW2MAnQpnwjJgt0sC9lGp8UazxGbJLSBSfs="
+  },
+  {
+    "pname": "ReactiveUI.Primitives",
+    "version": "6.0.0",
+    "hash": "sha256-b6ByzvvvWhV+BIGRDb9u5t9b9mvRz3memmumQbqtH/A="
+  },
+  {
+    "pname": "ReactiveUI.Primitives.Core",
+    "version": "6.0.0",
+    "hash": "sha256-bWM5Cp/rIuF9CglPo0dse+9a76lPHhjElO4W/3U4MJI="
+  },
   {
     "pname": "ReferenceTrimmer",
-    "version": "3.4.7",
-    "hash": "sha256-LgRvN1CYOZGj9Cx5SrOghx3KTJVPZZ22T8EgyKMyDJc="
+    "version": "3.5.7",
+    "hash": "sha256-31Mhd4PseBmf6wqmIvgtTEuGcQQR80wtsqg3YMTFp50="
   },
   {
     "pname": "Refit",
-    "version": "10.1.6",
-    "hash": "sha256-KC0PVsbqx5RHZxItYgJaBeUQBlPLQbTx643BzEhXIc0="
+    "version": "13.1.0",
+    "hash": "sha256-usU/SXfobVSWqku+J2KnRv3Zl662j+7BeBPFkIs/Mm0="
   },
   {
     "pname": "Refit.HttpClientFactory",
-    "version": "10.1.6",
-    "hash": "sha256-/fkHB7cFXIRVUDnznQVJBgpwLS8KdhtiASF78xp4C8Q="
+    "version": "13.1.0",
+    "hash": "sha256-n07aKFVFSa/dHm/WQuuEsRsBtkCes8APP7aw9MUgQ1k="
   },
   {
     "pname": "Refitter.MSBuild",
-    "version": "1.7.3",
-    "hash": "sha256-S7L3kPkBRO1rfsNKn2FDhB5qalG0UrRCmPcoCmeOF7w="
+    "version": "2.0.0",
+    "hash": "sha256-4ysnoFGZh1Hlsst/yfCrVx7MbD0O0cHOaY3fiYNHWTw="
   },
   {
     "pname": "Riok.Mapperly",
@@ -451,12 +476,12 @@
   },
   {
     "pname": "Testcontainers",
-    "version": "4.11.0",
-    "hash": "sha256-SbrnISUOL0sQntC/z9/jOutewfLHQVT6vqjl2MfIjmw="
+    "version": "4.12.0",
+    "hash": "sha256-NM+zFlgQIo0BP5V/WW8gLJ/tcSTZelbbklOZ3llzZ4g="
   },
   {
     "pname": "YamlDotNet",
-    "version": "17.0.1",
-    "hash": "sha256-z23qb/L7DcjLgVsvROjyD7gr342u3QKjcPA2mZ0xz2g="
+    "version": "18.1.0",
+    "hash": "sha256-Wf/mWt5nrZ2IYmf4d7Y0pFA2PLgblOGducpMNkYUFvY="
   }
 ]
diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix
index 455bdff775ff..a9a82b004c50 100644
--- a/pkgs/by-name/re/recyclarr/package.nix
+++ b/pkgs/by-name/re/recyclarr/package.nix
@@ -9,13 +9,13 @@
 }:
 buildDotnetModule (finalAttrs: {
   pname = "recyclarr";
-  version = "8.6.0";
+  version = "8.7.0";
 
   src = fetchFromGitHub {
     owner = "recyclarr";
     repo = "recyclarr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Uu6fBKODzKGYA6vSJPw0OV/+bi3y2F/SHfrdd5pdyzs=";
+    hash = "sha256-tH76rFsQNPMq5aVJJOrjGAOueTc/jhIE8taUe4aBhg8=";
   };
 
   projectFile = "Recyclarr.slnx";

From 0824c31d31b29e7082c119525482a1bedd4cdd21 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Fri, 17 Jul 2026 15:41:23 +0200
Subject: [PATCH 1361/1386] libeufin: do not override patchPhase

---
 pkgs/by-name/li/libeufin/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix
index 07f0344163ea..e6bb25489684 100644
--- a/pkgs/by-name/li/libeufin/package.nix
+++ b/pkgs/by-name/li/libeufin/package.nix
@@ -34,9 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  patchPhase = ''
-    runHook prePatch
-
+  postPatch = ''
     substituteInPlace Makefile \
       --replace-fail "install: build install-nobuild-files" "install: install-nobuild-files"
 
@@ -47,8 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Use gradle repo to download dependencies
     substituteInPlace build.gradle \
       --replace-fail 'mavenCentral()' "gradlePluginPortal()"
-
-    runHook postPatch
   '';
 
   preConfigure = ''

From dc6bb626a1b099b90444ca684942c63cfec7bd6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 14:08:26 +0000
Subject: [PATCH 1362/1386] libmbd: 0.14.0 -> 0.14.1

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

diff --git a/pkgs/by-name/li/libmbd/package.nix b/pkgs/by-name/li/libmbd/package.nix
index bf8233412d77..8e44c7b05f9b 100644
--- a/pkgs/by-name/li/libmbd/package.nix
+++ b/pkgs/by-name/li/libmbd/package.nix
@@ -15,13 +15,13 @@ assert !lapack.isILP64;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libMBD";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "libmbd";
     repo = "libMBD";
     rev = finalAttrs.version;
-    hash = "sha256-ra5nPH7wTlATHWM1QiMZ43P9q9wDfV9CUhm7T0nj3kk=";
+    hash = "sha256-pWwb7T9zJ6XOUAvKYqcbE/X5y9RFlfsLR2Nvq0Nq2dE=";
   };
 
   preConfigure = ''

From aa1aa0b6949113ce8b0f48af388d306e011e646b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 14:16:02 +0000
Subject: [PATCH 1363/1386] terraform-providers.scaleway_scaleway: 2.78.0 ->
 2.79.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 42666d2053b4..fde7a420dd44 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1184,13 +1184,13 @@
     "vendorHash": "sha256-uCw5Xdqp3VjLj6IytoVfO0atxkT69FNqJmAlA6eCmfs="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-rO5xmAJB2ndhVh7Lkun1Gxi04+I2lGVtkbbCbmngp3E=",
+    "hash": "sha256-NXW3b4E92uqZbzIpRTFKVKbPRghwfRK4akn4KY7C9p0=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.78.0",
+    "rev": "v2.79.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-x2cppxUU58nN7eu+wMxIoS16HezxzkHWI50ck2r34ls="
+    "vendorHash": "sha256-MKYAdMLETD12850TIBqBfHLRNLy15B6ycDUckIapwt8="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",

From 4316a78872acb678cf045cf318b1fd3472d1964f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 14:54:25 +0000
Subject: [PATCH 1364/1386] fnox: 1.30.0 -> 1.31.0

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

diff --git a/pkgs/by-name/fn/fnox/package.nix b/pkgs/by-name/fn/fnox/package.nix
index 06f3efe03306..93c2e7d90d1e 100644
--- a/pkgs/by-name/fn/fnox/package.nix
+++ b/pkgs/by-name/fn/fnox/package.nix
@@ -14,16 +14,16 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
   pname = "fnox";
-  version = "1.30.0";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "fnox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-maG2+KBPBsZqRvs/Iddl7egs478s3IWOF+lJKQrjyjs=";
+    hash = "sha256-BwuMuiJiC5QbtlfZz/aqSXQmjyf0jUWv2sNdKEK3LJY=";
   };
 
-  cargoHash = "sha256-s3Cv7uAZlk67IiolLkFgcwonfYi9qUh8xXqyNPIPesM=";
+  cargoHash = "sha256-vU1LA6vvNpLFRXj07WmtCoWDdJezqMoI/t7q7E77JUk=";
 
   nativeBuildInputs = [
     perl

From effc841c801af18c8731f4ba3e772f21d0eb5bd9 Mon Sep 17 00:00:00 2001
From: Kenji Berthold <aks.kenji@protonmail.com>
Date: Fri, 17 Jul 2026 17:08:24 +0200
Subject: [PATCH 1365/1386] nixos/userborn: fix typo

---
 nixos/modules/services/system/userborn.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix
index 5649b438965b..eeb0f6a40f35 100644
--- a/nixos/modules/services/system/userborn.nix
+++ b/nixos/modules/services/system/userborn.nix
@@ -86,7 +86,7 @@ in
         The primary motivation for this is an immutable `/etc`, where we cannot
         write the files directly to `/etc`.
 
-        However this an also serve other use cases, e.g. when `/etc` is on a `tmpfs`.
+        However this can also serve other use cases, e.g. when `/etc` is on a `tmpfs`.
       '';
     };
 

From 78e61f689fb0afadfa61d01e06696abf8346724e Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 17 Jul 2026 17:09:29 +0200
Subject: [PATCH 1366/1386] gram: fix darwin build

Similar to the build failure we had on zed-editor, git must be in the
build inputs to ensure the link is not considered broken in fixup.
---
 pkgs/by-name/gr/gram/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/gr/gram/package.nix b/pkgs/by-name/gr/gram/package.nix
index 894b90cddfc5..2f860f540a62 100644
--- a/pkgs/by-name/gr/gram/package.nix
+++ b/pkgs/by-name/gr/gram/package.nix
@@ -80,6 +80,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     fontconfig
     libxcb
     libxkbcommon
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    git
   ];
 
   cargoBuildFlags = [

From 6e9b46bffbebcb1dcf552fade1766a56dae3bcc1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 17 Jul 2026 11:33:42 -0400
Subject: [PATCH 1367/1386] victorialogs: 1.51.0 -> 1.52.0

Changelog: https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.52.0
---
 pkgs/by-name/vi/victorialogs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix
index 08037f2eeece..0cf91f12570e 100644
--- a/pkgs/by-name/vi/victorialogs/package.nix
+++ b/pkgs/by-name/vi/victorialogs/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaLogs";
-  version = "1.51.0";
+  version = "1.52.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaLogs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8rUDMV7bxMxyU0NYIMFSqGzSMwGogKFDliGXf4VSoCI=";
+    hash = "sha256-V4TWpv72LJ0FUYruwXvhmCpOLQh5l+7Of7aJS8vF6J0=";
   };
 
   vendorHash = null;

From 00627c1b9f5a279c077a9dfdcc5b79c8d135be29 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 17 Jul 2026 18:00:41 +0200
Subject: [PATCH 1368/1386] forgejo: 15.0.5 -> 16.0.0

https://forgejo.org/2026-07-release-v16-0/

https://codeberg.org/forgejo/forgejo/milestone/70071
---
 pkgs/by-name/fo/forgejo/generic.nix | 26 ++++++++++++++++++++++++++
 pkgs/by-name/fo/forgejo/lts.nix     | 12 +++++++++++-
 pkgs/by-name/fo/forgejo/package.nix | 10 +++++-----
 3 files changed, 42 insertions(+), 6 deletions(-)
 mode change 120000 => 100644 pkgs/by-name/fo/forgejo/lts.nix

diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index 413b070c3143..ec5555d62af9 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -12,6 +12,7 @@
   bash,
   brotli,
   buildGoModule,
+  coreutils,
   fetchpatch,
   forgejo,
   git,
@@ -79,6 +80,9 @@ buildGoModule rec {
     git
     openssh
     writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "16") [
+    coreutils
   ];
 
   patches = [
@@ -116,6 +120,23 @@ buildGoModule rec {
 
     # TestRunHookPrePostReceive (cmd/hook_test.go) needs .git to pass
     git init
+  ''
+  # Unlike NixOS, the Nix build sandbox has no /usr/bin/env and we
+  # can't just create it, so Forgejo trying to execute git hooks
+  # that have #!/usr/bin/env as shebang fails with:
+  #
+  #  To /build/repos44353414/user2/repo1.wiki.git
+  #   ! [remote rejected] fda09356fb8b1da00546f764933f9dacda1b44ea -> master (pre-receive hook declined)
+  #  error: failed to push some refs to '/build/repos44353414/user2/repo1.wiki.git'
+  #   - remote: fatal: cannot exec '/build/appdata2719412950/home/hooks/pre-receive': No such file or directory
+  #
+  # We also can't just call patchShebangs because the hooks are
+  # created just in time by the test suite. Patching the source of
+  # the hooks after go build but before go test is oddly enough
+  # the least invasive hack to have those tests pass.
+  + lib.optionalString (lib.versionAtLeast version "16") ''
+    substituteInPlace modules/git/hook_generate.go \
+      --replace-fail "#!/usr/bin/env" "#!${lib.getExe' coreutils "env"}"
   '';
 
   checkFlags =
@@ -124,6 +145,11 @@ buildGoModule rec {
         "TestPassword" # requires network: api.pwnedpasswords.com
         "TestCaptcha" # requires network: hcaptcha.com
         "TestDNSUpdate" # requires network: release.forgejo.org
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "16") [
+        "TestMigrateRepository" # requires network: codeberg.org
+      ]
+      ++ [
         "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS)
         "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS)
         "TestBleveDeleteIssue" # Known Flake-y https://github.com/NixOS/nixpkgs/issues/509878
diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
deleted file mode 120000
index 8d225ed3269a..000000000000
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ /dev/null
@@ -1 +0,0 @@
-package.nix
\ No newline at end of file
diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
new file mode 100644
index 000000000000..6c4609ae7b43
--- /dev/null
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -0,0 +1,11 @@
+import ./generic.nix {
+  version = "15.0.5";
+  hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ=";
+  npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg=";
+  vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig=";
+  lts = true;
+  nixUpdateExtraArgs = [
+    "--override-filename"
+    "pkgs/by-name/fo/forgejo/lts.nix"
+  ];
+}
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 474e72baff85..a192df6c43b6 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,9 +1,9 @@
 import ./generic.nix {
-  version = "15.0.5";
-  hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ=";
-  npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg=";
-  vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig=";
-  lts = true;
+  version = "16.0.0";
+  hash = "sha256-BZawFbrtcxftX4/Yk32aoVRQ6Kg+k1FhN9IoH6dxvVY=";
+  npmDepsHash = "sha256-UhivpUqNJvc3zHxdRVAWT9x68jG1KnQa8yS4KkL2W5g=";
+  vendorHash = "sha256-cb6f7ZX3pG95EEZotGXn6+YUJN59SFNVHFTejFJ6y28=";
+  lts = false;
   nixUpdateExtraArgs = [
     "--override-filename"
     "pkgs/by-name/fo/forgejo/package.nix"

From aca662a1f35cc41facf3c5177b17cbf4fad92573 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 16:47:26 +0000
Subject: [PATCH 1369/1386] dua: 2.37.1 -> 2.38.0

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

diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 8ab3e8ed629b..7c1579211686 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dua";
-  version = "2.37.1";
+  version = "2.38.0";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FVkq+iLkVcug/SzQtzmupHc1nh+orqyOnqv0xr1Dg/Q=";
+    hash = "sha256-vvCEWTkDoJvlz3hKay/179zkrDUU4rjeLtxZtw2YFLY=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-8lRpN3KcrK9x446buGVnHl0CcHVoLWl0slB7CAw37G8=";
+  cargoHash = "sha256-bYnRng0bPdGC9Y/jVjqWgFcoMM04F1BF02IwATq8Ohw=";
 
   checkFlags = [
     # Skip interactive tests

From 92ce29c58df72f0b737ced02edd128b3da7c824c Mon Sep 17 00:00:00 2001
From: OliMoli <olimoli@disroot.org>
Date: Thu, 16 Jul 2026 18:55:55 +0200
Subject: [PATCH 1370/1386] wayshot: add manpages

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

diff --git a/pkgs/by-name/wa/wayshot/package.nix b/pkgs/by-name/wa/wayshot/package.nix
index e52d7b41b7e7..1cb47b24a691 100644
--- a/pkgs/by-name/wa/wayshot/package.nix
+++ b/pkgs/by-name/wa/wayshot/package.nix
@@ -35,7 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   cargoHash = "sha256-J7ZKWx258bBCNBd061aCeKgTdcWMUF4yzAiIa9l8ZRA=";
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+  postInstall = ''
+    installManPage docs/wayshot.1.scd docs/wayshot.5.scd docs/wayshot.7.scd
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd wayshot \
       --bash <($out/bin/wayshot --completions bash) \
       --fish <($out/bin/wayshot --completions fish) \

From 0cf4096e7449ca842652dda3bd915a84ebc8b1b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 17:47:31 +0000
Subject: [PATCH 1371/1386] mcp-server-git: 2026.7.4 -> 2026.7.10

---
 pkgs/by-name/mc/mcp-server-git/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mc/mcp-server-git/package.nix b/pkgs/by-name/mc/mcp-server-git/package.nix
index c4e17c4d543b..98140ce96260 100644
--- a/pkgs/by-name/mc/mcp-server-git/package.nix
+++ b/pkgs/by-name/mc/mcp-server-git/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mcp-server-git";
-  version = "2026.7.4";
+  version = "2026.7.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "servers";
     tag = finalAttrs.version;
-    hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90=";
+    hash = "sha256-ORihWA8Xx7WAPo2+vRPpYNF9CGfc1sjmW+NfUKBGzxs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/git/";

From 7eb5f481468cdd1f3bf5a84b43b0c059ee2c3fac Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 16 Jul 2026 20:11:24 -0700
Subject: [PATCH 1372/1386] ci/github-script/bot: label llm-assisted PRs
 accordingly

Discussed in AGENTS.md debate PR

Assisted by https://regex101.com/, my brain, and love for humanity and free software

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 ci/github-script/bot.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 8e0043d5505c..684e3e33179a 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -395,6 +395,13 @@ module.exports = async ({ github, context, core, dry }) => {
         pull_number,
         per_page: 100,
       })
+
+      // label llm-assisted PRs accordingly
+      const assistedByPattern = /Assisted-by: (?!nix-init)/i
+      evalLabels['llm-assisted'] = prCommits.some((c) =>
+        assistedByPattern.test(c.commit.message),
+      )
+
       const commitSubjects = prCommits.map(
         (c) => c.commit.message.split('\n')[0],
       )

From a148bdf623f2260395d9565e7e9d61bf17d36ccf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 17:50:01 +0000
Subject: [PATCH 1373/1386] mcp-server-time: 2026.7.4 -> 2026.7.10

---
 pkgs/by-name/mc/mcp-server-time/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mc/mcp-server-time/package.nix b/pkgs/by-name/mc/mcp-server-time/package.nix
index 3b2b41b224a4..33e53dc6bac0 100644
--- a/pkgs/by-name/mc/mcp-server-time/package.nix
+++ b/pkgs/by-name/mc/mcp-server-time/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mcp-server-time";
-  version = "2026.7.4";
+  version = "2026.7.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "servers";
     tag = finalAttrs.version;
-    hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90=";
+    hash = "sha256-ORihWA8Xx7WAPo2+vRPpYNF9CGfc1sjmW+NfUKBGzxs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/time/";

From 4feedf4759a8d0f2aca0993378aee871bbd2f078 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 18:44:44 +0000
Subject: [PATCH 1374/1386] torrserver: 142 -> 142.1

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

diff --git a/pkgs/by-name/to/torrserver/package.nix b/pkgs/by-name/to/torrserver/package.nix
index 8c949fbe425b..c763d55d531e 100644
--- a/pkgs/by-name/to/torrserver/package.nix
+++ b/pkgs/by-name/to/torrserver/package.nix
@@ -7,15 +7,15 @@
 }:
 buildGo126Module rec {
   pname = "torrserver";
-  version = "142";
+  version = "142.1";
 
   src = fetchFromGitHub {
     owner = "YouROK";
     repo = "TorrServer";
     tag = "MatriX.${version}";
-    sha256 = "sha256-bAnnDbrKYfU3WdjwIW4GGDST4S13KIhGNoQQtI27UaQ=";
+    sha256 = "sha256-/CNY1wQxEs3rzHx04s1LWVNnN10JmiLjh48WBo2nid8=";
   };
-  vendorHash = "sha256-B5BAmdFuLWDkbp/lehFziyHXcMPIAgNySgTPv9Nv680=";
+  vendorHash = "sha256-M9rI/AU5ZWJre8B92OoGZZBd1C3bc4R8+r0SYAgY/C4=";
 
   modRoot = "server";
   subPackages = [ "cmd" ];

From d42e0f3b00c989f18c1417419d2c055ce0735d56 Mon Sep 17 00:00:00 2001
From: saffr3n <91146584+saffr3n@users.noreply.github.com>
Date: Fri, 17 Jul 2026 22:13:15 +0300
Subject: [PATCH 1375/1386] emmylua-ls: 0.23.2 -> 0.24.0

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

diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix
index 3f3def1bca0a..a50b5b411ad0 100644
--- a/pkgs/by-name/em/emmylua-ls/package.nix
+++ b/pkgs/by-name/em/emmylua-ls/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_ls";
-  version = "0.23.2";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-xjKTYzkfFWKyQzg6I2aafKBGn7XjkE8CCQ9AP8ebu/I=";
+    hash = "sha256-oijk0SFTjpIak9AetBfctMXJ/72bRGjuaib9adx1yac=";
   };
 
   __structuredAttrs = true;
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildAndTestSubdir = "crates/emmylua_ls";
 
-  cargoHash = "sha256-tVmATUh35h19AsmMCrijJ0rdBHYU6uMj2PE1iiiuDCE=";
+  cargoHash = "sha256-8uzkj7uCV3XzdagsrePwt2DE4MV12xlbwsaBONUymFQ=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From beb90090d4f85b507e1f723ac60d05dff5b1c950 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 19:46:51 +0000
Subject: [PATCH 1376/1386] kiro-cli: 2.10.0 -> 2.13.0

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

diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix
index 295cfe09be35..3e41ce545e9c 100644
--- a/pkgs/by-name/ki/kiro-cli/package.nix
+++ b/pkgs/by-name/ki/kiro-cli/package.nix
@@ -14,21 +14,21 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kiro-cli";
-  version = "2.10.0";
+  version = "2.13.0";
 
   src =
     {
       x86_64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
-        hash = "sha256-cJl6CyYCzbLpB6m+W9Tx7enaPzijgjOBjdmG6CPMM8k=";
+        hash = "sha256-8qEnlNv8lQK3SCjYJ/AdfWB/RELpjLI0VQ7n4vKA7DI=";
       };
       aarch64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
-        hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ=";
+        hash = "sha256-uKR5ZxuijDgfIJ4DmDVhN5XGHDyOyiRkLcTie2iuzZU=";
       };
       aarch64-darwin = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
-        hash = "sha256-NDeyXQO9NBsK3xqAEcO1gGn9ta+ZVQ1GNwZ4hbGUe3Q=";
+        hash = "sha256-GAK8+adzrEc1kXtHVCNC1aU09C86D9mroSQv7dXvbfo=";
       };
     }
     .${system} or (throw "Unsupported system: ${system}");

From 5ae52c6fdec751544345ee70fd23c7a941ff1037 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 19:50:05 +0000
Subject: [PATCH 1377/1386] antigravity-cli: 1.0.12 -> 1.1.4

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

diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix
index 455485d6a4bb..790ea78b87b7 100644
--- a/pkgs/by-name/an/antigravity-cli/package.nix
+++ b/pkgs/by-name/an/antigravity-cli/package.nix
@@ -6,8 +6,8 @@
   versionCheckHook,
 }:
 let
-  version = "1.0.12";
-  buildId = "6156052174077952";
+  version = "1.1.4";
+  buildId = "5165726265376768";
   wholeVersion = "${version}-${buildId}";
 
   throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
@@ -15,15 +15,15 @@ let
   sourceData = {
     x86_64-linux = fetchurl {
       url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-x64/cli_linux_x64.tar.gz";
-      hash = "sha256-fjB132jrrViqHPQiMenYuDvyiVtbBYqxc2sLY4PHUAg=";
+      hash = "sha256-qHY/CIE65zGFDg2CfMbm06f4xn3mvLIUUhCj7Bh37tE=";
     };
     aarch64-linux = fetchurl {
       url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-arm/cli_linux_arm64.tar.gz";
-      hash = "sha256-oDZ+WHWsG4imwLFjyG69XRPJvvkH9EaaZRb/aQIb8tQ=";
+      hash = "sha256-9dlI6XbTTLuhRdo+32gE39DWGcMIhikd45kkAj3oGO8=";
     };
     aarch64-darwin = fetchurl {
       url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz";
-      hash = "sha256-U/cwihF/cP5+7KSmkAToI5yOoYydguR5ZrKQMytpuCk=";
+      hash = "sha256-qhfFyMNvppzI01rjcpq/xUUTYiTsP38Y5ZpqkZMCSJs=";
     };
   };
 in

From 3f8ce5894508cc1b688f612930b1d5e2d0e16ec3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 20:07:18 +0000
Subject: [PATCH 1378/1386] terraform-providers.checkly_checkly: 1.25.0 ->
 1.26.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 28c6a1fa04f1..7def5aaf5550 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -155,13 +155,13 @@
     "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o="
   },
   "checkly_checkly": {
-    "hash": "sha256-9kcZXbrfl8ovrg1w3bWdta/ABnLtVIfseRptZn5NrgI=",
+    "hash": "sha256-or9qjJdA8sDmPnETyedWtsAWEsF9hJdDmPpX+qncN7E=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.25.0",
+    "rev": "v1.26.0",
     "spdx": null,
-    "vendorHash": "sha256-7XgTkzYBfkpF8Dd4YsgpB+YIfkANsg/60b3AyO8Y8FA="
+    "vendorHash": "sha256-nB77EpptqXhF+7/85h37CRQUk/iyq1ffSc2v2kQwFAQ="
   },
   "ciscodevnet_aci": {
     "hash": "sha256-8QnmISiZGRbW60mN9I6UYWDo6f2HUIFersVs/pDUD3o=",

From d26e383033c4298d2fa870c40ae5a1a0ac8174b5 Mon Sep 17 00:00:00 2001
From: Lyn <me@fugi.dev>
Date: Fri, 17 Jul 2026 20:53:28 +0000
Subject: [PATCH 1379/1386] sable-unwrapped: 1.19.4 -> 1.20.0

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

diff --git a/pkgs/by-name/sa/sable-unwrapped/package.nix b/pkgs/by-name/sa/sable-unwrapped/package.nix
index 6cb5d792e1e4..7a604c0ae930 100644
--- a/pkgs/by-name/sa/sable-unwrapped/package.nix
+++ b/pkgs/by-name/sa/sable-unwrapped/package.nix
@@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   pname = "sable-unwrapped";
-  version = "1.19.4";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "SableClient";
     repo = "Sable";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GI4ZXmqPTWt3WlTQDkjVfRWhiJnd3mdq5paA3/TGMEA=";
+    hash = "sha256-ams6Uwblo5mUzah9hlCPCUMXtrLtiUtRWwwKH4uabmk=";
   };
 
   pnpmDeps = fetchPnpmDeps {

From 64cd191c4fa39e00955c18eee9c76d6127003258 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 20:58:23 +0000
Subject: [PATCH 1380/1386] terraform-providers.linode_linode: 3.14.1 -> 4.1.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 28c6a1fa04f1..9cbd7d0178e4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -851,13 +851,13 @@
     "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM="
   },
   "linode_linode": {
-    "hash": "sha256-aOLto01ntce/l+1ZcQf5Rsdu6ptgpYWpf5JpJ0zRUNs=",
+    "hash": "sha256-N/SVZ1ajNRT53zxdYBT6Hd/wwAuKhEre0QSZUYbkwGA=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v3.14.1",
+    "rev": "v4.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-dnvv6sSzEUZ4Hbrq/pAgi/O1RyxCx89omCVzvCe70S0="
+    "vendorHash": "sha256-r5T8kmvCb2iBUJqw5m7hrr+ET7U9kIBUbsvEVqZlgrE="
   },
   "loafoe_htpasswd": {
     "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",

From d83946a9eea65310a994032c78c77a2ef1aa0a6f Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Fri, 17 Jul 2026 23:20:00 +0200
Subject: [PATCH 1381/1386] forgejo: remove unused coreutils from
 nativeCheckInputs

---
 pkgs/by-name/fo/forgejo/generic.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index ec5555d62af9..e1b7277aba7f 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -13,7 +13,6 @@
   brotli,
   buildGoModule,
   coreutils,
-  fetchpatch,
   forgejo,
   git,
   gzip,
@@ -80,9 +79,6 @@ buildGoModule rec {
     git
     openssh
     writableTmpDirAsHomeHook
-  ]
-  ++ lib.optionals (lib.versionAtLeast version "16") [
-    coreutils
   ];
 
   patches = [

From e44b628f92c414d4be04ea1c0d66f807997155f3 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Mon, 2 Mar 2026 11:22:48 -0500
Subject: [PATCH 1382/1386] python3Packages.flask-dramatiq: 0.6.0 -> 0.8.0

---
 .../python-modules/flask-dramatiq/default.nix | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/flask-dramatiq/default.nix b/pkgs/development/python-modules/flask-dramatiq/default.nix
index 3dece04ef7a3..86514a6bad44 100644
--- a/pkgs/development/python-modules/flask-dramatiq/default.nix
+++ b/pkgs/development/python-modules/flask-dramatiq/default.nix
@@ -2,11 +2,13 @@
   lib,
   buildPythonPackage,
   dramatiq,
-  fetchFromGitLab,
+  fetchFromGitHub,
   flask-migrate,
+  flask-sqlalchemy,
   flask,
+  httpx,
   periodiq,
-  poetry-core,
+  hatchling,
   postgresql,
   postgresqlTestHook,
   psycopg2,
@@ -16,35 +18,33 @@
   requests,
 }:
 
-buildPythonPackage {
+buildPythonPackage (finalAttrs: {
   pname = "flask-dramatiq";
-  version = "0.6.0";
+  version = "0.8.0";
   pyproject = true;
 
-  src = fetchFromGitLab {
-    owner = "bersace";
+  src = fetchFromGitHub {
+    owner = "pallets-eco";
     repo = "flask-dramatiq";
-    rev = "840209e9bf582b4dda468e8bba515f248f3f8534";
-    hash = "sha256-qjV1zyVzHPXMt+oUeGBdP9XVlbcSz2MF9Zygj543T4w=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Gt9yynbmFWMISP1U0jRjU6oY3ImrLxYa2D0xf0llCEg=";
   };
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'poetry>=0.12' 'poetry-core' \
-      --replace 'poetry.masonry.api' 'poetry.core.masonry.api'
-
     patchShebangs --build ./example.py
   '';
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [ "dramatiq" ];
 
   dependencies = [ dramatiq ];
 
   nativeCheckInputs = [
+    flask-sqlalchemy
     flask
     flask-migrate
+    httpx
     periodiq
     postgresql
     postgresqlTestHook
@@ -54,7 +54,8 @@ buildPythonPackage {
     pytestCheckHook
     requests
   ]
-  ++ dramatiq.optional-dependencies.rabbitmq;
+  ++ dramatiq.optional-dependencies.rabbitmq
+  ++ dramatiq.optional-dependencies.watch;
 
   postgresqlTestSetupPost = ''
     substituteInPlace config.py \
@@ -72,8 +73,8 @@ buildPythonPackage {
 
   meta = {
     description = "Adds Dramatiq support to your Flask application";
-    homepage = "https://gitlab.com/bersace/flask-dramatiq";
+    homepage = "https://github.com/pallets-eco/flask-dramatiq";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ traxys ];
   };
-}
+})

From a73b37840cc2d97bedd8f78411fab8daa10b1f5a Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Mon, 2 Mar 2026 11:23:09 -0500
Subject: [PATCH 1383/1386] python3Packages.periodiq: 0.13.0 -> 0.14.0

---
 .../python-modules/periodiq/default.nix         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix
index 701bc88bc670..a8b718302086 100644
--- a/pkgs/development/python-modules/periodiq/default.nix
+++ b/pkgs/development/python-modules/periodiq/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
-  poetry-core,
+  uv-build,
   dramatiq,
   pendulum,
   setuptools,
@@ -13,27 +13,28 @@
 
 buildPythonPackage rec {
   pname = "periodiq";
-  version = "0.13.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "bersace";
     repo = "periodiq";
     tag = "v${version}";
-    hash = "sha256-Pyh/T3/HGPYyaXjyM0wkQ1V7p5ibqxE1Q62QwCIJ8To=";
+    hash = "sha256-XYQ0cR0gdiX7GePqpMDG/Ml0CK+SBcNbsNB99FZ/D3I=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail 'poetry>=0.12' 'poetry-core' \
-      --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
+      --replace-fail "uv_build>=0.11,<0.12" uv_build
   '';
 
-  pythonRelaxDeps = [ "dramatiq" ];
+  pythonRelaxDeps = [
+    "dramatiq"
+  ];
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ uv-build ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dramatiq
     pendulum
     setuptools

From a16d05931dbdad7245e45674906c4a16d3e7b8af Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Mon, 2 Mar 2026 10:38:47 -0500
Subject: [PATCH 1384/1386] fittrackee: 0.11.2 -> 1.3.3

---
 doc/release-notes/rl-2611.section.md   |  3 +-
 pkgs/by-name/fi/fittrackee/package.nix | 77 +++++++++++++++-----------
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 2d03b3d265fd..092c950e980f 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -80,8 +80,7 @@
 
 ### Breaking changes {#sec-nixpkgs-release-26.11-lib-breaking}
 
-- Create the first release note entry in this section!
-
+- `fittrackee` 1.0.0 now requires postgres with postgis. The [upgrade guide](https://docs.fittrackee.org/en/upgrading-to-1.0.0.html) has steps to prepare for this upgrade.
 
 ### Deprecations {#sec-nixpkgs-release-26.11-lib-deprecations}
 
diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix
index f261ac07eae6..ed8611772707 100644
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@@ -1,49 +1,51 @@
 {
-  fetchFromGitHub,
+  fetchFromCodeberg,
+  fetchNpmDeps,
   lib,
   stdenv,
+  nodejs_24,
+  npmHooks,
   postgresql,
   postgresqlTestHook,
   python3Packages,
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "fittrackee";
-  version = "0.11.2";
+  version = "1.3.3";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "SamR1";
+  src = fetchFromCodeberg {
+    owner = "FitTrackee";
     repo = "FitTrackee";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A9gebHxNCpYUUIm7IjyySojIIyuTxfYCUeUufpUM1iA=";
+    hash = "sha256-XWR9gg52pfg0lHoFikQ2wVhvkPCTjTTndBYqBzYPB8s=";
   };
 
+  makeCacheWritable = true;
+  npmRoot = "fittrackee_client";
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-HEgof2ln+mBxM63Dv8Lc/bfx3ozoJCRYYyJOz6jh+Vs=";
+    sourceRoot = "${finalAttrs.src.name}/fittrackee_client";
+  };
+
+  nativeBuildInputs = [
+    nodejs_24
+    npmHooks.npmConfigHook
+  ];
+
+  preBuild = ''
+    pushd fittrackee_client
+    npm run build-only
+    popd
+  '';
+
   build-system = [
     python3Packages.poetry-core
   ];
 
-  # The upstream project changed the behavior of the CLI when --set-admin and --set-role are used together.
-  # Previously, it would raise an error, but now it issues a deprecation warning.
-  # This patch updates the test assertion to expect the new deprecation warning message.
-  # See upstream commit 6eda1b6119b3e41bdf8896e74b4a07d3c9e97609.
-  postPatch = ''
-    substituteInPlace fittrackee/tests/users/test_users_commands.py \
-      --replace '"--set-admin and --set-role can not be used together."' '"WARNING: --set-admin is deprecated. Please use --set-role option instead."'
-  '';
-
-  pythonRelaxDeps = [
-    "authlib"
-    "fitdecode"
-    "flask"
-    "flask-limiter"
-    "flask-migrate"
-    "nh3"
-    "lxml"
-    "pyopenssl"
-    "pytz"
-    "sqlalchemy"
-    "xmltodict"
-  ];
+  pythonRelaxDeps = true;
 
   dependencies =
     with python3Packages;
@@ -53,21 +55,31 @@ python3Packages.buildPythonApplication (finalAttrs: {
       click
       dramatiq
       dramatiq-abort
+      feedgenerator
       fitdecode
       flask
+      flask-babel
       flask-bcrypt
       flask-dramatiq
       flask-limiter
       flask-migrate
       flask-sqlalchemy
+      geoalchemy2
+      geopandas
       gpxpy
       gunicorn
       humanize
       jsonschema
+      lxml
+      mistune
       nh3
+      numpy
+      pandas
       psycopg2-binary
       pyjwt
       pyopenssl
+      pyproj
+      python-magic
       pytz
       shortuuid
       sqlalchemy
@@ -76,7 +88,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
       xmltodict
     ]
     ++ dramatiq.optional-dependencies.redis
-    ++ flask-limiter.optional-dependencies.redis;
+    ++ flask-limiter.optional-dependencies.redis
+    ++ geoalchemy2.optional-dependencies.shapely
+    ++ staticmap3.optional-dependencies.filecache;
 
   pythonImportsCheck = [ "fittrackee" ];
 
@@ -84,7 +98,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pytestCheckHook
     freezegun
     postgresqlTestHook
-    postgresql
+    (postgresql.withPackages (ps: with ps; [ postgis ]))
     time-machine
   ];
 
@@ -93,6 +107,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   ];
 
   postgresqlTestSetupPost = ''
+    echo "CREATE EXTENSION postgis; CREATE EXTENSION postgis_topology;" | PGUSER=postgres psql test_db
     export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABASE?host=$PGHOST
   '';
 
@@ -105,8 +120,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   meta = {
     description = "Self-hosted outdoor activity tracker";
-    homepage = "https://github.com/SamR1/FitTrackee";
-    changelog = "https://github.com/SamR1/FitTrackee/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    homepage = "https://docs.fittrackee.org/";
+    changelog = "https://codeberg.org/FitTrackee/FitTrackee/src/tag/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       tebriel

From 0a215e1b9edf18d5de4dd29c68561cd2e6807f25 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 18 Jul 2026 00:14:43 +0200
Subject: [PATCH 1385/1386] evcc: 0.311.1 -> 0.312.0

https://github.com/evcc-io/evcc/releases/tag/0.312.0
---
 pkgs/by-name/ev/evcc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 89a475328079..3b14b2c3110f 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.311.1";
+  version = "0.312.0";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-dxP28NPW+V30XIzh2w++Glrb2xfZ0tpp4H+qOM13yt8=";
+    hash = "sha256-GUHKrjCGm9LRQX5INdzSMPBV19FtaV8DTN3HIEUrxR4=";
   };
 
-  vendorHash = "sha256-Eh07T9FAoeoUfhJsK6DPmwE2rJX55Ijzp4ydxJc8/bQ=";
+  vendorHash = "sha256-x4iwvzf7iv6TyLEkTnqztDQrBD+3lT1yycB7yTD4xO4=";
 
   commonMeta = {
     license = lib.licenses.mit;

From e8638ad0b5c1ec70e110141ceec8c968e123babe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 12:29:39 +0000
Subject: [PATCH 1386/1386] python3Packages.nvchecker: 2.20 -> 2.21

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 .../python-modules/nvchecker/default.nix      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 77f0fbf89911..1317b88aa8c0 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -2,7 +2,9 @@
   lib,
   awesomeversion,
   buildPythonPackage,
+  cacert,
   docutils,
+  dulwich,
   fetchFromGitHub,
   flaky,
   installShellFiles,
@@ -12,6 +14,7 @@
   packaging,
   platformdirs,
   pycurl,
+  pygit2,
   pytest-asyncio,
   pytestCheckHook,
   pytest-httpbin,
@@ -22,16 +25,16 @@
   zstandard,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "nvchecker";
-  version = "2.20";
+  version = "2.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = "nvchecker";
-    tag = "v${version}";
-    hash = "sha256-udwflm3C7C6Q7rSA0x0+8uf1F5quy2okf2IyZqKtA3E=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XQrroiuDM9ISmfQLUbYIAzBOSYtO6q1MXqMfC3X8BUI=";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -57,6 +60,12 @@ buildPythonPackage rec {
     htmlparser = [ lxml ];
     rpmrepo = [ lxml ] ++ lib.optionals (pythonOlder "3.14") [ zstandard ];
     jq = [ jq ];
+    git_pygit2 = [ pygit2 ];
+    git_dulwich = [ dulwich ];
+  };
+
+  env = lib.optionalAttrs finalAttrs.doInstallCheck {
+    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
   };
 
   nativeCheckInputs = [
@@ -64,7 +73,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-httpbin
     pytestCheckHook
-  ];
+  ]
+  ++ builtins.concatLists (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   postBuild = ''
     patchShebangs docs/myrst2man.py
@@ -84,8 +94,8 @@ buildPythonPackage rec {
   meta = {
     description = "New version checker for software";
     homepage = "https://github.com/lilydjwg/nvchecker";
-    changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/${src.tag}";
+    changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
-}
+})