From b9253c1018e8bde30f557c11c7575406578809e2 Mon Sep 17 00:00:00 2001
From: Achmad Fathoni <fathoni.id@gmail.com>
Date: Tue, 11 Mar 2025 14:47:00 +0700
Subject: [PATCH 001/130] questdb: fix missing script

questdb needs env.sh & print-hello.sh to start
---
 pkgs/by-name/qu/questdb/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix
index 2ba052c53195..b56d22324f37 100644
--- a/pkgs/by-name/qu/questdb/package.nix
+++ b/pkgs/by-name/qu/questdb/package.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/bin $out/share/java
     cp questdb.sh $out/bin
+    cp env.sh $out/bin
+    cp print-hello.sh $out/bin
     cp questdb.jar $out/share/java
 
     ln -s $out/share/java/questdb.jar $out/bin

From 5336f6d5a9632fe471ea1020c325a9ec24c6b539 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 00:35:31 +0000
Subject: [PATCH 002/130] opensubdiv: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix
index af8271b27387..ef79417f15fa 100644
--- a/pkgs/by-name/op/opensubdiv/package.nix
+++ b/pkgs/by-name/op/opensubdiv/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opensubdiv";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
     tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-liy6pQyWMk7rw0usrCoLGzZLO7RAg0z2pV/GF2NnOkE=";
+    hash = "sha256-/22SeMzNNnrUgmPGpgbQwoYthdAdhRa615VhVJOvP9o=";
   };
 
   outputs = [

From dd85534711f5af53aedcb63c7444554742b0bd34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 13:54:10 +0000
Subject: [PATCH 003/130] libdatachannel: 0.23.0 -> 0.23.1

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

diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix
index ffa8eab61fb7..ca22335e075e 100644
--- a/pkgs/by-name/li/libdatachannel/package.nix
+++ b/pkgs/by-name/li/libdatachannel/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdatachannel";
-  version = "0.23.0";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "paullouisageneau";
     repo = "libdatachannel";
     rev = "v${version}";
-    hash = "sha256-bzheNNG6J0tswFZT+Vlqm2FS9MArois46yb8XeL5YqI=";
+    hash = "sha256-+2xJ3H5tnlP015dr0V5WidMl434EsMHwu6p7SrvizgM=";
   };
 
   outputs = [

From b66f9d6c08d958ebd3faed16419a2e5e567442d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 19:15:51 +0000
Subject: [PATCH 004/130] osl: 1.14.5.1 -> 1.14.6.0

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

diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 92b12ea37605..76c26725dd49 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openshadinglanguage";
-  version = "1.14.5.1";
+  version = "1.14.6.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dmGVCx4m2bkeKhAJbU1mrzEDAmnL++7GA5okb9wwk/Y=";
+    hash = "sha256-HVkZZkB15+PT9HcAo8NPhzM86wv5ZvnARQVu+n2gTGw=";
   };
 
   cmakeFlags = [

From 97b8d41a63471b98c4def09b15274dd8630b91b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 03:19:05 +0000
Subject: [PATCH 005/130] scotch: 7.0.7 -> 7.0.8

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

diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix
index acfffd47c5ad..a2097393abbd 100644
--- a/pkgs/by-name/sc/scotch/package.nix
+++ b/pkgs/by-name/sc/scotch/package.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "scotch";
-  version = "7.0.7";
+  version = "7.0.8";
 
   src = fetchFromGitLab {
     domain = "gitlab.inria.fr";
     owner = "scotch";
     repo = "scotch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hjxEJCV6/L/oJnonpN5zj0Asnh6d7j0We1T29G1dhmQ=";
+    hash = "sha256-AtpaBxgV9EamkAlvH9psp+K0o923EhSu6LQA89qyG3w=";
   };
 
   outputs = [

From 9cf033c4412ac6acaa2048ae693a1e05766328cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 02:30:46 +0000
Subject: [PATCH 006/130] rocksdb: 10.2.1 -> 10.4.2

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

diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix
index c2df5b1fc69c..1c6a7ecb3f2a 100644
--- a/pkgs/by-name/ro/rocksdb/package.nix
+++ b/pkgs/by-name/ro/rocksdb/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocksdb";
-  version = "10.2.1";
+  version = "10.4.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v8kZShgz0O3nHZwWjTvhcM56qAs/le1XgMVYyvVd4tg=";
+    hash = "sha256-mKh6zsmxsiUix4LX+npiytmKvLbo6WNA9y4Ns/EY+bE=";
   };
 
   patches = lib.optional (

From 8758d8e53d6a1736d933b3d37a9a37cf7ebf5d56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 12:37:54 +0000
Subject: [PATCH 007/130] a2ps: 4.15.6 -> 4.15.7

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

diff --git a/pkgs/by-name/a2/a2ps/package.nix b/pkgs/by-name/a2/a2ps/package.nix
index 861798968986..8d97f7f96b11 100644
--- a/pkgs/by-name/a2/a2ps/package.nix
+++ b/pkgs/by-name/a2/a2ps/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "a2ps";
-  version = "4.15.6";
+  version = "4.15.7";
 
   src = fetchurl {
     url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz";
-    hash = "sha256-h/+dgByxGWkYHVuM+LZeZeWyS7DHahuCXoCY8pBvvfQ=";
+    hash = "sha256-cV84Zwr9lQtMpxwB9Gj+760mXKUtPxEpNMY8Cov7uK8=";
   };
 
   postPatch = ''

From c3185d0c38618e1917de0cd2ca6c88c09542fb82 Mon Sep 17 00:00:00 2001
From: Solomon Victorino <git@solomonvictorino.com>
Date: Fri, 11 Jul 2025 14:17:59 -0600
Subject: [PATCH 008/130] liboqs: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix
index 75c10c8e5bee..c00c819de528 100644
--- a/pkgs/by-name/li/liboqs/package.nix
+++ b/pkgs/by-name/li/liboqs/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liboqs";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "open-quantum-safe";
     repo = "liboqs";
     rev = finalAttrs.version;
-    hash = "sha256-E3wOiWeQSgWzzu4zoYfLV1kGV3jsFE+XEnUezWSqkcA=";
+    hash = "sha256-BJgsXbKcQjJFk/A7JvkA0NKztv0BAnkgCAXv/TM2/04=";
   };
 
   patches = [

From 827a377cc4f2d93ff86c06b11e39f109fddd0ef9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 18:47:45 +0000
Subject: [PATCH 009/130] closurecompiler: 20250528 -> 20250706

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

diff --git a/pkgs/by-name/cl/closurecompiler/package.nix b/pkgs/by-name/cl/closurecompiler/package.nix
index 01a871241859..931fa70ff3cc 100644
--- a/pkgs/by-name/cl/closurecompiler/package.nix
+++ b/pkgs/by-name/cl/closurecompiler/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "closure-compiler";
-  version = "20250528";
+  version = "20250706";
 
   src = fetchurl {
     url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
-    sha256 = "sha256-P7NzTMgMdvG4LMKcmJx+x2LsPvmjtrr+RC6Oy/CVvD0=";
+    sha256 = "sha256-yf2w6a04S1Y60nL1hkxrhdLAiYO7yjdrUUqTPbyT2Ow=";
   };
 
   dontUnpack = true;

From 7f4021d4481d83ad48aaa6f1e65a4094804f0080 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 11:31:17 +0000
Subject: [PATCH 010/130] linuxPackages.universal-pidff: 0.1.1 -> 0.2.0

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

diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix
index dcf144543e8c..88d1169df2eb 100644
--- a/pkgs/os-specific/linux/universal-pidff/default.nix
+++ b/pkgs/os-specific/linux/universal-pidff/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "universal-pidff";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "JacKeTUs";
     repo = "universal-pidff";
     tag = version;
-    hash = "sha256-Ebj0s08x5+qkJFOUeiLF9lwfyJIH5llPRM+ZXcT594I=";
+    hash = "sha256-qjnQTkQiufHPEwMH+F+XE+VBc/DSTX6d0vxot35xbUc=";
   };
 
   postPatch = ''

From c1390c04857f909fd12f1d7a3ec8bfe4660f9fc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 15:26:51 +0000
Subject: [PATCH 011/130] linuxPackages.akvcam: 1.2.7 -> 1.3.0

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

diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix
index 7de6bdafc69e..1b9428a222a0 100644
--- a/pkgs/os-specific/linux/akvcam/default.nix
+++ b/pkgs/os-specific/linux/akvcam/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "akvcam";
-  version = "1.2.7";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "webcamoid";
     repo = "akvcam";
     rev = version;
-    sha256 = "sha256-I+dGfRLFOV8E35fLFnWtNWmqpzbWsA2dBx6pBKQsa7Q=";
+    sha256 = "sha256-3fs+Kfafry77SQvsAidM29g9CcfjWirteS/VdNSWVCE=";
   };
   sourceRoot = "${src.name}/src";
 

From 7efb19e07923831b5e672ecc461db4db6b03f467 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 19:03:49 +0000
Subject: [PATCH 012/130] protozero: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/by-name/pr/protozero/package.nix b/pkgs/by-name/pr/protozero/package.nix
index 9960890cfe29..9fa59741a663 100644
--- a/pkgs/by-name/pr/protozero/package.nix
+++ b/pkgs/by-name/pr/protozero/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "protozero";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "protozero";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kqR0YLxkRu8WclxaoR/zx+2sRTEZus7dUTbqjBkv12U=";
+    hash = "sha256-69GEAz6wSGMGozsWS9xmoTgyH8mTuDM9mUTCXfVI6f8=";
   };
 
   nativeBuildInputs = [ cmake ];

From e21fef90eab15b5f66f8aa16411385d57a4ae8ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Jul 2025 10:24:05 +0000
Subject: [PATCH 013/130] samtools: 1.21 -> 1.22.1

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

diff --git a/pkgs/by-name/sa/samtools/package.nix b/pkgs/by-name/sa/samtools/package.nix
index 10bb0010a940..aa571fab98ef 100644
--- a/pkgs/by-name/sa/samtools/package.nix
+++ b/pkgs/by-name/sa/samtools/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "samtools";
-  version = "1.21";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-BXJLCDprbwMF/K5SQ6BWzDbPgmMJw8uTR6a4nuP8Wto=";
+    hash = "sha256-Aqpc0LpS4GwggAVOBZ19d6iF3+lxfDHNid/npAR+2g4=";
   };
 
   # tests require `bgzip` from the htslib package

From 8c2dc66a4148854c88b0627c81083e6ac4a47489 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 07:02:49 +0000
Subject: [PATCH 014/130] graalvmPackages.graalvm-ce: 24.0.1 -> 24.0.2

---
 .../community-edition/graalvm-ce/hashes.nix    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix
index f00424c10195..a38117ef6be3 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix
@@ -1,22 +1,22 @@
 # Generated by update.sh script
 {
-  "version" = "24.0.1";
+  "version" = "24.0.2";
   "hashes" = {
     "aarch64-linux" = {
-      sha256 = "0bkn7ml2xikhscwnb9ixa9zb80lvkbvh28r56bv3s3gvmn7vxld3";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.1/graalvm-community-jdk-24.0.1_linux-aarch64_bin.tar.gz";
+      sha256 = "1xfncszlnxmjxfj79b3z5isc8a3gjk0cn3i7b0yli4c7hld9akf5";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.2/graalvm-community-jdk-24.0.2_linux-aarch64_bin.tar.gz";
     };
     "x86_64-linux" = {
-      sha256 = "1pjbm3kb7hs2hna39qj1ji57fsyckskiv3wwl1v08h1fczg49ifj";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.1/graalvm-community-jdk-24.0.1_linux-x64_bin.tar.gz";
+      sha256 = "080774x1chpa0n8bpmw575g5myi63ikffwgcvq3r7nvdh9n88qkd";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.2/graalvm-community-jdk-24.0.2_linux-x64_bin.tar.gz";
     };
     "x86_64-darwin" = {
-      sha256 = "1qjr0d3nwz0fc5yr78gjsqa8x9y1srczi7y0zbq6p6mcf3c1a9j5";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.1/graalvm-community-jdk-24.0.1_macos-x64_bin.tar.gz";
+      sha256 = "1lvn38dd7kl086344237jq20a1l4cqj2wcdjain1bawds5bdi7n5";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.2/graalvm-community-jdk-24.0.2_macos-x64_bin.tar.gz";
     };
     "aarch64-darwin" = {
-      sha256 = "1bffg1k0hwv5hniakcqh165a7k8fp5r4nj0595ynrmshncgnc60f";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.1/graalvm-community-jdk-24.0.1_macos-aarch64_bin.tar.gz";
+      sha256 = "11ymqs0knhx70n8mvanfnqaq3d8x5a9955hqccllgzj6fz86hl0z";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.2/graalvm-community-jdk-24.0.2_macos-aarch64_bin.tar.gz";
     };
   };
 }

From f421e25ac19b4e5ef8d6a3ad54f3ac0de180c290 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 19:00:04 +0000
Subject: [PATCH 015/130] sby: 0.52 -> 0.55

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

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index a55540fa01cf..7f01f8466315 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.52";
+  version = "0.55";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     tag = "v${version}";
-    hash = "sha256-E/je1lHvYCpmRlwM17PWTQemSnz8azviKiz4t9z17UM=";
+    hash = "sha256-Q02CLx8GYu7Rnngd03kRGstYVOm8mBl7JsP0bYOFtDg=";
   };
 
   nativeCheckInputs = [

From e4b8ae6263edf375808d11a6d4dc68dc5e735c95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 03:30:07 +0000
Subject: [PATCH 016/130] capacities: 1.48.7 -> 1.50.4

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

diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix
index 9d5244c11a01..69dcc09037bb 100644
--- a/pkgs/by-name/ca/capacities/package.nix
+++ b/pkgs/by-name/ca/capacities/package.nix
@@ -7,12 +7,12 @@
 }:
 let
   pname = "capacities";
-  version = "1.48.7";
+  version = "1.50.4";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://web.archive.org/web/20250519011655/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/capacities-${version}.AppImage";
-    hash = "sha256-fa1Wk3w+f467n0JtRz+Zjw9QKDKKnhS23biEtNqO17Y=";
+    hash = "sha256-8sp6q86C36FbJ1azhX5QWbb2PmqJ/bbZQX31yzNByU4=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 675707e7ca389ea5de33d9fe2493a30084ddf884 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 03:21:23 +0000
Subject: [PATCH 017/130] hamrs-pro: 2.41.1 -> 2.42.1

---
 pkgs/by-name/ha/hamrs-pro/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix
index 24ae84f32852..9de90e310c29 100644
--- a/pkgs/by-name/ha/hamrs-pro/package.nix
+++ b/pkgs/by-name/ha/hamrs-pro/package.nix
@@ -8,29 +8,29 @@
 
 let
   pname = "hamrs-pro";
-  version = "2.41.1";
+  version = "2.42.1";
 
   throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage";
-      hash = "sha256-HJXuxqIZU1dHf+ABb4rXnQkbQ1x7khpYiYq+0/HKZTs=";
+      hash = "sha256-LPXrzS/OF+O4zYlk+Ubf46mZbjTaE8OEA9n7NkC/jxE=";
     };
 
     aarch64-linux = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage";
-      hash = "sha256-pgMXAlOKxxzxJHMfM1fSfwmdKq2K1o7UVBQdeAwEIKE=";
+      hash = "sha256-WTmUscuz4mCnW19zoqxBkqBrb1VJBn/FBf2sDQQ3hF8=";
     };
 
     x86_64-darwin = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg";
-      hash = "sha256-kIvw18jvZCBJqdIL9fikSpKmZw+NDqFhCNvEO9gkvMA=";
+      hash = "sha256-n1wDHbo8URIZEIzJx6O7zGnH/RtMj75ltXImM3Q1QvI=";
     };
 
     aarch64-darwin = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg";
-      hash = "sha256-+zMXF8p/KcJrMbeFF2uHLBpqEmUtzN9rNVBD8+h1PG0=";
+      hash = "sha256-x/hxKLCVme5l7lo7REy8EjEBstrWA9uyC2sA811eOPk=";
     };
   };
 

From 345f1faa78f18fcb4b542d0852cbebb00239af87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 13:01:10 +0000
Subject: [PATCH 018/130] blobfuse: 2.4.2 -> 2.5.0

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

diff --git a/pkgs/by-name/bl/blobfuse/package.nix b/pkgs/by-name/bl/blobfuse/package.nix
index 6de880843121..73275675c8ad 100644
--- a/pkgs/by-name/bl/blobfuse/package.nix
+++ b/pkgs/by-name/bl/blobfuse/package.nix
@@ -9,19 +9,19 @@
 }:
 
 let
-  version = "2.4.2";
+  version = "2.5.0";
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-fuse";
     rev = "blobfuse2-${version}";
-    sha256 = "sha256-bpMX7flbb/QYZUtq1I1s2lAvrBhW7esPwxN/JupryDo=";
+    sha256 = "sha256-BRLORwEY8PeD9hFkpm3Gup+eXzdFkW1Rkr73ncyKrso=";
   };
 in
 buildGoModule {
   pname = "blobfuse";
   inherit version src;
 
-  vendorHash = "sha256-uWesaZshuBVf4yJiX6YqNMr0GiBkrHhOqefnCrpPCHg=";
+  vendorHash = "sha256-L1ix9pRal5Ssfwf+kl9SFC9bbveuKeiuzrBwapvbFZY=";
 
   buildInputs = [ fuse3 ];
 

From 46488d27361ad348a3a8e3253d2473944be55e8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 22:08:46 +0000
Subject: [PATCH 019/130] iosevka-bin: 33.2.6 -> 33.2.7

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index e7824a7b4903..942b85e8ecef 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.2.6";
+  version = "33.2.7";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index c7cfc0ba6c6c..4115611b72a2 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1cvcxr6s3g14dq13hfy81xx7mjs8smqh56ci7l9r9mmlvxi89bkh";
-  IosevkaAile = "06prb7bq78rxnxpydsgqpzlija93dp8bymj2k0pghxg05cwk47q8";
-  IosevkaCurly = "0zjh14n49wgg2fajmk63ra8yh8iq4km58g9ivyhaz7i2lz4iiaiw";
-  IosevkaCurlySlab = "16i2643p2fzjhlvwjhhnnsdcwa2baqx7ww02bjlxri2bwvbfqfjq";
-  IosevkaEtoile = "0a3bp1k6010cqp3vh1k9zxbg99mnxnvv1h7sjr90kym24mhj6n2f";
-  IosevkaSlab = "1skwbr41y4rpvfn6x9s0sqjz3gki9j46d0wcnmv067zag2mjvbd4";
-  IosevkaSS01 = "0v53a2ifpccgppia83y9v7766ch363913ic7lsfzkrlp1hxk8l2w";
-  IosevkaSS02 = "12jhv59flx0wl4vwf42f4rqfwb7k1l1sn6k9kazj7lbkh7sjjdd3";
-  IosevkaSS03 = "118dd5ij4q0f1wkjywh3dy96xrzy4a4ymn1naznvkfv660f9kdxc";
-  IosevkaSS04 = "1dqrbkkdp936sarfgzj9z1rnpy571gf3ms4kaarh12fz4yns0c11";
-  IosevkaSS05 = "05fw66j0s8pm5iqcz38lvnhpkxb8721gh45yh6bhkf34nl4kyw5y";
-  IosevkaSS06 = "1mbqlql2n936rayjmda47d6g1mdlmswxcgxcq3whs8b5p7jaj0ka";
-  IosevkaSS07 = "0b3z830accqm633wiqcdqqjinmh3wd69q7n7sa8xg7nkg865cxa1";
-  IosevkaSS08 = "1ac6q00ah67y2rn3fdby2wdpz4qnmcp3r5rzmbcj5wry6cvfnjgj";
-  IosevkaSS09 = "0zs8g3mijlwcppli0613x8q5q9axp2mn2dvj51civ28hjgzg5gp0";
-  IosevkaSS10 = "1lalr25znbxkmaw1a9rg8qagby0z8cml58l5pkvbjm2bz0ly2ry1";
-  IosevkaSS11 = "10vxwc7qsi4m2bhzb0rxwqvvx8bb2sibzjsby1b9wfkdbn9kcrrj";
-  IosevkaSS12 = "0qgign3c7g72wh0vlghy593fl067cgryd8z8vzbndg42npn302c2";
-  IosevkaSS13 = "0kicp6xdk321pg2msfi50ngxzclr2w8dss9gzyd1ls8gsx596p45";
-  IosevkaSS14 = "1g69wr3822avxqhsdrmfannwbvgigkdghi192j8a4bg0rr73sba2";
-  IosevkaSS15 = "0yliiksrwmcisyba1mzh2yhrmyxgzid2inccfhvybaimhyqx6mm8";
-  IosevkaSS16 = "1kcwma2l6p69mkb4pw56hi8797bg5wncxk59g191fl94y08mlc9v";
-  IosevkaSS17 = "1qy7576kr37nwgdr7r5j3ry12crn4z78x4kf8s5vzqmrxrjrdhnx";
-  IosevkaSS18 = "1xqh5s607imyzn8c7pzah7l6w409ki6xq214cinc298p8k3qxi9y";
-  SGr-Iosevka = "0dpdaq8c45dz8zcn27mxpdwwwgczw0glx0mg0qa29msp24dqc54r";
-  SGr-IosevkaCurly = "1j1h8yv6gi4fp8ci1ycpnbl2ayzzfzykb8q8cm8h4dxk38xwa3ab";
-  SGr-IosevkaCurlySlab = "07y5r7w42hnfx9sz33yapgc2x3vdjnzsispzl565va5wgyl8hcw9";
-  SGr-IosevkaFixed = "15792ir7x3mzrpfbhaisfihciw2k5j9l75qfvzxzr2p8j6k6b2mk";
-  SGr-IosevkaFixedCurly = "0i9g38b8qsz20h0sw2fk57rcrxspwf18x52z9zyvkh1nbhhxhx6f";
-  SGr-IosevkaFixedCurlySlab = "0lnx5wamvpahhxijxzqa2yzyxcrw9fi5c3l2lckz2phc94ivxxcm";
-  SGr-IosevkaFixedSlab = "1ck3xsc7w6a8jvdbggc5r9kjv6ycf8rmscjdpx334icgx9f3yfvd";
-  SGr-IosevkaFixedSS01 = "125siykvnh2qjycral9807687hqlv1kl7mcl10cgdq8my51sskxp";
-  SGr-IosevkaFixedSS02 = "1li6z7s370ga767asp2q2dw5nf43w7s7hwxcnlvvm5ylg4cw2sg2";
-  SGr-IosevkaFixedSS03 = "1dz5z4bp127x5plim4f6x6bcjwr3868s721syp1m9d8x1a31a5m1";
-  SGr-IosevkaFixedSS04 = "0p765cbh6rv47qqpncnijc29mm6wwjr6sw7srr1z7krvsqlybdw8";
-  SGr-IosevkaFixedSS05 = "0r5kqsj2fymw1p1x35p3jdwzqv48gy26025hz1n55rmpg2nln3m2";
-  SGr-IosevkaFixedSS06 = "041v6af6dw1bxkj1byxlin0dm6y93zlby9avsiyz3dd8mi19687j";
-  SGr-IosevkaFixedSS07 = "1wq9wpn3ggclalrqmn7l87hpi6mw3rqgxlyv3sqz4kr0qp5ysfya";
-  SGr-IosevkaFixedSS08 = "0xg00rwmhaacqsl2vhp0azjz4cgiryskxmfkcvz03k58fqaw1bq4";
-  SGr-IosevkaFixedSS09 = "0kzqgl25dd3lyf9hvkg7dh37dksy9gla0cd0wb5q4mvilblpaswr";
-  SGr-IosevkaFixedSS10 = "1492048iv4n3g3jk11njrxnqc9hl2gv89w1bqaqcmwnn4vw3l2jw";
-  SGr-IosevkaFixedSS11 = "1cnm293rxx7dxfgjbxd0n68njlkv6r3dz7dn3p8dsjfh6mq4gapm";
-  SGr-IosevkaFixedSS12 = "0d760gqpxh04rq52qpvvdbsicx8d9jrp3i3ak17m1m4v3cisi5xp";
-  SGr-IosevkaFixedSS13 = "1vnb3hrp8z2h0hz14fnlxxv3dpz74s4a33mhy0sm8ax5myich8sk";
-  SGr-IosevkaFixedSS14 = "0hz6cqb84abvllnkvnni0g2cjrwnzhy9iz45q5xs0f2s69kxkzil";
-  SGr-IosevkaFixedSS15 = "147a7x7np8v8p7qm9hr1mqghskxfbfag3454zvmna0ymi9w3d7w7";
-  SGr-IosevkaFixedSS16 = "0q9p01hazmaqdbvfv1y821dff4n41k2bkmylp8hzvd2qpyn1m7pv";
-  SGr-IosevkaFixedSS17 = "12kpc47kj1yx5b5bcpakagjif16hzq1a2psqna89ainxcw5qil2j";
-  SGr-IosevkaFixedSS18 = "0h3l8ci22hk3rbrhcilkr7mxdbs0j80ak38ncg0vj72qllpni0ib";
-  SGr-IosevkaSlab = "1mfr1ny5ksivg9cmlw5y9v0aqdxjdgcalr8l2vfad063i5igwm22";
-  SGr-IosevkaSS01 = "07w50mjqry9gxfajsnvhxlhyl7hzqaspiz55ccpfl8bajqmavpb4";
-  SGr-IosevkaSS02 = "0imd2rv1rmz0xxf5wl44d85d46kfp286kdxlc5z0rzm2ghylw029";
-  SGr-IosevkaSS03 = "17lz4ay6l4zaa31lz84s6pvfq5fbwag4r4c3iwh973xrhcsp0i97";
-  SGr-IosevkaSS04 = "1mpb4cyd44dxjqxyzina19ly5x0w37h9c2jhrj0c7zcwvn5ippzw";
-  SGr-IosevkaSS05 = "054qxgv3j5cp3agnv33aipc0fbya7k7091zg5jkliz7ybfjmp7cs";
-  SGr-IosevkaSS06 = "1kdakk5vv2vk23jij5q704qdppii982q6h5qy27kgc58kx7yhyi4";
-  SGr-IosevkaSS07 = "09i3lvc6p15mmh9m2c4wbiww0cb22rzlwysx2xqc5445vjmb8z7l";
-  SGr-IosevkaSS08 = "1kxkjbnxaa7nkq5qbfzzjaqmx0vj69i5x6dkk3f11kvfxjm294cg";
-  SGr-IosevkaSS09 = "0z80bqkv9xdmakzvkjpq0dr886mc7qhgqkqzi2zcxkknij09pm93";
-  SGr-IosevkaSS10 = "1q6d3apwaalsg07pvs1g93vmlmbrylbvyaadf14a5aqgj8q0whq5";
-  SGr-IosevkaSS11 = "0pah1l6hak2sd7alhd3bj811pm6rz2n3rnkbs71d389a717l6263";
-  SGr-IosevkaSS12 = "1v8iqc836rlp9h11762zrjlhazkyixjk4y9gz9bwnfg2qb7bblgh";
-  SGr-IosevkaSS13 = "0vma8101573kb5v264g5n9fmznnia53wm7kq46j1v9wjhyik5dmc";
-  SGr-IosevkaSS14 = "0f3z45d5wz8g1iyjj3sz73spawm2lbis94v7ziq038qvwa6b69qn";
-  SGr-IosevkaSS15 = "0f8c8ckbhdaxna30brqixnybsal9vlj85qrjv9mfnj87ayrb7k4p";
-  SGr-IosevkaSS16 = "1wxy8kkv3hvbqvkxng8rvb42dlna40dv9zdpmdax8zl122bsc684";
-  SGr-IosevkaSS17 = "0riax8l3ywjpnlnyaxvhd5cc8r8288881jqnay3397mcah11r9fj";
-  SGr-IosevkaSS18 = "10rx46k9jn0aldqbi5zyqizihvq5wsqyp3qglgmyan9fivwg7a8j";
-  SGr-IosevkaTerm = "0jv8z75sigkz82qxjvzm3q8hnfmznfh84w9041lhyjsq93vf4gzs";
-  SGr-IosevkaTermCurly = "195hl0vaycbpxg4ssx2qg1fjwlrnd8ryafyg53vq67gsp7slm405";
-  SGr-IosevkaTermCurlySlab = "112xgh42v2sbbwi1iar103cpgb6qbl3lmgy89dsrad7813v9mdis";
-  SGr-IosevkaTermSlab = "0hxx2drjmyq96cffk7kykinksl328rmjqaif3ppkf0c7hadn8s6l";
-  SGr-IosevkaTermSS01 = "0133sric8inqn3ym0ynq3ngllm1j8nrh3whggl00d2l8zn9sm1v2";
-  SGr-IosevkaTermSS02 = "1a8hxxj616qigxllfqsam10wgl726h8mbp9ri4s4lqg5fa24jvhg";
-  SGr-IosevkaTermSS03 = "0lq9si8d87magnx1v8igfb6y53njs1a07mr6dwp2c69cy9g8v6fl";
-  SGr-IosevkaTermSS04 = "0fdchd663z2xym0cxv1kv7czzv1ad6m48952hrc3rq8wvaqvkn4b";
-  SGr-IosevkaTermSS05 = "0v94dkp2bp1m8xf5nlk7ncwvb6v6f9p6zzczpb4m6gyy6n1yprsn";
-  SGr-IosevkaTermSS06 = "19apwxhvmnbcqphkwd2czp6szbjnw87q9mn3gpzwd731nrh0cfdz";
-  SGr-IosevkaTermSS07 = "0zyf1ylxqah1m6d8mh8k74czj30ycznvqs74ivj7d6wh1bpzzl5y";
-  SGr-IosevkaTermSS08 = "10s1qgb6aqil07lnm7zgagldl3k5bj8xb976kabf4da9yi3qff1x";
-  SGr-IosevkaTermSS09 = "0gzcvs6ppklhs4ymyabxmrk7b9pmbnn9v3w24q6hjmjxg8l4qsja";
-  SGr-IosevkaTermSS10 = "0gaf4q6jn3yfq28yvrflx2k7jgk4iw6d5p53a5zmywj7kr2a8vvg";
-  SGr-IosevkaTermSS11 = "183caa2py7ssadbmdwkyrm5briqzsj1r45aia92wp6ll449h29ka";
-  SGr-IosevkaTermSS12 = "03nhshkycnqzjvd3jvdzxnfrgw3l7jpmgs552dc0gwps5n2628w5";
-  SGr-IosevkaTermSS13 = "1di6fpds2i0jyf08jidlbddz6l2vba99f74cdgn8v39g4kyq8ng2";
-  SGr-IosevkaTermSS14 = "04ya798vwh6svbnapbxr2nd2z3g5x6hjqvyccbcizcdik498m1aw";
-  SGr-IosevkaTermSS15 = "1gi61fpzl27kp60ph9w1sn0kghgkmby80qnwjzs7ny6k8xnlwq23";
-  SGr-IosevkaTermSS16 = "1kq20xqfg76pv86bh5djd558injd0vqcg5m7pm3bzy4scriw3vw3";
-  SGr-IosevkaTermSS17 = "1m85s4c1l6qvng0bi3201klvaw2iz2lkshnx490xjfypx70231hm";
-  SGr-IosevkaTermSS18 = "1yinpsq5dbjqxyxaflfdvzmdg1v0ghqnigcf7j2cc9bqld397xh8";
+  Iosevka = "0z7w7j7wwc36qzmwralkbyps60p8x5wb514bdnjk8s9023z2w0nz";
+  IosevkaAile = "0pbappmm45vma5d45l2a98zb6213hfb0k30hvwv5298ds3k95f89";
+  IosevkaCurly = "1zw9gas6yw6dxk5ahdbbc9374rzzanr9k38ka4jhydn8zmcnsq85";
+  IosevkaCurlySlab = "1yvlyg5c5lydc5ycn9i8pnch1jwm749sng17b3xc0x18ndrqsa2x";
+  IosevkaEtoile = "12q8bvl8ckkj8v6ngw68bn62mcdfl5w71l7hc3m9b3fr4gfvz2gm";
+  IosevkaSlab = "0fpj2phmmsfqzii39a3zvyjzrbhjnn914cdcgp6g1b6xk5qd1p5n";
+  IosevkaSS01 = "03fzxs4wba1qc5mhy9cr664gfh9zz9wg0qsw3gxnn1rd9xd2y5ri";
+  IosevkaSS02 = "08pi97qzjs4v7xgck8g68llm880bp23kfgp8sqxdv4n2d5cr4yib";
+  IosevkaSS03 = "1d75hzcjz55jb9xwgky1ns78lg776aw0a0a8gyfm8kxhmb8n1kpp";
+  IosevkaSS04 = "0snq7wd02j0xmcf6smqxv33f4z9wdr14dz7hla892hnbm0pymlws";
+  IosevkaSS05 = "0xp502q3zv506fbgjid51n7j5hcq3hjvq8rz417shd9f68mx0z9z";
+  IosevkaSS06 = "0w2rjmv1k13jhndv165xaamcscxbsgh38icnzj72hs3kw8mgijj7";
+  IosevkaSS07 = "17661r5bnwd3hphy52d1mjp9sxs4jfxc741x672jxwdwnj8w6ffh";
+  IosevkaSS08 = "15q1kskng4nsp60kv09zwvp24m9lql9wa3ahb94s57k1rqmf4jn6";
+  IosevkaSS09 = "1l6p0arvndkz36h3x1npb1yj910nvbj3v0a3j5lz6dbhv0imsx0q";
+  IosevkaSS10 = "1agwjpw1hh8wagacld61ld9gyh5vmirrabjvv5s7gzrfr8acgp18";
+  IosevkaSS11 = "1hz7ln5w083z17napnm8v1gw6nzh8dkzbiqw8zrv5bmbj3jzc21n";
+  IosevkaSS12 = "10kz86ypf9c41n8yk7yx2rrxmwr3c0gwznw9lrida15lppwfq6as";
+  IosevkaSS13 = "0wbprdjyilp18j8gxa1fa0iggy84mzy826ms3bq20i4q6xcsqli5";
+  IosevkaSS14 = "07a6xcxl4mksxfpfvwx5pr3vw6mpnz9bfpfbsy53jgn3yc6cfwl1";
+  IosevkaSS15 = "1ij9z4ngh7s7ld4bh0f6mz4zxlsfa2l1dpq3b429na9vachv1khj";
+  IosevkaSS16 = "1skg7aqnzd7nyc43glbgg4b10xzmmc0gn20v6qmkrdv1cyhxwm87";
+  IosevkaSS17 = "0xcdv8zygvmh218qk9lgjcgdflcr54s7p86x5br2aja658azdlzp";
+  IosevkaSS18 = "1nf6wajmjx2aqqmv6zbfa29jsvg4lw8jf1jk32xrd5953yx30y6z";
+  SGr-Iosevka = "1czz0cz9py8ldrp0h1la5dd1b558ss32f2vbmcv5j5c76fify71f";
+  SGr-IosevkaCurly = "0zfqx11alkbd2bj77rnzgb4jy91fa6ns596m82gfkmks7ggq3b4j";
+  SGr-IosevkaCurlySlab = "0l0vfbq5vya9igx6xd9hsnm96bp8j87qnhj553rhd56jy73ms5la";
+  SGr-IosevkaFixed = "100g3j0v8qfmkkhl0zwyy736i5a0ci33hfmh1dwnzkx993qwrv01";
+  SGr-IosevkaFixedCurly = "0nriagy3m1r8fn2r51k4xi69b7xj09dhg4bvl0gj2syrrqldnkyj";
+  SGr-IosevkaFixedCurlySlab = "1bpihhg5gxlbg152vdwbb6kq5k8dcrirzwhay4w5bq9fzfg62p6z";
+  SGr-IosevkaFixedSlab = "0v5mfni7y3h519xa2r70bqx5ragk6l68kghsr1k0wbnv03m3ha7w";
+  SGr-IosevkaFixedSS01 = "158l9b0cdaa7al88wg6bba9xxp6sn914gj58g201w5xsbd0srpql";
+  SGr-IosevkaFixedSS02 = "1082wffk762mdc855iz7zrqhb9dpmd3yj324jzzsvhwhhj66hmnl";
+  SGr-IosevkaFixedSS03 = "1kr194dpq365ickgrmhrrjpsy0mv5ixm5z7xbciw6pppmk8aaami";
+  SGr-IosevkaFixedSS04 = "0z31masbyxvmfagdpcs1iz3ibslvg54ix9w6ld0rzkdjvln8g6pr";
+  SGr-IosevkaFixedSS05 = "0rnda4lnjv0ya1911mbrsymada6qq7nzrnzikzm2140ck3lq8lcl";
+  SGr-IosevkaFixedSS06 = "11p8ks82drhvmm9qnlqqz1r77chg0ffdrx4m0s32k46s928kjkxs";
+  SGr-IosevkaFixedSS07 = "07xfkr1qdvvr5w26q6qgfqbij2d3iaxxwh0ibj0x9v9zwf6nn7w3";
+  SGr-IosevkaFixedSS08 = "0p0phcjakd0x9qph8wr43l4qg8v3kv05k1dzmvbx7v6dbj69b230";
+  SGr-IosevkaFixedSS09 = "1hghv10j5gdizr0yjxs0qdmqvqdi397bzwscdj0asislf2scji52";
+  SGr-IosevkaFixedSS10 = "0yjwyhdkxg2icxsql814a33zf0k4pzsxwnk5wydd535qld2jl188";
+  SGr-IosevkaFixedSS11 = "0jrnmr5aspc155ajn9cxbapvbl240njx2zha7x0r1q471r7kf42y";
+  SGr-IosevkaFixedSS12 = "1p463hmkvmkcr4602blzwafs0gzi83b781barwi862dah5mp3yq6";
+  SGr-IosevkaFixedSS13 = "1jr0rfr276870gdl3ljysw4zp2habyqa80wcbzsdsp2m2nqdwn53";
+  SGr-IosevkaFixedSS14 = "1zryh9bmiipn4zvkga39ksqfrrnsr04invmidhrd955g39yz1c4a";
+  SGr-IosevkaFixedSS15 = "1ly33fh8m3hwkmzm7fr870wys3xp49cknd9dmdm1v4calylfd88w";
+  SGr-IosevkaFixedSS16 = "0gq66d1x5hdfn2iwcl75rq0586l7k6in9vsfhxabfgw9gp6y852c";
+  SGr-IosevkaFixedSS17 = "0sj1jmipz8a2vwizg6p0ywa838w2m3x5lfj49ql1ybh1bjz1cj23";
+  SGr-IosevkaFixedSS18 = "1rkz18k0nrz6if3nmcjpvrcbc2pg5w8z6dsvld90yf1964qll7q3";
+  SGr-IosevkaSlab = "18kif4a83qs1nsv3pvnyf8labw89ix4x42ydji6l387lzzxn5919";
+  SGr-IosevkaSS01 = "1j74h95csjfdvgmbqmnvgavhm5kjvbkh1rsh4xgrf4rqjcnr82kw";
+  SGr-IosevkaSS02 = "1n63pwjm05mwxzy18zw4hd0547ycg1dl0ivykgw1f25yf968wfg9";
+  SGr-IosevkaSS03 = "0a8v523slxnja9vslfz4cxy5g6h0zcj30mky70wxmnf2gmfvc7zv";
+  SGr-IosevkaSS04 = "0ylvzphbhvixfq69zyaick56jpkff33vyc2z1pszqblz0dzdc8kn";
+  SGr-IosevkaSS05 = "1ij58iqs9bmibgg9pj38053phnydwcb2k9npgbs88f08s1pgjvh5";
+  SGr-IosevkaSS06 = "00yfsbhgcxd3dv888hw8r4n4ivwxcn0m3zz99djgzxn0nd8r10y2";
+  SGr-IosevkaSS07 = "0b5c29x479i04afdkjplbq135pzhfcwi144xs0k2ba6s85g0y10d";
+  SGr-IosevkaSS08 = "1by2vd7kjqiqj7f3zps4xiz0ydq3gnljkh7jly513dg0idg2agwv";
+  SGr-IosevkaSS09 = "0a9sgh2vwm57ay1pzlrmwd549aaidg7p8b76dhxvhmvf006ay92b";
+  SGr-IosevkaSS10 = "079vr05ilaijqyy1wkqgk42jg5i2s3sz5y3i19gr1yqgfdpq2b3j";
+  SGr-IosevkaSS11 = "11l0cf7ib9ibcckpjymrpwgsadz3glwdics3mzhhzv28fz91b95c";
+  SGr-IosevkaSS12 = "1sbwi3fbj421z8jaa224hy8vmk565brclxzg9dnsdg5x8kxlf6jg";
+  SGr-IosevkaSS13 = "1qsqa76wkz2adaabigw6d74k0s0jlswagsyknxcpynh6fmzqcrs4";
+  SGr-IosevkaSS14 = "002kzsjqsajz5q1wy0vfr836ljmlm417zb3c6yjlnqp2zpzz26d5";
+  SGr-IosevkaSS15 = "1h74gl7xm2qdy0v3xhj0nmwn6b6zwxnmrv0wwpqd2yn4jf57xa4v";
+  SGr-IosevkaSS16 = "0y58mggxv7bqymf45bcy2mjlngz3hp5mbisy1n65d7kmqcjfyj97";
+  SGr-IosevkaSS17 = "1b728h7qnyd9i3jp1j7d7n11vksw6518rhl7470h01qmqnmpw579";
+  SGr-IosevkaSS18 = "1hh64ys2bjh7qlkz30vnj38grkr4s6c5nm8c1zgf6yi02xcrnxjg";
+  SGr-IosevkaTerm = "1k85q6y3h0i8ivm0llif3k4llgaxin87gmvjxn4h8092yfi59kkh";
+  SGr-IosevkaTermCurly = "1xwif6qjada58mswqd0myr2p2h06dik55cj4bsk3kmva2avvn2d3";
+  SGr-IosevkaTermCurlySlab = "161583x6zphxxzpzkp889rhjihpxy2ahrdc8nbqldn7j2nijz56s";
+  SGr-IosevkaTermSlab = "1fsx3z12plbkgjjdppf9c2b0y40vsavqp5hkj5b1j336cxah97yr";
+  SGr-IosevkaTermSS01 = "1z2xyyb2ddlrarxqzrv9x7hajpifqi15simqnmd31d899kx1zqx3";
+  SGr-IosevkaTermSS02 = "1nrr55hh2kd57ri6ipcm2425g469xj1gxf7lzivi1w8dbgk6mi4j";
+  SGr-IosevkaTermSS03 = "1zp7p0b4y911lxf80bkhj7x68xpjc36a6x6lmq2msq886hyayq14";
+  SGr-IosevkaTermSS04 = "15bzbrch7f0c4sxi01sasavkbjvgja1h740hd2zaqlsshx8sk91z";
+  SGr-IosevkaTermSS05 = "1zl760ikgq7y0x03zjnild7dpx9ndc1g0rjk5drp84qg8saaayz3";
+  SGr-IosevkaTermSS06 = "0zy62b3njnz0ip666xx68lmc8b4yaa610fy5qf9d6c8yj0qfb1gd";
+  SGr-IosevkaTermSS07 = "0m9j0v4ijz6yprvvnbv7591vh81xr1yyr73fy4463v9za99ccpvn";
+  SGr-IosevkaTermSS08 = "1a5qgy3cbf166q2j3gg8h4a0rfz9cjb6c1kqrmkvabxxk6fmg3s5";
+  SGr-IosevkaTermSS09 = "1hz3pasx0zg7467cpdwrm9gnfdwslbp5llawfsr2qp5vzkqggxhj";
+  SGr-IosevkaTermSS10 = "1cgfsmf2arcpjn3wclhkfqajx4nkc24d8ww3k8156bjd7bn8hxa8";
+  SGr-IosevkaTermSS11 = "0z6rw2f8palzm2k00pacnaw27kipr4sd3l9rh3ahw88s4h0r3kgv";
+  SGr-IosevkaTermSS12 = "0qak5xq61wxzr3gcyhamf9sanzisx8n72l7acwd7nffk9c5c7iy9";
+  SGr-IosevkaTermSS13 = "13vi16nks0kbd0hyg1g4cxi3pxxqk3sj297h5nxv0i0khfrdyyys";
+  SGr-IosevkaTermSS14 = "1q004ws9aamdvkfm2as6281ypk0fvq5m9ccv11azs9jcfydx5s1n";
+  SGr-IosevkaTermSS15 = "0fdk1x6wpzsrg0r304nsk9hszpy9yndjkrq62q6a466sxsykj3ij";
+  SGr-IosevkaTermSS16 = "0yiwj0dz7lf1y6v7snmxl5zfqq66hg4dg82fb2axibh0f0k9x51y";
+  SGr-IosevkaTermSS17 = "1xih5lnxl4v3gw3vz93pv2djkibmb13y4a76ky7svyg2y3v5dzhm";
+  SGr-IosevkaTermSS18 = "1qlk7fcsp3sbq4q1zny5gvfbqmkgz7cqxz5pvgfcjd6i6s932lmb";
 }

From b1c60eb3afffbfc74fd9afc009f1e53a0beb7ba1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 23:29:13 +0000
Subject: [PATCH 020/130] mercure: 0.19.2 -> 0.20.0

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

diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix
index 3eb34b67f8e9..86a144ee1a22 100644
--- a/pkgs/by-name/me/mercure/package.nix
+++ b/pkgs/by-name/me/mercure/package.nix
@@ -9,18 +9,18 @@
 
 buildGoModule rec {
   pname = "mercure";
-  version = "0.19.2";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "dunglas";
     repo = "mercure";
     rev = "v${version}";
-    hash = "sha256-Dmivt+djzY/3dr4aglRLFGG4LgH+Q7tZpqxnY70lHqI=";
+    hash = "sha256-JBvfNzsOP4ggJ7D2+5yW8837QsN15wO6EbFrTKVensU=";
   };
 
   sourceRoot = "${src.name}/caddy";
 
-  vendorHash = "sha256-WqlwQGA0zptt3WZKpDrWNAkAy1UIXmapdAFkZAntqLM=";
+  vendorHash = "sha256-ZCvIgyGw4F4VGbnuan5O+to5n969ThRZNFezu+byKWg=";
 
   subPackages = [ "mercure" ];
   excludedPackages = [ "../cmd/mercure" ];

From 34be3edbde63b1871fbcf338e5c4324e60212f91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 20:16:20 +0000
Subject: [PATCH 021/130] scipopt-papilo: 2.4.2 -> 2.4.3

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

diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix
index 6480be33f27a..7564fcd56603 100644
--- a/pkgs/by-name/sc/scipopt-papilo/package.nix
+++ b/pkgs/by-name/sc/scipopt-papilo/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "scipopt-papilo";
-  version = "2.4.2";
+  version = "2.4.3";
 
   # To correlate scipVersion and version, check: https://scipopt.org/#news
   scipVersion = "9.2.2";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "scipopt";
     repo = "papilo";
     tag = "v${version}";
-    hash = "sha256-/1AsAesUh/5YXeCU2OYopoG3SXAwAecPD88QvGkb2bY=";
+    hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8=";
   };
 
   nativeBuildInputs = [ cmake ];

From f842136751fe3b448f3cc4225dda379a4d6f012f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 08:26:09 +0000
Subject: [PATCH 022/130] tiledb: 2.28.0 -> 2.28.1

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

diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix
index 8b68590dfb6f..5734b21def18 100644
--- a/pkgs/by-name/ti/tiledb/package.nix
+++ b/pkgs/by-name/ti/tiledb/package.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "tiledb";
-  version = "2.28.0";
+  version = "2.28.1";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB";
     tag = version;
-    hash = "sha256-jNKnc8IPkXDxRUY9QJ+35qt2na1nO6RPeCVWBLb7lME=";
+    hash = "sha256-Cs3Lr8I/Mu02x78d7IySG0XX4u/VAjBs4p4b00XDT5k=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ];

From 59c51fb433854f2f9fb88b539dd19a78abf3f871 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 22 Jul 2025 13:40:36 +0200
Subject: [PATCH 023/130] pff-tools: init at 0-unstable-2025-07-22

---
 pkgs/by-name/pf/pff-tool/package.nix | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/pf/pff-tool/package.nix

diff --git a/pkgs/by-name/pf/pff-tool/package.nix b/pkgs/by-name/pf/pff-tool/package.nix
new file mode 100644
index 000000000000..9b394c198bf3
--- /dev/null
+++ b/pkgs/by-name/pf/pff-tool/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libpff,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "pff-tools";
+  version = "0-unstable-2025-07-22";
+
+  src = fetchFromGitHub {
+    owner = "avranju";
+    repo = "pff-tools";
+    rev = "d8776cd45e62c82adbbcc04f2f636b569de057ca";
+    hash = "sha256-MDMrKaq/iz5WdLhh3rv2ODFdaMoaeFtacT8xmRf3Qec=";
+  };
+
+  cargoHash = "sha256-SL+FTuVkgq0ll8SH7FgVapvemarc7ci0KtoGG16zxCM=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    libpff
+  ];
+
+  # Tests require a sample PST/OST file.
+  doCheck = false;
+
+  meta = {
+    description = "Command-line tools to process PFF files";
+    homepage = "https://github.com/avranju/pff-tools";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ d3vil0p3r ];
+    mainProgram = "pff-cli";
+  };
+})

From d8f8599178c5056e8b179c27664f8e6fa51f8370 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 12:36:13 +0000
Subject: [PATCH 024/130] libmysqlconnectorcpp: 9.3.0 -> 9.4.0

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

diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
index 18b5709b5b0b..f4277216bd57 100644
--- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
+++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmysqlconnectorcpp";
-  version = "9.3.0";
+  version = "9.4.0";
 
   src = fetchurl {
     url = "mirror://mysql/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
-    hash = "sha256-Jopvf0pstZ9T3eWWI74VWfkTop7B3oG/D/zL94DRtBY=";
+    hash = "sha256-NqfJPUoQ0doqLmY2dVnZF0GqDwNivArpQxcc8XcfZhU=";
   };
 
   nativeBuildInputs = [

From 15d269c660be51327127780bd2821d75345a2495 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Wed, 23 Jul 2025 18:16:14 +0200
Subject: [PATCH 025/130] kssd: 2.21 -> 2.21-unstable-2024-05-27

---
 pkgs/by-name/ks/kssd/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ks/kssd/package.nix b/pkgs/by-name/ks/kssd/package.nix
index 4e9fd39e4e7b..158a5dbace64 100644
--- a/pkgs/by-name/ks/kssd/package.nix
+++ b/pkgs/by-name/ks/kssd/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kssd";
-  version = "2.21";
+  version = "2.21-unstable-2024-05-27";
 
   src = fetchFromGitHub {
     owner = "yhg926";
     repo = "public_kssd";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-D/s1jL2oKE0rSdRMVljskYFsw5UPOv1L95Of+K+e17w=";
+    rev = "ce96b66dddc2d6c1ce611ad84cdf4c7ba62b4aa5";
+    hash = "sha256-qafPyDl+pDfnJ7S6mHBHht2OcQEQeV2kQM+ir5LTGFA=";
   };
 
   patches = [
@@ -47,12 +47,12 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "K-mer substring space decomposition";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://github.com/yhg926/public_kssd";
-    maintainers = with maintainers; [ unode ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ unode ];
+    platforms = lib.platforms.linux;
     mainProgram = "kssd";
   };
 })

From 55f39fa0613e748e15c56e47cba945d449dc1222 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, 25 Jul 2025 08:02:59 +0700
Subject: [PATCH 026/130] =?UTF-8?q?movim:=200.30.1=20=E2=86=92=200.31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index 54eb8db1f7dc..0cb5ed73e7f4 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -44,13 +44,13 @@ let
 in
 php.buildComposerProject2 (finalAttrs: {
   pname = "movim";
-  version = "0.30.1";
+  version = "0.31";
 
   src = fetchFromGitHub {
     owner = "movim";
     repo = "movim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MjP1rLyWJWrUAHrOKAwGN3A0wIq4iPaXlaUbtPs3F6U=";
+    hash = "sha256-rW751UhDBhakOrAT4BOiRDPpGldf1EwNZY8iavXlpLk=";
   };
 
   php = php.buildEnv (
@@ -88,7 +88,7 @@ php.buildComposerProject2 (finalAttrs: {
     ++ lib.optional minify.style.enable lightningcss
     ++ lib.optional minify.svg.enable scour;
 
-  vendorHash = "sha256-7jb4/UgnMcXtLCihwk4rr0HLw99FgiYeYJVATGxM/D4=";
+  vendorHash = "sha256-xkFyjs3jW7j+8WosRaxBEYQU2dwQlDr4/nrdtW03xvA=";
 
   postPatch = ''
     # Our modules are already wrapped, removes missing *.so warnings;

From 057164a72bee5d6a12985afa6b8473d41f05bd85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 13:31:10 +0000
Subject: [PATCH 027/130] nghttp3: 1.10.1 -> 1.11.0

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

diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix
index 6676fe825b35..59db62b92dab 100644
--- a/pkgs/by-name/ng/nghttp3/package.nix
+++ b/pkgs/by-name/ng/nghttp3/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nghttp3";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "nghttp3";
     rev = "v${version}";
-    hash = "sha256-V4JFqi3VdblpBlZJ1uFX56AlJn894oiX86OfoxVjBbE=";
+    hash = "sha256-8WQfXzzF3K0IJNectrE1amQ6Njq4pZslrcVun6Uhi6E=";
     fetchSubmodules = true;
   };
 

From c687b753ee1f6c18b53fe5302cdcbba085049498 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 20:55:58 +0000
Subject: [PATCH 028/130] cppcheck: 2.17.1 -> 2.18.0

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

diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index b7edb7089491..60c2a16a7920 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cppcheck";
-  version = "2.17.1";
+  version = "2.18.0";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "danmar";
     repo = "cppcheck";
     tag = finalAttrs.version;
-    hash = "sha256-jsLhVKNr/4RWw2SVNkycm/xbcy1BKIf983oTnaJKV6U=";
+    hash = "sha256-trbL2Me1VWmVMfL45H50xbR36izifFmoLHKQvte6oZQ=";
   };
 
   nativeBuildInputs = [

From af364acaaca540b7534af29fbf9f10f2a2bcd47e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 14:56:14 +0000
Subject: [PATCH 029/130] semantic-release: 24.2.5 -> 24.2.7

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

diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index 86e3ae849c80..c5c27674dab9 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "semantic-release";
-  version = "24.2.5";
+  version = "24.2.7";
 
   src = fetchFromGitHub {
     owner = "semantic-release";
     repo = "semantic-release";
     rev = "v${version}";
-    hash = "sha256-WS3hd84vDSH/u7AxtkPL8E1UutUKHzARSzVYOHLlKPU=";
+    hash = "sha256-7BIEb4gQLppa+CXCR+oYPvb/l8UB6ihNh4veBdDG8ac=";
   };
 
-  npmDepsHash = "sha256-uQWQ+0Ub1piW/BATHrrWfzjv10/f2fyVL5JwDF1NdqM=";
+  npmDepsHash = "sha256-ODu8foiTtU7bsaVL/ri4eCwpcyg/7CdSGtyPsA/myxU=";
 
   dontNpmBuild = true;
 

From 569c54cae350e54eec33d9d74fe69abcb2231e45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 14:54:31 +0000
Subject: [PATCH 030/130] jay: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix
index 386b6a1e8222..d7a01ae9426d 100644
--- a/pkgs/by-name/ja/jay/package.nix
+++ b/pkgs/by-name/ja/jay/package.nix
@@ -17,16 +17,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jay";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "mahkoh";
     repo = "jay";
     rev = "v${version}";
-    sha256 = "sha256-wrA/UGxhIUMc2T+0/UNKS9iN44pe9ap2l+xL8ZE5jsI=";
+    sha256 = "sha256-lVdNilNMeVN27VaDufWiNVme0apnX+w0x9JeHkDzFH4=";
   };
 
-  cargoHash = "sha256-2LfEktaHB+uIQSWeSFG+v7+7wfkGlDz54m7P4KttPLI=";
+  cargoHash = "sha256-5j4ECjBCMSCmGfFUQ72nwER/vTvCiDl6f2CyNF3n1ek=";
 
   SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
 

From bbd17a459e18eae810597291aad1be563773005d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 18:40:17 +0000
Subject: [PATCH 031/130] watchyourlan: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/by-name/wa/watchyourlan/package.nix b/pkgs/by-name/wa/watchyourlan/package.nix
index 2432d6e3c3f4..af1d6daf4e2b 100644
--- a/pkgs/by-name/wa/watchyourlan/package.nix
+++ b/pkgs/by-name/wa/watchyourlan/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "watchyourlan";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "aceberg";
     repo = "WatchYourLAN";
     tag = version;
-    hash = "sha256-BI/Ydp7YswgdhwaptmqohwCw1gvRefFF9cz3Bjc2cnA=";
+    hash = "sha256-TFqBuJHoHKJ/ftorgNG9JpiOrjSmqw+tHhaOYzoTeUM=";
   };
 
-  vendorHash = "sha256-NUv90wq3nFHDtfk3BitwJ3ZfciPESUIDzS5S/6zafEQ=";
+  vendorHash = "sha256-3HxpKahFa8keM9wbNJ3anEBMCoEphaj5rOhydajtnY0=";
 
   ldflags = [
     "-s"

From db203fff5ecbcb528c03770ce0bfde09749df1e3 Mon Sep 17 00:00:00 2001
From: ryota2357 <noreply@ryota2357.com>
Date: Sun, 27 Jul 2025 16:03:00 +0900
Subject: [PATCH 032/130] koka: 3.1.2 -> 3.2.2

---
 pkgs/development/compilers/koka/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix
index 67f3f931025f..b64b7f03bb60 100644
--- a/pkgs/development/compilers/koka/default.nix
+++ b/pkgs/development/compilers/koka/default.nix
@@ -20,7 +20,7 @@
   FloatingHex,
   isocline,
   lens,
-  lsp_2_4_0_0,
+  lsp,
   mtl,
   network,
   network-simple,
@@ -32,12 +32,12 @@
 }:
 
 let
-  version = "3.1.2";
+  version = "3.2.2";
   src = fetchFromGitHub {
     owner = "koka-lang";
     repo = "koka";
     rev = "v${version}";
-    hash = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI=";
+    hash = "sha256-k1N085NoAlxewAhg5UDMo7IUf2A6gCTc9k5MWMbU0d0=";
     fetchSubmodules = true;
   };
   kklib = stdenv.mkDerivation {
@@ -81,7 +81,7 @@ mkDerivation rec {
     FloatingHex
     isocline
     lens
-    lsp_2_4_0_0
+    lsp
     mtl
     network
     network-simple

From e0bac290b98c92037c6fb7737557cf45be72325a Mon Sep 17 00:00:00 2001
From: ryota2357 <noreply@ryota2357.com>
Date: Sun, 27 Jul 2025 17:25:38 +0900
Subject: [PATCH 033/130] koka: migrate to pkgs/by-name

---
 .../ko/koka/package.nix}                      | 57 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 --
 2 files changed, 25 insertions(+), 36 deletions(-)
 rename pkgs/{development/compilers/koka/default.nix => by-name/ko/koka/package.nix} (79%)

diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/by-name/ko/koka/package.nix
similarity index 79%
rename from pkgs/development/compilers/koka/default.nix
rename to pkgs/by-name/ko/koka/package.nix
index b64b7f03bb60..c761f3ca3126 100644
--- a/pkgs/development/compilers/koka/default.nix
+++ b/pkgs/by-name/ko/koka/package.nix
@@ -1,38 +1,16 @@
 {
+  lib,
   stdenv,
+  fetchFromGitHub,
   pkgsHostTarget,
+  haskellPackages,
   cmake,
   makeWrapper,
-  mkDerivation,
-  fetchFromGitHub,
-  alex,
-  lib,
-  hpack,
-  aeson,
-  array,
-  async,
-  base,
-  bytestring,
-  co-log-core,
-  cond,
-  containers,
-  directory,
-  FloatingHex,
-  isocline,
-  lens,
-  lsp,
-  mtl,
-  network,
-  network-simple,
-  parsec,
-  process,
-  text,
-  text-rope,
-  time,
 }:
 
 let
   version = "3.2.2";
+
   src = fetchFromGitHub {
     owner = "koka-lang";
     repo = "koka";
@@ -40,6 +18,7 @@ let
     hash = "sha256-k1N085NoAlxewAhg5UDMo7IUf2A6gCTc9k5MWMbU0d0=";
     fetchSubmodules = true;
   };
+
   kklib = stdenv.mkDerivation {
     pname = "kklib";
     inherit version;
@@ -54,6 +33,7 @@ let
       cp -a ../../kklib ''${!outputDev}/share/koka/v${version}
     '';
   };
+
   inherit (pkgsHostTarget.targetPackages.stdenv) cc;
   runtimeDeps = [
     cc
@@ -62,13 +42,20 @@ let
     pkgsHostTarget.cmake
   ];
 in
-mkDerivation rec {
+haskellPackages.mkDerivation {
   pname = "koka";
   inherit version src;
+
   isLibrary = false;
   isExecutable = true;
-  libraryToolDepends = [ hpack ];
-  executableHaskellDepends = [
+
+  buildTools = [ makeWrapper ];
+
+  libraryToolDepends = with haskellPackages; [
+    hpack
+  ];
+
+  executableHaskellDepends = with haskellPackages; [
     aeson
     array
     async
@@ -92,10 +79,11 @@ mkDerivation rec {
     time
     kklib
   ];
-  executableToolDepends = [
+
+  executableToolDepends = with haskellPackages; [
     alex
-    makeWrapper
   ];
+
   postInstall = ''
     mkdir -p $out/share/koka/v${version}
     cp -a lib $out/share/koka/v${version}
@@ -104,11 +92,16 @@ mkDerivation rec {
       --set CC "${lib.getBin cc}/bin/${cc.targetPrefix}cc" \
       --prefix PATH : "${lib.makeSearchPath "bin" runtimeDeps}"
   '';
+
+  doHaddock = false;
+
   doCheck = false;
+
   prePatch = "hpack";
+
   description = "Koka language compiler and interpreter";
   homepage = "https://github.com/koka-lang/koka";
-  changelog = "${homepage}/blob/master/doc/spec/news.mdk";
+  changelog = "https://github.com/koka-lang/koka/blob/v${version}/doc/spec/news.mdk";
   license = lib.licenses.asl20;
   maintainers = with lib.maintainers; [
     siraben
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index affa0ae81764..75dae499eeef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5713,10 +5713,6 @@ with pkgs;
   julia-stable-bin = julia_111-bin;
   julia-bin = julia-stable-bin;
 
-  koka = haskell.lib.compose.justStaticExecutables (
-    haskellPackages.callPackage ../development/compilers/koka { }
-  );
-
   kotlin = callPackage ../development/compilers/kotlin { };
   kotlin-native = callPackage ../development/compilers/kotlin/native.nix { };
 

From 0b5647dabd4a17cd03f43dc73143d63c13957cce Mon Sep 17 00:00:00 2001
From: ryota2357 <noreply@ryota2357.com>
Date: Sun, 27 Jul 2025 18:04:43 +0900
Subject: [PATCH 034/130] koka: update executableHaskellDepends

---
 pkgs/by-name/ko/koka/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koka/package.nix b/pkgs/by-name/ko/koka/package.nix
index c761f3ca3126..960eab8b3f0d 100644
--- a/pkgs/by-name/ko/koka/package.nix
+++ b/pkgs/by-name/ko/koka/package.nix
@@ -56,16 +56,16 @@ haskellPackages.mkDerivation {
   ];
 
   executableHaskellDepends = with haskellPackages; [
+    FloatingHex
     aeson
     array
     async
     base
     bytestring
     co-log-core
-    cond
     containers
     directory
-    FloatingHex
+    hashable
     isocline
     lens
     lsp
@@ -74,6 +74,7 @@ haskellPackages.mkDerivation {
     network-simple
     parsec
     process
+    stm
     text
     text-rope
     time

From a9a5663dfdcda1b6620c37f07ee024703752efac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 11:52:03 +0000
Subject: [PATCH 035/130] trealla: 2.78.24 -> 2.79.2

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

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 9ca183f254d5..afbddcbd7d8b 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.78.24";
+  version = "2.79.2";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0OCb/U09b7DNd3bOEszuVH7gA0cRVqoWS7/HRZRFCIs=";
+    hash = "sha256-ZbGxluQQi308UN4cdc7kRZq3Vbh+Deh3oUeViefIHX4=";
   };
 
   postPatch = ''

From 52019bf7cab86008965464b69466160df7842e5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 22:41:18 +0000
Subject: [PATCH 036/130] zpaqfranz: 62.2 -> 62.4

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

diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 8e5a49a9d48d..459e7fb74e5e 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zpaqfranz";
-  version = "62.2";
+  version = "62.4";
 
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
     rev = finalAttrs.version;
-    hash = "sha256-brTlBvJ6MQY7kPbdUuNrSuYZUtwhkNfu+SDoNJqyZ9o=";
+    hash = "sha256-bRYXQ+w4gLDsMeknmTMhbdzjf/PpD7qh5QHTRY8eqR0=";
   };
 
   nativeBuildInputs = [

From 938972440b597c33fe8ae84efd600774acd3c04d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 02:08:07 +0000
Subject: [PATCH 037/130] seamly2d: 2025.6.23.216 -> 2025.7.21.216

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

diff --git a/pkgs/by-name/se/seamly2d/package.nix b/pkgs/by-name/se/seamly2d/package.nix
index 64c431332496..92da7528708d 100644
--- a/pkgs/by-name/se/seamly2d/package.nix
+++ b/pkgs/by-name/se/seamly2d/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "seamly2d";
-  version = "2025.6.23.216";
+  version = "2025.7.21.216";
 
   src = fetchFromGitHub {
     owner = "FashionFreedom";
     repo = "Seamly2D";
     tag = "v${version}";
-    hash = "sha256-FcNSl+LXqxEMW8bY+WJCCnumRzBUMiP+Vj/VQ1EEmZo=";
+    hash = "sha256-rS+2dwRx5tZySfjSHOmr/PJxJntjcwbM9O99dCsMgnI=";
   };
 
   buildInputs = [

From a247197b4c0987d7c1a6c2a1c24c8c9224f7b7ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 08:21:03 +0000
Subject: [PATCH 038/130] ark-pixel-font: 2025.03.14 -> 2025.07.21

---
 pkgs/by-name/ar/ark-pixel-font/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix
index 21e84141216b..8f62e274427f 100644
--- a/pkgs/by-name/ar/ark-pixel-font/package.nix
+++ b/pkgs/by-name/ar/ark-pixel-font/package.nix
@@ -7,14 +7,14 @@
 
 python312Packages.buildPythonPackage rec {
   pname = "ark-pixel-font";
-  version = "2025.03.14";
+  version = "2025.07.21";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "TakWolf";
     repo = "ark-pixel-font";
     tag = version;
-    hash = "sha256-B/XsZEpSxY4k8uj3Vy31c9+GcO7d3NFcADLtPU6p/CI=";
+    hash = "sha256-NnkXKe4qlWl4lDHNcO5aVJWwyeSrHoHxqlla+RMgtQw=";
   };
 
   dependencies = with python312Packages; [

From fc6be91e4d90d7a212b0e39c77d46aaea867503f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 11:42:34 +0000
Subject: [PATCH 039/130] gildas: 20250701_a -> 20250701_b

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

diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix
index bcebb23da297..cda086308492 100644
--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@@ -24,8 +24,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "jul25a";
-  version = "20250701_a";
+  srcVersion = "jul25b";
+  version = "20250701_b";
   pname = "gildas";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
     ];
-    hash = "sha256-t64lcbdrPXu4II5IGyd9Un6yJGrH+wqKRt5jmr/F5y4=";
+    hash = "sha256-TU9UdvyzlIWGJWAAJIIGBO5NgXuKDYTdjHhFHRwTagU=";
   };
 
   nativeBuildInputs = [

From 76e61bc403c7fb69bf35dc5ec951e8e1050d4ba1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 12:21:26 +0000
Subject: [PATCH 040/130] krillinai: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix
index 271507158b53..27345bd188c0 100644
--- a/pkgs/by-name/kr/krillinai/package.nix
+++ b/pkgs/by-name/kr/krillinai/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "krillinai";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "krillinai";
     repo = "KlicStudio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cd+MrKXezcBKRSwmoRaD/2jiNT7r8R7IGweXHDZFhWE=";
+    hash = "sha256-LLVm5L8usGoMBbeU/eQMNv/+WMQcdyiOQmj3NM/D9TU=";
   };
 
   vendorHash = "sha256-bAKLNpt0K06egScyn7ImHV0csDsMQGUm92kU1PVQK+I=";

From 564c1af5b959ec2ec754259c55b2f93be7fe8f99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 16:37:14 +0000
Subject: [PATCH 041/130] seq66: 0.99.20 -> 0.99.21

---
 pkgs/applications/audio/seq66/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix
index 8f4f1283655d..90ed92fa2039 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/applications/audio/seq66/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seq66";
-  version = "0.99.20";
+  version = "0.99.21";
 
   src = fetchFromGitHub {
     owner = "ahlstromcj";
     repo = "seq66";
     rev = version;
-    hash = "sha256-YFSvwviC2f5PJD91jcmLuqf+kDqDeMhXNXD3n45kJL8=";
+    hash = "sha256-0joa69nSX3lcpoRq9YToNA75Sg9dlYMGRZEfcJm9Vjg=";
   };
 
   nativeBuildInputs = [

From e17893f45012c88ff9317d68155344620bf0e779 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 00:39:30 +0000
Subject: [PATCH 042/130] gwyddion: 2.68 -> 2.69

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

diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix
index 6e2a96f439ce..6f7b969aa0c4 100644
--- a/pkgs/by-name/gw/gwyddion/package.nix
+++ b/pkgs/by-name/gw/gwyddion/package.nix
@@ -34,10 +34,10 @@
 
 stdenv.mkDerivation rec {
   pname = "gwyddion";
-  version = "2.68";
+  version = "2.69";
   src = fetchurl {
     url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
-    sha256 = "sha256-clw/cXODYrELHiz3bTkWhM8vFacaKzTvHK3avW1am/o=";
+    sha256 = "sha256-WX62tR7ldaB/NQzAVzvHTQBaNJDZgyrRNqNp5w0w76Y=";
   };
 
   nativeBuildInputs = [

From a3f7ce8ec2acf81c7c7ca7ad18f49b5b299178d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 05:59:15 +0000
Subject: [PATCH 043/130] dart: 3.8.1 -> 3.8.2

---
 pkgs/development/compilers/dart/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix
index 6c50501ae087..9de681effad2 100644
--- a/pkgs/development/compilers/dart/sources.nix
+++ b/pkgs/development/compilers/dart/sources.nix
@@ -1,23 +1,23 @@
 let
-  version = "3.8.1";
+  version = "3.8.2";
 in
 { fetchurl }:
 {
   versionUsed = version;
   "${version}-x86_64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    hash = "sha256-OTcd89ZPlPWz2cERnD9UkWTFYoxqE7lFG3tEhZ8fkRQ=";
+    hash = "sha256-30f5sONEzlXcf8NrNPPK0vUYclULhIfj3H+Q9tlRuJE=";
   };
   "${version}-aarch64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    hash = "sha256-UIC8b0p4zM4OOOceRkdsCNYeCBRTZGlI8/DHcXepKPg=";
+    hash = "sha256-PO/YQEIKNSl302T9Lq+4pfOoUVrkJjFZ9bEETWujUpE=";
   };
   "${version}-aarch64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    hash = "sha256-eKMkAJe+47ebAJxp6tIuGq7e3ty+CT6qmACExWYQlsg=";
+    hash = "sha256-YFfbTNkJ437F99zzSsCmW8NPtBMwtMNxjEPbGlDokG8=";
   };
   "${version}-x86_64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    hash = "sha256-DVjAEKNh8/FYixwvV5QvfMr3t6u+A0BP73oQLrY48J0=";
+    hash = "sha256-KUW6qxHPdHIyjlVzcTmTuvkXlX+taRwUYcq9WglugxE=";
   };
 }

From 83aa62b2463415b3564efcf64260efb7593c2e4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 07:43:31 +0000
Subject: [PATCH 044/130] lynis: 3.1.4 -> 3.1.5

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

diff --git a/pkgs/by-name/ly/lynis/package.nix b/pkgs/by-name/ly/lynis/package.nix
index d58d24cfc514..47eefd68371e 100644
--- a/pkgs/by-name/ly/lynis/package.nix
+++ b/pkgs/by-name/ly/lynis/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "3.1.4";
+  version = "3.1.5";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "lynis";
     rev = version;
-    sha256 = "sha256-OnEEdJGU7ma6f7aA6ihgixHWZGZDmx7nzqmJH3p+ijk=";
+    sha256 = "sha256-XMgC6KjkLgjSOBHBx7WM7C2Vm3Z/lto7CFs10kIxwZc=";
   };
 
   nativeBuildInputs = [

From b0e1f0828122697dae6871011302b9eeda8549ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 06:38:47 +0000
Subject: [PATCH 045/130] docker-buildx: 0.25.0 -> 0.26.1

---
 pkgs/applications/virtualization/docker/buildx.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index f864697c6bad..9e4ff2a7111d 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.25.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    hash = "sha256-DdG2z0raDHcbBMDl7C0WORKhG0ZB9Gvie8u4/isE8ow=";
+    hash = "sha256-+ubv/8UdejxY7u3RdgS7L18hZHohlqGu9E3L0bTAmLY=";
   };
 
   doCheck = false;

From dc47ec03b47b2b2463b7fc9508a4a8bca85b6627 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 21 Jul 2025 23:29:35 -0700
Subject: [PATCH 046/130] python3Packages.rlp: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 3c258f2b8fea..7f1dd65edf4a 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -6,18 +6,19 @@
   eth-utils,
   hypothesis,
   pytestCheckHook,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "rlp";
-  version = "4.0.0";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "pyrlp";
     rev = "v${version}";
-    hash = "sha256-cRp+ZOPYs9kcqMKGaiYMOFBY+aPCyFqu+1/5wloLwqU=";
+    hash = "sha256-moerdcAJXqhlzDnTlvxL3Nzz485tOzJVCPlGrof80eQ=";
   };
 
   build-system = [ setuptools ];
@@ -27,10 +28,13 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook
+    pydantic
   ];
 
   pythonImportsCheck = [ "rlp" ];
 
+  disabledTests = [ "test_install_local_wheel" ];
+
   meta = with lib; {
     description = "RLP serialization library";
     homepage = "https://github.com/ethereum/pyrlp";

From 978e4370d9f040f0a57662def5370d430105a2fe Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 21 Jul 2025 23:28:30 -0700
Subject: [PATCH 047/130] python3Pacakges.py-ecc: 7.0.0 -> 8.0.0

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

diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix
index 6ee5b0534673..d39204e9dd92 100644
--- a/pkgs/development/python-modules/py-ecc/default.nix
+++ b/pkgs/development/python-modules/py-ecc/default.nix
@@ -9,11 +9,12 @@
   pythonAtLeast,
   pythonOlder,
   setuptools,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "py-ecc";
-  version = "7.0.0";
+  version = "8.0.0";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "ethereum";
     repo = "py_ecc";
     rev = "v${version}";
-    hash = "sha256-DKe+bI1GEzXg4Y4n5OA1/hWYz9L3X1AvaOFPEnCaAfs=";
+    hash = "sha256-4nmmX4TuErHxIDrBi+Ppr+4vuE7dSeqf8OqOxtqb3sY=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -32,7 +33,10 @@ buildPythonPackage rec {
     eth-utils
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pydantic
+  ];
 
   disabledTests = lib.optionals (pythonAtLeast "3.12") [
     # https://github.com/ethereum/py_ecc/issues/133
@@ -44,6 +48,7 @@ buildPythonPackage rec {
     "test_pairing_negative_G1"
     "test_pairing_negative_G2"
     "test_pairing_output_order"
+    "test_install_local_wheel"
   ];
 
   pythonImportsCheck = [ "py_ecc" ];

From 1465130c05585ca75e5d84a003c9f971be25d99c Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 21 Jul 2025 23:33:00 -0700
Subject: [PATCH 048/130] python3Packages.trie: 3.0.1 -> 3.1.0

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

diff --git a/pkgs/development/python-modules/trie/default.nix b/pkgs/development/python-modules/trie/default.nix
index 5e1359151709..4a8baa0082d9 100644
--- a/pkgs/development/python-modules/trie/default.nix
+++ b/pkgs/development/python-modules/trie/default.nix
@@ -13,18 +13,19 @@
   hypothesis,
   pytestCheckHook,
   pytest-xdist,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "trie";
-  version = "3.0.1";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "py-trie";
     tag = "v${version}";
-    hash = "sha256-kG/5ijckiEOfB5y1c3Yqudqnb1MDbPD25YZZM+H13Lw=";
+    hash = "sha256-QDywlAyFbQGgkATVifdixlnob4Tmsvr/VZ1rafzWKrU=";
   };
 
   build-system = [ setuptools ];
@@ -41,6 +42,7 @@ buildPythonPackage rec {
     hypothesis
     pytestCheckHook
     pytest-xdist
+    pydantic
   ]
   ++ eth-hash.optional-dependencies.pycryptodome;
 
@@ -49,6 +51,7 @@ buildPythonPackage rec {
     "test_fixtures_exist"
     "test_bin_trie_update_value"
     "test_branch_updates"
+    "test_install_local_wheel"
   ];
   disabledTestPaths = [ "tests/core/test_iter.py" ];
 

From 80a4d69b1d783196a6bf5dae1bab2e02aa0ec96a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sat, 19 Jul 2025 23:07:47 -0400
Subject: [PATCH 049/130] python3Packages.eth-typing: 5.1.0 -> 5.2.1

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

diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
index 19d4101c83c3..0760c299b336 100644
--- a/pkgs/development/python-modules/eth-typing/default.nix
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "eth-typing";
-  version = "5.1.0";
+  version = "5.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-typing";
     tag = "v${version}";
-    hash = "sha256-IOWd6WFPAYO+VZwlMilRVHtudEjHt5p8Xu4WloFB/ww=";
+    hash = "sha256-w/xYqDmtlNs9dk4lTX0zxjdlUc7l7vi8ZnSE62W0m8o=";
   };
 
   build-system = [ setuptools ];

From 1c90d71c2815cea4c4542f371312eb438e7ab6ee Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sat, 19 Jul 2025 23:11:05 -0400
Subject: [PATCH 050/130] python3Packages.eth-utils: 5.1.0 -> 5.3.0

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

diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index 3e4f1f7aa114..78a10d9a4c3d 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -9,6 +9,7 @@
   eth-typing,
   cytoolz,
   toolz,
+  pydantic,
   # nativeCheckInputs
   hypothesis,
   mypy,
@@ -17,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "eth-utils";
-  version = "5.1.0";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-utils";
     tag = "v${version}";
-    hash = "sha256-uPzg1gUEsulQL2u22R/REHWx1ZtbMxvcXf6UgWqkDF4=";
+    hash = "sha256-VWNQyLfOEQTusdNHO/8/fWyGVFVwr1Cg1IfyNMSsfGQ=";
   };
 
   build-system = [ setuptools ];
@@ -40,6 +41,7 @@ buildPythonPackage rec {
     hypothesis
     mypy
     pytestCheckHook
+    pydantic
   ]
   ++ eth-hash.optional-dependencies.pycryptodome;
 

From 14f90a64011637e10b8f94f3b989010c6fafb704 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 20 Jul 2025 10:09:54 -0700
Subject: [PATCH 051/130] python3Packages.eth-account: 0.13.5 -> 0.13.7

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

diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix
index be26789c0623..43b996fa24ce 100644
--- a/pkgs/development/python-modules/eth-account/default.nix
+++ b/pkgs/development/python-modules/eth-account/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "eth-account";
-  version = "0.13.5";
+  version = "0.13.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-account";
     tag = "v${version}";
-    hash = "sha256-CBD0vJLYA+3FreOTsVXJlDJhRvPbDUn4X55o6EF+uBA=";
+    hash = "sha256-Ipz2zIKCpIzKBtX0UZnvpKZeTUcDPbGTzMgmcJC/4qs=";
   };
 
   build-system = [ setuptools ];
@@ -48,6 +48,7 @@ buildPythonPackage rec {
     eth-rlp
     eth-utils
     hexbytes
+    pydantic
     rlp
     websockets
   ];
@@ -74,6 +75,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "eth_account" ];
 
+  pythonRelaxDeps = [ "eth-keyfile" ];
+
   meta = {
     description = "Account abstraction library for web3.py";
     homepage = "https://github.com/ethereum/eth-account";

From b48f0d7d32752dc4f2176c0a4e98f1fc62f0c5dd Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 22 Jul 2025 21:23:51 -0700
Subject: [PATCH 052/130] python3Packages.eth-keyfile: 0.8.1 -> 0.9.1

---
 .../python-modules/eth-keyfile/default.nix       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix
index 0d16bc1ff21a..62be7f6e7307 100644
--- a/pkgs/development/python-modules/eth-keyfile/default.nix
+++ b/pkgs/development/python-modules/eth-keyfile/default.nix
@@ -7,13 +7,15 @@
   eth-keys,
   eth-utils,
   pycryptodome,
+  py-ecc,
   # nativeCheckInputs
   pytestCheckHook,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "eth-keyfile";
-  version = "0.8.1";
+  version = "0.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -21,7 +23,7 @@ buildPythonPackage rec {
     repo = "eth-keyfile";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-HufsN3aXdQErcQmnG2PZnEm5joqpy4f8IWNm3VrzJSY=";
+    hash = "sha256-DR17EupRDnviN6OXF+B+RlCVdG8cfcvnIgIEKxrXFKs=";
   };
 
   build-system = [ setuptools ];
@@ -30,12 +32,20 @@ buildPythonPackage rec {
     eth-keys
     eth-utils
     pycryptodome
+    py-ecc
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pydantic
+  ];
 
   pythonImportsCheck = [ "eth_keyfile" ];
 
+  disabledTests = [
+    "test_install_local_wheel"
+  ];
+
   meta = {
     description = "Tools for handling the encrypted keyfile format used to store private keys";
     homepage = "https://github.com/ethereum/eth-keyfile";

From 64a7489c3f4cf4507cc3f038e52de69bdf4c7cef Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 22 Jul 2025 21:54:31 -0700
Subject: [PATCH 053/130] python3Packages.eth-keys: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix
index e09926107189..7377ae5f925b 100644
--- a/pkgs/development/python-modules/eth-keys/default.nix
+++ b/pkgs/development/python-modules/eth-keys/default.nix
@@ -15,18 +15,19 @@
   coincurve,
   eth-hash,
   isPyPy,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "eth-keys";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-keys";
     tag = "v${version}";
-    hash = "sha256-HyOfuzwldtqjjowW7HGdZ8RNMXNK3y2NrXUoeMlWJjs=";
+    hash = "sha256-H/s/D4f4tqP/WTil9uLmFw2Do9sEjMWwEreQEooeszQ=";
   };
 
   build-system = [ setuptools ];
@@ -42,6 +43,7 @@ buildPythonPackage rec {
     hypothesis
     pyasn1
     pytestCheckHook
+    pydantic
   ]
   ++ optional-dependencies.coincurve
   ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3
@@ -49,6 +51,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "eth_keys" ];
 
+  disabledTests = [ "test_install_local_wheel" ];
+
   optional-dependencies = {
     coincurve = [ coincurve ];
   };

From c5dd7d749d5d260fa445fd41ce69876954b78677 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 22 Jul 2025 21:58:38 -0700
Subject: [PATCH 054/130] python3Packages.hexbytes: 1.2.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix
index 0e36d028b6fa..ea1e5692a54d 100644
--- a/pkgs/development/python-modules/hexbytes/default.nix
+++ b/pkgs/development/python-modules/hexbytes/default.nix
@@ -7,11 +7,12 @@
   hypothesis,
   pytestCheckHook,
   pythonOlder,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "hexbytes";
-  version = "1.2.0";
+  version = "1.3.1";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -19,7 +20,7 @@ buildPythonPackage rec {
     owner = "ethereum";
     repo = "hexbytes";
     tag = "v${version}";
-    hash = "sha256-8st1nQiGApt+aNl8/cftYk0ZzA+MxbLyGi53UWUlAjM=";
+    hash = "sha256-xYXxlyVGdsksxZJtSpz1V3pj4NL7IzX0gaQeCoiHr8g=";
   };
 
   build-system = [ setuptools ];
@@ -28,8 +29,11 @@ buildPythonPackage rec {
     eth-utils
     hypothesis
     pytestCheckHook
+    pydantic
   ];
 
+  disabledTests = [ "test_install_local_wheel" ];
+
   pythonImportsCheck = [ "hexbytes" ];
 
   meta = with lib; {

From 9a378e929ca3d8e4392b3a944134989a4f21af1c Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 22 Jul 2025 22:02:46 -0700
Subject: [PATCH 055/130] python3Packages.py-evm: 0.10.1-beta.2 ->
 0.12.1-beta.1

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

diff --git a/pkgs/development/python-modules/py-evm/default.nix b/pkgs/development/python-modules/py-evm/default.nix
index 9ec30e60434e..9b78ea9c6180 100644
--- a/pkgs/development/python-modules/py-evm/default.nix
+++ b/pkgs/development/python-modules/py-evm/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "py-evm";
-  version = "0.10.1-beta.2";
+  version = "0.12.1-beta.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "py-evm";
     tag = "v${version}";
-    hash = "sha256-2BWMen/6ZcL1/SgGP0XcrTC63+LEjZO7Ogb3anhavsE=";
+    hash = "sha256-n2F0ApdmIED0wrGuNN45lyb7cGu8pRn8mLDehT7Ru9E=";
   };
 
   build-system = [ setuptools ];
@@ -45,6 +45,7 @@ buildPythonPackage rec {
     eth-typing
     eth-utils
     lru-dict
+    pydantic
     py-ecc
     rlp
     trie

From 938a88c36ecb8b18423de58b855c2e86afe634a9 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 22 Jul 2025 22:18:30 -0700
Subject: [PATCH 056/130] python3Packages.eth-abi: 5.1.0 -> 5.2.0

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

diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix
index 4d5027687310..13875854934e 100644
--- a/pkgs/development/python-modules/eth-abi/default.nix
+++ b/pkgs/development/python-modules/eth-abi/default.nix
@@ -12,18 +12,19 @@
   pytestCheckHook,
   pytest-xdist,
   eth-hash,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "eth-abi";
-  version = "5.1.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-abi";
     tag = "v${version}";
-    hash = "sha256-D3aGMx2oZFttwQ90ouwQbbRelCb2bvyQgvamKweX9Nw=";
+    hash = "sha256-/tyGm/lH72oZEKfTd25t+k0y3TuAZQg+hUABT4YCP2g=";
   };
 
   build-system = [ setuptools ];
@@ -38,12 +39,14 @@ buildPythonPackage rec {
     hypothesis
     pytestCheckHook
     pytest-xdist
+    pydantic
   ]
   ++ eth-hash.optional-dependencies.pycryptodome;
 
   disabledTests = [
     # boolean list representation changed
     "test_get_abi_strategy_returns_certain_strategies_for_known_type_strings"
+    "test_install_local_wheel"
   ];
 
   pythonImportsCheck = [ "eth_abi" ];

From e0f15338b7db405cc9b18afd407a24a03647e2d8 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 23 Jul 2025 00:21:09 -0700
Subject: [PATCH 057/130] python3Packages.eth-tester: 0.12.0-beta.2 ->
 0.13.0-beta.1

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

diff --git a/pkgs/development/python-modules/eth-tester/default.nix b/pkgs/development/python-modules/eth-tester/default.nix
index 7d2210c5450b..f83a8f3e5253 100644
--- a/pkgs/development/python-modules/eth-tester/default.nix
+++ b/pkgs/development/python-modules/eth-tester/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "eth-tester";
-  version = "0.12.0-beta.2";
+  version = "0.13.0-beta.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-tester";
     tag = "v${version}";
-    hash = "sha256-ox7adsqD0MPZFcxBhino8cgwYYEWrBnD+ugPQOuOO2U=";
+    hash = "sha256-ssPtsEQAyaJde/empEpGU1bf3s4yxwlEXqpacN5GWDw=";
   };
 
   build-system = [ setuptools ];
@@ -49,6 +49,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "eth_tester" ];
 
+  disabledTests = [
+    "test_install_local_wheel"
+  ];
+
   meta = {
     description = "Tool suite for testing ethereum applications";
     homepage = "https://github.com/ethereum/eth-tester";

From a90678ad2cba94f5a0b774f1cbeabf0da4aad85d Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 23 Jul 2025 00:22:16 -0700
Subject: [PATCH 058/130] python3Packages.eth-rlp: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix
index 3bc8d7c35b83..2b2d6e3597d6 100644
--- a/pkgs/development/python-modules/eth-rlp/default.nix
+++ b/pkgs/development/python-modules/eth-rlp/default.nix
@@ -9,11 +9,12 @@
   pytestCheckHook,
   pythonOlder,
   rlp,
+  pydantic,
 }:
 
 buildPythonPackage rec {
   pname = "eth-rlp";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "ethereum";
     repo = "eth-rlp";
     rev = "v${version}";
-    hash = "sha256-FTqIutndf+epmO5XNEUoRAUEmn299aTLIZNe5SMcxAQ=";
+    hash = "sha256-e8nPfxk3OnFEcPnfTy1IEUCHVId6E/ssNOUeAe331+U=";
   };
 
   build-system = [ setuptools ];
@@ -32,10 +33,18 @@ buildPythonPackage rec {
     rlp
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome;
+  nativeCheckInputs = [
+    pytestCheckHook
+    pydantic
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome;
 
   pythonImportsCheck = [ "eth_rlp" ];
 
+  disabledTests = [
+    "test_install_local_wheel"
+  ];
+
   meta = with lib; {
     description = "RLP definitions for common Ethereum objects";
     homepage = "https://github.com/ethereum/eth-rlp";

From 9306e311ca844472e9619c7158cea34aee6ff8ea Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 23 Jul 2025 00:24:35 -0700
Subject: [PATCH 059/130] python3Packages.web3: 7.8.0 -> 7.12.1

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

diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix
index 1ec9324c3392..630ad19b2953 100644
--- a/pkgs/development/python-modules/web3/default.nix
+++ b/pkgs/development/python-modules/web3/default.nix
@@ -39,14 +39,14 @@
 
 buildPythonPackage rec {
   pname = "web3";
-  version = "7.8.0";
+  version = "7.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "web3.py";
     tag = "v${version}";
-    hash = "sha256-Rk12QZK47oF0ri1+kCquW4vaqPPPO5UPYOhq4StR1+U=";
+    hash = "sha256-5fmZJun8yRm+BSKPfe9Fsmp7IWpFhwHD3+iBtkKmr1w=";
   };
 
   build-system = [ setuptools ];

From e8b4b8b9e6d5b522cc79961c8405fda36a9e2d8b Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 23 Jul 2025 00:37:21 -0700
Subject: [PATCH 060/130] python3Packages.slither-analyzer: 0.10.3 -> 0.11.3

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

diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
index 770e6d837350..2b637314e7ea 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "slither-analyzer";
-  version = "0.10.3";
+  version = "0.11.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "crytic";
     repo = "slither";
     tag = version;
-    hash = "sha256-KWLv0tpd1FHZ9apipVPWw6VjtfYpngsH7XDQQ3luBZA=";
+    hash = "sha256-HgPQPyxDvKrmqGiHjiVGxEguYUcaNYwK1gZoMMkQWhM=";
   };
 
   nativeBuildInputs = [

From 56b4e4f81d1cdfdb8dc8370631f5faabb565af92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 18:13:41 +0000
Subject: [PATCH 061/130] opentelemetry-collector-builder: 0.129.0 -> 0.131.0

---
 pkgs/tools/misc/opentelemetry-collector/builder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix
index 3a0a161b2cfc..063c40be62c9 100644
--- a/pkgs/tools/misc/opentelemetry-collector/builder.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix
@@ -7,17 +7,17 @@ buildGoModule rec {
   pname = "ocb";
   # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
   # whenever that version changes.
-  version = "0.129.0";
+  version = "0.131.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector";
     rev = "cmd/builder/v${version}";
-    hash = "sha256-sKz4JWZUaprMY1kJNnX2Lrg4xM+y2MPulStKHfG/htg=";
+    hash = "sha256-T4Ffa3csQaxoRxSobNpoHqyOw6PrKdPj1XUmdrSK5d8=";
   };
 
   sourceRoot = "${src.name}/cmd/builder";
-  vendorHash = "sha256-nKd+fq3wLT1Hebeu+VQhjs320xdykgJ95yhxKDuyVFY=";
+  vendorHash = "sha256-1240ZKF6/MqspTXd5rznE4/bZ2QWmXS0KgPwuCdm/lA=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From ebd217f981dad624bd4e56ce6749527b0a06b0ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 18:41:44 +0000
Subject: [PATCH 062/130] youtube-tui: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/by-name/yo/youtube-tui/package.nix b/pkgs/by-name/yo/youtube-tui/package.nix
index 9fc833481cbc..7d12feea5f05 100644
--- a/pkgs/by-name/yo/youtube-tui/package.nix
+++ b/pkgs/by-name/yo/youtube-tui/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "youtube-tui";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "Siriusmart";
     repo = "youtube-tui";
     tag = "v${version}";
-    hash = "sha256-pt/lKvNDd3gji2+Ubd/ARiuV5MvdSxMfzJubACXTcUc=";
+    hash = "sha256-svZoE7WuBlehYVRRn8S0rR2/5j87DLreqARmfLyHdLg=";
   };
 
-  cargoHash = "sha256-JbG+fYyHC6Li4kuNjQRS7gxU7nLADMEqTZQEBRAASjM=";
+  cargoHash = "sha256-cFee80E/XI4EI5EW8gfB4OOCltJaPS4asE0AXTAGv/k=";
 
   nativeBuildInputs = [
     pkg-config

From 9948eade4d482c80dd84ba35393507b9af240c98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 22:39:58 +0000
Subject: [PATCH 063/130] buf: 1.55.1 -> 1.56.0

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

diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index 0ca381100788..d9079a7e0036 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "buf";
-  version = "1.55.1";
+  version = "1.56.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-41IY2P2s9kCV6aQh5vg7xVmu4Ovl9gakGmgcI/QSwfw=";
+    hash = "sha256-a2yU8KgMRNEz5fgFx/e0U6Hrtw53neeO5PWsTU8AV14=";
   };
 
-  vendorHash = "sha256-2kg7VXIFKXXY1uDUSV3+4vo6GYwnxyvJIZ/a8j99lhk=";
+  vendorHash = "sha256-lWcqXMkOpa+bh40zH8LQ86mIbTAqB2mk8naN1oY7Xuc=";
 
   patches = [
     # Skip a test that requires networking to be available to work.

From 61ede8ed23386c29871335a0b6c8b026a5dd176e Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Fri, 1 Aug 2025 08:48:05 +0800
Subject: [PATCH 064/130] waydroid-helper: various fixes

---
 pkgs/by-name/wa/waydroid-helper/package.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 42dd8bda565a..a57bf766b492 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -16,8 +16,12 @@
   dbus,
   systemd,
   bash,
+  bindfs,
+  e2fsprogs,
   fakeroot,
+  fuse,
   gobject-introspection,
+  unzip,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -38,7 +42,9 @@ python3Packages.buildPythonApplication rec {
       --replace-fail "dbus_service_dir," "'$out/share/dbus-1/system-services',"
     substituteInPlace systemd/meson.build \
       --replace-fail ": systemd_system_unit_dir" ": '$out/lib/systemd/system'" \
-      --replace-fail ": systemd_user_unit_dir" ": '$out/lib/sysusers.d'"
+      --replace-fail ": systemd_user_unit_dir" ": '$out/lib/systemd/user'"
+    substituteInPlace systemd/{system/waydroid-mount,user/waydroid-monitor}.service \
+      --replace-fail "/usr/bin/waydroid-helper" "$out/bin/waydroid-helper"
     # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short
     # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing
     sed -i '/test(/{N;/Validate appstream file/!b;:a;N;/)/!ba;d}' data/meson.build
@@ -80,7 +86,15 @@ python3Packages.buildPythonApplication rec {
 
   makeWrapperArgs = [
     "\${gappsWrapperArgs[@]}"
-    "--prefix PATH : ${lib.makeBinPath [ fakeroot ]}"
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        bindfs
+        e2fsprogs
+        fakeroot
+        fuse
+        unzip
+      ]
+    }"
   ];
 
   postInstallCheck = ''

From 88df1b409fc07d82af8bdc7c31b8eb90258a70f9 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Fri, 1 Aug 2025 08:49:00 +0800
Subject: [PATCH 065/130] waydroid-helper: 0.1.2 -> 0.2.3

Diff: https://github.com/ayasa520/waydroid-helper/compare/refs/tags/v0.1.2...refs/tags/v0.2.3

Changelog: https://github.com/ayasa520/waydroid-helper/releases/tag/v0.2.3
---
 pkgs/by-name/wa/waydroid-helper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index a57bf766b492..f84ce8caf412 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -26,14 +26,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waydroid-helper";
-  version = "0.1.2";
+  version = "0.2.3";
   pyproject = false; # uses meson
 
   src = fetchFromGitHub {
     owner = "ayasa520";
     repo = "waydroid-helper";
     tag = "v${version}";
-    hash = "sha256-dYduO5Wi8Ia/pR1xQKPhC6Ek/1Q9fm2RaVuhm9KYiU0=";
+    hash = "sha256-QxtCxujf7S3YRx/4rRMecFBomP+9tqrIBdYhc3WQT20=";
   };
 
   postPatch = ''
@@ -104,7 +104,7 @@ python3Packages.buildPythonApplication rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Provides a user-friendly way to configure Waydroid and install extensions";
+    description = "User-friendly way to configure Waydroid and install extensions, including Magisk and ARM translation";
     homepage = "https://github.com/ayasa520/waydroid-helper";
     changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}";
     mainProgram = "waydroid-helper";

From 10cbc86a5c2c628c6fa11ae5c05659a2d6f8797b Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Fri, 1 Aug 2025 08:54:30 +0800
Subject: [PATCH 066/130] waydroid-helper: sort

---
 pkgs/by-name/wa/waydroid-helper/package.nix | 59 +++++++++++----------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index f84ce8caf412..81fa878b05ab 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -1,33 +1,31 @@
 {
   lib,
+  python3Packages,
   fetchFromGitHub,
-  nix-update-script,
+  appstream,
+  cmake,
   desktop-file-utils,
-  libadwaita,
+  glib,
+  gobject-introspection,
   meson,
   ninja,
   pkg-config,
   wrapGAppsHook4,
-  libxml2,
-  python3Packages,
-  appstream,
-  glib,
-  cmake,
-  dbus,
-  systemd,
   bash,
   bindfs,
+  dbus,
   e2fsprogs,
   fakeroot,
   fuse,
-  gobject-introspection,
+  libadwaita,
+  libxml2,
+  systemd,
   unzip,
+  nix-update-script,
 }:
 
-python3Packages.buildPythonApplication rec {
-  pname = "waydroid-helper";
+let
   version = "0.2.3";
-  pyproject = false; # uses meson
 
   src = fetchFromGitHub {
     owner = "ayasa520";
@@ -35,6 +33,11 @@ python3Packages.buildPythonApplication rec {
     tag = "v${version}";
     hash = "sha256-QxtCxujf7S3YRx/4rRMecFBomP+9tqrIBdYhc3WQT20=";
   };
+in
+python3Packages.buildPythonApplication {
+  pname = "waydroid-helper";
+  inherit version src;
+  pyproject = false; # uses meson
 
   postPatch = ''
     substituteInPlace dbus/meson.build \
@@ -45,39 +48,41 @@ python3Packages.buildPythonApplication rec {
       --replace-fail ": systemd_user_unit_dir" ": '$out/lib/systemd/user'"
     substituteInPlace systemd/{system/waydroid-mount,user/waydroid-monitor}.service \
       --replace-fail "/usr/bin/waydroid-helper" "$out/bin/waydroid-helper"
-    # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short
-    # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing
+  ''
+  # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short
+  # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing
+  + ''
     sed -i '/test(/{N;/Validate appstream file/!b;:a;N;/)/!ba;d}' data/meson.build
   '';
 
   nativeBuildInputs = [
     appstream
-    glib
     cmake
+    desktop-file-utils
+    glib
+    gobject-introspection
     meson
     ninja
     pkg-config
     wrapGAppsHook4
-    desktop-file-utils
-    gobject-introspection
   ];
 
   buildInputs = [
-    libxml2
-    libadwaita
-    dbus
     bash
+    dbus
+    libadwaita
+    libxml2
     systemd
   ];
 
   dontUseCmakeConfigure = true;
 
   dependencies = with python3Packages; [
-    pygobject3
-    httpx
-    pyyaml
     aiofiles
     dbus-python
+    httpx
+    pygobject3
+    pyyaml
   ];
 
   strictDeps = true;
@@ -104,12 +109,12 @@ python3Packages.buildPythonApplication rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    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";
-    changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}";
-    mainProgram = "waydroid-helper";
-    platforms = lib.platforms.linux;
     license = with lib.licenses; [ gpl3Plus ];
+    mainProgram = "waydroid-helper";
     maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }

From 281244d1b45f65e379ebaf36433b3fa5ff57e9fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 09:31:36 +0000
Subject: [PATCH 067/130] kimai: 2.36.1 -> 2.37.0

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

diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index 218292c47b21..8b01e764bfbd 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -7,13 +7,13 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.36.1";
+  version = "2.37.0";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-TZMkCKwfmn2Iv1BXKH49NRB6oCIKlPmkrPcLNZlyaPo=";
+    hash = "sha256-cxVPR1xNupIyT5nwWpia11MXwx48G5WwkoGhdj0KUJ8=";
   };
 
   php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-ROy/ZWVOZ6fM92kV94uPiyUudmuCpK+9zE/5xzd+BQc=";
+  vendorHash = "sha256-scRFKOIb03poY94IpJ7Nj8p6AooTD+bSQjX48izfujY=";
 
   composerNoPlugins = false;
   composerNoScripts = false;

From b350fb4a8154093825949b563bc1dad2b87a0550 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 10:44:47 +0000
Subject: [PATCH 068/130] vue-language-server: 3.0.1 -> 3.0.4

---
 pkgs/by-name/vu/vue-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 7e50946892f2..e0225cb8dc6d 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -9,19 +9,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.0.1";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VPN4XWZDT44GwUZNih9sH2AiOKr8800B748DRoZ6hWc=";
+    hash = "sha256-vWnJ3Qaa1dcXmQ+PTvbuK6lpgqR7J/Z0UrsPr2pD8Q4=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-X34wBcLHhCkpr6oFrUE33X8EjUjdSpV5TZQPYbMzRDs=";
+    hash = "sha256-UlIAW0m8Y3he8uDd73pXufk4r4PAXWFPDYFvRa2Fw4Y=";
   };
 
   nativeBuildInputs = [

From 86f78c00cee567656785d9a044d6ff02c04171e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 14:50:41 +0000
Subject: [PATCH 069/130] airgeddon: 11.50 -> 11.51

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

diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix
index 0b417a301a7f..3da4dba9df3b 100644
--- a/pkgs/by-name/ai/airgeddon/package.nix
+++ b/pkgs/by-name/ai/airgeddon/package.nix
@@ -114,13 +114,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "airgeddon";
-  version = "11.50";
+  version = "11.51";
 
   src = fetchFromGitHub {
     owner = "v1s1t0r1sh3r3";
     repo = "airgeddon";
     tag = "v${version}";
-    hash = "sha256-hy6q25hWGEFlih0IuwoqDRjbUk1/iShj6uY+mz6hlFU=";
+    hash = "sha256-PkP8sPpX/z3yjvTpsRYJ9fKzUaMsnCp+p6AAoTlcAA0=";
   };
 
   strictDeps = true;

From 51462b8a68c06fb3886feb53a429a143acbad122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= <dev@ntr.li>
Date: Tue, 3 Jun 2025 18:53:59 +0200
Subject: [PATCH 070/130] nixos/traccar: Rework configuration file creation.

Previously, a flat attribute set was expected. The new implementation
uses nested attribute sets. This is a breaking change.
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/modules/services/monitoring/traccar.nix | 56 ++++++++++++-------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index eefc6d7f4cdd..e9904f12984b 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -129,6 +129,8 @@
 
 - [`services.victorialogs.package`](#opt-services.victorialogs.package) now defaults to `victorialogs`, as `victoriametrics` no longer contains the VictoriaLogs binaries.
 
+- The `services.traccar.settings` attribute has been reworked. Instead of the previous flat attribute set the new implementation uses nested attribute sets. You need to update you configuration manually. For instance, `services.traccar.settings.loggerConsole` becomes `services.traccar.settings.logger.console`.
+
 - The `wstunnel` module was converted to RFC42-style settings, you will need to update your NixOS config if you make use of this module.
 
 - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.
diff --git a/nixos/modules/services/monitoring/traccar.nix b/nixos/modules/services/monitoring/traccar.nix
index 4a2370b51cd2..9ff8e01e91c7 100644
--- a/nixos/modules/services/monitoring/traccar.nix
+++ b/nixos/modules/services/monitoring/traccar.nix
@@ -8,44 +8,62 @@ let
   cfg = config.services.traccar;
   stateDirectory = "/var/lib/traccar";
   configFilePath = "${stateDirectory}/config.xml";
-  expandCamelCase = lib.replaceStrings lib.upperChars (map (s: ".${s}") lib.lowerChars);
-  mkConfigEntry = key: value: "<entry key='${expandCamelCase key}'>${value}</entry>";
+
+  # Map leafs to XML <entry> elements as expected by traccar, using
+  # dot-separated keys for nested attribute paths.
+  mapLeafs = lib.mapAttrsRecursive (
+    path: value: "<entry key='${lib.concatStringsSep "." path}'>${value}</entry>"
+  );
+
+  mkConfigEntry = config: lib.collect builtins.isString (mapLeafs config);
+
   mkConfig =
     configurationOptions:
     pkgs.writeText "traccar.xml" ''
       <?xml version='1.0' encoding='UTF-8'?>
       <!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
       <properties>
-          ${builtins.concatStringsSep "\n" (lib.mapAttrsToList mkConfigEntry configurationOptions)}
+          ${builtins.concatStringsSep "\n" (mkConfigEntry configurationOptions)}
       </properties>
     '';
 
   defaultConfig = {
-    databaseDriver = "org.h2.Driver";
-    databasePassword = "";
-    databaseUrl = "jdbc:h2:${stateDirectory}/traccar";
-    databaseUser = "sa";
-    loggerConsole = "true";
-    mediaPath = "${stateDirectory}/media";
-    templatesRoot = "${stateDirectory}/templates";
+    database = {
+      driver = "org.h2.Driver";
+      password = "";
+      url = "jdbc:h2:${stateDirectory}/traccar";
+      user = "sa";
+    };
+    logger.console = "true";
+    media.path = "${stateDirectory}/media";
+    templates.root = "${stateDirectory}/templates";
   };
+
 in
 {
   options.services.traccar = {
     enable = lib.mkEnableOption "Traccar, an open source GPS tracking system";
+    settingsFile = lib.mkOption {
+      type = with lib.types; nullOr path;
+      default = null;
+      description = ''
+        File used as configuration for traccar. When specified, {option}`settings` is ignored.
+      '';
+    };
     settings = lib.mkOption {
       apply = lib.recursiveUpdate defaultConfig;
       default = defaultConfig;
       description = ''
         {file}`config.xml` configuration as a Nix attribute set.
-        Attribute names are translated from camelCase to dot-separated strings. For instance:
-        {option}`mailSmtpPort = "25"`
-        would result in the following configuration property:
+        This option is ignored if `settingsFile` is set.
+
+        Nested attributes get translated to a properties entry in the traccar configuration.
+        For instance: `mail.smtp.port = "25"` results in the following entry:
         `<entry key='mail.smtp.port'>25</entry>`
-        Configuration options should match those described in
-        [Traccar - Configuration File](https://www.traccar.org/configuration-file/).
-        Secret tokens should be specified using {option}`environmentFile`
+
+        Secrets should be specified using {option}`environmentFile`
         instead of this world-readable attribute set.
+        [Traccar - Configuration File](https://www.traccar.org/configuration-file/).
       '';
     };
     environmentFile = lib.mkOption {
@@ -56,7 +74,7 @@ in
 
         Can be used for storing the secrets without making them available in the world-readable Nix store.
 
-        For example, you can set {option}`services.traccar.settings.databasePassword = "$TRACCAR_DB_PASSWORD"`
+        For example, you can set {option}`services.traccar.settings.database.password = "$TRACCAR_DB_PASSWORD"`
         and then specify `TRACCAR_DB_PASSWORD="<secret>"` in the environment file.
         This value will get substituted in the configuration file.
       '';
@@ -65,7 +83,7 @@ in
 
   config =
     let
-      configuration = mkConfig cfg.settings;
+      configuration = if cfg.settingsFile != null then cfg.settingsFile else mkConfig cfg.settings;
     in
     lib.mkIf cfg.enable {
       systemd.services.traccar = {
@@ -92,7 +110,7 @@ in
 
         serviceConfig = {
           DynamicUser = true;
-          EnvironmentFile = cfg.environmentFile;
+          EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
           ExecStart = "${lib.getExe pkgs.traccar} ${configFilePath}";
           LockPersonality = true;
           NoNewPrivileges = true;

From 7a787e122bb704cf5a889ccdb3e1fcd773480f49 Mon Sep 17 00:00:00 2001
From: 49016 <49016@duck.com>
Date: Fri, 1 Aug 2025 21:33:33 +0200
Subject: [PATCH 071/130] lib.modules: Add hint when using `config` in
 `imports`

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

diff --git a/lib/modules.nix b/lib/modules.nix
index 36a2ee5c4181..437f8298a58e 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -637,6 +637,15 @@ let
     key: f:
     args@{ config, ... }:
     let
+      importHint =
+        name:
+        if name == "config" then
+          "\n\n"
+          + ''
+            … If you get an infinite recursion here, you probably reference `config`
+              in `imports`. This is not supported; consider using mkEnableOption.''
+        else
+          "";
       # Module arguments are resolved in a strict manner when attribute set
       # deconstruction is used.  As the arguments are now defined with the
       # config._module.args option, the strictness used on the attribute
@@ -649,7 +658,7 @@ let
       # a module will resolve strictly the attributes used as argument but
       # not their values.  The values are forwarding the result of the
       # evaluation of the option.
-      context = name: ''while evaluating the module argument `${name}' in "${key}":'';
+      context = name: ''while evaluating the module argument `${name}' in "${key}":${importHint name}'';
       extraArgs = mapAttrs (
         name: _: addErrorContext (context name) (args.${name} or config._module.args.${name})
       ) (functionArgs f);

From 5dcc8a5f1e21f887de51f874ed97688ba1301933 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 20:41:12 +0000
Subject: [PATCH 072/130] ecs-agent: 1.96.0 -> 1.97.0

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

diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index 55f41773cfaf..2b249f53ed5d 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecs-agent";
-  version = "1.96.0";
+  version = "1.97.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aws";
     repo = "amazon-ecs-agent";
-    hash = "sha256-jKqGKSPjHQvRKAxqB81u/i7LeIV8IeiCF9O5dSmebQQ=";
+    hash = "sha256-QdEmV78bQDw3YaJCPCFlLpo1rLsRu4Hn8e/JrZVkGQc=";
   };
 
   vendorHash = null;

From 6e0b3898fb5e4dc8e9261f88e26b9f0a8669a3b4 Mon Sep 17 00:00:00 2001
From: Solomon Victorino <git@solomonvictorino.com>
Date: Fri, 1 Aug 2025 15:25:17 -0600
Subject: [PATCH 073/130] oqs-provider: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix
index 9e20798b1b71..e25ae17d80ac 100644
--- a/pkgs/by-name/oq/oqs-provider/package.nix
+++ b/pkgs/by-name/oq/oqs-provider/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   name = "oqs-provider";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "open-quantum-safe";
     repo = "oqs-provider";
     rev = finalAttrs.version;
-    hash = "sha256-R9rau/Q+KSkr0hNxpvc3ub9eLQqS1kIONoOEw8zFUBk=";
+    hash = "sha256-/FdVcFNrRWJmEmO1B+LybL+MH4N7LdwvHaOpQi6vCTU=";
   };
 
   nativeBuildInputs = [

From e28f3f0cd018d60a3793cb705b5a24f76b78dedd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 2 Aug 2025 10:40:00 +0200
Subject: [PATCH 074/130] lib.modules: Test infinite recursion hint

We don't want it to occur in the trace of any unrelated errors.
---
 lib/tests/modules.sh | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index dac8b0e33676..8b021ab6980a 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -82,6 +82,30 @@ checkConfigOutput() {
     fi
 }
 
+invertIfUnset() {
+    gate="$1"
+    shift
+    if [[ -n "${!gate:-}" ]]; then
+        "$@"
+    else
+        ! "$@"
+    fi
+}
+
+globalErrorLogCheck() {
+    invertIfUnset "REQUIRE_INFINITE_RECURSION_HINT" \
+      grep -i 'if you get an infinite recursion here' \
+      <<<"$err" >/dev/null \
+      || {
+        if [[ -n "${REQUIRE_INFINITE_RECURSION_HINT:-}" ]]; then
+            echo "Unexpected infinite recursion hint"
+        else
+            echo "Expected infinite recursion hint, but none found"
+        fi
+        return 1
+      }
+}
+
 checkConfigError() {
     local errorContains=$1
     local err=""
@@ -94,6 +118,14 @@ checkConfigError() {
         logFailure
         logEndFailure
     else
+        if ! globalErrorLogCheck "$err"; then
+            logStartFailure
+            echo "LOG:"
+            reportFailure "$@"
+            echo "GLOBAL ERROR LOG CHECK FAILED"
+            logFailure
+            logEndFailure
+        fi
         if echo "$err" | grep -zP --silent "$errorContains" ; then
             ((++pass))
         else
@@ -488,7 +520,7 @@ checkConfigOutput '^"bar"$' config.nest.bar ./freeform-attrsOf.nix ./freeform-ne
 checkConfigOutput '^null$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix
 checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix
 # Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf
-checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix
+REQUIRE_INFINITE_RECURSION_HINT=1 checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix
 checkConfigError 'The option .* was accessed but has no value defined. Try setting the option.' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
 checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix
 # submodules in freeformTypes should have their locations annotated

From 9dad048f2118dd8678b8fbf69b7355b9a399d3cf Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 2 Aug 2025 10:51:09 +0200
Subject: [PATCH 075/130] lib.modules: Generalize the import hint to
 _module.args

---
 lib/modules.nix      | 14 +++-----------
 lib/tests/modules.sh |  4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 437f8298a58e..d723bf1656f2 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -254,11 +254,12 @@ let
                   inherit
                     lib
                     options
-                    config
                     specialArgs
                     ;
                   _class = class;
                   _prefix = prefix;
+                  config = builtins.addErrorContext "If you get an infinite recursion here, you probably reference `config`
+              in `imports`. This is not supported; consider using mkEnableOption." config;
                 }
                 // specialArgs
               );
@@ -637,15 +638,6 @@ let
     key: f:
     args@{ config, ... }:
     let
-      importHint =
-        name:
-        if name == "config" then
-          "\n\n"
-          + ''
-            … If you get an infinite recursion here, you probably reference `config`
-              in `imports`. This is not supported; consider using mkEnableOption.''
-        else
-          "";
       # Module arguments are resolved in a strict manner when attribute set
       # deconstruction is used.  As the arguments are now defined with the
       # config._module.args option, the strictness used on the attribute
@@ -658,7 +650,7 @@ let
       # a module will resolve strictly the attributes used as argument but
       # not their values.  The values are forwarding the result of the
       # evaluation of the option.
-      context = name: ''while evaluating the module argument `${name}' in "${key}":${importHint name}'';
+      context = name: ''while evaluating the module argument `${name}' in "${key}":'';
       extraArgs = mapAttrs (
         name: _: addErrorContext (context name) (args.${name} or config._module.args.${name})
       ) (functionArgs f);
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 8b021ab6980a..a4aa5201715c 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -315,8 +315,8 @@ checkConfigOutput '^true$' "$@" ./define-_module-args-custom.nix
 # Check that using _module.args on imports cause infinite recursions, with
 # the proper error context.
 set -- "$@" ./define-_module-args-custom.nix ./import-custom-arg.nix
-checkConfigError 'while evaluating the module argument .*custom.* in .*import-custom-arg.nix.*:' "$@"
-checkConfigError 'infinite recursion encountered' "$@"
+REQUIRE_INFINITE_RECURSION_HINT=1 checkConfigError 'while evaluating the module argument .*custom.* in .*import-custom-arg.nix.*:' "$@"
+REQUIRE_INFINITE_RECURSION_HINT=1 checkConfigError 'infinite recursion encountered' "$@"
 
 # Check _module.check.
 set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix

From 3d15b12d8f7acd0764a3cf08a2b3b58db4449a26 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 2 Aug 2025 10:59:55 +0200
Subject: [PATCH 076/130] lib.modules: Make _module.args evaluation explicit in
 trace

---
 lib/modules.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index d723bf1656f2..dc4513da8e0a 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -652,7 +652,13 @@ let
       # evaluation of the option.
       context = name: ''while evaluating the module argument `${name}' in "${key}":'';
       extraArgs = mapAttrs (
-        name: _: addErrorContext (context name) (args.${name} or config._module.args.${name})
+        name: _:
+        addErrorContext (context name) (
+          args.${name} or (addErrorContext
+            "noting that argument `${name}` is not externally provided, so querying `_module.args` instead, requiring `config`"
+            config._module.args.${name}
+          )
+        )
       ) (functionArgs f);
 
       # Note: we append in the opposite order such that we can add an error

From c34e08489ec87a23cd18dd4f6035c840071995b9 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 2 Aug 2025 11:01:14 +0200
Subject: [PATCH 077/130] lib.modules: Adjust error message

- Lower case error trace for consistency
- Be more explicit about the condition under which the hint applies,
  and the resolution.
---
 lib/modules.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index dc4513da8e0a..ad8a381e97f7 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -258,8 +258,7 @@ let
                     ;
                   _class = class;
                   _prefix = prefix;
-                  config = builtins.addErrorContext "If you get an infinite recursion here, you probably reference `config`
-              in `imports`. This is not supported; consider using mkEnableOption." config;
+                  config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. This is not possible. If you are trying to achieve a conditional behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config;
                 }
                 // specialArgs
               );

From 3d070424cfbb983031bbbb1809bcbe0c334275ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 10:18:09 +0000
Subject: [PATCH 078/130] python3Packages.pybase64: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 73e365127214..3fd5932d7e27 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pybase64";
-  version = "1.4.1";
+  version = "1.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     repo = "pybase64";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-mEwFcnqUKCWYYrcjELshJYNqTxQ//4w4OzaWhrzB5Mg=";
+    hash = "sha256-VSCMBKyDgNjwRUvT29z3KdN/dReqbmaaNeWomnyFJFg=";
   };
 
   build-system = [ setuptools ];

From b1123057f50d03424e8715436ac7d7869c935052 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 14:34:32 +0000
Subject: [PATCH 079/130] squawk: 2.21.0 -> 2.21.1

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

diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix
index 34be74c74bc2..7c90f3b241f8 100644
--- a/pkgs/by-name/sq/squawk/package.nix
+++ b/pkgs/by-name/sq/squawk/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "squawk";
-  version = "2.21.0";
+  version = "2.21.1";
 
   src = fetchFromGitHub {
     owner = "sbdchd";
     repo = "squawk";
     tag = "v${version}";
-    hash = "sha256-Za+d1o1fmD35yKtiK/SGWucOPeKowbrwzOHdBvAh1EE=";
+    hash = "sha256-Ox6UPy4EFN3WEpXYXx0SGVRcAY0zl0x7eCxKP/kS3qo=";
   };
 
-  cargoHash = "sha256-jSvcuBurw9HDnemm5133ElrDdTMHzlt+C5d99Kywk7w=";
+  cargoHash = "sha256-WRGz70lb1HwVOwi+un8h7PoDMlFrJbuFmw3q+JKkfZw=";
 
   nativeBuildInputs = [
     pkg-config

From c3f0b0da54d16c833daf29cfb5d6440c87022417 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 17:00:49 +0000
Subject: [PATCH 080/130] crun: 1.22 -> 1.23.1

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

diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix
index 10a4e2bd7b93..e7a3d93829a9 100644
--- a/pkgs/by-name/cr/crun/package.nix
+++ b/pkgs/by-name/cr/crun/package.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "1.22";
+  version = "1.23.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "crun";
     rev = version;
-    hash = "sha256-6XhwGuV9btN7wuwJuQITHtVTKBcawTuMG8lY22RMdWk=";
+    hash = "sha256-jGRL/P4pR3nNikTYZxxqFvOK63pepClVhwBmeCF/dNU=";
     fetchSubmodules = true;
   };
 

From 7b8c7a16b7315ccbd879bd77d74a795c646beb69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 18:43:33 +0000
Subject: [PATCH 081/130] trexio: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix
index ecfa125c8579..d470db516727 100644
--- a/pkgs/by-name/tr/trexio/package.nix
+++ b/pkgs/by-name/tr/trexio/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "trexio";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "TREX-CoE";
     repo = "trexio";
     rev = "v${version}";
-    hash = "sha256-KP8tpwBr/ymjcXmCssdn+Xti0UKgazJSGTgVpvE+CiM=";
+    hash = "sha256-mTn/46oIvBbv7X0QwDxXQJH3QyH34u487QpLferC2Uc=";
   };
 
   postPatch = ''

From ceac5080ea5f001505ca38da96947821418122e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 19:39:21 +0000
Subject: [PATCH 082/130] json-fortran: 9.0.3 -> 9.0.4

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

diff --git a/pkgs/by-name/js/json-fortran/package.nix b/pkgs/by-name/js/json-fortran/package.nix
index 924a018c3344..aa18a56a6899 100644
--- a/pkgs/by-name/js/json-fortran/package.nix
+++ b/pkgs/by-name/js/json-fortran/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "json-fortran";
-  version = "9.0.3";
+  version = "9.0.4";
 
   src = fetchFromGitHub {
     owner = "jacobwilliams";
     repo = "json-fortran";
     rev = version;
-    hash = "sha256-MMHMyEPZYz7dkYX1OA9D1kgRCTpzTVussJbh4rWHlyU=";
+    hash = "sha256-tLDs/yh9xMfZd2m+jD6Mm3Lr4asI4SrBDOAU2vN5OfA=";
   };
 
   nativeBuildInputs = [

From f054be2d658c637651c7adffa30009a88001b9ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 19:49:55 +0000
Subject: [PATCH 083/130] renode-unstable: 1.15.3+20250720git2309db7fd ->
 1.15.3+20250801git3f8169b88

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

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index b33a4af28867..3f64f88924bb 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -7,11 +7,11 @@
 renode.overrideAttrs (
   finalAttrs: _: {
     pname = "renode-unstable";
-    version = "1.15.3+20250720git2309db7fd";
+    version = "1.15.3+20250801git3f8169b88";
 
     src = fetchurl {
       url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
-      hash = "sha256-pcgjT27cBlHzHnh4q9AsgVAVXshdvA0Tdo0dsq9rXP4=";
+      hash = "sha256-1GtLD69h0oYLXqs5n+0Vzc00WtK6mdPR9BkP4tjOmW8=";
     };
 
     passthru.updateScript =

From 7576bbed5b71a4ee6cf0352bda100f29eba0b809 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 23:40:51 +0000
Subject: [PATCH 084/130] rio: 0.2.23 -> 0.2.24

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

diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index a7ad42f89b9b..2a1f366089bb 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -53,16 +53,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rio";
-  version = "0.2.23";
+  version = "0.2.24";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hhKlXuhv0PP8/xCIZ0lFGtCYCzOzH0gUeh48GdKpG6A=";
+    hash = "sha256-djKDi4ysRWtoMabJkEZ3jQ8hAE9JISi/ivjSFZmAwLY=";
   };
 
-  cargoHash = "sha256-+pfudGeWq4EARQDu+HAZczWlzStuzDPArMm1oCZGfKU=";
+  cargoHash = "sha256-cdMIbip5fjDHewh/HiYzb/3QVRXUH7OeRQO+zfuGw6Q=";
 
   nativeBuildInputs = [
     ncurses

From e0383ff85a87660550978b21cf2d5aa2c74d6821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 08:51:32 +0000
Subject: [PATCH 085/130] arrow: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/by-name/ar/arrow/package.nix b/pkgs/by-name/ar/arrow/package.nix
index f798956d6d9f..576f80f03c53 100644
--- a/pkgs/by-name/ar/arrow/package.nix
+++ b/pkgs/by-name/ar/arrow/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "arrow";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "mhgolkar";
     repo = "Arrow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oodW6XvesBWic0yK1Se/tycjqblE4qUSuAk+3MY3x8I=";
+    hash = "sha256-+Tlqh0Xn2xnF2AWv9u5xIWo6Mvg/uEsqqxWx70kd3+k=";
   };
 
   desktopItems = [

From dcc9ff0aa33eecb5201e92de549bae39efe33cc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 10:48:49 +0000
Subject: [PATCH 086/130] subtitleedit: 4.0.12 -> 4.0.13

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

diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix
index f194f593f3f8..ce40f008d8b3 100644
--- a/pkgs/by-name/su/subtitleedit/package.nix
+++ b/pkgs/by-name/su/subtitleedit/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "subtitleedit";
-  version = "4.0.12";
+  version = "4.0.13";
 
   src = fetchzip {
     url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${
       lib.replaceStrings [ "." ] [ "" ] version
     }.zip";
-    hash = "sha256-UlkFTsdssrjrPA0oOXJuSckEf1uMxh+POojfDX7NUu8=";
+    hash = "sha256-Oo/w+1cEQ3+Xoa9H9VrGCaLFWFI2ajdj9wn3Pk9WEUk=";
     stripRoot = false;
   };
 

From 2bd8641b156a7bda566a4b4a7964d0756d4b4e33 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 13:04:07 +0200
Subject: [PATCH 087/130] python313Packages.authlib: 1.6.0 -> 1.6.1

Diff: https://github.com/lepture/authlib/compare/refs/tags/v1.6.0...refs/tags/v1.6.1

Changelog: https://github.com/lepture/authlib/blob/v1.6.1/docs/changelog.rst
---
 pkgs/development/python-modules/authlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix
index 5662d2fddeeb..8b39e8713147 100644
--- a/pkgs/development/python-modules/authlib/default.nix
+++ b/pkgs/development/python-modules/authlib/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "authlib";
-  version = "1.6.0";
+  version = "1.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "lepture";
     repo = "authlib";
     tag = "v${version}";
-    hash = "sha256-USZc+IKcg0+aEG2ISx29jTwm8BBuzNqFoZLBpZ7K2DU=";
+    hash = "sha256-2VVfq3D5SbWQI+ZLtG1+fv5CkY54DQ9dvgpMiSffueE=";
   };
 
   build-system = [ setuptools ];

From a28c42116e6a39a6f03340f3c16048009324c38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sun, 3 Aug 2025 13:07:32 +0100
Subject: [PATCH 088/130] vuetorrent: 2.27.0 -> 2.28.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 bd27fcf7cea5..2115af44f864 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.27.0";
+  version = "2.28.1";
 
   src = fetchFromGitHub {
     owner = "VueTorrent";
     repo = "VueTorrent";
     tag = "v${version}";
-    hash = "sha256-0yzxlXyA8wEY6oixjhXFBZ+FL5vFbK6OiLSt5/bv0e4=";
+    hash = "sha256-YIhZREiHFRYgPvI0DVMHaD4TU7mQyigEDUwOaNheqdw=";
   };
 
-  npmDepsHash = "sha256-7tcLXKpqF4LMuLCcjfVSZUipdrjQiiTS2R5XmLVxv2o=";
+  npmDepsHash = "sha256-VS6cjwKsNo0TNEF/71u2PTb2ZhSz5AG9YVh/FTIopzg=";
 
   installPhase = ''
     runHook preInstall

From 1837155ab32b9e27ad7990f03543d45295623179 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 3 Aug 2025 17:23:54 +0200
Subject: [PATCH 089/130] typstyle: 0.13.16 -> 0.13.17

Changelog: https://github.com/typstyle-rs/typstyle/releases/tag/v0.13.17
Diff:
https://github.com/typstyle-rs/typstyle/compare/v0.13.16...v0.13.17
---
 pkgs/by-name/ty/typstyle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 6571d8502d77..c46865f7bdf8 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.16";
+  version = "0.13.17";
 
   src = fetchFromGitHub {
     owner = "typstyle-rs";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dfw1jyPNZ0LDEZ+pbJt9DWKa4aBlFCAZIgKrZK+AmJw=";
+    hash = "sha256-JsRMs6ARiXs/S/ybkzNo4giR3BvGbOm8X/UH08kvznU=";
   };
 
-  cargoHash = "sha256-Eg8i+vsBp0BuxxBWXZisVKiGge25UKfxoK/3Knk+LsU=";
+  cargoHash = "sha256-G7X5FoWHEWFoLqfHmbuSylG7/xp4aXrSugnGc20oZcE=";
 
   # Disabling tests requiring network access
   checkFlags = [

From 48f811cc53949e3b15951a1dee2be21ec93d690b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 19:37:31 +0200
Subject: [PATCH 090/130] re-isearch: 2.20220925.4.0a-unstable-2025-03-16 ->
 2.20220925.4.0a-unstable-2025-05-15

---
 ...fix-JsonHitTable-undefined-reference.patch | 50 ---------------
 .../1001-Fix-resurcive-make-parallelism.patch | 64 +++++++++++++++++++
 pkgs/by-name/re/re-isearch/package.nix        | 28 ++++----
 3 files changed, 80 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch
 create mode 100644 pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch

diff --git a/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch b/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch
deleted file mode 100644
index 30b8696b70d8..000000000000
--- a/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# fixes "undefined reference to `IDB::JsonHitTable(RESULT const&)" build failure
-
----
- src/idb.cxx | 26 --------------------------
- 1 file changed, 26 deletions(-)
-
-diff --git a/src/idb.cxx b/src/idb.cxx
-index 2469c06..753a9fb 100644
---- a/src/idb.cxx
-+++ b/src/idb.cxx
-@@ -5486,37 +5486,11 @@ STRING IDB::XMLHitTable(const RESULT& Result)
- }
- #endif
-
--#if 0
- STRING IDB::JsonHitTable(const RESULT& Result)
- {
--#if 1
-   message_log (LOG_FATAL, "JsonHitTable is not yet implemented");
-   return NulString;
--#else
--/*
--<folders>
--    <folder id="123" private="0" archived="0" order="1">Shopping</folder>
--</folders>
--
--is JSON
--
--{
--    "folders": {
--        "folder":{
--        "@": {
--            "id": "123",
--            "private": "0",
--            "archived": "0",
--            "order": "1"
--            },
--        "#": "Shopping"
--        }
--    }
--}
--*/
- }
--#endif
--#endif
-
-
- PIRSET IDB::SearchSmart(QUERY *Query, const STRING& DefaultField)
---
-2.47.2
diff --git a/pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch b/pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch
new file mode 100644
index 000000000000..1d6720550a40
--- /dev/null
+++ b/pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch
@@ -0,0 +1,64 @@
+From 9fc97ea817762e2575954cd31aa735b2cfec7a5e Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Sun, 3 Aug 2025 19:08:30 +0200
+Subject: [PATCH] build/Makefile: Fix recursive make & parallelism
+
+- Recursively calling make should be done by using the special `MAKE` variable, which will preserve parallelism across calls
+- Don't hardcode parallelism in recursive make calls, inherit user-supplied ones instead
+---
+ build/Makefile | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/build/Makefile b/build/Makefile
+index 6633ebd..807bfd9 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -2,36 +2,36 @@ UNAME := $(shell uname)
+ 
+ all:
+ ifeq ($(UNAME), Darwin)
+-	make -j 5  -f Makefile.MacOS-OMP $(MFLAGS)  
++	$(MAKE) -f Makefile.MacOS-OMP $(MFLAGS)
+ endif
+ ifeq ($(UNAME), Linux)
+-	make -j 3  -f Makefile.ubuntu $(MFLAGS)
++	$(MAKE) -f Makefile.ubuntu $(MFLAGS)
+ endif
+ ifeq ($(UNAME), Solaris)
+-	make  -f Makefile.solaris $(MFLAGS)
++	$(MAKE) -f Makefile.solaris $(MFLAGS)
+ endif
+ 
+ install:
+ ifeq ($(UNAME), Darwin)
+-	make -j 5  -f Makefile.MacOS-OMP $(MFLAGS) install
++	$(MAKE) -f Makefile.MacOS-OMP $(MFLAGS) install
+ endif
+ ifeq ($(UNAME), Linux)
+-	make -j 3  -f Makefile.ubuntu $(MFLAGS) install
++	$(MAKE) -f Makefile.ubuntu $(MFLAGS) install
+ endif
+ ifeq ($(UNAME), Solaris)
+-	make  -f Makefile.solaris $(MFLAGS) install
++	$(MAKE) -f Makefile.solaris $(MFLAGS) install
+ endif
+ 
+ 
+ plugins:
+ ifeq ($(UNAME), Darwin)
+-	make -j 5 -f Makefile.MacOS $(MFLAGS) plugins
++	$(MAKE) -f Makefile.MacOS $(MFLAGS) plugins
+ endif
+ ifeq ($(UNAME), Linux)
+-	make -j 3  -f Makefile.ubuntu $(MFLAGS) plugins
++	$(MAKE) -f Makefile.ubuntu $(MFLAGS) plugins
+ endif
+ ifeq ($(UNAME), Solaris)
+-	make  -f Makefile.solaris $(MFLAGS) plugins
++	$(MAKE) -f Makefile.solaris $(MFLAGS) plugins
+ endif
+ 
+ 
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index b0e1e1c9e810..6e3c26db8d30 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -11,24 +11,27 @@
 
 stdenv.mkDerivation {
   pname = "re-Isearch";
-  version = "2.20220925.4.0a-unstable-2025-03-16";
+  version = "2.20220925.4.0a-unstable-2025-05-15";
 
   src = fetchFromGitHub {
     owner = "re-Isearch";
     repo = "re-Isearch";
-    rev = "56e0dfbe7468881b3958ca8e630f41a5354e9873";
-    hash = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM=";
+    rev = "35e939fd60948f112b668b06d2b8b75f2c7425d3";
+    hash = "sha256-r7KUwx2SrfnpSknGSpzw33Qwp63htoKknrnmdOgA/9Y=";
   };
 
-  # Upstream issue: https://github.com/re-Isearch/re-Isearch/issues/11
-  patches = [ ./0001-fix-JsonHitTable-undefined-reference.patch ];
+  patches = [
+    # https://github.com/re-Isearch/re-Isearch/pull/12
+    ./1001-Fix-resurcive-make-parallelism.patch
+  ];
 
   postPatch = ''
     # Fix gcc-13 build due to missing <cstdint> include.
+    # https://github.com/re-Isearch/re-Isearch/pull/13
     sed -e '1i #include <cstdint>' -i src/mmap.cxx
 
-    # g++: error: unrecognized command-line option '-msse2'
-    # gcc: error: unrecognized command-line option '-m64'
+    # These flags are not supported on all architectures
+    # https://github.com/re-Isearch/re-Isearch/issues/14
     substituteInPlace build/Makefile.ubuntu \
       --replace-fail "-msse2" "" \
       --replace-fail "-m64" ""
@@ -43,20 +46,21 @@ stdenv.mkDerivation {
   ];
 
   makeFlags = [
-    "CC=g++"
-    "cc=gcc"
-    "LD=g++"
+    "CC=${stdenv.cc.targetPrefix}c++"
+    "cc=${stdenv.cc.targetPrefix}cc"
+    "LD=${stdenv.cc.targetPrefix}c++"
   ];
 
   preBuild = ''
     cd build
-    make clean # clean up pre-built objects in the source
     makeFlagsArray+=(
-      EXTRA_INC="-I${db.dev}/include -I${lib.getDev file}/include"
+      EXTRA_INC="-I${lib.getDev db}/include -I${lib.getDev file}/include"
       LD_PATH="-L../lib -L${db.out}/lib -L${file}/lib -L${libnsl}/lib"
     )
   '';
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     runHook preInstall
 

From ff4d9b8f495985f1769df98c40255b3932fd29ca Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Sun, 3 Aug 2025 13:48:28 -0400
Subject: [PATCH 091/130] wayland-bongocat: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/by-name/wa/wayland-bongocat/package.nix b/pkgs/by-name/wa/wayland-bongocat/package.nix
index 5be8a2f306be..6079709e47f3 100644
--- a/pkgs/by-name/wa/wayland-bongocat/package.nix
+++ b/pkgs/by-name/wa/wayland-bongocat/package.nix
@@ -9,12 +9,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland-bongocat";
-  version = "1.2.2";
+  version = "1.2.3";
   src = fetchFromGitHub {
     owner = "saatvik333";
     repo = "wayland-bongocat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7IsWg0VE6Sqo0elOAUicmWGasXrvBeGeBRP/mDVgfzI=";
+    hash = "sha256-XCjOusgvTkEiID55MxP2ppVtKiDz5XAF1kSCIAXN3DQ=";
   };
 
   # Package dependencies

From f92169c861c2fa389a15623569165d76fc78622f Mon Sep 17 00:00:00 2001
From: Hongbo <hehongbo@mail.com>
Date: Sun, 27 Jul 2025 18:50:25 +0800
Subject: [PATCH 092/130] grub2: refactor platforms logic, avoid abusing
 `meta.broken`

Previously, we used `platforms.gnu` and `platforms.linux` for Grub2's available
platforms, but blocking unsupported platforms via asserts. An attempt has been
made through marking unsupported platforms "broken" for EFI, but it would be
better if we just document the supported platforms in `meta.platforms` in the
first place. Also, the Grub2 package already has platform support for
PC/EFI/Xen, which deserves to be restructured in a unified way.

Regarding `meta.broken`, it shouldn't be used on invalid combinations of
arguments, as it will cause misunderstandings.

Changes have been made:
- Remove `meta.broken`, along with the 3 conditions in it.
- Remove `canEfi`, chain `efiSystemsBuild` on `meta.platform` if
  `pkgs.grub2_efi` is asked (building with `efiSupport = true;`)
- Avoid reusing `efiSystemsBuild` for Xen (PV), build a dedicated
  `xenSystemsBuild` for Xen, and chain that into `meta.platforms` in the same
  format.
- Revert the other 2 conditions (building with invalid arguments) back to
  asserts.

Signed-off-by: Hongbo <hehongbo@mail.com>
---
 pkgs/tools/misc/grub/default.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 4e795fd6607e..8b56473f87ab 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -60,12 +60,12 @@ let
     riscv64-linux.target = "riscv64";
   };
 
-  canEfi = lib.any (system: stdenv.hostPlatform.system == system) (
-    lib.mapAttrsToList (name: _: name) efiSystemsBuild
-  );
-  inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (
-    lib.mapAttrsToList (name: _: name) pcSystems
-  );
+  xenSystemsBuild = {
+    i686-linux.target = "i386";
+    x86_64-linux.target = "x86_64";
+  };
+
+  inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.attrNames pcSystems);
 
   gnulib = fetchFromSavannah {
     repo = "gnulib";
@@ -88,6 +88,10 @@ let
     hash = "sha256-IoRiJHNQ58y0UhCAD0CrpFiI8Mz1upzAtyh5K4Njh/w=";
   };
 in
+
+assert zfsSupport -> zfs != null;
+assert !(efiSupport && xenSupport);
+
 stdenv.mkDerivation rec {
   pname = "grub";
   version = "2.12";
@@ -605,7 +609,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals xenSupport [
     "--with-platform=xen"
-    "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
+    "--target=${xenSystemsBuild.${stdenv.hostPlatform.system}.target}"
   ];
 
   # save target that grub is compiled for
@@ -653,16 +657,13 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
 
     platforms =
-      if xenSupport then
-        [
-          "x86_64-linux"
-          "i686-linux"
-        ]
+      if efiSupport then
+        lib.attrNames efiSystemsBuild
+      else if xenSupport then
+        lib.attrNames xenSystemsBuild
       else
         platforms.gnu ++ platforms.linux;
 
     maintainers = [ ];
-
-    broken = !(efiSupport -> canEfi) || !(zfsSupport -> zfs != null) || (efiSupport && xenSupport);
   };
 }

From 1d3cc9064ef2575eb85a24be2b618bbdeaa67990 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 20:19:26 +0200
Subject: [PATCH 093/130] steamworks: Various fixes

- Change updateScript to gitUpdater, nix-update-script was trying to downgrade to the last tag with a release page
- Add catch2 to checkInputs, was previously unused
- Fix catch2 linking
- Fix non-debug compilation
- Enable tests
- Add references to upstream-submitted fixes
---
 .../1001-Add-missing-logger-methods.patch     | 26 +++++++++++++++++
 pkgs/by-name/st/steamworks/package.nix        | 29 ++++++++++++++-----
 2 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/st/steamworks/1001-Add-missing-logger-methods.patch

diff --git a/pkgs/by-name/st/steamworks/1001-Add-missing-logger-methods.patch b/pkgs/by-name/st/steamworks/1001-Add-missing-logger-methods.patch
new file mode 100644
index 000000000000..b7d98fabfe20
--- /dev/null
+++ b/pkgs/by-name/st/steamworks/1001-Add-missing-logger-methods.patch
@@ -0,0 +1,26 @@
+From 5f144d5d26ea0dd1754ed25a583ebafa01ecbb4b Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Sun, 3 Aug 2025 20:06:49 +0200
+Subject: [PATCH] src/common/logger.h: Add missing methods under NDEBUG
+
+---
+ src/common/logger.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/common/logger.h b/src/common/logger.h
+index 0901205..259f058 100644
+--- a/src/common/logger.h
++++ b/src/common/logger.h
+@@ -81,6 +81,9 @@ public:
+ 	LoggerStream& getStream(int level) { return stream; }
+ 
+ 	void debug(...) {}
++	void warn(...) {}
++
++	bool isDebugEnabled() { return false; }
+ };
+ 
+ // Bogus level numbers; I don't know if these are compatible with
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/st/steamworks/package.nix b/pkgs/by-name/st/steamworks/package.nix
index c528c6897c95..f8c48dffcbb2 100644
--- a/pkgs/by-name/st/steamworks/package.nix
+++ b/pkgs/by-name/st/steamworks/package.nix
@@ -11,7 +11,7 @@
   log4cpp,
   openldap,
   sqlite,
-  nix-update-script,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,9 +25,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-hD1nTyv/t7MQdopqivfSE0o4Qk1ymG8zQVg56lY+t9o=";
   };
 
-  # src/common/logger.h:254:63: error: 'uint8_t' does not name a type
+  patches = [
+    # https://gitlab.com/arpa2/steamworks/-/merge_requests/13
+    ./1001-Add-missing-logger-methods.patch
+  ];
+
   postPatch = ''
-    sed -i "38i #include <cstdint>" src/common/logger.h
+    # src/common/logger.h:254:63: error: 'uint8_t' does not name a type
+    # https://gitlab.com/arpa2/steamworks/-/merge_requests/11
+    sed -i "40i #include <cstdint>" src/common/logger.h
+
+    # ld: cannot find -lLog4cpp: No such file or directory
+    # https://gitlab.com/arpa2/steamworks/-/merge_requests/12
+    substituteInPlace src/common/CMakeLists.txt \
+      --replace-fail 'Catch2::Catch2 Log4cpp' 'Catch2::Catch2 Log4cpp::Log4cpp'
   '';
 
   strictDeps = true;
@@ -47,11 +58,15 @@ stdenv.mkDerivation (finalAttrs: {
     sqlite
   ];
 
-  # Currently doesn't build in `Release` since a macro is messing with some code
-  # when building in `Release`.
-  cmakeBuildType = "Debug";
+  checkInputs = [
+    catch2
+  ];
 
-  passthru.updateScript = nix-update-script { };
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Configuration information distributed over LDAP in near realtime";

From f3da09dfef69b458fae8d4004d34d3c600cc7edb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 20:22:37 +0200
Subject: [PATCH 094/130] re-isearch: Disable enableParallelBuilding again

Do so explicitly, and add a note about why.
---
 pkgs/by-name/re/re-isearch/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 6e3c26db8d30..23326ab144a4 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -59,7 +59,10 @@ stdenv.mkDerivation {
     )
   '';
 
-  enableParallelBuilding = true;
+  # Handwritten Makefiles, doesn't properly ensure that libraries are built before they're used in linking
+  # ld: cannot find -libUtils: No such file or directory
+  # ld: cannot find -libLocal: No such file or directory
+  enableParallelBuilding = false;
 
   installPhase = ''
     runHook preInstall

From 23a401b10436d4b40c2ad65876b65b444fa27ab6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 19:43:18 +0000
Subject: [PATCH 095/130] python3Packages.ossapi: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix
index ad0e774d3d56..0869a8af0601 100644
--- a/pkgs/development/python-modules/ossapi/default.nix
+++ b/pkgs/development/python-modules/ossapi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "ossapi";
-  version = "5.3.1";
+  version = "5.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tybug";
     repo = "ossapi";
     tag = "v${version}";
-    hash = "sha256-5a2kSdOHF0BM/ZjhtPc9O/BiZXeLuZFlXwVOJHnKYLI=";
+    hash = "sha256-sLzw/0RsA0PGxxQeVz4TGIpTMMlrZ0i4ZGolrz5S16E=";
   };
 
   build-system = [ setuptools ];

From 51a2caecf4d1ce7003bf611569fc79eefbde932c Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 3 Aug 2025 10:05:16 +0200
Subject: [PATCH 096/130] nixos/auditd: support configuring service through nix

---
 nixos/modules/security/auditd.nix | 95 ++++++++++++++++++++++++++++++-
 1 file changed, 93 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 45ea1d9b2af0..fb35ad35aebd 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -4,16 +4,107 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.security.auditd;
 
+  settingsType =
+    with lib.types;
+    nullOr (oneOf [
+      bool
+      nonEmptyStr
+      path
+      int
+    ]);
+
+  prepareConfigValue =
+    v:
+    if lib.isBool v then
+      (if v then "yes" else "no")
+    else if lib.isList v then
+      lib.concatStringsSep " " (map prepareConfigValue v)
+    else
+      builtins.toString v;
+  prepareConfigText =
+    conf:
+    lib.concatLines (
+      lib.mapAttrsToList (k: v: if v == null then "#${k} =" else "${k} = ${prepareConfigValue v}") conf
+    );
+in
 {
-  options.security.auditd.enable = lib.mkEnableOption "the Linux Audit daemon";
+  options.security.auditd = {
+    enable = lib.mkEnableOption "the Linux Audit daemon";
+
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = lib.types.attrsOf settingsType;
+        options = {
+          # space_left needs to be larger than admin_space_left, yet they default to be the same if left open.
+          space_left = lib.mkOption {
+            type = lib.types.either lib.types.int (lib.types.strMatching "[0-9]+%");
+            default = 75;
+            description = ''
+              If the free space in the filesystem containing log_file drops below this value, the audit daemon takes the action specified by
+              {option}`space_left_action`. If the value of {option}`space_left` is specified as a whole number, it is interpreted as an absolute size in mebibytes
+              (MiB). If the value is specified as a number between 1 and 99 followed by a percentage sign (e.g., 5%), the audit daemon calculates
+              the absolute size in megabytes based on the size of the filesystem containing {option}`log_file`. (E.g., if the filesystem containing
+              {option}`log_file` is 2 gibibytes in size, and {option}`space_left` is set to 25%, then the audit daemon sets {option}`space_left` to approximately 500 mebibytes.
+
+              ::: {.note}
+              This calculation is performed when the audit daemon starts, so if you resize the filesystem containing {option}`log_file` while the
+              audit daemon is running, you should send the audit daemon SIGHUP to re-read the configuration file and recalculate the correct per‐
+              centage.
+              :::
+            '';
+          };
+          admin_space_left = lib.mkOption {
+            type = lib.types.either lib.types.int (lib.types.strMatching "[0-9]+%");
+            default = 50;
+            description = ''
+              This is a numeric value in mebibytes (MiB) that tells the audit daemon when to perform a configurable action because the system is running
+              low on disk space. This should be considered the last chance to do something before running out of disk space. The numeric value for
+              this parameter should be lower than the number for {option}`space_left`. You may also append a percent sign (e.g. 1%) to the number to have
+              the audit daemon calculate the number based on the disk partition size.
+            '';
+          };
+        };
+      };
+
+      default = { };
+      description = "auditd configuration file contents. See {auditd.conf} for supported values.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion =
+          let
+            cfg' = cfg.settings;
+          in
+          (
+            (lib.isInt cfg'.space_left && lib.isInt cfg'.admin_space_left)
+            -> cfg'.space_left > cfg'.admin_space_left
+          )
+          && (
+            let
+              get_percent = s: lib.toInt (lib.strings.removeSuffix "%" s);
+            in
+            (lib.isString cfg'.space_left && lib.isString cfg'.admin_space_left)
+            -> (get_percent cfg'.space_left) > (get_percent cfg'.admin_space_left)
+          );
+        message = "`security.auditd.settings.space_left` must be larger than `security.auditd.settings.admin_space_left`";
+      }
+    ];
 
-  config = lib.mkIf config.security.auditd.enable {
     # Starting auditd should also enable loading the audit rules..
     security.audit.enable = lib.mkDefault true;
 
     environment.systemPackages = [ pkgs.audit ];
 
+    environment.etc = {
+      "audit/auditd.conf".text = prepareConfigText cfg.settings;
+    };
+
     systemd.services.auditd = {
       description = "Security Audit Logging Service";
       documentation = [ "man:auditd(8)" ];

From 2c77ad7e9e6ae0deb4f34edad0b501e023421555 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 3 Aug 2025 22:13:24 +0200
Subject: [PATCH 097/130] nixos/auditd: add plugin support

---
 nixos/modules/security/auditd.nix | 90 ++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index fb35ad35aebd..3d07a1d93809 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -16,6 +16,73 @@ let
       int
     ]);
 
+  pluginOptions = lib.types.submodule {
+    options = {
+      active = lib.mkEnableOption "Whether to enable this plugin";
+      direction = lib.mkOption {
+        type = lib.types.enum [
+          "in"
+          "out"
+        ];
+        default = "out";
+        description = ''
+          The option is dictated by the plugin. In or out are the only choices.
+          You cannot make a plugin operate in a way it wasn't  designed just by
+          changing this option. This option is to give a clue to the event dispatcher
+          about which direction events flow.
+
+          ::: {.note}
+          Inbound events are not supported yet.
+          :::
+        '';
+      };
+      path = lib.mkOption {
+        type = lib.types.path;
+        description = "This is the absolute path to the plugin executable.";
+      };
+      type = lib.mkOption {
+        type = lib.types.enum [ "always" ];
+        readOnly = true;
+        default = "always";
+        description = ''
+          This tells the dispatcher how the plugin wants to be run. There is only
+          one valid option, `always`, which means the plugin is external and should
+          always be run. The default is `always` since there are no more builtin plugins.
+        '';
+      };
+      args = lib.mkOption {
+        type = lib.types.nullOr (lib.types.listOf lib.types.nonEmptyStr);
+        default = null;
+        description = ''
+          This allows you to pass arguments to the child program.
+          Generally plugins do not take arguments and have their own
+          config file that instructs them how they should be configured.
+        '';
+      };
+      format = lib.mkOption {
+        type = lib.types.enum [
+          "binary"
+          "string"
+        ];
+        default = "string";
+        description = ''
+          Binary passes the data exactly as the audit event dispatcher gets it from
+          the audit daemon. The string option tells the dispatcher to completely change
+          the event into a string suitable for parsing with the audit parsing library.
+        '';
+      };
+      settings = lib.mkOption {
+        type = lib.types.nullOr (
+          lib.types.submodule {
+            freeformType = lib.types.attrsOf settingsType;
+          }
+        );
+        default = null;
+        description = "Plugin-specific config file to link to /etc/audit/<plugin>.conf";
+      };
+    };
+  };
+
   prepareConfigValue =
     v:
     if lib.isBool v then
@@ -72,6 +139,12 @@ in
       default = { };
       description = "auditd configuration file contents. See {auditd.conf} for supported values.";
     };
+
+    plugins = lib.mkOption {
+      type = lib.types.attrsOf pluginOptions;
+      default = { };
+      description = "Plugin definitions to register with auditd";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -101,9 +174,24 @@ in
 
     environment.systemPackages = [ pkgs.audit ];
 
+    # setting this to anything other than /etc/audit/plugins.d will break, so we pin it here
+    security.auditd.settings.plugin_dir = "/etc/audit/plugins.d";
+
     environment.etc = {
       "audit/auditd.conf".text = prepareConfigText cfg.settings;
-    };
+    }
+    // (lib.mapAttrs' (
+      pluginName: pluginDefinitionConfigValue:
+      lib.nameValuePair "audit/plugins.d/${pluginName}.conf" {
+        text = prepareConfigText (lib.removeAttrs pluginDefinitionConfigValue [ "settings" ]);
+      }
+    ) cfg.plugins)
+    // (lib.mapAttrs' (
+      pluginName: pluginDefinitionConfigValue:
+      lib.nameValuePair "audit/audisp-${pluginName}.conf" {
+        text = prepareConfigText pluginDefinitionConfigValue.settings;
+      }
+    ) (lib.filterAttrs (_: v: v.settings != null) cfg.plugins));
 
     systemd.services.auditd = {
       description = "Security Audit Logging Service";

From ee774bb6244ca58820cdadd3bd85be6748e3fd05 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 3 Aug 2025 22:17:53 +0200
Subject: [PATCH 098/130] nixos/auditd: add built-in plugins (default disabled)

---
 nixos/modules/security/auditd.nix | 65 +++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 3d07a1d93809..ff20cc2fbbf7 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -143,6 +143,39 @@ in
     plugins = lib.mkOption {
       type = lib.types.attrsOf pluginOptions;
       default = { };
+      defaultText = lib.literalExpression ''
+        {
+          af_unix = {
+            path = lib.getExe' pkgs.audit "audisp-af_unix";
+            args = [
+              "0640"
+              "/var/run/audispd_events"
+              "string"
+            ];
+            format = "binary";
+          };
+          remote = {
+            path = lib.getExe' pkgs.audit "audisp-remote";
+            settings = { };
+          };
+          filter = {
+            path = lib.getExe' pkgs.audit "audisp-filter";
+            args = [
+              "allowlist"
+              "/etc/audit/audisp-filter.conf"
+              (lib.getExe' pkgs.audit "audisp-syslog")
+              "LOG_USER"
+              "LOG_INFO"
+              "interpret"
+            ];
+            settings = { };
+          };
+          syslog = {
+            path = lib.getExe' pkgs.audit "audisp-syslog";
+            args = [ "LOG_INFO" ];
+          };
+        }
+      '';
       description = "Plugin definitions to register with auditd";
     };
   };
@@ -193,6 +226,38 @@ in
       }
     ) (lib.filterAttrs (_: v: v.settings != null) cfg.plugins));
 
+    security.auditd.plugins = {
+      af_unix = {
+        path = lib.getExe' pkgs.audit "audisp-af_unix";
+        args = [
+          "0640"
+          "/var/run/audispd_events"
+          "string"
+        ];
+        format = "binary";
+      };
+      remote = {
+        path = lib.getExe' pkgs.audit "audisp-remote";
+        settings = { };
+      };
+      filter = {
+        path = lib.getExe' pkgs.audit "audisp-filter";
+        args = [
+          "allowlist"
+          "/etc/audit/audisp-filter.conf"
+          (lib.getExe' pkgs.audit "audisp-syslog")
+          "LOG_USER"
+          "LOG_INFO"
+          "interpret"
+        ];
+        settings = { };
+      };
+      syslog = {
+        path = lib.getExe' pkgs.audit "audisp-syslog";
+        args = [ "LOG_INFO" ];
+      };
+    };
+
     systemd.services.auditd = {
       description = "Security Audit Logging Service";
       documentation = [ "man:auditd(8)" ];

From 916d8b65cf2ca46089b03c6bb8eca45b87d3d287 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 25 Jun 2025 23:27:02 +0200
Subject: [PATCH 099/130] nixos/tests/audit: test plugins

---
 nixos/tests/audit.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/audit.nix b/nixos/tests/audit.nix
index b99a0f98f0ad..6f32a004e635 100644
--- a/nixos/tests/audit.nix
+++ b/nixos/tests/audit.nix
@@ -12,7 +12,13 @@
             "-a always,exit -F exe=${lib.getExe pkgs.hello} -k nixos-test"
           ];
         };
-        security.auditd.enable = true;
+        security.auditd = {
+          enable = true;
+          plugins.af_unix.active = true;
+          plugins.syslog.active = true;
+          # plugins.remote.active = true; # needs configuring a remote server for logging
+          # plugins.filter.active = true; # needs configuring allowlist/denylist
+        };
 
         environment.systemPackages = [ pkgs.hello ];
       };
@@ -25,6 +31,9 @@
     with subtest("Audit subsystem gets enabled"):
       assert "enabled 1" in machine.succeed("auditctl -s")
 
+    with subtest("unix socket plugin activated"):
+      machine.succeed("stat /var/run/audispd_events")
+
     with subtest("Custom rule produces audit traces"):
       machine.succeed("hello")
       print(machine.succeed("ausearch -k nixos-test -sc exit_group"))

From cf70c17cf25c02877f111077509b6985c65c0e7f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 3 Aug 2025 10:10:26 +0200
Subject: [PATCH 100/130] nixos/tests/audit: add grimmauld to maintainers

---
 nixos/tests/audit.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/tests/audit.nix b/nixos/tests/audit.nix
index 6f32a004e635..7f1280060824 100644
--- a/nixos/tests/audit.nix
+++ b/nixos/tests/audit.nix
@@ -1,7 +1,12 @@
+{ lib, ... }:
 {
 
   name = "audit";
 
+  meta = {
+    maintainers = with lib.maintainers; [ grimmauld ];
+  };
+
   nodes = {
     machine =
       { lib, pkgs, ... }:

From e4c72d07aa1c549d4933335bc231069873366860 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 21:37:49 +0000
Subject: [PATCH 101/130] python3Packages.x-transformers: 2.4.14 -> 2.5.6

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

diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix
index 3c67ae0d0992..ffdc30857b50 100644
--- a/pkgs/development/python-modules/x-transformers/default.nix
+++ b/pkgs/development/python-modules/x-transformers/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "x-transformers";
-  version = "2.4.14";
+  version = "2.5.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "x-transformers";
     tag = version;
-    hash = "sha256-mKn7w+FJAfNYNBE8ugnJhhj2K1IWpIslr0k4qGpLU6o=";
+    hash = "sha256-9PUOPcTm2xvtKV4T2lAGu/3BiQZzSlwo43i0x1gbrAM=";
   };
 
   build-system = [ hatchling ];

From 3fa86ae0bf255b8f4dffb35fa03dc89ae0e23bb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 21:41:37 +0000
Subject: [PATCH 102/130] luau-lsp: 1.52.1 -> 1.53.1

---
 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 851cc117b3f3..8c3f061ee498 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.52.1";
+  version = "1.53.1";
 
   src = fetchFromGitHub {
     owner = "JohnnyMorganz";
     repo = "luau-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-h99VTcOrbe7e63inMN7y0ohEQebzRPRYcKiHU3aBI18=";
+    hash = "sha256-EsDmWxl0qWDBh6Vrz5Hzjy1ZzEWn/5QQTrCWXehQZ4M=";
     fetchSubmodules = true;
   };
 

From 18d98edade1411408d2ddbdc9935aa9bf3839d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 3 Aug 2025 23:49:32 +0200
Subject: [PATCH 103/130] searxng: 0-unstable-2025-07-18 ->
 0-unstable-2025-08-03

Diff: https://github.com/searxng/searxng/compare/ff2e0ea2788a04ae5a13fc90b3725828a1ebc026...2e62eb5d68d875c49e32229103a4fd75fe26c104
---
 pkgs/by-name/se/searxng/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index adf5c3216223..041dd0834762 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-07-18";
+    version = "0-unstable-2025-08-03";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "ff2e0ea2788a04ae5a13fc90b3725828a1ebc026";
-      hash = "sha256-Pxpozg3ecqGzwUCXL9zYsCivr9VpCVSYc/kjZn+V4xk=";
+      rev = "2e62eb5d68d875c49e32229103a4fd75fe26c104";
+      hash = "sha256-UKGPkaG2agXZhEi2h8g2gXHHEDmDSzL/f9B+l5WZVvE=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
@@ -81,6 +81,7 @@ python.pkgs.toPythonModule (
         typer
         uvloop
         valkey
+        whitenoise
       ]
       ++ httpx.optional-dependencies.http2
       ++ httpx-socks.optional-dependencies.asyncio;

From 50c9612a0e4b3360c4d2834013337efb65f9ce3f Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 4 Aug 2025 06:01:22 +0800
Subject: [PATCH 104/130] basedmypy: fix build

---
 .../python-modules/basedmypy/default.nix            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix
index 47d305414edd..288b5852f8bc 100644
--- a/pkgs/development/python-modules/basedmypy/default.nix
+++ b/pkgs/development/python-modules/basedmypy/default.nix
@@ -47,6 +47,11 @@ buildPythonPackage rec {
     substituteInPlace \
       pyproject.toml \
       --replace-warn 'types-setuptools==' 'types-setuptools>='
+  ''
+  # __closed__ returns None at runtime (not a bool)
+  + ''
+    substituteInPlace test-data/unit/lib-stub/typing_extensions.pyi \
+      --replace-fail "__closed__: bool" "__closed__: None"
   '';
 
   build-system = [
@@ -119,7 +124,13 @@ buildPythonPackage rec {
   ++ lib.optionals stdenv.hostPlatform.isi686 [
     # https://github.com/python/mypy/issues/15221
     "mypyc/test/test_run.py"
-  ];
+  ]
+  ++
+    lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && pythonOlder "3.13")
+      [
+        # mypy/test/testsolve.py::SolveSuite::test_simple_constraints_with_dynamic_type: [Any | A] != [Any]
+        "mypy/test/testsolve.py"
+      ];
 
   passthru.updateScript = nix-update-script { };
 

From e8a8eb39697550f880361b40441d5bc28d74a7f7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 4 Aug 2025 00:26:24 +0200
Subject: [PATCH 105/130] semantic-release: mark as broken on aarch64-linux

---
 pkgs/by-name/se/semantic-release/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index c5c27674dab9..d769dbf91579 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -40,5 +40,7 @@ buildNpmPackage rec {
     homepage = "https://semantic-release.gitbook.io/semantic-release/";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sestrella ];
+    # https://hydra.nixos.org/job/nixpkgs/trunk/semantic-release.aarch64-linux
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From a2f492c11578a7e3f7b15ae5c916367a0ac7470e Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 01:42:16 +0300
Subject: [PATCH 106/130] raycast: 1.102.0 -> 1.102.3

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

diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
index 0a696ed364d0..8c01dd5dd048 100644
--- a/pkgs/by-name/ra/raycast/package.nix
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -12,19 +12,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raycast";
-  version = "1.102.0";
+  version = "1.102.3";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-f26Tf59ow7rJiL+2BRgDhbEpWB2z4JaRUsT9UMxKjV4=";
+        hash = "sha256-rb67RWmv4zJs4osGt/4D5XfV3ZT1YbwhHAhEqPrCxCk=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-Ict34LSjpN1Ah/uOclRi0xQfO6oQgmP57K+12bIjW6k=";
+        hash = "sha256-1CCIrqDv7h0z/49X9UrObeWmyAz++XpMdZ58ilW4wIM=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From ae0211faa4cc735934a99ec3a9880fcf324fe130 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 02:18:10 +0300
Subject: [PATCH 107/130] vencord: 1.12.7 -> 1.12.9

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

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index aae37eecd725..17839da6b504 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.7";
+  version = "1.12.9";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MS88KCH8ZdLyKoR0K45CSJutZSKUhz4FAE2VtrSx0ic=";
+    hash = "sha256-dvQM4xHRcHLRxEh3+V2LKBPv+Es6T1CTbD9/oY912Ys=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 0a944f9e0386df6db711b2caa811a5ceeecaea99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 21:05:17 +0000
Subject: [PATCH 108/130] tinty: 0.27.0 -> 0.28.0

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

diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix
index 87f43a7025db..da2ee0e2ff1e 100644
--- a/pkgs/by-name/ti/tinty/package.nix
+++ b/pkgs/by-name/ti/tinty/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
 }:
 let
-  version = "0.27.0";
+  version = "0.28.0";
 in
 rustPlatform.buildRustPackage {
   pname = "tinty";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "tinted-theming";
     repo = "tinty";
     tag = "v${version}";
-    hash = "sha256-3gJRVKkC3B+DVfVmvlRjBdp6cD5x5wZMX3p4PWVIjno=";
+    hash = "sha256-9bMqB2TkLj/FjHpaHoOWZihKOvUAwCT5leyua70GEhg=";
   };
 
-  cargoHash = "sha256-CJcPhUxClxk2SQAbAt1hzX7QbAhpXQCEc4xy1ADkAtk=";
+  cargoHash = "sha256-q0JPho+WSg4gDrfs+RevnJnQ3vdQ67uLPx7Afdidmu0=";
 
   # Pretty much all tests require internet access
   doCheck = false;

From 6e89881a56656471ca1e44d6aacd3a45476a688b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 02:35:28 +0000
Subject: [PATCH 109/130] codebook: 0.3.5 -> 0.3.6

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

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index 695f74af899b..a53919b6ce0b 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lQfk4dJ9WFraxMDWJVSBiTGumikfHYlMBe+0NHa/3nY=";
+    hash = "sha256-zSxMvWRpH1AtvHo/odQZftxgAMdOd8p2ZiMUcsOWhes=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-MLd7V5Pp8yx4pFAXSjZf4KUGp964ombrnGKbrtXhC0I=";
+  cargoHash = "sha256-FS8ZEjFFoNCJGkfL8C5hBgwj9o9XT239/9Qh/Xea2wk=";
 
   # Integration tests require internet access for dictionaries
   doCheck = false;

From f5f4d6e8e37e9866950e186f52bc57399114bbb4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 24 Mar 2025 13:42:31 +0000
Subject: [PATCH 110/130] =?UTF-8?q?nixos/installation-device:=20don?=
 =?UTF-8?q?=E2=80=99t=20include=20`stdenv`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A basic NixOS system shouldn’t require `stdenv` to install, and
it adds something like 45 MiB of build tools to the installer
closure. This doesn’t really help much at present since
WebKitGTK(?!) has a dodgy reference to GCC, but it’s a step in the
right direction.
---
 nixos/modules/profiles/installation-device.nix | 3 +--
 nixos/tests/installer.nix                      | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 3a29f7ab8c90..0b25dd5af8e9 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -107,11 +107,10 @@ with lib;
     boot.kernel.sysctl."vm.overcommit_memory" = "1";
 
     # To speed up installation a little bit, include the complete
-    # stdenv in the Nix store on the CD.
+    # stdenvNoCC in the Nix store on the CD.
     system.extraDependencies =
       with pkgs;
       [
-        stdenv
         stdenvNoCC # for runCommand
         busybox
         # For boot.initrd.systemd
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 56f1b4f19bfb..010a3e97aba3 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -709,6 +709,10 @@ let
               system.extraDependencies =
                 with pkgs;
                 [
+                  # TODO: Remove this when we can install systems
+                  # without `stdenv`.
+                  stdenv
+
                   bintools
                   brotli
                   brotli.dev

From 2fa52c7a0d48ef5d165155e3b2f51da94eea0be4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 03:20:05 +0000
Subject: [PATCH 111/130] veryl: 0.16.2 -> 0.16.3

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

diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index 590471ebcde5..c4e3fa5109e2 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veryl";
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchFromGitHub {
     owner = "veryl-lang";
     repo = "veryl";
     rev = "v${version}";
-    hash = "sha256-YMJUxeCc9b7EObkQHTkP34JCYVFYhh6aUp4fLBQINP0=";
+    hash = "sha256-oAA9EG06MTd88oiW93qIpnzjTWV2SoIDec/SLzI0ouQ=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-2+3UlnIZIRJv+pZhFa8NU+S6/D5eHhuYZ095HUygPSk=";
+  cargoHash = "sha256-TtK8qGlioJ0yOrLhe2kQ/DrQmnz9wDJjRMS1r24HLE4=";
 
   nativeBuildInputs = [
     pkg-config

From 508dd8afbe75e97da249bc8a2840ff8b19fe45d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 04:38:44 +0000
Subject: [PATCH 112/130] waagent: 2.14.0.0 -> 2.14.0.1

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

diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix
index d406c36da99a..2804923a182d 100644
--- a/pkgs/by-name/wa/waagent/package.nix
+++ b/pkgs/by-name/wa/waagent/package.nix
@@ -15,14 +15,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "waagent";
-  version = "2.14.0.0";
+  version = "2.14.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "WALinuxAgent";
-    tag = "pre-v${version}";
-    hash = "sha256-nJZXyqdsSQgW+nGqyTS9XSW4z5mGRHtCYsDHKDw/eiM=";
+    tag = "v${version}";
+    hash = "sha256-1q/buJSVaxu2ZTpDAw5slgQIJ0pih2i6nA42hgKqJ5I=";
   };
   patches = [
     # Suppress the following error when waagent tries to configure sshd:

From 34060bbd9fc3e2084498949a3f63c2e205af62ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 05:18:09 +0000
Subject: [PATCH 113/130] LycheeSlicer: 7.4.0 -> 7.4.2

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

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index f6deac0844d7..07137f72633a 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "LycheeSlicer";
-  version = "7.4.0";
+  version = "7.4.2";
 
   src = fetchurl {
     url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
-    hash = "sha256-ivyRpQSyYatWITgiOsgNJRVAWIlFmsU+GlzYDRoESbA=";
+    hash = "sha256-RTLlNB6eiesXZayC69hpnXQsAgmPuaJTC+18Q6KzAP0=";
   };
 
   desktopItem = makeDesktopItem {

From 01a140e64a5845117c6cc7d05f49fa1cb46ceb61 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 4 Aug 2025 07:38:02 +0200
Subject: [PATCH 114/130] sfizz: 1.2.1 -> 1.2.3

---
 pkgs/by-name/sf/sfizz/gcc13.patch | 13 -----------
 pkgs/by-name/sf/sfizz/package.nix | 36 +++++++++++--------------------
 2 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/sf/sfizz/gcc13.patch

diff --git a/pkgs/by-name/sf/sfizz/gcc13.patch b/pkgs/by-name/sf/sfizz/gcc13.patch
deleted file mode 100644
index 9db969d25f3a..000000000000
--- a/pkgs/by-name/sf/sfizz/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Submodule plugins/vst/external/VST_SDK/VST3_SDK/public.sdk contains modified content
-diff --git a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h
-index ff910aa..f15ae78 100644
---- a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h
-+++ b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h
-@@ -37,6 +37,7 @@
- #pragma once
- 
- #include "pluginterfaces/vst/vsttypes.h"
-+#include <cstdint>
- #include <string>
- 
- //------------------------------------------------------------------------
diff --git a/pkgs/by-name/sf/sfizz/package.nix b/pkgs/by-name/sf/sfizz/package.nix
index 08bade12ae73..931331a559b0 100644
--- a/pkgs/by-name/sf/sfizz/package.nix
+++ b/pkgs/by-name/sf/sfizz/package.nix
@@ -20,15 +20,15 @@
   catch2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sfizz";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "sfztools";
     repo = "sfizz";
-    rev = version;
-    hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI=";
+    tag = finalAttrs.version;
+    hash = "sha256-347olgxCyCRmKX0jxgBkYkoBuy9TMbsQgWOIoMppUAo=";
     fetchSubmodules = true;
   };
 
@@ -55,33 +55,23 @@ stdenv.mkDerivation rec {
     freetype
     pango
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
-  # Fix missing include
-  patches = [ ./gcc13.patch ];
-
-  postPatch = ''
-    cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
-
-    substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \
-      --replace 'zenitypath = "zenity"' 'zenitypath = "${zenity}/bin/zenity"'
-    substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \
-      --replace '/usr/bin/zenity' '${zenity}/bin/zenity'
-  '';
-
-  cmakeFlags = [ "-DSFIZZ_TESTS=ON" ];
+  cmakeFlags = [
+    (lib.cmakeBool "SFIZZ_TESTS" true)
+  ];
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sfztools/sfizz";
     description = "SFZ jack client and LV2 plugin";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.all;
-    badPlatforms = platforms.darwin;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 35e23fd71a0605f40509ab47c060e9edf9e56bb8 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 4 Aug 2025 07:58:46 +0200
Subject: [PATCH 115/130] tpnotes: switch to finalAttrs

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index d770c2e190d1..d81707fe938b 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -7,17 +7,18 @@
   oniguruma,
   installShellFiles,
   tpnote,
-  testers,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
   version = "1.25.14";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-CgC4aLg1GdqDXzuWfV4i5C4//I3GJ2RJa0y3oFOM0II=";
   };
 
@@ -39,19 +40,27 @@ rustPlatform.buildRustPackage rec {
 
   RUSTONIG_SYSTEM_LIBONIG = true;
 
-  passthru.tests.version = testers.testVersion { package = tpnote; };
-
   # The `tpnote` crate has no unit tests. All tests are in `tpnote-lib`.
   checkType = "debug";
   cargoTestFlags = "--package tpnote-lib";
   doCheck = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
-    changelog = "https://github.com/getreu/tp-note/releases/tag/v${version}";
+    changelog = "https://github.com/getreu/tp-note/releases/tag/v${finalAttrs.version}";
     description = "Markup enhanced granular note-taking";
     homepage = "https://blog.getreu.net/projects/tp-note/";
     license = lib.licenses.mit;
     mainProgram = "tpnote";
     maintainers = with lib.maintainers; [ getreu ];
   };
-}
+})

From 284d8dacdf642b8c4149a4a1bed76820693fd853 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 21 Jul 2025 06:03:06 +0200
Subject: [PATCH 116/130] =?UTF-8?q?ocamlPackages.ocsipersist:=201.1.0=20?=
 =?UTF-8?q?=E2=86=92=202.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ocsipersist/default.nix          | 10 +---------
 pkgs/development/ocaml-modules/ocsipersist/lib.nix | 10 ++++------
 .../ocaml-modules/ocsipersist/pgsql.nix            | 14 +++++---------
 .../ocaml-modules/ocsipersist/sqlite.nix           | 14 +++++---------
 4 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsipersist/default.nix b/pkgs/development/ocaml-modules/ocsipersist/default.nix
index 5141e0d07ead..73273870cc9e 100644
--- a/pkgs/development/ocaml-modules/ocsipersist/default.nix
+++ b/pkgs/development/ocaml-modules/ocsipersist/default.nix
@@ -1,23 +1,15 @@
 {
   buildDunePackage,
   ocsipersist-lib,
-  ocsipersist-pgsql,
-  ocsipersist-sqlite,
 }:
 
 buildDunePackage {
   pname = "ocsipersist";
   inherit (ocsipersist-lib) src version;
-  duneVersion = "3";
-
-  buildInputs = [
-    ocsipersist-pgsql
-    ocsipersist-sqlite
-  ];
 
   propagatedBuildInputs = [ ocsipersist-lib ];
 
   meta = ocsipersist-lib.meta // {
-    description = "Persistent key/value storage (for Ocsigen) using multiple backends";
+    description = "Persistent key/value storage for OCaml using multiple backends";
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
index e21c1979cc23..d88841190bc8 100644
--- a/pkgs/development/ocaml-modules/ocsipersist/lib.nix
+++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
@@ -8,15 +8,13 @@
 
 buildDunePackage rec {
   pname = "ocsipersist-lib";
-  version = "1.1.0";
-
-  duneVersion = "3";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsipersist";
-    rev = version;
-    sha256 = "sha256:1d6kdcfjvrz0dl764mnyxc477aa57rvmzkg154qc915w2y1nbz9a";
+    tag = version;
+    hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU=";
   };
 
   buildInputs = [ lwt_ppx ];
@@ -26,6 +24,6 @@ buildDunePackage rec {
     description = "Persistent key/value storage (for Ocsigen) - support library";
     license = lib.licenses.lgpl21Only;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/ocsigen/ocsipersist/";
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix
index 6543eef30162..3d7c001c306f 100644
--- a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix
+++ b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix
@@ -1,26 +1,22 @@
 {
   buildDunePackage,
-  ocsipersist-lib,
+  ocsipersist,
   lwt_log,
-  ocsigen_server,
   pgocaml,
   xml-light,
 }:
 
 buildDunePackage {
   pname = "ocsipersist-pgsql";
-  inherit (ocsipersist-lib) version src;
-  duneVersion = "3";
+  inherit (ocsipersist) version src;
 
   propagatedBuildInputs = [
     lwt_log
-    ocsigen_server
-    ocsipersist-lib
+    ocsipersist
     pgocaml
-    xml-light
   ];
 
-  meta = ocsipersist-lib.meta // {
-    description = "Persistent key/value storage (for Ocsigen) using PostgreSQL";
+  meta = ocsipersist.meta // {
+    description = "Persistent key/value storage for OCaml using PostgreSQL";
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix
index bb501ebcec71..429f56f46ef2 100644
--- a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix
+++ b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix
@@ -1,26 +1,22 @@
 {
   buildDunePackage,
-  ocsipersist-lib,
+  ocsipersist,
   lwt_log,
   ocaml_sqlite3,
   ocsigen_server,
-  xml-light,
 }:
 
 buildDunePackage {
   pname = "ocsipersist-sqlite";
-  inherit (ocsipersist-lib) version src;
-  duneVersion = "3";
+  inherit (ocsipersist) version src;
 
   propagatedBuildInputs = [
     lwt_log
     ocaml_sqlite3
-    ocsigen_server
-    ocsipersist-lib
-    xml-light
+    ocsipersist
   ];
 
-  meta = ocsipersist-lib.meta // {
-    description = "Persistent key/value storage (for Ocsigen) using SQLite";
+  meta = ocsipersist.meta // {
+    description = "Persistent key/value storage for OCaml using SQLite";
   };
 }

From e2e7d2b3b07e7c2abd14e888b0be0ecaf4ef3353 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 21 Jul 2025 06:03:11 +0200
Subject: [PATCH 117/130] ocamlPackages.ocsipersist-sqlite-config: init at
 2.0.0

ocamlPackages.ocsipersist-pgsql-config: init at 2.0.0
---
 .../ocsipersist/pgsql-config.nix              | 23 +++++++++++++++++++
 .../ocsipersist/sqlite-config.nix             | 23 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  8 +++++++
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocsipersist/pgsql-config.nix
 create mode 100644 pkgs/development/ocaml-modules/ocsipersist/sqlite-config.nix

diff --git a/pkgs/development/ocaml-modules/ocsipersist/pgsql-config.nix b/pkgs/development/ocaml-modules/ocsipersist/pgsql-config.nix
new file mode 100644
index 000000000000..a5b1214bd736
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsipersist/pgsql-config.nix
@@ -0,0 +1,23 @@
+{
+  buildDunePackage,
+  findlib,
+  ocsipersist-pgsql,
+  ocsigen_server,
+  xml-light,
+}:
+
+buildDunePackage {
+  pname = "ocsipersist-pgsql-config";
+  inherit (ocsipersist-pgsql) version src;
+
+  propagatedBuildInputs = [
+    findlib
+    ocsipersist-pgsql
+    ocsigen_server
+    xml-light
+  ];
+
+  meta = ocsipersist-pgsql.meta // {
+    description = "Ocsigen Server configuration file extension for ocsipersist-pgsql";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocsipersist/sqlite-config.nix b/pkgs/development/ocaml-modules/ocsipersist/sqlite-config.nix
new file mode 100644
index 000000000000..4c70f6c05133
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsipersist/sqlite-config.nix
@@ -0,0 +1,23 @@
+{
+  buildDunePackage,
+  findlib,
+  ocsipersist-sqlite,
+  ocsigen_server,
+  xml-light,
+}:
+
+buildDunePackage {
+  pname = "ocsipersist-sqlite-config";
+  inherit (ocsipersist-sqlite) version src;
+
+  propagatedBuildInputs = [
+    findlib
+    ocsipersist-sqlite
+    ocsigen_server
+    xml-light
+  ];
+
+  meta = ocsipersist-sqlite.meta // {
+    description = "Ocsigen Server configuration file extension for ocsipersist-sqlite";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3f6ec4544ac5..43562b81a573 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1513,8 +1513,16 @@ let
 
         ocsipersist-pgsql = callPackage ../development/ocaml-modules/ocsipersist/pgsql.nix { };
 
+        ocsipersist-pgsql-config =
+          callPackage ../development/ocaml-modules/ocsipersist/pgsql-config.nix
+            { };
+
         ocsipersist-sqlite = callPackage ../development/ocaml-modules/ocsipersist/sqlite.nix { };
 
+        ocsipersist-sqlite-config =
+          callPackage ../development/ocaml-modules/ocsipersist/sqlite-config.nix
+            { };
+
         octavius = callPackage ../development/ocaml-modules/octavius { };
 
         ocurl = callPackage ../development/ocaml-modules/ocurl { };

From 77b1e1a66b961da0243d540a22945c079ae38001 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 1 Aug 2025 14:22:31 +0200
Subject: [PATCH 118/130] ocamlPackages.js_of_ocaml: 6.1.1 -> 6.2.0

---
 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 0918b5356f4f..744d0d841324 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -12,7 +12,7 @@
   sedlex,
   version ?
     if lib.versionAtLeast ocaml.version "4.13" then
-      "6.1.1"
+      "6.2.0"
     else if lib.versionAtLeast ocaml.version "4.11" then
       "6.0.1"
     else
@@ -28,6 +28,7 @@ buildDunePackage {
     url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
     hash =
       {
+        "6.2.0" = "sha256-fMZBd40bFyo1KogzPuDoxiE2WgrPzZuH44v9243Spdo=";
         "6.1.1" = "sha256-0x2kGq5hwCqqi01QTk6TcFIz0wPNgaB7tKxe7bA9YBQ=";
         "6.0.1" = "sha256-gT2+4rYuFUEEnqI6IOQFzyROJ+v6mFl4XPpT4obSxhQ=";
         "5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc=";

From 7e9484a9a1472050cc5038cb53824985abf71d58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 22:03:39 +0000
Subject: [PATCH 119/130] dix: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/by-name/di/dix/package.nix b/pkgs/by-name/di/dix/package.nix
index 39369441a8c7..ab2625bde291 100644
--- a/pkgs/by-name/di/dix/package.nix
+++ b/pkgs/by-name/di/dix/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dix";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "faukah";
     repo = "dix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cSmxpzj5bNcMgfxJQiYwcwKjCrsTHxY+loRi+pzpFd4=";
+    hash = "sha256-Gq5Nr6xVGpAf1XnYrmoeyvqVgffAi8R6QETJU3xv22M=";
   };
 
-  cargoHash = "sha256-iYjDN3t1rZaZEm6TCUl/mZkVzxqYNHRTZkPipheG9EY=";
+  cargoHash = "sha256-IEsZNuLXKa+MInuortG4ifHTZ0Ngs0ugm02BK6shzHA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 966ec01383479af0bfb75245b3715b591c3df665 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 07:47:58 +0000
Subject: [PATCH 120/130] molecule: 25.6.0 -> 25.7.0

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

diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index 792f532fd9cb..bb6b16307f91 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "molecule";
-  version = "25.6.0";
+  version = "25.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DbII3li+zssMqHvyzEjhAXI04eOtlHwXlIdzf4hOfHw=";
+    hash = "sha256-oljMrwotFaoLSS/Epa1jhouyKeCYRRzZpY+/QBW7pRA=";
   };
 
   nativeBuildInputs = [

From e15141fc6a3f8b5e47856d9082ab3fca9241cd3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 13:37:45 +0000
Subject: [PATCH 121/130] luanti-client: 5.12.0 -> 5.13.0

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

diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix
index 36065b5438df..51dc07907881 100644
--- a/pkgs/by-name/lu/luanti/package.nix
+++ b/pkgs/by-name/lu/luanti/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luanti";
-  version = "5.12.0";
+  version = "5.13.0";
 
   src = fetchFromGitHub {
     owner = "luanti-org";
     repo = "luanti";
     tag = finalAttrs.version;
-    hash = "sha256-voP2/6s2tjsIULHa5+M08oNNLg0YQmtFmPeNO4TnE9E=";
+    hash = "sha256-TvI0+G7bRwwkEegv/AN4aBIN05M1AnWsaYD4lr3VTb8=";
   };
 
   patches = [

From 720d2dbc034132753f5a0a93e4f05c5c891d4d86 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:58:19 +0800
Subject: [PATCH 122/130] blocksat-cli: disable failed test

---
 pkgs/development/python-modules/blocksat-cli/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index ef15124e548a..aee1deb15c52 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -58,6 +58,8 @@ buildPythonPackage rec {
     # Non-NixOS package managers are not present in the build environment.
     "test_parse_upgradable_list_apt"
     "test_parse_upgradable_list_dnf"
+    # Fails due to GPG clearsign output lacking trailing newline in some setups.
+    "test_clearsign_verification"
   ];
 
   disabledTestPaths = [ "blocksatgui/tests/" ];

From 5620fc678ed474f28b5691fd7111ab856ed02e1b Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Mon, 4 Aug 2025 10:05:26 +0200
Subject: [PATCH 123/130] lib.modules: Improve infinite recursion hint

hsjobeki: Using config in imports is possible in general. But its not possible to do conditional imports where the condition depends on config. Thats two different statements.

Co-authored-by: Johannes Kirschbauer <hsjobeki+github@gmail.com>
---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index ad8a381e97f7..c55d276d4970 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -258,7 +258,7 @@ let
                     ;
                   _class = class;
                   _prefix = prefix;
-                  config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. This is not possible. If you are trying to achieve a conditional behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config;
+                  config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. If you are trying to achieve a conditional import behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config;
                 }
                 // specialArgs
               );

From 5fadf32beefe590c26d9dc0dd33f8b9c9c213579 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 22 Jul 2025 03:46:23 +0200
Subject: [PATCH 124/130] =?UTF-8?q?ocamlPackages.ocsigen-start:=206.2.0=20?=
 =?UTF-8?q?=E2=86=92=207.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ocsigen-start/default.nix            | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 37a63948a355..2e0a0ab4e45d 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   ocaml,
   findlib,
   ocsigen-toolkit,
@@ -17,7 +16,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-ocsigen-start";
-  version = "6.2.0";
+  version = "7.1.0";
 
   nativeBuildInputs = [
     ocaml
@@ -38,18 +37,13 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./templates-dir.patch
-    # Compatibility with tyxml 4.6.x
-    (fetchpatch {
-      url = "https://github.com/ocsigen/ocsigen-start/commit/0b70506f94fcb2e06cb65ce0d6a28b9b84c695f3.patch";
-      hash = "sha256-p/VvIu9reI8lc9lxWiTrjZvn46vuF00QInYuWPtRVyk=";
-    })
   ];
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigen-start";
     rev = version;
-    hash = "sha256-i2nj/m1Ihb/bprtHvZh47/oK0v+aFNVH+A2CB4rrrPk=";
+    hash = "sha256-2DFFceUI7BYgGKvJ1sZphLWt/Rusa5Y86yc94Mi/quo=";
   };
 
   preInstall = ''

From 0bed63d0d90f087dce055beeefcbefab7a2c7a48 Mon Sep 17 00:00:00 2001
From: Wolfgang Meier <womeier@posteo.de>
Date: Fri, 18 Jul 2025 17:49:29 +0200
Subject: [PATCH 125/130] coqPackages.wasmcert: init at 2.1.0

Co-authored-by: Pierre Roux <pierre.roux@onera.fr>
---
 .../coq-modules/wasmcert/default.nix          | 67 +++++++++++++++++++
 .../development/coq-modules/wasmcert/test.nix | 30 +++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 3 files changed, 98 insertions(+)
 create mode 100644 pkgs/development/coq-modules/wasmcert/default.nix
 create mode 100644 pkgs/development/coq-modules/wasmcert/test.nix

diff --git a/pkgs/development/coq-modules/wasmcert/default.nix b/pkgs/development/coq-modules/wasmcert/default.nix
new file mode 100644
index 000000000000..cf9e8a49f7ba
--- /dev/null
+++ b/pkgs/development/coq-modules/wasmcert/default.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  mkCoqDerivation,
+  callPackage,
+  coq,
+  flocq,
+  parseque,
+  mathcomp-boot,
+  compcert,
+  ExtLib,
+  version ? null,
+}:
+
+with lib;
+mkCoqDerivation {
+  pname = "wasm";
+  repo = "WasmCert-Coq";
+  owner = "WasmCert";
+
+  inherit version;
+  defaultVersion =
+    let
+      case = coq: mc: out: {
+        cases = [
+          coq
+          mc
+        ];
+        inherit out;
+      };
+    in
+    with lib.versions;
+    lib.switch
+      [ coq.coq-version mathcomp-boot.version ]
+      [
+        (case (isEq "8.20") (isEq "2.4") "2.1.0")
+      ]
+      null;
+
+  release."2.1.0".sha256 = "sha256-k094mxDLLeelYP+ABm+dm6Y5YrachrbhNeZhfwLHNRo=";
+
+  mlPlugin = true;
+  useDune = true;
+
+  propagatedBuildInputs = [
+    ExtLib
+    mathcomp-boot
+    parseque
+    flocq
+    compcert
+  ];
+
+  buildInputs = [
+    coq.ocamlPackages.mdx
+    coq.ocamlPackages.linenoise
+    coq.ocamlPackages.wasm
+  ];
+
+  releaseRev = v: "v${v}";
+
+  passthru.tests.HelloWorld = callPackage ./test.nix { };
+
+  meta = {
+    description = "Wasm mechanisation in Coq/Rocq";
+    maintainers = with maintainers; [ womeier ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/coq-modules/wasmcert/test.nix b/pkgs/development/coq-modules/wasmcert/test.nix
new file mode 100644
index 000000000000..ba548f794cdd
--- /dev/null
+++ b/pkgs/development/coq-modules/wasmcert/test.nix
@@ -0,0 +1,30 @@
+{
+  stdenv,
+  coq,
+  wasmcert,
+}:
+
+stdenv.mkDerivation {
+  pname = "wasmcert-interpreter-test";
+  inherit (wasmcert) src version;
+  nativeCheckInputs = [
+    wasmcert
+    coq
+  ];
+  dontConfigure = true;
+  dontBuild = true;
+  doCheck = true;
+
+  checkPhase = ''
+    coqc .ci/import_test.v
+
+    wasm_coq_interpreter tests/add.wasm -r main
+
+    if [ $? -ne 0 ]; then
+      echo "Wasm_coq_interpreter failed to run hello world program"
+      exit 1
+    fi
+  '';
+
+  installPhase = "touch $out";
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 5b14584990a0..f7a41d8a05f4 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -245,6 +245,7 @@ let
           };
         })
       );
+      wasmcert = callPackage ../development/coq-modules/wasmcert { };
       waterproof = callPackage ../development/coq-modules/waterproof { };
       zorns-lemma = callPackage ../development/coq-modules/zorns-lemma { };
       filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;

From 5d587e28bb546091ed2edf56afe4bb9abe6cdbbf Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 31 Jul 2025 11:49:59 +0200
Subject: [PATCH 126/130] coqPackages.interval: 4.11.2 -> 4.11.3

---
 pkgs/development/coq-modules/interval/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index d46d4cf043c1..aac6ba0581d8 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -23,6 +23,7 @@ mkCoqDerivation rec {
     in
     with lib.versions;
     lib.switch coq.coq-version [
+      (case (range "8.13" "9.1") "4.11.3")
       (case (range "8.13" "9.0") "4.11.2")
       (case (range "8.13" "8.20") "4.11.1")
       (case (range "8.12" "8.19") "4.10.0")
@@ -34,6 +35,7 @@ mkCoqDerivation rec {
       (case (range "8.7" "8.11") "3.4.2")
       (case (range "8.5" "8.6") "3.3.0")
     ] null;
+  release."4.11.3".sha256 = "sha256-Cwovc3ln7ZEEDgMEh+pSUYqD/rtwFk4ED2hTRdy9YRg";
   release."4.11.2".sha256 = "sha256-ouhjHtlxcqt06+Pt+UZAzwp83bVYPh3N+8jnsVvapSU=";
   release."4.11.1".sha256 = "sha256-QWZvU468rOhK796xCCEawW6rhCRTPnE0iLll9ynKflo=";
   release."4.11.0".sha256 = "sha256-vPwa4zSjyvxHLGDoNaBnHV2pb77dnQFbC50BL80fcvE=";

From e0720d01bf42e6d9ff9eb3c585250a9160544b2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 08:09:19 +0000
Subject: [PATCH 127/130] newelle: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix
index f0559481d3bc..b4731d40e555 100644
--- a/pkgs/by-name/ne/newelle/package.nix
+++ b/pkgs/by-name/ne/newelle/package.nix
@@ -20,7 +20,7 @@
 }:
 
 let
-  version = "1.0.0";
+  version = "1.0.1";
 in
 python3Packages.buildPythonApplication {
   pname = "newelle";
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication {
     owner = "qwersyk";
     repo = "Newelle";
     tag = version;
-    hash = "sha256-9Tjp1RZMEdJWLjcy2AjOy3Rw7Q1ulFeZU4y+rMXSmFA=";
+    hash = "sha256-l/eNf1KLZeuDWf1A/5Y8fggOovKmjW6UFNMvNxuJXkc=";
   };
 
   postPatch = ''

From 66f3e201812d806043c9eb8af46b302d07c7d2d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 08:05:03 +0000
Subject: [PATCH 128/130] scipopt-scip: 9.2.2 -> 9.2.3

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

diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix
index 76dbfea1b9aa..f6a2efe88a67 100644
--- a/pkgs/by-name/sc/scipopt-scip/package.nix
+++ b/pkgs/by-name/sc/scipopt-scip/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "scipopt-scip";
-  version = "9.2.2";
+  version = "9.2.3";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "scip";
     tag = "v${lib.replaceStrings [ "." ] [ "" ] version}";
-    hash = "sha256-gxR308XrlmuUym/ujwGcD9a7Z+Z7vQNHaK4zO/PWPBQ=";
+    hash = "sha256-Zc1AXNpHQXXFO8jkMaJj6xYkmkQxAM8G+SiPiH9xCAw=";
   };
 
   nativeBuildInputs = [ cmake ];

From 69ef0b210b86cd80289242f9f74e3d22ba261db0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 10:38:15 +0000
Subject: [PATCH 129/130] uuu: 1.5.201 -> 1.5.219

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

diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix
index 1d7ee0625f94..3aaddaa5e5b5 100644
--- a/pkgs/by-name/uu/uuu/package.nix
+++ b/pkgs/by-name/uu/uuu/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uuu";
-  version = "1.5.201";
+  version = "1.5.219";
 
   src = fetchFromGitHub {
     owner = "nxp-imx";
     repo = "mfgtools";
     rev = "uuu_${finalAttrs.version}";
-    hash = "sha256-G1Let5cJVzxKLs+4umnGfcSEvTeotqsgpZ0CDycBNEo=";
+    hash = "sha256-hiRKW97PBU6bIXnS/D1oPaSLpY8Z/wm+m8Pp/4RCVQM=";
   };
 
   passthru.updateScript = nix-update-script {

From 7091e75f78a96fe617a1711eb9f13f4a58c439d1 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Thu, 31 Jul 2025 06:38:56 +0000
Subject: [PATCH 130/130] treewide: replace `rev` with `tag` in fetchFromGitHub

---
 pkgs/by-name/as/ashuffle/package.nix                      | 2 +-
 pkgs/by-name/au/augeas/package.nix                        | 2 +-
 pkgs/by-name/av/avalonia/package.nix                      | 2 +-
 pkgs/by-name/aw/awk-language-server/package.nix           | 2 +-
 pkgs/by-name/bc/bchoppr/package.nix                       | 2 +-
 pkgs/by-name/be/bespokesynth/package.nix                  | 2 +-
 pkgs/by-name/bi/bio-gappa/package.nix                     | 2 +-
 pkgs/by-name/bi/biodiff/package.nix                       | 2 +-
 pkgs/by-name/bi/bitbox/package.nix                        | 2 +-
 pkgs/by-name/bl/blink1-tool/package.nix                   | 2 +-
 pkgs/by-name/bo/boa/package.nix                           | 2 +-
 pkgs/by-name/bo/bom/package.nix                           | 2 +-
 pkgs/by-name/br/brewtarget/package.nix                    | 2 +-
 pkgs/by-name/br/brickstore/package.nix                    | 2 +-
 pkgs/by-name/bs/bs2b-lv2/package.nix                      | 2 +-
 pkgs/by-name/bu/budgie-control-center/package.nix         | 2 +-
 pkgs/by-name/bu/budgie-desktop/package.nix                | 2 +-
 pkgs/by-name/bu/bugdom/package.nix                        | 2 +-
 pkgs/by-name/bu/bulk_extractor/package.nix                | 2 +-
 pkgs/by-name/ca/catppuccin-gtk/package.nix                | 2 +-
 pkgs/by-name/ch/chow-centaur/package.nix                  | 2 +-
 pkgs/by-name/ch/chow-kick/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/cl/cloudcompare/package.nix                  | 2 +-
 pkgs/by-name/cm/cmdstan/package.nix                       | 2 +-
 pkgs/by-name/co/codecrafters-cli/package.nix              | 2 +-
 pkgs/by-name/co/colima/package.nix                        | 2 +-
 pkgs/by-name/co/convimg/package.nix                       | 2 +-
 pkgs/by-name/cp/cp2k/package.nix                          | 2 +-
 pkgs/by-name/cp/cpp-netlib/package.nix                    | 2 +-
 pkgs/by-name/cp/cpp-redis/package.nix                     | 2 +-
 pkgs/by-name/cr/crc32c/package.nix                        | 2 +-
 pkgs/by-name/cr/criterion/package.nix                     | 2 +-
 pkgs/by-name/de/design/package.nix                        | 2 +-
 pkgs/by-name/de/detect-it-easy/package.nix                | 2 +-
 pkgs/by-name/dr/dragmap/package.nix                       | 2 +-
 pkgs/by-name/dr/dragonfly-reverb/package.nix              | 2 +-
 pkgs/by-name/dr/dragonflydb/package.nix                   | 2 +-
 pkgs/by-name/dr/drogon/package.nix                        | 2 +-
 pkgs/by-name/dx/dxvk_2/package.nix                        | 2 +-
 pkgs/by-name/ed/editorconfig-core-c/package.nix           | 2 +-
 pkgs/by-name/ei/eiwd/package.nix                          | 2 +-
 pkgs/by-name/en/encpipe/package.nix                       | 2 +-
 pkgs/by-name/eo/eos-installer/package.nix                 | 2 +-
 pkgs/by-name/er/erigon/package.nix                        | 2 +-
 pkgs/by-name/et/eternity/package.nix                      | 2 +-
 pkgs/by-name/ez/ezquake/package.nix                       | 2 +-
 pkgs/by-name/fa/fastddsgen/package.nix                    | 2 +-
 pkgs/by-name/fa/faust2/package.nix                        | 2 +-
 pkgs/by-name/fa/faustlive/package.nix                     | 2 +-
 pkgs/by-name/fe/feather/package.nix                       | 2 +-
 pkgs/by-name/fi/firestarter/package.nix                   | 2 +-
 pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix   | 2 +-
 pkgs/by-name/fl/flycast/package.nix                       | 2 +-
 pkgs/by-name/fn/fna3d/package.nix                         | 2 +-
 pkgs/by-name/fo/foxotron/package.nix                      | 2 +-
 pkgs/by-name/fr/freebayes/package.nix                     | 2 +-
 pkgs/by-name/fr/freecad/package.nix                       | 2 +-
 pkgs/by-name/fu/fulcio/package.nix                        | 2 +-
 pkgs/by-name/ge/gebaar-libinput/package.nix               | 2 +-
 pkgs/by-name/ge/gerbolyze/package.nix                     | 2 +-
 pkgs/by-name/gf/gfxreconstruct/package.nix                | 2 +-
 pkgs/by-name/gi/gimx/package.nix                          | 2 +-
 pkgs/by-name/gi/git-get/package.nix                       | 2 +-
 pkgs/by-name/gi/gitqlient/package.nix                     | 2 +-
 pkgs/by-name/gl/glslls/package.nix                        | 2 +-
 pkgs/by-name/gl/glslviewer/package.nix                    | 2 +-
 pkgs/by-name/gn/gnustep-libobjc/package.nix               | 2 +-
 pkgs/by-name/go/gossa/package.nix                         | 2 +-
 pkgs/by-name/gr/grandorgue/package.nix                    | 2 +-
 pkgs/by-name/gr/grenedalf/package.nix                     | 2 +-
 pkgs/by-name/gr/grpc-tools/package.nix                    | 2 +-
 pkgs/by-name/gr/grpc/package.nix                          | 2 +-
 pkgs/by-name/gx/gxplugins-lv2/package.nix                 | 2 +-
 pkgs/by-name/he/helio-workstation/package.nix             | 2 +-
 pkgs/by-name/ic/ictree/package.nix                        | 2 +-
 pkgs/by-name/il/illum/package.nix                         | 2 +-
 pkgs/by-name/im/imagelol/package.nix                      | 2 +-
 pkgs/by-name/in/inferno/package.nix                       | 2 +-
 pkgs/by-name/iq/iqtree/package.nix                        | 2 +-
 pkgs/by-name/it/itgmania/package.nix                      | 2 +-
 pkgs/by-name/je/jetbrains-runner/package.nix              | 2 +-
 pkgs/by-name/ju/junction/package.nix                      | 2 +-
 pkgs/by-name/kd/kdigger/package.nix                       | 2 +-
 pkgs/by-name/kl/klystrack/package.nix                     | 2 +-
 pkgs/by-name/ld/ldacbt/package.nix                        | 2 +-
 pkgs/by-name/ld/ldc/package.nix                           | 2 +-
 pkgs/by-name/le/lemminx/package.nix                       | 2 +-
 pkgs/by-name/le/leptosfmt/package.nix                     | 2 +-
 pkgs/by-name/li/libbladeRF/package.nix                    | 2 +-
 pkgs/by-name/li/libcaption/package.nix                    | 2 +-
 pkgs/by-name/li/libcgroup/package.nix                     | 2 +-
 pkgs/by-name/li/libff/package.nix                         | 2 +-
 pkgs/by-name/li/libime/package.nix                        | 2 +-
 pkgs/by-name/li/libjxl/package.nix                        | 2 +-
 pkgs/by-name/li/libnitrokey/package.nix                   | 2 +-
 pkgs/by-name/li/libredwg/package.nix                      | 2 +-
 pkgs/by-name/li/libresprite/package.nix                   | 2 +-
 pkgs/by-name/li/librum/package.nix                        | 2 +-
 pkgs/by-name/li/libsidplayfp/package.nix                  | 2 +-
 pkgs/by-name/li/libstaden-read/package.nix                | 2 +-
 pkgs/by-name/li/libsurvive/package.nix                    | 2 +-
 pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix    | 2 +-
 pkgs/by-name/li/linuxwave/package.nix                     | 2 +-
 pkgs/by-name/li/litmus/package.nix                        | 2 +-
 pkgs/by-name/lo/logiops/package.nix                       | 2 +-
 pkgs/by-name/lo/loksh/package.nix                         | 2 +-
 pkgs/by-name/lu/lune/package.nix                          | 2 +-
 pkgs/by-name/ma/makeself/package.nix                      | 2 +-
 pkgs/by-name/ma/mamba/package.nix                         | 2 +-
 pkgs/by-name/ma/manifest-tool/package.nix                 | 2 +-
 pkgs/by-name/ma/mariadb-galera/package.nix                | 2 +-
 pkgs/by-name/ma/marker/package.nix                        | 2 +-
 pkgs/by-name/ma/master_me/package.nix                     | 2 +-
 pkgs/by-name/ma/material-design-icons/package.nix         | 2 +-
 pkgs/by-name/me/megaglest/package.nix                     | 2 +-
 pkgs/by-name/mi/micropython/package.nix                   | 2 +-
 pkgs/by-name/mi/minia/package.nix                         | 2 +-
 pkgs/by-name/ml/mlt/package.nix                           | 2 +-
 pkgs/by-name/mm/mmex/package.nix                          | 2 +-
 pkgs/by-name/mm/mmv/package.nix                           | 2 +-
 pkgs/by-name/mo/moonlight-embedded/package.nix            | 2 +-
 pkgs/by-name/mo/moonlight-qt/package.nix                  | 2 +-
 pkgs/by-name/mo/mountpoint-s3/package.nix                 | 2 +-
 pkgs/by-name/mo/mozc/package.nix                          | 2 +-
 pkgs/by-name/ms/mscp/package.nix                          | 2 +-
 pkgs/by-name/mu/museum/package.nix                        | 2 +-
 pkgs/by-name/mu/mustache-go/package.nix                   | 2 +-
 pkgs/by-name/na/nasc/package.nix                          | 2 +-
 pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix        | 2 +-
 pkgs/by-name/ne/neuron/package.nix                        | 2 +-
 pkgs/by-name/ni/ninjas2/package.nix                       | 2 +-
 pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix       | 2 +-
 pkgs/by-name/ni/nitrokey-pro-firmware/package.nix         | 2 +-
 pkgs/by-name/ni/nitrokey-start-firmware/package.nix       | 2 +-
 pkgs/by-name/no/noisetorch/package.nix                    | 2 +-
 pkgs/by-name/no/notes/package.nix                         | 2 +-
 pkgs/by-name/no/noto-fonts-cjk-sans/package.nix           | 2 +-
 pkgs/by-name/no/noto-fonts-cjk-serif/package.nix          | 2 +-
 pkgs/by-name/od/odin2/package.nix                         | 2 +-
 pkgs/by-name/op/openboardview/package.nix                 | 2 +-
 pkgs/by-name/op/opencl-clhpp/package.nix                  | 2 +-
 pkgs/by-name/op/openmsx/package.nix                       | 2 +-
 pkgs/by-name/op/openrocket/package.nix                    | 2 +-
 pkgs/by-name/op/openseachest/package.nix                  | 2 +-
 pkgs/by-name/or/orocos-kdl/package.nix                    | 2 +-
 pkgs/by-name/or/orogene/package.nix                       | 2 +-
 pkgs/by-name/os/osqp/package.nix                          | 2 +-
 pkgs/by-name/os/ossia-score/package.nix                   | 2 +-
 pkgs/by-name/ow/owamp/package.nix                         | 2 +-
 pkgs/by-name/p1/p11-kit/package.nix                       | 2 +-
 pkgs/by-name/pa/pam_rssh/package.nix                      | 2 +-
 pkgs/by-name/pd/pdfcpu/package.nix                        | 2 +-
 pkgs/by-name/pd/pdfslicer/package.nix                     | 2 +-
 pkgs/by-name/pe/penguin-subtitle-player/package.nix       | 2 +-
 pkgs/by-name/pi/picom/package.nix                         | 2 +-
 pkgs/by-name/pk/pkcs11-provider/package.nix               | 2 +-
 pkgs/by-name/pm/pmix/package.nix                          | 2 +-
 pkgs/by-name/pn/pngquant/package.nix                      | 2 +-
 pkgs/by-name/po/pokeget-rs/package.nix                    | 2 +-
 pkgs/by-name/po/polybar/package.nix                       | 2 +-
 pkgs/by-name/po/polylux2pdfpc/package.nix                 | 2 +-
 pkgs/by-name/po/ponyc/package.nix                         | 2 +-
 pkgs/by-name/po/poptracker/package.nix                    | 2 +-
 pkgs/by-name/pr/pragtical/package.nix                     | 2 +-
 pkgs/by-name/pr/prime-server/package.nix                  | 2 +-
 pkgs/by-name/pr/process-compose/package.nix               | 2 +-
 pkgs/by-name/pr/proteus/package.nix                       | 2 +-
 pkgs/by-name/pr/prrte/package.nix                         | 2 +-
 pkgs/by-name/pv/pvsneslib/package.nix                     | 2 +-
 pkgs/by-name/qc/qcm/package.nix                           | 2 +-
 pkgs/by-name/qg/qgrep/package.nix                         | 2 +-
 pkgs/by-name/qg/qgroundcontrol/package.nix                | 2 +-
 pkgs/by-name/qu/quadrafuzz/package.nix                    | 2 +-
 pkgs/by-name/ra/rapidyaml/package.nix                     | 2 +-
 pkgs/by-name/rb/rbdoom-3-bfg/package.nix                  | 2 +-
 pkgs/by-name/re/revive/package.nix                        | 2 +-
 pkgs/by-name/rh/rhvoice/package.nix                       | 2 +-
 pkgs/by-name/ri/ricochet-refresh/package.nix              | 2 +-
 pkgs/by-name/ri/rictydiminished-with-firacode/package.nix | 2 +-
 pkgs/by-name/rm/rmw/package.nix                           | 2 +-
 pkgs/by-name/ro/rofi-file-browser/package.nix             | 2 +-
 pkgs/by-name/rp/rpiboot/package.nix                       | 2 +-
 pkgs/by-name/rt/rtags/package.nix                         | 2 +-
 pkgs/by-name/ru/rubyfmt/package.nix                       | 2 +-
 pkgs/by-name/ru/rustdesk-server/package.nix               | 2 +-
 pkgs/by-name/sa/sambamba/package.nix                      | 2 +-
 pkgs/by-name/se/securefs/package.nix                      | 2 +-
 pkgs/by-name/se/serial-studio/package.nix                 | 2 +-
 pkgs/by-name/sh/shadered/package.nix                      | 2 +-
 pkgs/by-name/sh/shim-unsigned/package.nix                 | 2 +-
 pkgs/by-name/sh/shisho/package.nix                        | 2 +-
 pkgs/by-name/sh/show-midi/package.nix                     | 2 +-
 pkgs/by-name/si/singular/package.nix                      | 2 +-
 pkgs/by-name/sn/snes9x/package.nix                        | 2 +-
 pkgs/by-name/so/sonobus/package.nix                       | 2 +-
 pkgs/by-name/so/sony-headphones-client/package.nix        | 2 +-
 pkgs/by-name/sp/space-station-14-launcher/package.nix     | 2 +-
 pkgs/by-name/sp/spdk/package.nix                          | 2 +-
 pkgs/by-name/sp/spicy-parser-generator/package.nix        | 2 +-
 pkgs/by-name/sq/sqlcheck/package.nix                      | 2 +-
 pkgs/by-name/st/starboard/package.nix                     | 2 +-
 pkgs/by-name/st/stellar-core/package.nix                  | 2 +-
 pkgs/by-name/st/sticky-notes/package.nix                  | 2 +-
 pkgs/by-name/st/stochas/package.nix                       | 2 +-
 pkgs/by-name/su/sumo/package.nix                          | 2 +-
 pkgs/by-name/su/surge-XT/package.nix                      | 2 +-
 pkgs/by-name/su/sus-compiler/package.nix                  | 2 +-
 pkgs/by-name/sv/svaba/package.nix                         | 2 +-
 pkgs/by-name/sy/symfony-cli/package.nix                   | 2 +-
 pkgs/by-name/sy/syslogng/package.nix                      | 2 +-
 pkgs/by-name/ta/taisei/package.nix                        | 2 +-
 pkgs/by-name/ta/tamatool/package.nix                      | 2 +-
 pkgs/by-name/ta/tangram/package.nix                       | 2 +-
 pkgs/by-name/ta/tarantool/package.nix                     | 2 +-
 pkgs/by-name/ta/taskwarrior2/package.nix                  | 2 +-
 pkgs/by-name/tc/tcpflow/package.nix                       | 2 +-
 pkgs/by-name/te/tempo/package.nix                         | 2 +-
 pkgs/by-name/te/tev/package.nix                           | 2 +-
 pkgs/by-name/th/themix-gui/package.nix                    | 2 +-
 pkgs/by-name/ti/timewarrior/package.nix                   | 2 +-
 pkgs/by-name/ti/tinyfecvpn/package.nix                    | 2 +-
 pkgs/by-name/ti/tinygo/package.nix                        | 2 +-
 pkgs/by-name/tl/tlock/package.nix                         | 2 +-
 pkgs/by-name/tr/tracebox/package.nix                      | 2 +-
 pkgs/by-name/tr/trackma/package.nix                       | 2 +-
 pkgs/by-name/tr/transmission_3/package.nix                | 2 +-
 pkgs/by-name/tr/trezord/package.nix                       | 2 +-
 pkgs/by-name/tv/tvm/package.nix                           | 2 +-
 pkgs/by-name/um/umpire/package.nix                        | 2 +-
 pkgs/by-name/un/unvanquished/package.nix                  | 2 +-
 pkgs/by-name/ur/ursadb/package.nix                        | 2 +-
 pkgs/by-name/ut/utf8cpp/package.nix                       | 2 +-
 pkgs/by-name/ut/utox/package.nix                          | 2 +-
 pkgs/by-name/vc/vcpkg/package.nix                         | 2 +-
 pkgs/by-name/vi/violet/package.nix                        | 2 +-
 pkgs/by-name/vn/vnote/package.nix                         | 2 +-
 pkgs/by-name/vo/volk/package.nix                          | 2 +-
 pkgs/by-name/vo/volk_2/package.nix                        | 2 +-
 pkgs/by-name/wa/wabt/package.nix                          | 2 +-
 pkgs/by-name/wa/wasm-tools/package.nix                    | 2 +-
 pkgs/by-name/wi/wiliwili/package.nix                      | 2 +-
 pkgs/by-name/wi/wineasio/package.nix                      | 2 +-
 pkgs/by-name/wo/wolf-shaper/package.nix                   | 2 +-
 pkgs/by-name/wx/wxGTK31/package.nix                       | 2 +-
 pkgs/by-name/wx/wxformbuilder/package.nix                 | 2 +-
 pkgs/by-name/x4/x42-avldrums/package.nix                  | 2 +-
 pkgs/by-name/xe/xemu/package.nix                          | 2 +-
 pkgs/by-name/xg/xgboost/package.nix                       | 2 +-
 pkgs/by-name/xk/xkb-switch-i3/package.nix                 | 2 +-
 pkgs/by-name/xp/xpano/package.nix                         | 2 +-
 pkgs/by-name/xs/xstow/package.nix                         | 2 +-
 pkgs/by-name/xt/xtuner/package.nix                        | 2 +-
 pkgs/by-name/za/zam-plugins/package.nix                   | 2 +-
 pkgs/by-name/zi/zimfw/package.nix                         | 2 +-
 pkgs/by-name/zl/zls/package.nix                           | 2 +-
 pkgs/by-name/zo/zoneminder/package.nix                    | 2 +-
 258 files changed, 258 insertions(+), 258 deletions(-)

diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix
index 80bd69bf6256..445b02f07c40 100644
--- a/pkgs/by-name/as/ashuffle/package.nix
+++ b/pkgs/by-name/as/ashuffle/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joshkunz";
     repo = "ashuffle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HQ4+vyTvX0mhfuRclbiC+MvllV3300ztAwL0IxrUiC8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/au/augeas/package.nix b/pkgs/by-name/au/augeas/package.nix
index 92bb4e031468..ddf84c05ccf5 100644
--- a/pkgs/by-name/au/augeas/package.nix
+++ b/pkgs/by-name/au/augeas/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hercules-team";
     repo = "augeas";
-    rev = "release-${version}";
+    tag = "release-${version}";
     fetchSubmodules = true;
     hash = "sha256-U5tm3LDUeI/idHtL2Zy33BigkyvHunXPjToDC59G9VE=";
   };
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index d778706177c5..e92724e29276 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation (
       src = fetchFromGitHub {
         owner = "AvaloniaUI";
         repo = "Avalonia";
-        rev = version;
+        tag = version;
         fetchSubmodules = true;
         hash = "sha256-b7K8h2hqkLnXj3YIaRKUqlbWsDNhfWCEqH1W8K0lP6g=";
       };
diff --git a/pkgs/by-name/aw/awk-language-server/package.nix b/pkgs/by-name/aw/awk-language-server/package.nix
index 4207a2394013..5a985c8823fa 100644
--- a/pkgs/by-name/aw/awk-language-server/package.nix
+++ b/pkgs/by-name/aw/awk-language-server/package.nix
@@ -13,7 +13,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "Beaglefoot";
     repo = "awk-language-server";
-    rev = "server-${version}";
+    tag = "server-${version}";
     hash = "sha256-YtduDfMAUAoQY9tgyhgERFwx9TEgD52KdeHnX2MrjjI=";
     sparseCheckout = [ "server" ];
     postFetch = ''
diff --git a/pkgs/by-name/bc/bchoppr/package.nix b/pkgs/by-name/bc/bchoppr/package.nix
index 0d53aec5d6db..8faf2a6b964c 100644
--- a/pkgs/by-name/bc/bchoppr/package.nix
+++ b/pkgs/by-name/bc/bchoppr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "bchoppr";
-    rev = version;
+    tag = version;
     hash = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 1e95ca7792a2..e573d82d95e1 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BespokeSynth";
     repo = "bespokesynth";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ad8wdLos3jM0gRMpcfRKeaiUxJsPGqWd/7XeDz87ToQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix
index 329ffab3fed3..334afeff26f7 100644
--- a/pkgs/by-name/bi/bio-gappa/package.nix
+++ b/pkgs/by-name/bi/bio-gappa/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lczech";
     repo = "gappa";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-WV8PO0v+e14tyjEm+xQGveQ0Pslgeh+osEMCqF8mue0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bi/biodiff/package.nix b/pkgs/by-name/bi/biodiff/package.nix
index a3700e8ef80b..a79412e3c4a2 100644
--- a/pkgs/by-name/bi/biodiff/package.nix
+++ b/pkgs/by-name/bi/biodiff/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "8051Enthusiast";
     repo = "biodiff";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZLxjOV08sC5dKICvRUyL6FLMORkxwdLgNq7L45CDwa4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index 96d53d5a367e..70d2a9bc4bb3 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-zpkjYnGsmPKjxUpp2H1qSzqthOO1mTmki3bPqo35sBo=";
   };
diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix
index 0d52efe9ba11..5ab2630cb58c 100644
--- a/pkgs/by-name/bl/blink1-tool/package.nix
+++ b/pkgs/by-name/bl/blink1-tool/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "todbot";
     repo = "blink1-tool";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-xuCjPSQUQ/KOcdsie/ndecUiEt+t46m4eI33PXJoAAY=";
   };
diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix
index c3d7a51abe39..eb69566b49e2 100644
--- a/pkgs/by-name/bo/boa/package.nix
+++ b/pkgs/by-name/bo/boa/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "boa-dev";
     repo = "boa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-foCIzzFoEpcE6i0QrSbiob3YHIOeTpjwpAMtcPGL8Vg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bo/bom/package.nix b/pkgs/by-name/bo/bom/package.nix
index 48f8f841985f..f33c24910a44 100644
--- a/pkgs/by-name/bo/bom/package.nix
+++ b/pkgs/by-name/bo/bom/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "bom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nYzBaFtOJhqO0O6MJsxTw/mxsIOa+cnU27nOFRe2/uI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix
index 6ccbf7403907..2466af669544 100644
--- a/pkgs/by-name/br/brewtarget/package.nix
+++ b/pkgs/by-name/br/brewtarget/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Brewtarget";
     repo = "brewtarget";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-VVdihVdNIAtPlugqGWDWvxMdOFGLnRmewPt6BgvbxBk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/br/brickstore/package.nix b/pkgs/by-name/br/brickstore/package.nix
index 44e3d45a017e..44ba98dd143a 100644
--- a/pkgs/by-name/br/brickstore/package.nix
+++ b/pkgs/by-name/br/brickstore/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rgriebl";
     repo = "brickstore";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bs/bs2b-lv2/package.nix b/pkgs/by-name/bs/bs2b-lv2/package.nix
index 161522ef32f1..7bc5d979aae9 100644
--- a/pkgs/by-name/bs/bs2b-lv2/package.nix
+++ b/pkgs/by-name/bs/bs2b-lv2/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nilninull";
     repo = "bs2b-lv2";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-dOcDPtiKN9Kfs2cdaeDO/GkWrh5tfJSHfiHPBtxJXvc=";
   };
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 6e45b327e7a4..b638f9246ba0 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BuddiesOfBudgie";
     repo = "budgie-control-center";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";
   };
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 860cd7961bfd..71957c7f352a 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BuddiesOfBudgie";
     repo = "budgie-desktop";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo=";
   };
diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix
index d3ad6d6f7653..61ba303af5b3 100644
--- a/pkgs/by-name/bu/bugdom/package.nix
+++ b/pkgs/by-name/bu/bugdom/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jorio";
     repo = "bugdom";
-    rev = version;
+    tag = version;
     hash = "sha256-0c7v5tSqYuqtLOFl4sqD7+naJNqX/wlKHVntkZQGJ8A=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bu/bulk_extractor/package.nix b/pkgs/by-name/bu/bulk_extractor/package.nix
index 9af14298ec42..14337a7035cd 100644
--- a/pkgs/by-name/bu/bulk_extractor/package.nix
+++ b/pkgs/by-name/bu/bulk_extractor/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "simsong";
     repo = "bulk_extractor";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Jj/amXESFBu/ZaiIRlDKmtWTBVQ2TEvOM2jBYP3y1L8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix
index f2a30186c456..922f6973e979 100644
--- a/pkgs/by-name/ca/catppuccin-gtk/package.nix
+++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix
@@ -70,7 +70,7 @@ lib.checkListOfEnum "${pname}: theme accent" validAccents accents lib.checkListO
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "gtk";
-      rev = "v${version}";
+      tag = "v${version}";
       fetchSubmodules = true;
       hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc=";
     };
diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix
index 3eced1b2fa2f..0d32a5b0e6fa 100644
--- a/pkgs/by-name/ch/chow-centaur/package.nix
+++ b/pkgs/by-name/ch/chow-centaur/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jatinchowdhury18";
     repo = "KlonCentaur";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-kDDom6q0Tgni0/L+FgBVZC1/sL9W9fRP60U4o4ijP1c=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index 21291574d7c6..97a5d818f0c1 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Chowdhury-DSP";
     repo = "ChowKick";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-YYcNiJGGw21aVY03tyQLu3wHCJhxYiDNJZ+LWNbQdj4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix
index bce17eeef4a9..56c59cdeba11 100644
--- a/pkgs/by-name/ch/chow-phaser/package.nix
+++ b/pkgs/by-name/ch/chow-phaser/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jatinchowdhury18";
     repo = "ChowPhaser";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ=";
   };
diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index a0fb380ed791..75da391e7914 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jatinchowdhury18";
     repo = "AnalogTapeModel";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix
index bd6d3f856749..b2079b16ad36 100644
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CloudCompare";
     repo = "CloudCompare";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a/0lf3Mt5ZpLFRM8jAoqZer8pY1ROgPRY4dPt34Bk3E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix
index 022f27e74cb8..8cb501df30fd 100644
--- a/pkgs/by-name/cm/cmdstan/package.nix
+++ b/pkgs/by-name/cm/cmdstan/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "cmdstan";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-9Dan86C0nxxxkIXaOSKExY0hngAgWTpL4RlI3rTnBZo=";
   };
diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix
index 8662580a829f..79c283a1c540 100644
--- a/pkgs/by-name/co/codecrafters-cli/package.nix
+++ b/pkgs/by-name/co/codecrafters-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "codecrafters-io";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YgQPDc5BUIoEd44NLpRluxCKooW99qvcSTrFPm6qJKM=";
     # A shortened git commit hash is part of the version output, and is
     # needed at build time. Use the `.git` directory to retrieve the
diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix
index ca4b9a17660d..99d3c6f06972 100644
--- a/pkgs/by-name/co/colima/package.nix
+++ b/pkgs/by-name/co/colima/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abiosoft";
     repo = "colima";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RQnHqEabxyoAKr8BfmVhk8z+l5oy8pa5JPTWk/0FV5g=";
     # We need the git revision
     leaveDotGit = true;
diff --git a/pkgs/by-name/co/convimg/package.nix b/pkgs/by-name/co/convimg/package.nix
index 1d9a3863dbc9..daa889c19110 100644
--- a/pkgs/by-name/co/convimg/package.nix
+++ b/pkgs/by-name/co/convimg/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mateoconlechuga";
     repo = "convimg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5insJ391Usef8GF3Yh74PEqE534zitQg9udFRPcz69g=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix
index 535d0adbf6d6..64229039b8ca 100644
--- a/pkgs/by-name/cp/cp2k/package.nix
+++ b/pkgs/by-name/cp/cp2k/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cp2k";
     repo = "cp2k";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-04AFiEuv+EYubZVoYErQDdr9zipKlF7Gqy8DrUaYUMk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cp/cpp-netlib/package.nix b/pkgs/by-name/cp/cpp-netlib/package.nix
index 466884fbbd33..faab71f0e3f3 100644
--- a/pkgs/by-name/cp/cpp-netlib/package.nix
+++ b/pkgs/by-name/cp/cpp-netlib/package.nix
@@ -18,7 +18,7 @@ stdenvForCppNetlib.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpp-netlib";
     repo = "cpp-netlib";
-    rev = "cpp-netlib-${version}";
+    tag = "cpp-netlib-${version}";
     sha256 = "18782sz7aggsl66b4mmi1i0ijwa76iww337fi9sygnplz2hs03a3";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix
index 6fc1e5b7c1e3..0d99b8069179 100644
--- a/pkgs/by-name/cp/cpp-redis/package.nix
+++ b/pkgs/by-name/cp/cpp-redis/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpp-redis";
     repo = "cpp_redis";
-    rev = version;
+    tag = version;
     hash = "sha256-dLAnxgldylWWKO3WIyx+F7ylOpRH+0nD7NZjWSOxuwQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix
index e1f510216857..fa2dd97b7a14 100644
--- a/pkgs/by-name/cr/crc32c/package.nix
+++ b/pkgs/by-name/cr/crc32c/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "crc32c";
-    rev = version;
+    tag = version;
     sha256 = "0c383p7vkfq9rblww6mqxz8sygycyl27rr0j3bzb8l8ga71710ii";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cr/criterion/package.nix b/pkgs/by-name/cr/criterion/package.nix
index 958a9a7c89ed..611aff9167d5 100644
--- a/pkgs/by-name/cr/criterion/package.nix
+++ b/pkgs/by-name/cr/criterion/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Snaipe";
     repo = "Criterion";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-5GH7AYjrnBnqiSmp28BoaM1Xmy8sPs1atfqJkGy3Yf0=";
   };
diff --git a/pkgs/by-name/de/design/package.nix b/pkgs/by-name/de/design/package.nix
index bdafc2d99ec7..8c4d84aaa45c 100644
--- a/pkgs/by-name/de/design/package.nix
+++ b/pkgs/by-name/de/design/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dubstar-04";
     repo = "Design";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Q4R/Ztu4w8IRvq15xNXN/iP/6hIHe/W+me1jROGpYc8=";
   };
diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix
index b8e4a7739402..000e587214f6 100644
--- a/pkgs/by-name/de/detect-it-easy/package.nix
+++ b/pkgs/by-name/de/detect-it-easy/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "horsicq";
     repo = "DIE-engine";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-yHgxYig5myY2nExweUk2muKbJTKN3SiwOLgQcMIY/BQ=";
   };
diff --git a/pkgs/by-name/dr/dragmap/package.nix b/pkgs/by-name/dr/dragmap/package.nix
index 2408b01be91d..08d2654119a1 100644
--- a/pkgs/by-name/dr/dragmap/package.nix
+++ b/pkgs/by-name/dr/dragmap/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Illumina";
     repo = "DRAGMAP";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-f1jsOErriS1I/iUS4CzJ3+Dz8SMUve/ccb3KaE+L7U8=";
   };
diff --git a/pkgs/by-name/dr/dragonfly-reverb/package.nix b/pkgs/by-name/dr/dragonfly-reverb/package.nix
index f741bcb7c02c..c4715ff54f51 100644
--- a/pkgs/by-name/dr/dragonfly-reverb/package.nix
+++ b/pkgs/by-name/dr/dragonfly-reverb/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelwillis";
     repo = "dragonfly-reverb";
-    rev = version;
+    tag = version;
     hash = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/dr/dragonflydb/package.nix b/pkgs/by-name/dr/dragonflydb/package.nix
index 5a38c54c07e7..18ffa5379a97 100644
--- a/pkgs/by-name/dr/dragonflydb/package.nix
+++ b/pkgs/by-name/dr/dragonflydb/package.nix
@@ -32,7 +32,7 @@ let
   src = fetchFromGitHub {
     owner = pname;
     repo = "dragonfly";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P6WMW/n+VezWDXGagT4B+ZYyCp8oufDV6MTrpKpLZcs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/dr/drogon/package.nix b/pkgs/by-name/dr/drogon/package.nix
index 6b7f29dd1a33..0a8cfce537ee 100644
--- a/pkgs/by-name/dr/drogon/package.nix
+++ b/pkgs/by-name/dr/drogon/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "drogonframework";
     repo = "drogon";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-eFOYmqfyb/yp83HRa0hWSMuROozR/nfnEp7k5yx8hj0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix
index 154987407116..e9aed076d0ac 100644
--- a/pkgs/by-name/dx/dxvk_2/package.nix
+++ b/pkgs/by-name/dx/dxvk_2/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "doitsujin";
     repo = "dxvk";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-edu9JQAKu8yUZLh+37RB1s1A3+s8xeUYQ5Oibdes9ZI=";
     fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
   };
diff --git a/pkgs/by-name/ed/editorconfig-core-c/package.nix b/pkgs/by-name/ed/editorconfig-core-c/package.nix
index bdf1b640508f..4dbcd1299448 100644
--- a/pkgs/by-name/ed/editorconfig-core-c/package.nix
+++ b/pkgs/by-name/ed/editorconfig-core-c/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "editorconfig";
     repo = "editorconfig-core-c";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-myJNJxKwgmgm+P2MqnYmW8OC0oYcInL+Suyf/xwX9xo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix
index d5af257d8937..5cb995f09772 100644
--- a/pkgs/by-name/ei/eiwd/package.nix
+++ b/pkgs/by-name/ei/eiwd/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "illiliti";
     repo = "eiwd";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-rmkXR4RZbtD6lh8cGrHLWVGTw4fQqP9+Z9qaftG1ld0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/en/encpipe/package.nix b/pkgs/by-name/en/encpipe/package.nix
index 6d9f09b9c74f..a36ae92e953f 100644
--- a/pkgs/by-name/en/encpipe/package.nix
+++ b/pkgs/by-name/en/encpipe/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "encpipe";
-    rev = version;
+    tag = version;
     hash = "sha256-YlEKSWzZuQyDi0mbwJh9Dfn4gKiOeqihSHPt4yY6YdY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/eo/eos-installer/package.nix b/pkgs/by-name/eo/eos-installer/package.nix
index 9bdfbccf6a1d..db327b5dd08c 100644
--- a/pkgs/by-name/eo/eos-installer/package.nix
+++ b/pkgs/by-name/eo/eos-installer/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "endlessm";
     repo = "eos-installer";
-    rev = "Release_${version}";
+    tag = "Release_${version}";
     sha256 = "BqvZglzFJabGXkI8hnLiw1r+CvM7kSKQPj8IKYBB6S4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix
index 89c6479b35ca..290b2ee39807 100644
--- a/pkgs/by-name/er/erigon/package.nix
+++ b/pkgs/by-name/er/erigon/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ledgerwatch";
     repo = "erigon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MQpHRlKxWCBD2Tj9isxMKwvYBy9HtDkQPyKPse8uB3g=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/et/eternity/package.nix b/pkgs/by-name/et/eternity/package.nix
index 0e04df9a5a7e..94f93d167746 100644
--- a/pkgs/by-name/et/eternity/package.nix
+++ b/pkgs/by-name/et/eternity/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "team-eternity";
     repo = "eternity";
-    rev = version;
+    tag = version;
     sha256 = "0dlz7axbiw003bgwk2hl43w8r2bwnxhi042i1xwdiwaja0cpnf5y";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index e45036f33570..e4b335b4b53c 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QW-Group";
     repo = pname + "-source";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-ThrsJfj+eP7Lv2ZSNLO6/b98VHrL6/rhwf2p0qMvTF8=";
   };
diff --git a/pkgs/by-name/fa/fastddsgen/package.nix b/pkgs/by-name/fa/fastddsgen/package.nix
index c23a1d4843d2..a6a82fbe9931 100644
--- a/pkgs/by-name/fa/fastddsgen/package.nix
+++ b/pkgs/by-name/fa/fastddsgen/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-DDS-Gen";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-4w6DYz0QhD8L27FE+SzptfoMjhiuJ6OFex2LNAqwmPw=";
   };
diff --git a/pkgs/by-name/fa/faust2/package.nix b/pkgs/by-name/fa/faust2/package.nix
index 6c3f5bac9fa4..179b8b2507a9 100644
--- a/pkgs/by-name/fa/faust2/package.nix
+++ b/pkgs/by-name/fa/faust2/package.nix
@@ -28,7 +28,7 @@ let
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
-    rev = version;
+    tag = version;
     hash = "sha256-Rn+Cjpk4vttxARrkDSnpKdBdSRtgElsit8zu1BA8Jd4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fa/faustlive/package.nix b/pkgs/by-name/fa/faustlive/package.nix
index d7830565fcc8..d7fa14c241a1 100644
--- a/pkgs/by-name/fa/faustlive/package.nix
+++ b/pkgs/by-name/fa/faustlive/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faustlive";
-    rev = version;
+    tag = version;
     hash = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix
index f23bb0f1fc99..fb3fb09de5c9 100644
--- a/pkgs/by-name/fe/feather/package.nix
+++ b/pkgs/by-name/fe/feather/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "feather-wallet";
     repo = "feather";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-DZBRZBcoba32Z/bFThn/9siC8VESg5gdfoFO4Nw8JqM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fi/firestarter/package.nix b/pkgs/by-name/fi/firestarter/package.nix
index 8319aa613aed..6201b12ee330 100644
--- a/pkgs/by-name/fi/firestarter/package.nix
+++ b/pkgs/by-name/fi/firestarter/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tud-zih-energy";
     repo = "FIRESTARTER";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ik6j1lw5nldj4i3lllrywqg54m9i2vxkxsb2zr4q0d2rfywhn23";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
index 7e5d98550d46..f20968b3c15d 100644
--- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
+++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fzyzcjy";
     repo = "flutter_rust_bridge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Us+LwT6tjBcTl2xclVsiLauSlIO8w+PiokpiDB+h1fI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fl/flycast/package.nix b/pkgs/by-name/fl/flycast/package.nix
index 0f08b2b02ada..2e45cf9ce6e5 100644
--- a/pkgs/by-name/fl/flycast/package.nix
+++ b/pkgs/by-name/fl/flycast/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OnlSkwPDUrpj9uEPEAxZO1iSgd5ZiQUJLneu14v9pKQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix
index 162210bbccd4..b2b5330515b6 100644
--- a/pkgs/by-name/fn/fna3d/package.nix
+++ b/pkgs/by-name/fn/fna3d/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FNA3D";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-0rRwIbOciPepo+ApvJiK5IyhMdq/4jsMlCSv0UeDETs=";
   };
diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix
index 503ce17f68e6..3f297e76c125 100644
--- a/pkgs/by-name/fo/foxotron/package.nix
+++ b/pkgs/by-name/fo/foxotron/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gargaj";
     repo = "Foxotron";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-OnZWoiQ5ASKQV73/W6nl17B2ANwqCy/PlybHbNwrOyQ=";
   };
diff --git a/pkgs/by-name/fr/freebayes/package.nix b/pkgs/by-name/fr/freebayes/package.nix
index 8d8b832d5a47..cdbde42007e9 100644
--- a/pkgs/by-name/fr/freebayes/package.nix
+++ b/pkgs/by-name/fr/freebayes/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     name = "freebayes-${version}-src";
     owner = "ekg";
     repo = "freebayes";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "035nriknjqq8gvil81vvsmvqwi35v80q8h1cw24vd1gdyn1x7bys";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 30f485de8179..48994ef77dd1 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -62,7 +62,7 @@ freecad-utils.makeCustomizable (
     src = fetchFromGitHub {
       owner = "FreeCAD";
       repo = "FreeCAD";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-VFTNawXxu2ofjj2Frg4OfVhiMKFywBhm7lZunP85ZEQ=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix
index ceb54c442d7e..0385f18d999b 100644
--- a/pkgs/by-name/fu/fulcio/package.nix
+++ b/pkgs/by-name/fu/fulcio/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = "fulcio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UVUVT4RvNHvzIwV6azu2h1O9lnNu0PQnnkj4wbrY8BA=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/ge/gebaar-libinput/package.nix b/pkgs/by-name/ge/gebaar-libinput/package.nix
index 1372c980a32d..d41e6f1f0e88 100644
--- a/pkgs/by-name/ge/gebaar-libinput/package.nix
+++ b/pkgs/by-name/ge/gebaar-libinput/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Coffee2CodeNL";
     repo = "gebaar-libinput";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1kqcgwkia1p195xr082838dvj1gqif9d63i8a52jb0lc32zzizh6";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index 97f310f9be0e..9dfbca7f369c 100644
--- a/pkgs/by-name/ge/gerbolyze/package.nix
+++ b/pkgs/by-name/ge/gerbolyze/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "jaseg";
     repo = "gerbolyze";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bisLln3Y239HuJt0MkrCU+6vLLbEDxfTjEJMkcbE/wE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 573d6529632d..18b0fbc2b54c 100644
--- a/pkgs/by-name/gf/gfxreconstruct/package.nix
+++ b/pkgs/by-name/gf/gfxreconstruct/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LunarG";
     repo = "gfxreconstruct";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MuCdJoBFxKwDCOCltlU3oBS9elFS6F251dHjHcIb4Jg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix
index ed6a382e0298..7b37c872dc57 100644
--- a/pkgs/by-name/gi/gimx/package.nix
+++ b/pkgs/by-name/gi/gimx/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matlo";
     repo = "GIMX";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-BcFLdQgEAi6Sxyb5/P9YAIkmeXNZXrKcOa/6g817xQg=";
   };
diff --git a/pkgs/by-name/gi/git-get/package.nix b/pkgs/by-name/gi/git-get/package.nix
index e8d52c5bf985..1508687989cc 100644
--- a/pkgs/by-name/gi/git-get/package.nix
+++ b/pkgs/by-name/gi/git-get/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grdl";
     repo = "git-get";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v98Ff7io7j1LLzciHNWJBU3LcdSr+lhwYrvON7QjyCI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/gi/gitqlient/package.nix b/pkgs/by-name/gi/gitqlient/package.nix
index 2dd1b4973ad3..75d9dc1f4cb2 100644
--- a/pkgs/by-name/gi/gitqlient/package.nix
+++ b/pkgs/by-name/gi/gitqlient/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "francescmm";
     repo = "gitqlient";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
   };
diff --git a/pkgs/by-name/gl/glslls/package.nix b/pkgs/by-name/gl/glslls/package.nix
index c23047cf027d..d88a188d3628 100644
--- a/pkgs/by-name/gl/glslls/package.nix
+++ b/pkgs/by-name/gl/glslls/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "glsl-language-server";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-wi1QiqaWRh1DmIhwmu94lL/4uuMv6DnB+whM61Jg1Zs=";
   };
diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix
index 35d4a06a2d87..cc43264d1093 100644
--- a/pkgs/by-name/gl/glslviewer/package.nix
+++ b/pkgs/by-name/gl/glslviewer/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "patriciogonzalezvivo";
     repo = "glslViewer";
     fetchSubmodules = true;
-    rev = version;
+    tag = version;
     hash = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnustep-libobjc/package.nix b/pkgs/by-name/gn/gnustep-libobjc/package.nix
index 330e31bf7bb6..1184eddcc058 100644
--- a/pkgs/by-name/gn/gnustep-libobjc/package.nix
+++ b/pkgs/by-name/gn/gnustep-libobjc/package.nix
@@ -13,7 +13,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gnustep";
     repo = "libobjc2";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+NP214bbisk7dCFAHaxnhNOfC/0bZLp8Dd2A9F2vK+s=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/go/gossa/package.nix b/pkgs/by-name/go/gossa/package.nix
index bce4c6bf0577..4bd1fe57970f 100644
--- a/pkgs/by-name/go/gossa/package.nix
+++ b/pkgs/by-name/go/gossa/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pldubouilh";
     repo = "gossa";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-FGlUj0BJ8KeCfvdN9+NG4rqtaUIxgpqQ+09Ie1/TpAQ=";
   };
diff --git a/pkgs/by-name/gr/grandorgue/package.nix b/pkgs/by-name/gr/grandorgue/package.nix
index e39ac03091a9..ae5044d61067 100644
--- a/pkgs/by-name/gr/grandorgue/package.nix
+++ b/pkgs/by-name/gr/grandorgue/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GrandOrgue";
     repo = "grandorgue";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-9H7YpTtv9Y36Nc0WCyRy/ohpOQ3WVUd9gMahnGhANRc=";
   };
diff --git a/pkgs/by-name/gr/grenedalf/package.nix b/pkgs/by-name/gr/grenedalf/package.nix
index 5d2e8a85a8a9..50a6381240df 100644
--- a/pkgs/by-name/gr/grenedalf/package.nix
+++ b/pkgs/by-name/gr/grenedalf/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lczech";
     repo = "grenedalf";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DJ7nZjOvYFQlN/L+S2QcMVvH/M9Dhla4VXl2nxc22m4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gr/grpc-tools/package.nix b/pkgs/by-name/gr/grpc-tools/package.nix
index 5bf09b7f0b94..501b4432f525 100644
--- a/pkgs/by-name/gr/grpc-tools/package.nix
+++ b/pkgs/by-name/gr/grpc-tools/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc-node";
-    rev = "grpc-tools@${version}";
+    tag = "grpc-tools@${version}";
     hash = "sha256-708lBIGW5+vvSTrZHl/kc+ck7JKNXElrghIGDrMSyx8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 34ca53f27bc1..f863c0b3f77b 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VAr+f+xqZfrP4XfCnZ9KxVTO6pHQe9gB2DgaQuen840=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix
index 70a474006607..7de8ecf66734 100644
--- a/pkgs/by-name/gx/gxplugins-lv2/package.nix
+++ b/pkgs/by-name/gx/gxplugins-lv2/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "GxPlugins.lv2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix
index 6da23268d0ec..f1e6556686ce 100644
--- a/pkgs/by-name/he/helio-workstation/package.nix
+++ b/pkgs/by-name/he/helio-workstation/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "helio-fm";
     repo = "helio-workstation";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-JzJA9Y710upgzvsgPEV9QzpRUTYI0i2yi6thnUAcrL0=";
   };
diff --git a/pkgs/by-name/ic/ictree/package.nix b/pkgs/by-name/ic/ictree/package.nix
index 674563cb39ed..24f24cbae4e7 100644
--- a/pkgs/by-name/ic/ictree/package.nix
+++ b/pkgs/by-name/ic/ictree/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NikitaIvanovV";
     repo = "ictree";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-77Wo6jN8VUGTXBuGL0a9kvSIixdyEQoxqqNsHq9jcWw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/il/illum/package.nix b/pkgs/by-name/il/illum/package.nix
index 889e0e9a7bca..1d8336d97e2f 100644
--- a/pkgs/by-name/il/illum/package.nix
+++ b/pkgs/by-name/il/illum/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jmesmon";
     repo = "illum";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "S4lUBeRnZlRUpIxFdN/bh979xvdS7roF6/6Dk0ZUrnM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix
index 664955fbea6a..efdc4991ad94 100644
--- a/pkgs/by-name/im/imagelol/package.nix
+++ b/pkgs/by-name/im/imagelol/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MCRedstoner2004";
     repo = "imagelol";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0978zdrfj41jsqm78afyyd1l64iki9nwjvhd8ynii1b553nn4dmd";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 04bbcbe8c7f9..0365f5a7a60f 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "inferno";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D72rkTnUgLJRHFEDoUwQDLQJAPGyqmxhf6hmNJGUl+U=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/iq/iqtree/package.nix b/pkgs/by-name/iq/iqtree/package.nix
index 4b71ea69c896..97ab0313722e 100644
--- a/pkgs/by-name/iq/iqtree/package.nix
+++ b/pkgs/by-name/iq/iqtree/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iqtree";
     repo = "iqtree2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8d5zqZIevv3bnq7z7Iyo/x8i445y1RAFtRMeK8s/ieQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix
index d8e595a1034c..cbb5a65e8b50 100644
--- a/pkgs/by-name/it/itgmania/package.nix
+++ b/pkgs/by-name/it/itgmania/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "itgmania";
     repo = "itgmania";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-C9qVUZdRnKbQgfgbXnzT+lI2+FEXBaMQv/U6UF5wyzo=";
   };
diff --git a/pkgs/by-name/je/jetbrains-runner/package.nix b/pkgs/by-name/je/jetbrains-runner/package.nix
index fcb91662e252..eae81f1f1278 100644
--- a/pkgs/by-name/je/jetbrains-runner/package.nix
+++ b/pkgs/by-name/je/jetbrains-runner/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alex1701c";
     repo = "JetBrainsRunner";
-    rev = version;
+    tag = version;
     hash = "sha256-fzGwwvBgvUVU6Ra66KrIAqRjWWR6pWYbWVkOk2tDwkc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ju/junction/package.nix b/pkgs/by-name/ju/junction/package.nix
index 8540f0406159..b64b5a3ecee1 100644
--- a/pkgs/by-name/ju/junction/package.nix
+++ b/pkgs/by-name/ju/junction/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "junction";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gnFig8C46x73gAUl9VVx3Y3hrhEVeP/DvaYHYuv9RTg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix
index 11e01070670f..7a8d821d98f4 100644
--- a/pkgs/by-name/kd/kdigger/package.nix
+++ b/pkgs/by-name/kd/kdigger/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "quarkslab";
     repo = "kdigger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hpLhtTENtOBQjm+CZRAcx1BG9831JUFIsLL57wZIrso=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/kl/klystrack/package.nix b/pkgs/by-name/kl/klystrack/package.nix
index 2992ca3f5a90..3b6f7c6674ad 100644
--- a/pkgs/by-name/kl/klystrack/package.nix
+++ b/pkgs/by-name/kl/klystrack/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kometbomb";
     repo = "klystrack";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     sha256 = "1h99sm2ddaq483hhk2s3z4bjbgn0d2h7qna7l7qq98wvhqix8iyz";
   };
diff --git a/pkgs/by-name/ld/ldacbt/package.nix b/pkgs/by-name/ld/ldacbt/package.nix
index a4aa2b645198..f92c1f564af8 100644
--- a/pkgs/by-name/ld/ldacbt/package.nix
+++ b/pkgs/by-name/ld/ldacbt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "ldacBT";
     owner = "ehfive";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09dalysx4fgrgpfdm9a51x6slnf4iik1sqba4xjgabpvq91bnb63";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix
index 90e362a9952f..afda829e6a3c 100644
--- a/pkgs/by-name/ld/ldc/package.nix
+++ b/pkgs/by-name/ld/ldc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ldc-developers";
     repo = "ldc";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix
index d8725383d944..828e81ed0812 100644
--- a/pkgs/by-name/le/lemminx/package.nix
+++ b/pkgs/by-name/le/lemminx/package.nix
@@ -30,7 +30,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "lemminx";
-    rev = version;
+    tag = version;
     hash = "sha256-a+9RN1265fsmYAUMuUTxA+VqJv7xPlzuc8HqoZwmR4M=";
     # Lemminx reads this git information at runtime from a git.properties
     # file on the classpath
diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix
index 196bb3271cef..b6931829597b 100644
--- a/pkgs/by-name/le/leptosfmt/package.nix
+++ b/pkgs/by-name/le/leptosfmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bram209";
     repo = "leptosfmt";
-    rev = version;
+    tag = version;
     hash = "sha256-+trLQFU8oP45xHQ3DsEESQzQX2WpvQcfpgGC9o5ITcY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libbladeRF/package.nix b/pkgs/by-name/li/libbladeRF/package.nix
index 8e9cb3b10532..fd2832ff0810 100644
--- a/pkgs/by-name/li/libbladeRF/package.nix
+++ b/pkgs/by-name/li/libbladeRF/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nuand";
     repo = "bladeRF";
-    rev = "libbladeRF_v${version}";
+    tag = "libbladeRF_v${version}";
     hash = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libcaption/package.nix b/pkgs/by-name/li/libcaption/package.nix
index 8218389e4304..adcf4f7f22c2 100644
--- a/pkgs/by-name/li/libcaption/package.nix
+++ b/pkgs/by-name/li/libcaption/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "szatmary";
     repo = "libcaption";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libcgroup/package.nix b/pkgs/by-name/li/libcgroup/package.nix
index d6d603ccceee..a14d24f153da 100644
--- a/pkgs/by-name/li/libcgroup/package.nix
+++ b/pkgs/by-name/li/libcgroup/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libcgroup";
     repo = "libcgroup";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-kWW9ID/eYZH0O/Ge8pf3Cso4yu644R5EiQFYfZMcizs=";
   };
diff --git a/pkgs/by-name/li/libff/package.nix b/pkgs/by-name/li/libff/package.nix
index bb6413beaa7c..da6ee91db807 100644
--- a/pkgs/by-name/li/libff/package.nix
+++ b/pkgs/by-name/li/libff/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scipr-lab";
     repo = "libff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0dczi829497vqlmn6n4fgi89bc2h9f13gx30av5z2h6ikik7crgn";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix
index 073c3f603628..2f0413b43198 100644
--- a/pkgs/by-name/li/libime/package.nix
+++ b/pkgs/by-name/li/libime/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "libime";
-    rev = version;
+    tag = version;
     hash = "sha256-liVJEBUYcVYjjJCMW68xXbEHKQpAgTLCPm2yIdWG3IQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index 79977aeba872..b1154d5bc69b 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libjxl";
     repo = "libjxl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ORwhKOp5Nog366UkLbuWpjz/6sJhxUO6+SkoJGH+3fE=";
     # There are various submodules in `third_party/`.
     fetchSubmodules = true;
diff --git a/pkgs/by-name/li/libnitrokey/package.nix b/pkgs/by-name/li/libnitrokey/package.nix
index 5b084bc64a69..cf5cf8a578d7 100644
--- a/pkgs/by-name/li/libnitrokey/package.nix
+++ b/pkgs/by-name/li/libnitrokey/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "libnitrokey";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-4PEZ31QyVOmdhpKqTN8fwcHoLuu+w+OJ3fZeqwlE+io=";
     # On OSX, libnitrokey depends on a custom version of hidapi in a submodule.
     # Monitor https://github.com/Nitrokey/libnitrokey/issues/140 to see if we
diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix
index a9853d3a5faa..8e4de639d490 100644
--- a/pkgs/by-name/li/libredwg/package.nix
+++ b/pkgs/by-name/li/libredwg/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibreDWG";
     repo = "libredwg";
-    rev = version;
+    tag = version;
     hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix
index bec2bcf0549f..12ccf0d7304d 100644
--- a/pkgs/by-name/li/libresprite/package.nix
+++ b/pkgs/by-name/li/libresprite/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LibreSprite";
     repo = "LibreSprite";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-jXjrA859hR46Cp5qi6Z1C+hLWCUR7yGlASOGlTveeW8=";
   };
diff --git a/pkgs/by-name/li/librum/package.nix b/pkgs/by-name/li/librum/package.nix
index 004188253cba..5d13804397c4 100644
--- a/pkgs/by-name/li/librum/package.nix
+++ b/pkgs/by-name/li/librum/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Librum-Reader";
     repo = "Librum";
-    rev = "v.${version}";
+    tag = "v.${version}";
     fetchSubmodules = true;
     hash = "sha256-Iwcbcz8LrznFP8rfW6mg9p7klAtTx4daFxylTeFKrH0=";
   };
diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 1c2c943b88eb..69811579dfc4 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-rK7Il8WE4AJbn7GKn21fXr1o+DDdyOjfJ0saeqcZ5Pg=";
   };
diff --git a/pkgs/by-name/li/libstaden-read/package.nix b/pkgs/by-name/li/libstaden-read/package.nix
index bf431ad89e0b..34c8423b5ecb 100644
--- a/pkgs/by-name/li/libstaden-read/package.nix
+++ b/pkgs/by-name/li/libstaden-read/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jkbonfield";
     repo = "io_lib";
-    rev = "io_lib-" + builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version;
+    tag = "io_lib-" + builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-X96gFrefH2NAp4+fvVLXHP9FbF04gQOWLm/tAFJPgR8=";
   };
diff --git a/pkgs/by-name/li/libsurvive/package.nix b/pkgs/by-name/li/libsurvive/package.nix
index f51a47ba2c98..0e2de3df085d 100644
--- a/pkgs/by-name/li/libsurvive/package.nix
+++ b/pkgs/by-name/li/libsurvive/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cntools";
     repo = "libsurvive";
-    rev = "v${version}";
+    tag = "v${version}";
     # Fixes 'Unknown CMake command "cnkalman_generate_code"'
     fetchSubmodules = true;
     hash = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk=";
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 d4371b7720e8..cde586922b7c 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
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix
index e270959fbb2d..2fef04972a75 100644
--- a/pkgs/by-name/li/linuxwave/package.nix
+++ b/pkgs/by-name/li/linuxwave/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "linuxwave";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-OuD5U/T3GuCQrzdhx01NXPSXD7pUAvLnNsznttJogz8=";
   };
diff --git a/pkgs/by-name/li/litmus/package.nix b/pkgs/by-name/li/litmus/package.nix
index 2741576e5a0c..b6cf2f524600 100644
--- a/pkgs/by-name/li/litmus/package.nix
+++ b/pkgs/by-name/li/litmus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notroj";
     repo = "litmus";
-    rev = version;
+    tag = version;
     # Required for neon m4 macros, bundled neon not used
     fetchSubmodules = true;
     hash = "sha256-jWz0cnytgn7px3vvB9/ilWBNALQiW5/QvgguM27I3yQ=";
diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix
index 3ffaf371d4bf..f8c5054033de 100644
--- a/pkgs/by-name/lo/logiops/package.nix
+++ b/pkgs/by-name/lo/logiops/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (oldAttrs: {
   src = fetchFromGitHub {
     owner = "PixlOne";
     repo = "logiops";
-    rev = "v${oldAttrs.version}";
+    tag = "v${oldAttrs.version}";
     hash = "sha256-GAnlPqjIFGyOWwYFs7gth2m9ITc1jyiaW0sWwQ2zFOs=";
     # In v0.3.0, the `ipcgull` submodule was added as a dependency
     # https://github.com/PixlOne/logiops/releases/tag/v0.3.0
diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index 57af96cb8afc..39690af2f820 100644
--- a/pkgs/by-name/lo/loksh/package.nix
+++ b/pkgs/by-name/lo/loksh/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "loksh";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-BxQ7SZwRP9PlD2MV7DqG7tQ2lqzlkTwmaKwbgC7NYrc=";
   };
diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index 5867cef8d145..04fecadc8c30 100644
--- a/pkgs/by-name/lu/lune/package.nix
+++ b/pkgs/by-name/lu/lune/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "filiptibell";
     repo = "lune";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Kk3ZIF+kQzsg/ApUm12bbWlIthj5cpVefAqEGhgxb3w=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ma/makeself/package.nix b/pkgs/by-name/ma/makeself/package.nix
index 33f4a587a7be..4f8292e24c15 100644
--- a/pkgs/by-name/ma/makeself/package.nix
+++ b/pkgs/by-name/ma/makeself/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "megastep";
     repo = "makeself";
-    rev = "release-${version}";
+    tag = "release-${version}";
     fetchSubmodules = true;
     hash = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g=";
   };
diff --git a/pkgs/by-name/ma/mamba/package.nix b/pkgs/by-name/ma/mamba/package.nix
index 5c52999720cb..49a06c146c13 100644
--- a/pkgs/by-name/ma/mamba/package.nix
+++ b/pkgs/by-name/ma/mamba/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "Mamba";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-S1+nGnB1LHIUgYves0qtWh+QXYKjtKWICpOo38b3zbY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix
index 4fafbd72dbb2..a9ef6eb830b9 100644
--- a/pkgs/by-name/ma/manifest-tool/package.nix
+++ b/pkgs/by-name/ma/manifest-tool/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "estesp";
     repo = "manifest-tool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tEUsqrJGRhyirI8TEgG6r9crHX58webHO5v7JLLRQ30=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix
index 7d2b2bb9bea4..996a513b4919 100644
--- a/pkgs/by-name/ma/mariadb-galera/package.nix
+++ b/pkgs/by-name/ma/mariadb-galera/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "codership";
     repo = "galera";
-    rev = "release_${version}";
+    tag = "release_${version}";
     hash = "sha256-v7zwhXfW9K1wvV951Utt/rUbSIMiRZB1rWfeK1VJzN4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix
index 861456103f01..20f1f653e33e 100644
--- a/pkgs/by-name/ma/marker/package.nix
+++ b/pkgs/by-name/ma/marker/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fabiocolacio";
     repo = "Marker";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
   };
diff --git a/pkgs/by-name/ma/master_me/package.nix b/pkgs/by-name/ma/master_me/package.nix
index 5b49e61ad44e..90036b2e284f 100644
--- a/pkgs/by-name/ma/master_me/package.nix
+++ b/pkgs/by-name/ma/master_me/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trummerschlunk";
     repo = "master_me";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-eesMXxRcCgzhSQ+WUqM00EuKYhFxysjH+RWKHKGYzUM=";
   };
diff --git a/pkgs/by-name/ma/material-design-icons/package.nix b/pkgs/by-name/ma/material-design-icons/package.nix
index 800a245b36f4..449eb27f16e6 100644
--- a/pkgs/by-name/ma/material-design-icons/package.nix
+++ b/pkgs/by-name/ma/material-design-icons/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Templarian";
     repo = "MaterialDesign-Webfont";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7t3i3nPJZ/tRslLBfY+9kXH8TR145GC2hPFYJeMHRL8=";
     sparseCheckout = [ "fonts" ];
   };
diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix
index 81b2a6b0843e..18b3923132cd 100644
--- a/pkgs/by-name/me/megaglest/package.nix
+++ b/pkgs/by-name/me/megaglest/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "MegaGlest";
     repo = "megaglest-source";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws";
   };
diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix
index 15b39dc7e192..2bc2e567f3bd 100644
--- a/pkgs/by-name/mi/micropython/package.nix
+++ b/pkgs/by-name/mi/micropython/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "micropython";
     repo = "micropython";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yH5omiYs07ZKECI+DAnpYq4T+r2O/RuGdtN+dhYxePc=";
     fetchSubmodules = true;
 
diff --git a/pkgs/by-name/mi/minia/package.nix b/pkgs/by-name/mi/minia/package.nix
index 1e76f8a62127..1397cc2cb286 100644
--- a/pkgs/by-name/mi/minia/package.nix
+++ b/pkgs/by-name/mi/minia/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GATB";
     repo = "minia";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bmfrywixaaql898l0ixsfkhxjf2hb08ssnqzlzacfizxdp46siq";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 80a4e6dd6222..d1ddccffe280 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4=";
     # 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
diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix
index 66e754624784..45052a65adaa 100644
--- a/pkgs/by-name/mm/mmex/package.nix
+++ b/pkgs/by-name/mm/mmex/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moneymanagerex";
     repo = "moneymanagerex";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-gpDwfRKXgp6hEpitflVIAIOU/k3Fx6hKKhyzQvLlog8=";
   };
diff --git a/pkgs/by-name/mm/mmv/package.nix b/pkgs/by-name/mm/mmv/package.nix
index 7016a79fd0d3..c439db1a1cb4 100644
--- a/pkgs/by-name/mm/mmv/package.nix
+++ b/pkgs/by-name/mm/mmv/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rrthomas";
     repo = "mmv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-h+hdrIQz+7jKdMdJtWhBbZgvmNTIOr7Q38nhfAWC+G4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/moonlight-embedded/package.nix b/pkgs/by-name/mo/moonlight-embedded/package.nix
index 208338644096..c794648d137e 100644
--- a/pkgs/by-name/mo/moonlight-embedded/package.nix
+++ b/pkgs/by-name/mo/moonlight-embedded/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moonlight-stream";
     repo = "moonlight-embedded";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix
index 57f0e7954d27..0ff24a291319 100644
--- a/pkgs/by-name/mo/moonlight-qt/package.nix
+++ b/pkgs/by-name/mo/moonlight-qt/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "moonlight-stream";
     repo = "moonlight-qt";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rWVNpfRDLrWsqELPFquA6rW6/AfWV+6DNLUCPqIhle0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix
index 870665bba217..58e8dda6f710 100644
--- a/pkgs/by-name/mo/mountpoint-s3/package.nix
+++ b/pkgs/by-name/mo/mountpoint-s3/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "mountpoint-s3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uV0umUoJkYgmjWjv8GMnk5TRRbCCJS1ut3VV1HvkaAw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix
index 3a2b5fdddd7d..16e88d44278f 100644
--- a/pkgs/by-name/mo/mozc/package.nix
+++ b/pkgs/by-name/mo/mozc/package.nix
@@ -24,7 +24,7 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "mozc";
-    rev = version;
+    tag = version;
     hash = "sha256-w0bjoMmq8gL7DSehEG7cKqp5e4kNOXnCYLW31Zl9FRs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix
index 5ee4d6e22f0c..975002979981 100644
--- a/pkgs/by-name/ms/mscp/package.nix
+++ b/pkgs/by-name/ms/mscp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "upa";
     repo = "mscp";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-5lX0b3JfjmQh/HlESRMNxqCe2qFRAEZoazysoy252dY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index 0be17c7a2aff..7cf70b973d8b 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "server" ];
-    rev = "photos-v${version}";
+    tag = "photos-v${version}";
     hash = "sha256-801wTTxruhZc18+TAPSYrBRtCPNZXwSKs2Hkvc/6BjM=";
   };
 
diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix
index 573974effa3f..7e0f27be2769 100644
--- a/pkgs/by-name/mu/mustache-go/package.nix
+++ b/pkgs/by-name/mu/mustache-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cbroglie";
     repo = "mustache";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE=";
   };
diff --git a/pkgs/by-name/na/nasc/package.nix b/pkgs/by-name/na/nasc/package.nix
index d4ada36729ec..5117945b556b 100644
--- a/pkgs/by-name/na/nasc/package.nix
+++ b/pkgs/by-name/na/nasc/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "parnold-x";
     repo = "nasc";
-    rev = version;
+    tag = version;
     sha256 = "02b9a59a9fzsb6nn3ycwwbcbv04qfzm6x7csq2addpzx5wak6dd8";
     fetchSubmodules = true;
   };
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 4cc5b3146186..d0bc1b54563b 100644
--- a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
+++ b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mikeoliphant";
     repo = "neural-amp-modeler-lv2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-5BOZOocZWWSWawXJFMAgM0NR0s0CbkzDVr6fnvZMvd0=";
   };
diff --git a/pkgs/by-name/ne/neuron/package.nix b/pkgs/by-name/ne/neuron/package.nix
index b0c5c4901bcd..93cccf3081fa 100644
--- a/pkgs/by-name/ne/neuron/package.nix
+++ b/pkgs/by-name/ne/neuron/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "neuronsimulator";
     repo = "nrn";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-dmpx0Wud0IhdFvvTJuW/w1Uq6vFYaNal9n27LAqV1Qc=";
   };
diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix
index a16286321406..de076902e6f3 100644
--- a/pkgs/by-name/ni/ninjas2/package.nix
+++ b/pkgs/by-name/ni/ninjas2/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clearly-broken-software";
     repo = "ninjas2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1kwp6pmnfar2ip9693gprfbcfscklgri1k1ycimxzlqr61nkd2k9";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
index 843a3637a855..b5aeac3f4f0c 100644
--- a/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
+++ b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-fido2-firmware";
-    rev = "${version}.nitrokey";
+    tag = "${version}.nitrokey";
     hash = "sha256-7AsnxRf8mdybI6Mup2mV01U09r5C/oUX6fG2ymkkOOo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix
index 8c14178fc744..adcc2e19fcc3 100644
--- a/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix
+++ b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-pro-firmware";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q+kbEOLA05xR6weAWDA1hx4fVsaN9UNKiOXGxPRfXuI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix
index 4169ccf702c0..6ff3a595b2e1 100644
--- a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix
+++ b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-start-firmware";
-    rev = "RTM.${finalAttrs.version}";
+    tag = "RTM.${finalAttrs.version}";
     hash = "sha256-POW1d/fgOyYa7127FSTCtHGyMWYzKW0qqA1WUyvNc3w=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/no/noisetorch/package.nix b/pkgs/by-name/no/noisetorch/package.nix
index 6399aa99ddb4..af3824a164aa 100644
--- a/pkgs/by-name/no/noisetorch/package.nix
+++ b/pkgs/by-name/no/noisetorch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "noisetorch";
     repo = "NoiseTorch";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A=";
   };
diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix
index 2a5317c2f459..f12ac0631b4b 100644
--- a/pkgs/by-name/no/notes/package.nix
+++ b/pkgs/by-name/no/notes/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nuttyartist";
     repo = "notes";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ceZ37torgnxZJybacjnNG+kNAU/I2Ki7ZZ7Tzn4pIas=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
index 10b39469d344..7cf021a402ed 100644
--- a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
+++ b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notofonts";
     repo = "noto-cjk";
-    rev = "Sans${version}";
+    tag = "Sans${version}";
     hash = "sha256-i3ZKoSy2SVs46IViha+Sg8atH4n3ywgrunHPLtVT4Pk=";
     sparseCheckout = [
       "Sans/OTC"
diff --git a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
index 4cac82c83563..4bb5c093c025 100644
--- a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
+++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notofonts";
     repo = "noto-cjk";
-    rev = "Serif${version}";
+    tag = "Serif${version}";
     hash = "sha256-Bwuu64TAnOnqUgLlBsUw/jnv9emngqFBmVn6zEqySlc=";
     sparseCheckout = [
       "Serif/OTC"
diff --git a/pkgs/by-name/od/odin2/package.nix b/pkgs/by-name/od/odin2/package.nix
index 40beb4b2a582..272dddea2f06 100644
--- a/pkgs/by-name/od/odin2/package.nix
+++ b/pkgs/by-name/od/odin2/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TheWaveWarden";
     repo = "odin2";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY=";
   };
diff --git a/pkgs/by-name/op/openboardview/package.nix b/pkgs/by-name/op/openboardview/package.nix
index 71f71e966e61..3b65f339ecfe 100644
--- a/pkgs/by-name/op/openboardview/package.nix
+++ b/pkgs/by-name/op/openboardview/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenBoardView";
     repo = "OpenBoardView";
-    rev = version;
+    tag = version;
     hash = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/op/opencl-clhpp/package.nix b/pkgs/by-name/op/opencl-clhpp/package.nix
index 5a545fccc4da..d7e3fc23f36d 100644
--- a/pkgs/by-name/op/opencl-clhpp/package.nix
+++ b/pkgs/by-name/op/opencl-clhpp/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-CLHPP";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     sha256 = "sha256-3RVZJIt03pRmjrPa9q6h6uqFCuTnxvEqjUGUmdwybbY=";
   };
diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix
index bf2722098390..c396baa4cb7d 100644
--- a/pkgs/by-name/op/openmsx/package.nix
+++ b/pkgs/by-name/op/openmsx/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "openMSX";
     repo = "openMSX";
-    rev = "RELEASE_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    tag = "RELEASE_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-iY+oZ7fHZnnEGunM4kOxOGH2Biqj2PfdLhbT8J4mYrA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/op/openrocket/package.nix b/pkgs/by-name/op/openrocket/package.nix
index beddf4d887c0..0d888e0490c9 100644
--- a/pkgs/by-name/op/openrocket/package.nix
+++ b/pkgs/by-name/op/openrocket/package.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "openrocket";
     repo = "openrocket";
-    rev = "release-${finalAttrs.version}";
+    tag = "release-${finalAttrs.version}";
     hash = "sha256-Dg/v72N9cDG9Ko5JIcZxGxh+ClRDgf5Jq5DvQyCiYOs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/op/openseachest/package.nix b/pkgs/by-name/op/openseachest/package.nix
index 4f58c07e665f..7129d314ccb8 100644
--- a/pkgs/by-name/op/openseachest/package.nix
+++ b/pkgs/by-name/op/openseachest/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Seagate";
     repo = "openSeaChest";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kd2JRtqnxfYRJcr1yKSB0LZAR96j2WW4tR1iRTvVANs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix
index 304f1c7de443..e2ea39a3a8eb 100644
--- a/pkgs/by-name/or/orocos-kdl/package.nix
+++ b/pkgs/by-name/or/orocos-kdl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "orocos";
     repo = "orocos_kinematics_dynamics";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "15ky7vw461005axx96d0f4zxdnb9dxl3h082igyd68sbdb8r1419";
     # Needed to build Python bindings
     fetchSubmodules = true;
diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix
index 7c58ecebee2a..3d000c9c8909 100644
--- a/pkgs/by-name/or/orogene/package.nix
+++ b/pkgs/by-name/or/orogene/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orogene";
     repo = "orogene";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GMWrlvZZ2xlcvcRG3u8jS8KiewHpyX0brNe4pmCpHbM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/os/osqp/package.nix b/pkgs/by-name/os/osqp/package.nix
index 0425777a85f8..da9ca6a4a140 100644
--- a/pkgs/by-name/os/osqp/package.nix
+++ b/pkgs/by-name/os/osqp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oxfordcontrol";
     repo = "osqp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-enkK5EFyAeLaUnHNYS3oq43HsHY5IuSLgsYP0k/GW8c=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix
index 2854aadc3760..46b1e59d8c44 100644
--- a/pkgs/by-name/os/ossia-score/package.nix
+++ b/pkgs/by-name/os/ossia-score/package.nix
@@ -49,7 +49,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ossia";
     repo = "score";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-khVWoHsxezQjU6O+OX7t1zuzLJpIVTim1rMswD7TaQU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ow/owamp/package.nix b/pkgs/by-name/ow/owamp/package.nix
index 36f64a1eeb8f..be7cd034606f 100644
--- a/pkgs/by-name/ow/owamp/package.nix
+++ b/pkgs/by-name/ow/owamp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "perfsonar";
     repo = "owamp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "5o85XSn84nOvNjIzlaZ2R6/TSHpKbWLXTO0FmqWsNMU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index 373e9ac77d44..c00c752997c9 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
-    rev = version;
+    tag = version;
     hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix
index 92541c58c8dc..08cc8dcc7972 100644
--- a/pkgs/by-name/pa/pam_rssh/package.nix
+++ b/pkgs/by-name/pa/pam_rssh/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "z4yx";
     repo = "pam_rssh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VxbaxqyIAwmjjbgfTajqwPQC3bp7g/JNVNx9yy/3tus=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index 2563b35be678..f1d0b0b084df 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = "pdfcpu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HTqaFl/ug/4sdchZBD4VQiXbD1L0/DVf2efZ3BV/vx4=";
     # Apparently upstream requires that the compiled executable will know the
     # commit hash and the date of the commit. This information is also presented
diff --git a/pkgs/by-name/pd/pdfslicer/package.nix b/pkgs/by-name/pd/pdfslicer/package.nix
index 34e7c61d3642..9af9f541b486 100644
--- a/pkgs/by-name/pd/pdfslicer/package.nix
+++ b/pkgs/by-name/pd/pdfslicer/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "junrrein";
     repo = "pdfslicer";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls";
   };
diff --git a/pkgs/by-name/pe/penguin-subtitle-player/package.nix b/pkgs/by-name/pe/penguin-subtitle-player/package.nix
index d2eb9306fd20..56afe098fa2d 100644
--- a/pkgs/by-name/pe/penguin-subtitle-player/package.nix
+++ b/pkgs/by-name/pe/penguin-subtitle-player/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "carsonip";
     repo = "Penguin-Subtitle-Player";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-AhdShg/eWqF44W1r+KmcHzbGKF2TNSD/wPKj+x4oQkM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index ed386a0ebaf7..6a54b69fc98a 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "yshui";
     repo = "picom";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-H8IbzzrzF1c63MXbw5mqoll3H+vgcSVpijrlSDNkc+o=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix
index 5fdac02fb126..8b5dcfe34df1 100644
--- a/pkgs/by-name/pk/pkcs11-provider/package.nix
+++ b/pkgs/by-name/pk/pkcs11-provider/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "pkcs11-provider";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Q9dmzYDBco+LLVWdORFTjRyk0RX8qhmZ1m+Kgfeyr04=";
   };
diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix
index 9b919a3c14f3..866d684e8439 100644
--- a/pkgs/by-name/pm/pmix/package.nix
+++ b/pkgs/by-name/pm/pmix/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     repo = "openpmix";
     owner = "openpmix";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qj/exBi1siCHY1QqNY+ad6n3XI4JZuwnM93Vp+rj1AQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix
index 76ea7972a57d..26d2ced9aa79 100644
--- a/pkgs/by-name/pn/pngquant/package.nix
+++ b/pkgs/by-name/pn/pngquant/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "pngquant";
-    rev = version;
+    tag = version;
     hash = "sha256-u2zEp9Llo+c/+1QGW4V4r40KQn/ATHCTEsrpy7bRf/I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix
index 749000456785..72fc5437cb9d 100644
--- a/pkgs/by-name/po/pokeget-rs/package.nix
+++ b/pkgs/by-name/po/pokeget-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "talwat";
     repo = "pokeget-rs";
-    rev = version;
+    tag = version;
     hash = "sha256-EtEmaA0ukLoK0vaX+s3d8xodB3pUwSb1EyeyMBF0+rc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 1b70a27916b6..d6657073c5f8 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "polybar";
     repo = "polybar";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-5PYKl6Hi4EYEmUBwkV0rLiwxNqIyR5jwm495YnNs0gI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix
index 5e27f3d7f50a..651e3b905a02 100644
--- a/pkgs/by-name/po/polylux2pdfpc/package.nix
+++ b/pkgs/by-name/po/polylux2pdfpc/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "polylux-typ";
     repo = "polylux";
-    rev = "v${version}";
+    tag = "v${version}";
     sparseCheckout = [ dirname ];
     hash = "sha256-41FgRejonvVTmE89WGm0Cqumm8lb6kkfxtkWV74UKJA=";
   };
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index 9df6c6acac35..cad398189fb3 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (rec {
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
-    rev = version;
+    tag = version;
     hash = "sha256-4gDv8UWTk0RWVNC4PU70YKSK9fIMbWBsQbHboVls2BA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix
index 8ce7a266e95f..01fd12f14290 100644
--- a/pkgs/by-name/po/poptracker/package.nix
+++ b/pkgs/by-name/po/poptracker/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "black-sliver";
     repo = "PopTracker";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DFJfuDOzcVdiXLv5EzO5TL3UJLCZPM1bTZharp2ww5U=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix
index f94b451d40d1..443a87ffd76b 100644
--- a/pkgs/by-name/pr/pragtical/package.nix
+++ b/pkgs/by-name/pr/pragtical/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pragtical";
     repo = "pragtical";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
 
     # also fetch required git submodules
diff --git a/pkgs/by-name/pr/prime-server/package.nix b/pkgs/by-name/pr/prime-server/package.nix
index 64ee8fa1d602..6f4d891767d8 100644
--- a/pkgs/by-name/pr/prime-server/package.nix
+++ b/pkgs/by-name/pr/prime-server/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kevinkreiser";
     repo = "prime_server";
-    rev = version;
+    tag = version;
     sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 5909434207a1..00d8baa134bf 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = "process-compose";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qv/fVfuQD7Nan5Nn1RkwXoGZuPYSRWQaojEn6MCF9BQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/pr/proteus/package.nix b/pkgs/by-name/pr/proteus/package.nix
index c3d774532606..9e6d6606e966 100644
--- a/pkgs/by-name/pr/proteus/package.nix
+++ b/pkgs/by-name/pr/proteus/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GuitarML";
     repo = "Proteus";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-WhJh+Sx64JYxQQ1LXpDUwXeodFU1EZ0TmMhn+6w0hQg=";
   };
diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix
index 7e9b68ddceb8..2001bd52dab0 100644
--- a/pkgs/by-name/pr/prrte/package.nix
+++ b/pkgs/by-name/pr/prrte/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openpmix";
     repo = "prrte";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4JEh4N/38k0Xgp0CqnFipaEZlJBQr8nyxoncyz0/7yo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pv/pvsneslib/package.nix b/pkgs/by-name/pv/pvsneslib/package.nix
index 1289fa2fff63..23094c2e81cc 100644
--- a/pkgs/by-name/pv/pvsneslib/package.nix
+++ b/pkgs/by-name/pv/pvsneslib/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alekmaul";
     repo = "pvsneslib";
-    rev = version;
+    tag = version;
     hash = "sha256-Cl4+WvjKbq5IPqf7ivVYwBYwDDWWHGNeq4nWXPxsUHw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix
index baffb0244316..018f14af9890 100644
--- a/pkgs/by-name/qc/qcm/package.nix
+++ b/pkgs/by-name/qc/qcm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hypengw";
     repo = "Qcm";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-41GsG+NKCMw+LuRUf31ilRso/SkKYVV3IrMSviOZdWs=";
   };
diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix
index a6961947e75c..dfc875ef2c5f 100644
--- a/pkgs/by-name/qg/qgrep/package.nix
+++ b/pkgs/by-name/qg/qgrep/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "qgrep";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-TeXOzfb1Nu6hz9l6dXGZY+xboscPapKm0Z264hv1Aww=";
   };
diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix
index 16aa73665325..d9bacad8215e 100644
--- a/pkgs/by-name/qg/qgroundcontrol/package.nix
+++ b/pkgs/by-name/qg/qgroundcontrol/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mavlink";
     repo = "qgroundcontrol";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wjrfwE97J+UzBPIARQ6cPadN6xIdqR8i+ZKbtiDproM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/qu/quadrafuzz/package.nix b/pkgs/by-name/qu/quadrafuzz/package.nix
index c7d5357e60d5..2b3193413c3f 100644
--- a/pkgs/by-name/qu/quadrafuzz/package.nix
+++ b/pkgs/by-name/qu/quadrafuzz/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpcima";
     repo = "quadrafuzz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1kjsf7il9krihwlrq08gk2xvil4b4q5zd87nnm103hby2w7ws7z1";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix
index 07bc3eee474e..842f956d5e76 100644
--- a/pkgs/by-name/ra/rapidyaml/package.nix
+++ b/pkgs/by-name/ra/rapidyaml/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "biojppm";
     repo = "rapidyaml";
     fetchSubmodules = true;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+ENfflVjeesX14m0G71HdeSIECopZV4J2JL9+c+nbXE=";
   };
 
diff --git a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
index ef44167c38f6..aebd1a7925ae 100644
--- a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
+++ b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RobertBeckebans";
     repo = "rbdoom-3-bfg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9BZEFO+e5IG6hv9+QI9OJecQ84rLTWBDz4k0GU6SeDE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix
index dc80ce610e23..f2f56b8e946e 100644
--- a/pkgs/by-name/re/revive/package.nix
+++ b/pkgs/by-name/re/revive/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mgechev";
     repo = "revive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-89BlSc2tgxAJUGZM951fF+0H+SOsl0+xz/G18neRZxI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix
index 13dbed47924e..d030ed1dee04 100644
--- a/pkgs/by-name/rh/rhvoice/package.nix
+++ b/pkgs/by-name/rh/rhvoice/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RHVoice";
     repo = "RHVoice";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-4l4S4MUnVGN/El1BBuZvzPPcavUefjMyBk1hk0ux7zo=";
   };
diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix
index 85dac1ad349c..4333716339c4 100644
--- a/pkgs/by-name/ri/ricochet-refresh/package.nix
+++ b/pkgs/by-name/ri/ricochet-refresh/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "blueprint-freespeech";
     repo = "ricochet-refresh";
-    rev = "v${finalAttrs.version}-release";
+    tag = "v${finalAttrs.version}-release";
     fetchSubmodules = true;
     hash = "sha256-/IT3K3PL2fNl4P7xzItVnI8xJx5MmKxhw3ZEX9rN7j4=";
   };
diff --git a/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix b/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
index 73b0558334bc..2dad3c3a590e 100644
--- a/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
+++ b/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hakatashi";
     repo = "RictyDiminished-with-FiraCode";
-    rev = version;
+    tag = version;
     hash = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix
index b3c5093b84fd..70d76cfe6463 100644
--- a/pkgs/by-name/rm/rmw/package.nix
+++ b/pkgs/by-name/rm/rmw/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "theimpossibleastronaut";
     repo = "rmw";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rfJdJHSkusZj/PN74KgV5i36YC0YRZmIfRdvkUNoKEM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ro/rofi-file-browser/package.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix
index 59ba23bdd3ee..87a0c68619b9 100644
--- a/pkgs/by-name/ro/rofi-file-browser/package.nix
+++ b/pkgs/by-name/ro/rofi-file-browser/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marvinkreis";
     repo = "rofi-file-browser-extended";
-    rev = version;
+    tag = version;
     hash = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix
index 7f0a68862f7a..373362a2c02c 100644
--- a/pkgs/by-name/rp/rpiboot/package.nix
+++ b/pkgs/by-name/rp/rpiboot/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "usbboot";
-    rev = version;
+    tag = version;
     hash = "sha256-WccnaIUF5M080M4vg5NzBCLpLVcE7ts/oJJE8CLRi8A=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rt/rtags/package.nix b/pkgs/by-name/rt/rtags/package.nix
index 4810f666f3e9..a5ebc016da6e 100644
--- a/pkgs/by-name/rt/rtags/package.nix
+++ b/pkgs/by-name/rt/rtags/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andersbakken";
     repo = "rtags";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
     fetchSubmodules = true;
     # unicode file names lead to different checksums on HFS+ vs. other
diff --git a/pkgs/by-name/ru/rubyfmt/package.nix b/pkgs/by-name/ru/rubyfmt/package.nix
index 037f592aef12..c7df49763b0c 100644
--- a/pkgs/by-name/ru/rubyfmt/package.nix
+++ b/pkgs/by-name/ru/rubyfmt/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fables-tales";
     repo = "rubyfmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix
index 1c988910d14a..29c7b81c4b5d 100644
--- a/pkgs/by-name/ru/rustdesk-server/package.nix
+++ b/pkgs/by-name/ru/rustdesk-server/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk-server";
-    rev = version;
+    tag = version;
     hash = "sha256-5LRMey1cxmjLg1s9RtVwgPjHjwYLSQHa6Tyv7r/XEQs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sa/sambamba/package.nix b/pkgs/by-name/sa/sambamba/package.nix
index 9cf37daf1606..57dee8f5ca56 100644
--- a/pkgs/by-name/sa/sambamba/package.nix
+++ b/pkgs/by-name/sa/sambamba/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "biod";
     repo = "sambamba";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/se/securefs/package.nix b/pkgs/by-name/se/securefs/package.nix
index 1dd426b55a37..41785780aa88 100644
--- a/pkgs/by-name/se/securefs/package.nix
+++ b/pkgs/by-name/se/securefs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "netheril96";
     repo = "securefs";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-7xjGuN7jcLgfGkaBoSj+WsBpM806PPGzeBs7DnI+fwc=";
   };
diff --git a/pkgs/by-name/se/serial-studio/package.nix b/pkgs/by-name/se/serial-studio/package.nix
index 5cb29976b08f..2b2928eaaa04 100644
--- a/pkgs/by-name/se/serial-studio/package.nix
+++ b/pkgs/by-name/se/serial-studio/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Serial-Studio";
     repo = "Serial-Studio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q3RWy3HRs5NG0skFb7PSv8jK5pI5rtbccP8j38l8kjM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/shadered/package.nix b/pkgs/by-name/sh/shadered/package.nix
index 7d56afbfe763..032b363ddf7e 100644
--- a/pkgs/by-name/sh/shadered/package.nix
+++ b/pkgs/by-name/sh/shadered/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dfranx";
     repo = "SHADERed";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr";
   };
diff --git a/pkgs/by-name/sh/shim-unsigned/package.nix b/pkgs/by-name/sh/shim-unsigned/package.nix
index 21811d3a422a..0c0fd8d790c6 100644
--- a/pkgs/by-name/sh/shim-unsigned/package.nix
+++ b/pkgs/by-name/sh/shim-unsigned/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhboot";
     repo = "shim";
-    rev = version;
+    tag = version;
     hash = "sha256-KFpt//A4/T0FRBSPuTKQH/mEIqLVEiE+Lpvuq7ec6eo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix
index 574a79cfbedc..b7289b7bac7e 100644
--- a/pkgs/by-name/sh/shisho/package.nix
+++ b/pkgs/by-name/sh/shisho/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "flatt-security";
     repo = "shisho";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix
index 3fc5da619ee8..14f23b78edf9 100644
--- a/pkgs/by-name/sh/show-midi/package.nix
+++ b/pkgs/by-name/sh/show-midi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gbevin";
     repo = "ShowMIDI";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-jANrFZqJZZMTGyNa0sIthoQzaDMdLzpGZqHfxNw8hDg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix
index 9135f13c901e..608e4d3a4797 100644
--- a/pkgs/by-name/si/singular/package.nix
+++ b/pkgs/by-name/si/singular/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
     # if a release is tagged (which sometimes does not happen), it will
     # be in the format below.
-    rev = "Release-${lib.replaceStrings [ "." ] [ "-" ] version}";
+    tag = "Release-${lib.replaceStrings [ "." ] [ "-" ] version}";
     hash = "sha256-vrRIirWQLbbe1l07AqqHK/StWo0egKuivdKT5R8Rx58=";
 
     # the repository's .gitattributes file contains the lines "/Tst/
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index ce94e1acf870..6dc116b60af6 100644
--- a/pkgs/by-name/sn/snes9x/package.nix
+++ b/pkgs/by-name/sn/snes9x/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-INMVyB3alwmsApO7ToAaUWgh7jlg2MeLxqHCEnUO88U=";
   };
diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index e752dddf7b6a..bdcc44d62730 100644
--- a/pkgs/by-name/so/sonobus/package.nix
+++ b/pkgs/by-name/so/sonobus/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sonosaurus";
     repo = "sonobus";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NOdmHFKrV7lb8XbeG5GdLKYZ0c/vcz3fcqYj9JvE+/Q=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/so/sony-headphones-client/package.nix b/pkgs/by-name/so/sony-headphones-client/package.nix
index 0682713cf1c5..c17507fb6faf 100644
--- a/pkgs/by-name/so/sony-headphones-client/package.nix
+++ b/pkgs/by-name/so/sony-headphones-client/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Plutoberth";
     repo = "SonyHeadphonesClient";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vhI97KheKzr87exCh4xNN7NDefcagdMu1tWSt67vLiU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index f0c60006a00d..b4db13f51cd1 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -49,7 +49,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "space-wizards";
     repo = "SS14.Launcher";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Es+DBwWh2QxCev+Aepi8ItTXSYIgNgb05zdScOBZNJs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix
index 58cd81ccdbce..0e097563dd9c 100644
--- a/pkgs/by-name/sp/spdk/package.nix
+++ b/pkgs/by-name/sp/spdk/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spdk";
     repo = "spdk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-27mbIycenOk51PLQrAfU1cZcjiWddNtxoyC6Q9wxqFg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix
index 240746849c71..4b9299282981 100644
--- a/pkgs/by-name/sp/spicy-parser-generator/package.nix
+++ b/pkgs/by-name/sp/spicy-parser-generator/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeek";
     repo = "spicy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+F7P8D70vN85pYyTOSMXgf1yWgPJHPpvP38rOyKTJ/A=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sq/sqlcheck/package.nix b/pkgs/by-name/sq/sqlcheck/package.nix
index 15bd89c81f8f..7bcf34efe87e 100644
--- a/pkgs/by-name/sq/sqlcheck/package.nix
+++ b/pkgs/by-name/sq/sqlcheck/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jarulraj";
     repo = "sqlcheck";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix
index c1040b0308c1..eb82de1c1d52 100644
--- a/pkgs/by-name/st/starboard/package.nix
+++ b/pkgs/by-name/st/starboard/package.nix
@@ -16,7 +16,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "starboard";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yQ4ABzN8EvD5qs0yjTaihM145K79LglprC2nlqAw0XU=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix
index 9485fa2fb2c0..985e65605495 100644
--- a/pkgs/by-name/st/stellar-core/package.nix
+++ b/pkgs/by-name/st/stellar-core/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stellar";
     repo = "stellar-core";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lxBn/T01Tsa7tid3mRJUigUwv9d3BAPZhV9Mp1lywBU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/sticky-notes/package.nix b/pkgs/by-name/st/sticky-notes/package.nix
index 5e01d7f0f9f8..8d12de0105d4 100644
--- a/pkgs/by-name/st/sticky-notes/package.nix
+++ b/pkgs/by-name/st/sticky-notes/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vixalien";
     repo = "sticky";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-82Yxw8NSw82rxhuAgsdN2lCiQ/hli4tQiU6jCgGyp4U=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/stochas/package.nix b/pkgs/by-name/st/stochas/package.nix
index e82fc7864d98..6ad06b890180 100644
--- a/pkgs/by-name/st/stochas/package.nix
+++ b/pkgs/by-name/st/stochas/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "surge-synthesizer";
     repo = "stochas";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Gp49cWvUkwz4xAq5sA1nUO+amRC39iWeUemQJyv6hTs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix
index fd861826278a..540c547bda2d 100644
--- a/pkgs/by-name/su/sumo/package.nix
+++ b/pkgs/by-name/su/sumo/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "sumo";
-    rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
     hash = "sha256-yXXOCvlHAzGmNQeXyWQtmq1UdkQ6qt4L9noUii/voP4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index 395a06019316..3cc5357ef96c 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "surge-synthesizer";
     repo = "surge";
-    rev = "release_xt_${version}";
+    tag = "release_xt_${version}";
     fetchSubmodules = true;
     hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ=";
   };
diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix
index 649eeb0026ea..c7a7f35fe8d2 100644
--- a/pkgs/by-name/su/sus-compiler/package.nix
+++ b/pkgs/by-name/su/sus-compiler/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pc2";
     repo = "sus-compiler";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dQef5TiOV33lnNl7XKl7TlCY0E2sEclehWOmy2uvISY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sv/svaba/package.nix b/pkgs/by-name/sv/svaba/package.nix
index ea1d3938c009..075f5cc7f394 100644
--- a/pkgs/by-name/sv/svaba/package.nix
+++ b/pkgs/by-name/sv/svaba/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "walaj";
     repo = "svaba";
-    rev = version;
+    tag = version;
     sha256 = "1vv5mc9z5d22kgdy7mm27ya5aahnqgkcrskdr2405058ikk9g8kp";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index 58e1350c33da..521a2f8d3ec2 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xl8pKfAgaeEjtITMpp6urwPndIBXxSyYEcX0PpVK8nc=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix
index 42ce49b68309..91739e82fe0b 100644
--- a/pkgs/by-name/sy/syslogng/package.nix
+++ b/pkgs/by-name/sy/syslogng/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "syslog-ng";
     repo = "syslog-ng";
-    rev = "syslog-ng-${finalAttrs.version}";
+    tag = "syslog-ng-${finalAttrs.version}";
     hash = "sha256-/hLrUwJhA0jesOl7gmWHfTVO2M7IG8QNPRzc/TIGTH4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
index ffbfce310b4e..20d634de5de2 100644
--- a/pkgs/by-name/ta/taisei/package.nix
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "taisei-project";
     repo = "taisei";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/tamatool/package.nix b/pkgs/by-name/ta/tamatool/package.nix
index 8e0af3062c5d..d3d696807a20 100644
--- a/pkgs/by-name/ta/tamatool/package.nix
+++ b/pkgs/by-name/ta/tamatool/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jcrona";
     repo = "tamatool";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-VDmpIBuMWg3TwfCf9J6/bi/DaWip6ESAQWvGh2SH+A8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix
index 0239dd78c72b..8df7f88ee292 100644
--- a/pkgs/by-name/ta/tangram/package.nix
+++ b/pkgs/by-name/ta/tangram/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "Tangram";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OtQN8Iigu92iKa7CAaslIpbS0bqJ9Vus++inrgV/eeM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/tarantool/package.nix b/pkgs/by-name/ta/tarantool/package.nix
index 4bfc8c4bb9e4..f61eeae0247d 100644
--- a/pkgs/by-name/ta/tarantool/package.nix
+++ b/pkgs/by-name/ta/tarantool/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tarantool";
     repo = "tarantool";
-    rev = version;
+    tag = version;
     hash = "sha256-yCRU5IxC6gNS+O2KYtKWjFk35EHkBnnzWy5UnyuB9f4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix
index 151a2f134160..db6eed2e2081 100644
--- a/pkgs/by-name/ta/taskwarrior2/package.nix
+++ b/pkgs/by-name/ta/taskwarrior2/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "taskwarrior";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/tc/tcpflow/package.nix b/pkgs/by-name/tc/tcpflow/package.nix
index 4328b56d9d7c..b151d557e42e 100644
--- a/pkgs/by-name/tc/tcpflow/package.nix
+++ b/pkgs/by-name/tc/tcpflow/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simsong";
     repo = "tcpflow";
-    rev = "tcpflow-${version}";
+    tag = "tcpflow-${version}";
     sha256 = "0vbm097jhi5n8pg08ia1yhzc225zv9948blb76f4br739l9l22vq";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index 11ee385d9832..a3acabedac1b 100644
--- a/pkgs/by-name/te/tempo/package.nix
+++ b/pkgs/by-name/te/tempo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tempo";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-RzDOx2ZyA0ZntFD1ryfipsgPsxVmsdOusZ37RCnQQnM=";
   };
diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index 0ee38b5cbafc..2d08955e608c 100644
--- a/pkgs/by-name/te/tev/package.nix
+++ b/pkgs/by-name/te/tev/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tom94";
     repo = "tev";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-ke1T5nOrDoJilpfshAIAFWw/640Gm5OaxZ+ZakCevTs=";
   };
diff --git a/pkgs/by-name/th/themix-gui/package.nix b/pkgs/by-name/th/themix-gui/package.nix
index 91bf3f3bf027..0c2bef19e7f5 100644
--- a/pkgs/by-name/th/themix-gui/package.nix
+++ b/pkgs/by-name/th/themix-gui/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "themix-project";
     repo = "themix-gui";
-    rev = version;
+    tag = version;
     hash = "sha256-xFtwNx1c7Atb+9yorZhs/uVkkoxbZiELJ0SZ88L7KMs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ti/timewarrior/package.nix b/pkgs/by-name/ti/timewarrior/package.nix
index 51c68203282f..ac25beb43b83 100644
--- a/pkgs/by-name/ti/timewarrior/package.nix
+++ b/pkgs/by-name/ti/timewarrior/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "timewarrior";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6WZ5k9cxWe+eS9me700ITq0rKEiIuDhTtmuzhOnUM4k=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ti/tinyfecvpn/package.nix b/pkgs/by-name/ti/tinyfecvpn/package.nix
index c62d4076d246..04077328094d 100644
--- a/pkgs/by-name/ti/tinyfecvpn/package.nix
+++ b/pkgs/by-name/ti/tinyfecvpn/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wangyu-";
     repo = "tinyfecvpn";
-    rev = version;
+    tag = version;
     hash = "sha256-g4dduREH64TDK3Y2PKc5RZiISW4h2ALRh8vQK7jvCZU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ti/tinygo/package.nix b/pkgs/by-name/ti/tinygo/package.nix
index 4746b1b04799..d987dcad850a 100644
--- a/pkgs/by-name/ti/tinygo/package.nix
+++ b/pkgs/by-name/ti/tinygo/package.nix
@@ -39,7 +39,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tinygo-org";
     repo = "tinygo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-I/9JXjt6aF/80Mh3iRgUYXv4l+m3XIpmKsIBviOuWCo=";
     fetchSubmodules = true;
     # The public hydra server on `hydra.nixos.org` is configured with
diff --git a/pkgs/by-name/tl/tlock/package.nix b/pkgs/by-name/tl/tlock/package.nix
index 99df2eb8123f..f70ab54a79a3 100644
--- a/pkgs/by-name/tl/tlock/package.nix
+++ b/pkgs/by-name/tl/tlock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "eklairs";
     repo = "tlock";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-O6erxzanSO5BjMnSSmn89w9SA+xyHhp0SSDkCk5hp8Y=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/tr/tracebox/package.nix b/pkgs/by-name/tr/tracebox/package.nix
index 7a373f49796e..2b5dd819bd89 100644
--- a/pkgs/by-name/tr/tracebox/package.nix
+++ b/pkgs/by-name/tr/tracebox/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tracebox";
     repo = "tracebox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1KBJ4uXa1XpzEw23IjndZg+aGJXk3PVw8LYKAvxbxCA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/tr/trackma/package.nix b/pkgs/by-name/tr/trackma/package.nix
index 304199faf9e4..1a41238f89c5 100644
--- a/pkgs/by-name/tr/trackma/package.nix
+++ b/pkgs/by-name/tr/trackma/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "z411";
     repo = "trackma";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "Hov9qdVabu1k3SIoUmvcRtSK8TcETqGPXI2RqN/bei4=";
     fetchSubmodules = true; # for anime-relations submodule
   };
diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
index 2201ac294241..00cd2c3bd699 100644
--- a/pkgs/by-name/tr/transmission_3/package.nix
+++ b/pkgs/by-name/tr/transmission_3/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "transmission";
     repo = "transmission";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-n4iEDt9AstDZPZXN47p13brNLbNWS3BTB+A4UuoEjzE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/tr/trezord/package.nix b/pkgs/by-name/tr/trezord/package.nix
index b30297ff87c2..11e573f66763 100644
--- a/pkgs/by-name/tr/trezord/package.nix
+++ b/pkgs/by-name/tr/trezord/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "trezord-go";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-3I6NOzDMhzRyVSOURl7TjJ1Z0P0RcKrSs5rNaZ0Ho9M=";
   };
diff --git a/pkgs/by-name/tv/tvm/package.nix b/pkgs/by-name/tv/tvm/package.nix
index 3d8af028ddc4..e4e94deb3170 100644
--- a/pkgs/by-name/tv/tvm/package.nix
+++ b/pkgs/by-name/tv/tvm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "incubator-tvm";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-/5IpOraFTgg6sQ1TLHoepq/C8VHKg5BXKrNMBSyYajA=";
   };
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index ca79dc4de4a1..0d9fd60ff92e 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "umpire";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MHvJRXAMV64GxGgCJjQPlaNyxVjBvyQXogbla9UMFL8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix
index 877f5d51d28c..509412e7bb7e 100644
--- a/pkgs/by-name/un/unvanquished/package.nix
+++ b/pkgs/by-name/un/unvanquished/package.nix
@@ -40,7 +40,7 @@ let
   src = fetchFromGitHub {
     owner = "Unvanquished";
     repo = "Unvanquished";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-wOFSPPEu7AGsEcqHG7xFWzFlYZRWAIvvfTj5FLZ3HFc=";
   };
diff --git a/pkgs/by-name/ur/ursadb/package.nix b/pkgs/by-name/ur/ursadb/package.nix
index 38b623f3f935..108c9ef067cc 100644
--- a/pkgs/by-name/ur/ursadb/package.nix
+++ b/pkgs/by-name/ur/ursadb/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = "ursadb";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UVfOImngYPB8UBQHzxwJM+dT3DWiT+7V+QGfUggjazI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
index e6590b444a49..ebaff9ecb83d 100644
--- a/pkgs/by-name/ut/utf8cpp/package.nix
+++ b/pkgs/by-name/ut/utf8cpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nemtrif";
     repo = "utfcpp";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-e8qH4eygLnQw7B8x+HN+vH8cr8fkxnTFz+PKtFJ8dGE=";
   };
diff --git a/pkgs/by-name/ut/utox/package.nix b/pkgs/by-name/ut/utox/package.nix
index 58aff9b45cf0..701496ddf60c 100644
--- a/pkgs/by-name/ut/utox/package.nix
+++ b/pkgs/by-name/ut/utox/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uTox";
     repo = "uTox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 6af97a9cbf73..0f7f7d15196d 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZJu3dFsKc7L2THgGXNtBszXUbEEoM3bnLxtf5x5UPTM=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/vi/violet/package.nix b/pkgs/by-name/vi/violet/package.nix
index c52728b84051..5a2eae79a2ad 100644
--- a/pkgs/by-name/vi/violet/package.nix
+++ b/pkgs/by-name/vi/violet/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "paullouisageneau";
     repo = "violet";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OBrEydVqhbxJZED8mUjV605kvtbXPqb35X1XeNBNvjg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix
index 00a519f1087b..c1981cfbd1a0 100644
--- a/pkgs/by-name/vn/vnote/package.nix
+++ b/pkgs/by-name/vn/vnote/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vnotex";
     repo = "vnote";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-40k0wSqRdwlUqrbb9mDK0dqsSEqCfbNLt+cUKeky+do=";
   };
diff --git a/pkgs/by-name/vo/volk/package.nix b/pkgs/by-name/vo/volk/package.nix
index ecba4223280e..21576eaccd80 100644
--- a/pkgs/by-name/vo/volk/package.nix
+++ b/pkgs/by-name/vo/volk/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gnuradio";
     repo = "volk";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-R1FT5sbl0fAAl6YIX5aD5CiQ/AjZkCSDPPQPiuy4WBY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix
index dd6cd7ec1855..4ce83db262f2 100644
--- a/pkgs/by-name/vo/volk_2/package.nix
+++ b/pkgs/by-name/vo/volk_2/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gnuradio";
     repo = "volk";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wa/wabt/package.nix b/pkgs/by-name/wa/wabt/package.nix
index d2d16f1f7de8..3474ffb569d4 100644
--- a/pkgs/by-name/wa/wabt/package.nix
+++ b/pkgs/by-name/wa/wabt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wabt";
-    rev = version;
+    tag = version;
     hash = "sha256-Ejr+FxaYRDI01apHhKTs11iwcv72a8ZxyPmVetEvadU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index 6d5c48d84055..d55c86f86703 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SrWmoDSz2/qSiex46CeDIgarjgGRp2KOThGP4YjglZY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix
index cdb354bc1e2a..ed7390a18770 100644
--- a/pkgs/by-name/wi/wiliwili/package.nix
+++ b/pkgs/by-name/wi/wiliwili/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xfangfang";
     repo = "wiliwili";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-37DQafP+PFjrfNXJt88oK0ghqQEVQjDdVbYsf1tHAN4=";
   };
diff --git a/pkgs/by-name/wi/wineasio/package.nix b/pkgs/by-name/wi/wineasio/package.nix
index 50e40a56a2ae..955951318877 100644
--- a/pkgs/by-name/wi/wineasio/package.nix
+++ b/pkgs/by-name/wi/wineasio/package.nix
@@ -15,7 +15,7 @@ multiStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wineasio";
     repo = "wineasio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d5BGJAkaM5XZXyqm6K/UzFE4sD6QVHHGnLi1bcHxiaM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wo/wolf-shaper/package.nix b/pkgs/by-name/wo/wolf-shaper/package.nix
index d4e234fc6173..cb3efbe23d6c 100644
--- a/pkgs/by-name/wo/wolf-shaper/package.nix
+++ b/pkgs/by-name/wo/wolf-shaper/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wolf-plugins";
     repo = "wolf-shaper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4oi1wnex6eNRHUWXZHnvrmqp4veFuPJqD0YuOhDepg4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index 55d7860a78d1..295354da8074 100644
--- a/pkgs/by-name/wx/wxGTK31/package.nix
+++ b/pkgs/by-name/wx/wxGTK31/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wxWidgets";
     repo = "wxWidgets";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9qYPatpTT28H+fz77o7/Y3YVmiK0OCsiQT5QAYe93M0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix
index c87eec9291c7..5af43a438361 100644
--- a/pkgs/by-name/wx/wxformbuilder/package.nix
+++ b/pkgs/by-name/wx/wxformbuilder/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wxFormBuilder";
     repo = "wxFormBuilder";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/x4/x42-avldrums/package.nix b/pkgs/by-name/x4/x42-avldrums/package.nix
index b17474141d7d..e89ba0b2dcbe 100644
--- a/pkgs/by-name/x4/x42-avldrums/package.nix
+++ b/pkgs/by-name/x4/x42-avldrums/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "avldrums.lv2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index b89fb23ea126..bb8bd99aac2d 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-lTZ5j5ULh4GFW4zlQy4l7e4zr8TEIvenGNC59O6G0Wg=";
   };
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index ab3ccbb3772b..33ce30dc6f3e 100644
--- a/pkgs/by-name/xg/xgboost/package.nix
+++ b/pkgs/by-name/xg/xgboost/package.nix
@@ -53,7 +53,7 @@ effectiveStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dmlc";
     repo = pnameBase;
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-8mj8uw7bbwhRaL0JZf9L9//a+Re2AwbL0e7Oiw/BqIA=";
   };
diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
index bf7954c782b7..2b65df932864 100644
--- a/pkgs/by-name/xk/xkb-switch-i3/package.nix
+++ b/pkgs/by-name/xk/xkb-switch-i3/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Zebradil";
     repo = "xkb-switch-i3";
-    rev = version;
+    tag = version;
     hash = "sha256-5d1DdRtz0QCWISSsWQt9xgTOekYUCkhfMsjG+/kyQK4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xp/xpano/package.nix b/pkgs/by-name/xp/xpano/package.nix
index 5eb825e97099..e07014097bc8 100644
--- a/pkgs/by-name/xp/xpano/package.nix
+++ b/pkgs/by-name/xp/xpano/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krupkat";
     repo = "xpano";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xs/xstow/package.nix b/pkgs/by-name/xs/xstow/package.nix
index 83957658f852..7102bf70bb82 100644
--- a/pkgs/by-name/xs/xstow/package.nix
+++ b/pkgs/by-name/xs/xstow/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "majorkingleo";
     repo = "xstow";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-c89+thw5N3Cgl1Ww+W7c3YsyhNJMLlreedvdWJFY3WY=";
   };
diff --git a/pkgs/by-name/xt/xtuner/package.nix b/pkgs/by-name/xt/xtuner/package.nix
index a2199f49e70d..617b2fbc0d45 100644
--- a/pkgs/by-name/xt/xtuner/package.nix
+++ b/pkgs/by-name/xt/xtuner/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "XTuner";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1i5chfnf3hcivwzni9z6cn9pb68qmwsx8bf4z7d29a5vig8kbhrv";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix
index 984dd5ab902b..b2e651ea4954 100644
--- a/pkgs/by-name/za/zam-plugins/package.nix
+++ b/pkgs/by-name/za/zam-plugins/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zamaudio";
     repo = "zam-plugins";
-    rev = version;
+    tag = version;
     hash = "sha256-pjnhDavKnyQjPF4nUO+j1J+Qtw8yIYMY9A5zBMb4zFU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix
index 5848dac14772..526fe2dda5c6 100644
--- a/pkgs/by-name/zi/zimfw/package.nix
+++ b/pkgs/by-name/zi/zimfw/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zimfw";
     repo = "zimfw";
-    rev = "v${version}";
+    tag = "v${version}";
     ## zim only needs this one file to be installed.
     sparseCheckout = [ "zimfw.zsh" ];
     hash = "sha256-qQViaQOpLp8F4zvJETbNp0lxpdVhM1Meg7WcMKkjJRQ=";
diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix
index 09b86edb4099..e03a7600f8df 100644
--- a/pkgs/by-name/zl/zls/package.nix
+++ b/pkgs/by-name/zl/zls/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zigtools";
     repo = "zls";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";
   };
diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix
index fa472003edda..1dc750cfe011 100644
--- a/pkgs/by-name/zo/zoneminder/package.nix
+++ b/pkgs/by-name/zo/zoneminder/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ZoneMinder";
     repo = "zoneminder";
-    rev = version;
+    tag = version;
     hash = "sha256-0mpT3qjF8zlcsd6OlNIvrabDsz+oJPPy9Vn2TQSuHAI=";
     fetchSubmodules = true;
   };